; and (ii) sold in substantial quantities in the commercial marketplace; and (B) does not include bulk cargo, as defined in section 40102(4) of title 46, such as agricultural products and petroleum products. (2) The term product or material , with respect to a project or program— (A) means an article, material, or supply brought to the site where the project or program is being carried out for incorporation into the project or program; and (B) includes an item brought to the site preassembled from articles, materials, or supplies. (3) The term United States includes the District of Columbia, the Commonwealth of Puerto Rico, the Northern Mariana Islands, Guam, American Samoa, and the Virgin Islands. . 1018. Repeal of obsolete provision of law regarding vessel nomenclature Section 8662 of title 10, United States Code, is amended— (1) by striking subsection (b); and (2) by redesignating subsection (c) as subsection (b). 1019. Responsibility of Commandant of the Marine Corps with respect to naval battle force ship assessment and requirement reporting Section 8695(e) of title 10, United States Code, is amended— (1) in the subsection heading, by striking Amphibious warfare ships and inserting Responsibilities of Commandant of Marine Corps ; and (2) by inserting before the period at the end the following: and for naval vessels with the primary mission of transporting Marines . 1020. Policy of the United States on shipbuilding defense industrial base Section 1025(a) of the National Defense Authorization Act for Fiscal Year 2018 ( Public Law 115–91 ; 10 U.S.C. 7291 note) is amended— (1) by striking United States and all that follows and inserting United States— ; and (2) by adding at the end the following new paragraphs: (1) to have available, as soon as practicable, not fewer than 355 battle force ships, comprised of the optimal mix of platforms, with funding subject to the availability of appropriations or other funds