; and (B) that crediting shall be conducted in accordance with procedures established by the Secretary. ; and (8) in subsection (g)(1)— (A) by striking subsection (d)(1)(A)(ii) for each of fiscal years 2016 through 2020 and inserting subsection (d)(1)(A)(iv) for each fiscal year ; (B) by inserting rural after functionally classified as ; and (C) by inserting or on critical rural freight corridors designated under section 167(e) after minor collectors . (b) Clerical amendment The analysis for chapter 1 of title 23, United States Code, is amended by striking the item relating to section 133 and inserting the following: 133. Surface transportation program. . (c) Conforming amendments (1) Advance acquisition of real property Section 108(c) of title 23, United States Code, is amended— (A) in paragraph (2)(A) by striking block grant ; and (B) in paragraph (3) by striking block grant . (2) Nondiscrimination Section 140(b) of title 23, United States Code, is amended by striking block grant . (3) Public transportation Section 142(e)(2) of title 23, United States Code, is amended by striking block grant . (4) Highway use tax evasion projects Section 143(b)(8) of title 23, United States Code, is amended in the heading by striking block grant . (5) Congestion mitigation and air quality improvement program Section 149(d) of title 23, United States Code, is amended— (A) in paragraph (1)(B) by striking block grant ; and (B) in paragraph (2)(A) by striking block grant . (6) Territorial and Puerto Rico highway program Section 165 of title 23, United States Code, is amended— (A) in subsection (b)(2)(A)(ii) by striking block grant