TECHNICAL AND CONFORMING CHANGES.

SEC. 3030. TECHNICAL AND CONFORMING CHANGES. (a) Repeal.—Section 20008(b) of MAP-21 (49 U.S.C. 5309 note) is repealed. (b) Repeal Section 5313.—Section 5313 of title 49, United States Code, and the item relating to that section in the analysis for chapter 53 of such title, are repealed. (c) Repeal of Section 5319.—Section 5319 of title 49, United States Code, and the item relating to that section in the analysis for chapter 53 of such title, are repealed. (d) Repeal of Section 5322.—Section 5322 of title 49, United States Code, and the item relating to that section in the analysis for chapter 53 of such title, are repealed. (e) Section 5325.—Section 5325 of title 49, United States Code is amended— (1) in subsection (e)(2), by striking “at least two”; and (2) in subsection (h), by striking “Federal Public Transportation Act of 2012” and inserting “Federal Public Transportation Act of 2015”. (f) Section 5340.—Section 5340 of title 49, United States Code, is amended— (1) by striking subsection (b); and (2) by inserting the following: “(b) Allocation.—The Secretary shall apportion the amounts made available under section 5338(b)(2)(N) in accordance with subsection (c) and subsection (d).” . (g) Chapter 105 of Title 49, United States Code.—Section 10501(c) of title 49, United States Code, is amended— (1) in paragraph (1)— (A) in subparagraph (A)(i), by striking “section 5302(a)” and inserting “section 5302”; and (B) in subparagraph (B)— (i) by striking “mass transportation” and inserting “public transportation”; and (ii) by striking “section 5302(a)” and inserting “section 5302”; and (2) in paragraph (2)(A), by striking “mass transportation” and inserting “public transportation”.