CONFORMING AMENDMENTS.

SEC. 402. CONFORMING AMENDMENTS. (a) Electronic Charts.— (1) Transfer of provision.—Section 4A of the Ports and Waterways Safety Act (33 U.S.C. 1223a)— (A) is redesignated as section 3105 of title 46, United States Code, and transferred to appear after section 3104 of that title; and (B) is amended by striking subsection (b) and inserting the following: “(b) Limitation on Application.—Except pursuant to an international treaty, convention, or agreement, to which the United States is a party, this section shall not apply to any foreign vessel that is not destined for, or departing from, a port or place subject to the jurisdiction of the United States and that is in— “(1) innocent passage through the territorial sea of the United States; or “(2) transit through the navigable waters of the United States that form a part of an international strait.” . (2) [46 U.S.C. 3101] Clerical amendment.—The analysis at the beginning of chapter 31 of such titleis amended by adding at the end the following: “3105. Electronic charts.” . (b) Port, Harbor, and Coastal Facility Security.— (1) Transfer of provisions.—So much of section 7 of the Ports and Waterways Safety Act (33 U.S.C. 1226) as precedes subsection (c) of that section is redesignated as section 70116 of title 46, United States Code, and transferred to section 70116 of that title. (2) Definitions, administration, and enforcement.—Section 70116 of title 46, United States Code, as amended by paragraph (1) of this subsection, is amended by adding at the end the following: “(c) Definitions, Administration, and Enforcement.—This section shall be treated as part of chapter 700 for purposes of sections 70031, 70032, 70034, 70035, and 70036.” . (3) [46 U.S.C. 70101] Clerical amendment.—The analysis at the beginning of chapter 701 of such titleis amended by striking the item relating to section 70116 and inserting the following: “70116. Port, harbor, and coastal facility security.” . (c) Nondisclosure of Port Security Plans.—Subsection (c) of section 7 of the Ports and Waterways Safety Act (33 U.S.C. 1226), as so designated before the application of subsection (b)(1) of this section— (1) is redesignated as subsection (f) of section 70103 of title 46, United States Code, and transferred so as to appear after subsection (e) of such section; and (2) is amended by striking “this Act” and inserting “this chapter”. (d) [46 U.S.C. 2301] Repeal.—Section 2307 of title 46, United States Code, and the item relating to that section in the analysis at the beginning of chapter 23 of that title, are repealed. (e) Repeal.—The Ports and Waterways Safety Act (33 U.S.C. 1221-1231, 1232-1232b), as amended by this Act, is repealed.