; and (2) in clause (ii), by striking the fiscal years 2016 and 2017 and inserting fiscal years 2018 through 2021 . (e) Reinstatement and reauthorization of grants To combat child sex trafficking (1) Reinstatement of expired provision (A) In general Section 202 of the Trafficking Victims Protection Reauthorization Act of 2005 ( 42 U.S.C. 14044a ) is amended to read as such section read on March 6, 2017. (B) Conforming amendment Section 1241(b) of the Violence Against Women Reauthorization Act of 2013 ( 42 U.S.C. 14044a note) is repealed. (2) Effective date The amendments made by paragraph (1) shall take effect as though enacted on March 6, 2017. (3) Reauthorization Section 202(i) of the Trafficking Victims Protection Reauthorization Act of 2005, as amended by paragraph (1), is amended by striking 2014 through 2017 and inserting 2018 through 2021 . 302. Establishment of Office of Victim Assistance (a) Technical amendments Subtitle D of title IV of the Homeland Security Act of 2002 ( 6 U.S.C. 251 et seq.) is amended— (1) in section 442— (A) by striking bureau each place such term appears, except in subsection (a)(1), and inserting agency ; (B) by striking the Bureau of Border Security each place such term appears and inserting U.S. Immigration and Customs Enforcement ; (C) in the section heading, by striking Bureau of Border Security and inserting U.S. Immigration and Customs Enforcement ; (D) in subsection (a)— (i) in the heading, by striking of Bureau ; (ii) in paragraph (1), by striking a bureau to be known as the Bureau of Border Security . and inserting an agency to be known as U.S. Immigration and Customs Enforcement . ; (iii) in paragraph (3)(C), by striking the Bureau of before Citizenship and Immigration Services and inserting U.S. ; and (iv) in paragraph (4), by striking the Bureau. and inserting the agency. ; and (E) in subsection (b)(2)— (i) in the matter preceding subparagraph (A), by striking Bureau of Border Security and inserting U.S. Immigration and Customs Enforcement