Title: To make technical amendments to update statutory references to provisions reclassified to title 34, United States Code.
Policy area: Crime and Law Enforcement

Summary:
This bill makes technical amendments to the U.S. Code to revise references to statutory provisions reclassified to Title 34 (Crime Control and Law Enforcement).

[Congressional Bills 115th Congress]
[From the U.S. Government Publishing Office]
[H.R. 5335 Introduced in House (IH)]

<DOC>






115th CONGRESS
  2d Session
                                H. R. 5335

    To make technical amendments to update statutory references to 
        provisions reclassified to title 34, United States Code.


_______________________________________________________________________


                    IN THE HOUSE OF REPRESENTATIVES

                             March 19, 2018

    Mr. Sensenbrenner (for himself, Mr. Goodlatte, and Mr. Nadler) 
 introduced the following bill; which was referred to the Committee on 
                             the Judiciary

_______________________________________________________________________

                                 A BILL


 
    To make technical amendments to update statutory references to 
        provisions reclassified to title 34, United States Code.

    Be it enacted by the Senate and House of Representatives of the 
United States of America in Congress assembled,

SECTION 1. TITLE 2, UNITED STATES CODE.

    Section 2(2) of the Fallen Heroes Flag Act of 2016 (2 U.S.C. 
1881(2)) is amended by striking ``(42 U.S.C. 3796b)'' and inserting 
``(34 U.S.C. 10284)''.

SEC. 2. TITLE 6, UNITED STATES CODE.

    Section 2002(c)(1) of the Homeland Security Act of 2002 (6 U.S.C. 
603(c)(1)) is amended by striking ``(42 U.S.C. 3714)'' and inserting 
``(6 U.S.C. 603 note)''.

SEC. 3. TITLE 8, UNITED STATES CODE.

            (1) Section 403(d) of the Uniting and Strengthening America 
        by Providing Appropriate Tools Required to Intercept and 
        Obstruct Terrorism Act of 2001 (Public Law 107-56, 8 U.S.C. 
        1105 note) is amended by striking ``(subtitle A of title II of 
        Public Law 105-251; 42 U.S.C. 14611-16)'' and inserting 
        ``(subtitle A of title II of Public Law 105-251; 34 U.S.C. 
        40311-16)''.
            (2) Section 204(a)(1)(A)(viii)(II) of the Immigration and 
        Nationality Act (8 U.S.C. 1154(a)(1)(A)(viii)(II)) is amended 
        by inserting ``(34 U.S.C. 20911)'' after ``section 111 of the 
        Adam Walsh Child Protection and Safety Act of 2006''.
            (3) Section 214 of the Immigration and Nationality Act (8 
        U.S.C. 1184) is amended as follows:
                    (A) Subsection (d)(3)(A) is amended by striking 
                ``section 3 of the Violence Against Women and 
                Department of Justice Reauthorization Act of 2005'' and 
                inserting ``section 40002(a) of the Violence Against 
                Women Act of 1994 (34 U.S.C. 12291(a))''.
                    (B) Subsection (r)(5)(A) is amended by striking 
                ``section 3 of the Violence Against Women and 
                Department of Justice Reauthorization Act of 2005'' and 
                inserting ``section 40002(a) of the Violence Against 
                Women Act of 1994 (34 U.S.C. 12291(a))''.
            (4) Section 833(e)(2) of the International Marriage Broker 
        Regulation Act of 2005 (8 U.S.C. 1375a(e)(2)) is amended by 
        striking ``section 3 of this Act'' and inserting ``section 
        40002(a) of the Violence Against Women Act of 1994 (34 U.S.C. 
        12291(a))''.

SEC. 4. TITLE 10, UNITED STATES CODE.

            (1) Section 115(a)(8)(C)(i) of the Department of Justice 
        Appropriations Act, 1998 (Public Law 105-119; 10 U.S.C. 951 
        note) is amended by inserting ``(34 U.S.C. 20901 et seq.)'' 
        after ``Sex Offender Registration and Notification Act''.
            (2) Section 1565 of title 10, United States Code, is 
        amended as follows:
                    (A) Subsection (a)(2) is amended by inserting ``(34 
                U.S.C. 40702(a))'' after ``section 3(a) of the DNA 
                Analysis Backlog Elimination Act of 2000''.
                    (B) Subsection (d)(2) is amended by striking ``(42 
                U.S.C. 14135a(d))'' and inserting ``(34 U.S.C. 
                40702(d))''.
                    (C) Subsection (e)(1) is amended by inserting ``(34 
                U.S.C. 12592(a))'' after ``subsection (a) of section 
                210304 of the Violent Crime Control and Law Enforcement 
                Act of 1994''.
                    (D) Subsection (e)(2)(A) is amended by inserting 
                ``(34 U.S.C. 40702)'' after ``section 3 of the DNA 
                Analysis Backlog Elimination Act of 2000''.
                    (E) Subsection (e)(2)(B) is amended by inserting 
                ``(34 U.S.C. 40703)'' after ``section 4 of the DNA 
                Analysis Backlog Elimination Act of 2000''.
            (3) Section 575(a) of the National Defense Authorization 
        Act for Fiscal Year 2017 (Public Law 114-328, 10 U.S.C. 1787 
        note) is amended as follows:
                    (A) Paragraph (1)(B) is amended by striking ``(42 
                U.S.C. 13031(b))'' and inserting ``(34 U.S.C. 
                20341(b))''.
                    (B) Paragraph (3) is amended by striking ``(42 
                U.S.C. 13031(c))'' and inserting ``(34 U.S.C. 
                20341(c))''.
            (4) Section 2696(f)(1)(C) of title 10, United States Code, 
        is amended by striking ``(42 U.S.C. 3762a)'' and inserting 
        ``(34 U.S.C. 10171)''.

SEC. 5. TITLE 12, UNITED STATES CODE.

            (1) Section 4107(c)(2) of the Small Business Jobs Act of 
        2010 (Public Law 111-240, 12 U.S.C. 4741 note) is amended by 
        striking ``(42 U.S.C. 16911)'' and inserting ``(34 U.S.C. 
        20911)''.
            (2) Section 3011(b)(2) of the State Small Business Credit 
        Initiative Act of 2010 (12 U.S.C. 5710(b)(2)) is amended by 
        striking ``(42 U.S.C. 16911)'' and inserting ``(34 U.S.C. 
        20911)''.

SEC. 6. TITLE 18, UNITED STATES CODE.

            (1) Section 798(d)(4) of title 18, United States Code, is 
        amended by striking ``(42 U.S.C. 10601)'' and inserting ``(34 
        U.S.C. 20101)''.
            (2) Section 2250(b)(1) of title 18, United States Code, is 
        amended by striking ``(42 U.S.C. 16901 et seq.)'' and inserting 
        ``(34 U.S.C. 20901 et seq.)''.
            (3) Section 2258 of title 18, United States Code, is 
        amended by inserting ``(34 U.S.C. 20341(b))'' after 
        ``subsection (b) of section 226 of the Victims of Child Abuse 
        Act of 1990''.
            (4) Section 3014 of title 18, United States Code, is 
        amended as follows:
                    (A) Subsection (e)(1)(A) is amended by striking 
                ``(42 U.S.C. 14044c)'' and inserting ``(34 U.S.C. 
                20705)''.
                    (B) Subsection (e)(1)(C) is amended by striking 
                ``(42 U.S.C. 13002(b))'' and inserting ``(34 U.S.C. 
                20304(b))''.
                    (C) Subsection (e)(1)(D) is amended by striking 
                ``(42 U.S.C. 17616)'' and inserting ``(34 U.S.C. 
                21116)''.
                    (D) Subsection (h)(2)(A) is amended by striking 
                ``(42 U.S.C. 14044a, 14044b, and 14044c)'' and 
                inserting ``(34 U.S.C. 20702, 20703, 20705)''.
                    (E) Subsection (h)(2)(C) is amended by striking 
                ``(42 U.S.C. 13002(b))'' and inserting ``(34 U.S.C. 
                20304(b))''.
                    (F) Subsection (h)(3) is amended by striking ``(42 
                U.S.C. 13002(b))'' and inserting ``(34 U.S.C. 
                20304(b))''.
            (5) Section 3142 of title 18, United States Code, is 
        amended as follows:
                    (A) Subsection (b) is amended by striking ``(42 
                U.S.C. 14135a)'' and inserting ``(34 U.S.C. 40702)''.
                    (B) Subsection (c)(1)(A) is amended by striking 
                ``(42 U.S.C. 14135a)'' and inserting ``(34 U.S.C. 
                40702)''.
            (6) Section 3486(a)(1)(D)(ii) of title 18, United States 
        Code, is amended by striking ``(42 U.S.C. 16901 et seq.)'' and 
        inserting ``(34 U.S.C. 20901 et seq.)''.
            (7) Section 3510(c) of title 18, United States Code, is 
        amended by inserting ``(34 U.S.C. 20141(e)(2))'' after 
        ``section 503(e)(2) of the Victims' Rights and Restitution Act 
        of 1990''.
            (8) Section 3563 of title 18, United States Code, is 
        amended as follows:
                    (A) Subsection (a)(8) is amended by inserting ``(34 
                U.S.C. 20901 et seq.)'' after ``Sex Offender 
                Registration and Notification Act''.
                    (B) Subsection (a)(9) is amended by inserting ``(34 
                U.S.C. 40702)'' after ``section 3 of the DNA Analysis 
                Backlog Elimination Act of 2000''.
                    (C) Subsection (b)(23) is amended by inserting 
                ``(34 U.S.C. 20901 et seq.)'' after ``Sex Offender 
                Registration and Notification Act''.
            (9) Section 3583(d) (matter before paragraph (1)) of title 
        18, United States Code, is amended by--
                    (A) inserting ``(34 U.S.C. 20901 et seq.)'' after 
                ``Sex Offender Registration and Notification Act''; and
                    (B) inserting ``(34 U.S.C. 40702)'' after ``section 
                3 of the DNA Analysis Backlog Elimination Act of 
                2000''.
            (10) Section 3771(a)(10) of title 18, United States Code, 
        is amended by striking ``(42 U.S.C. 10607(c))'' and inserting 
        ``(34 U.S.C. 20141(c))''.
            (11) Section 3772(d) of title 18, United States Code, is 
        amended by striking ``(42 U.S.C. 10601(d)(3)(A)(i))'' and 
        inserting ``(34 U.S.C. 20101(d)(3)(A)(i))''.
            (12) Section 4042(c)(2) of title 18, United States Code, is 
        amended by inserting ``(34 U.S.C. 20901 et seq.)'' after ``Sex 
        Offender Registration and Notification Act''.
            (13) Section 4048(g)(2)(A) of title 18, United States Code, 
        is amended by striking ``(42 U.S.C. 10601)'' and inserting 
        ``(34 U.S.C. 20101)''.

SEC. 7. TITLE 20, UNITED STATES CODE.

            (1) Section 480(d)(1)(H)(ii) of the Higher Education Act of 
        1965 (20 U.S.C. 1087vv(d)(1)(H)(ii)) is amended by inserting 
        ``(34 U.S.C. 11201 et seq.)'' after ``Runaway and Homeless 
        Youth Act''.
            (2) Section 485(f) of the Jeanne Clery Disclosure of Campus 
        Security Policy and Campus Crime Statistics Act (20 U.S.C. 
        1092(f)) is amended as follows:
                    (A) Paragraph (6)(A)(i) is amended by striking 
                ``(42 U.S.C. 13925(a))'' and inserting ``(34 U.S.C. 
                12291(a))''.
                    (B) Paragraph (7) is amended by--
                            (i) inserting ``(34 U.S.C. 41305, 41305 
                        note)'' after ``Hate Crime Statistics Act''; 
                        and
                            (ii) striking ``(42 U.S.C. 13925(a))'' and 
                        inserting ``(34 U.S.C. 12291(a))''.
            (3) Section 704(a)(9) of the Safe Schools Act of 1994 (20 
        U.S.C. 5964(a)(9)) is amended by inserting ``(34 U.S.C. 11101 
        et seq.)'' after ``Juvenile Justice and Delinquency Prevention 
        Act of 1974''.
            (4) Section 1414(c)(19) of the Elementary and Secondary 
        Education Act of 1965 (20 U.S.C. 6434(c)(19)) is amended by 
        striking ``(42 U.S.C. 5601 et seq.)'' and inserting ``(34 
        U.S.C. 11101 et seq.)''.
            (5) Section 1423(10) of the Elementary and Secondary 
        Education Act of 1965 (20 U.S.C. 6453(10)) is amended by 
        inserting ``(34 U.S.C. 11101 et seq.)'' after ``Juvenile 
        Justice and Delinquency Prevention Act of 1974''.
            (6) Section 1425(10) of the Elementary and Secondary 
        Education Act of 1965 (20 U.S.C. 6455(10)) is amended by 
        inserting ``(34 U.S.C. 11101 et seq.)'' after ``Juvenile 
        Justice and Delinquency Prevention Act of 1974''.

SEC. 8. TITLE 22, UNITED STATES CODE.

            (1) Section 240 of the William Wilberforce Trafficking 
        Victims Protection Reauthorization Act of 2008 (22 U.S.C. 212b) 
        is amended as follows:
                    (A) Subsection (a) is amended by inserting ``(34 
                U.S.C. 21507)'' after ``section 9 of the International 
                Megan's Law to Prevent Child Exploitation and Other 
                Sexual Crimes Through Advanced Notification of 
                Traveling Sex Offenders''.
                    (B) Subsection (b)(2) is amended by inserting ``(34 
                U.S.C. 21507)'' after ``section 9 of the International 
                Megan's Law to Prevent Child Exploitation and Other 
                Sexual Crimes Through Advanced Notification of 
                Traveling Sex Offenders''.
                    (C) Subsection (c)(1)(A) is amended by inserting 
                ``(34 U.S.C. 21503(f))'' after ``section 4(f) of the 
                International Megan's Law to Prevent Child Exploitation 
                and Other Sexual Crimes Through Advanced Notification 
                of Traveling Sex Offenders''.
                    (D) Subsection (f) is amended by inserting ``(34 
                U.S.C. 21507)'' after ``section 9 of the International 
                Megan's Law to Prevent Child Exploitation and Other 
                Sexual Crimes Through Advanced Notification of 
                Traveling Sex Offenders''.
            (2) Section 105(d)(7) of the Trafficking Victims Protection 
        Act of 2000 (22 U.S.C. 7103(d)(7)) is amended as follows:
                    (A) Subparagraph (L) is amended by striking 
                ``sections 202 and 204 of the Trafficking Victims 
                Protection Act of 2005'' and inserting ``sections 202 
                and 204 of the Trafficking Victims Protection 
                Reauthorization Act of 2005 (34 U.S.C. 20702, 20705)''.
                    (B) Subparagraph (R) is amended by striking ``(42 
                U.S.C. 14044(a))'' and inserting ``(34 U.S.C. 
                20702(a))''.

SEC. 9. TITLE 25, UNITED STATES CODE.

            (1) Section 4213(b)(1) of the Indian Alcohol and Substance 
        Abuse Prevention and Treatment Act of 1986 (25 U.S.C. 
        2433(b)(1)) is amended by inserting ``(34 U.S.C. 11101 et 
        seq.)'' after ``Juvenile Justice and Delinquency Prevention Act 
        of 1974''.
            (2) Section 4220(a)(2) of the Indian Alcohol and Substance 
        Abuse Prevention and Treatment Act of 1986 (25 U.S.C. 
        2453(a)(2)) is amended by inserting ``(34 U.S.C. 11101 et 
        seq.)'' after ``Juvenile Justice and Delinquency Prevention Act 
        of 1974''.
            (3) Section 4221 of the Indian Alcohol and Substance Abuse 
        Prevention and Treatment Act of 1986 (25 U.S.C. 2454) is 
        amended by inserting ``(34 U.S.C. 11101 et seq.)'' after 
        ``Juvenile Justice and Delinquency Prevention Act of 1974''.
            (4) Section 3(c)(14) of the Indian Law Enforcement Reform 
        Act (25 U.S.C. 2802(c)(14)) is amended by striking ``(42 U.S.C. 
        3732)'' and inserting ``(34 U.S.C. 10132(g))''.

SEC. 10. TITLE 26, UNITED STATES CODE.

            (1) Section 101(h) of the Internal Revenue Code of 1986 (26 
        U.S.C. 101(h)) is amended as follows:
                    (A) Paragraph (1) (matter before subparagraph (A)) 
                is amended by inserting ``(34 U.S.C. 10284)'' after 
                ``section 1204 of the Omnibus Crime Control and Safe 
                Streets Act of 1968''.
                    (B) Paragraph (2)(B) is amended by inserting ``(34 
                U.S.C. 10284)'' after ``section 1204 of such Act''.
            (2) Section 104(a)(6)(A) of the Internal Revenue Code of 
        1986 (26 U.S.C. 104(a)(6)(A)) is amended by striking ``(42 
        U.S.C. 3796)'' and inserting ``(34 U.S.C. 10281)''.
            (3) Section 402(l)(4)(C) of the Internal Revenue Code of 
        1986 (26 U.S.C. 402(l)(4)(C)) is amended by striking ``(42 
        U.S.C. 3796b(9)(A))'' and inserting ``(34 U.S.C. 
        10284(9)(A))''.
            (4) Section 4980I(f)(3) of the Internal Revenue Code of 
        1986 (26 U.S.C. 4980I(f)(3)) is amended by inserting ``(34 
        U.S.C. 10284)'' after ``section 1204 of the Omnibus Crime 
        Control and Safe Streets Act of 1968''.
            (5) Section 6103(i)(1)(C)(iv) of the Internal Revenue Code 
        of 1986 (26 U.S.C. 6103(i)(1)(C)(iv)) is amended by striking 
        ``(42 U.S.C. 16911(7))'' and inserting ``(34 U.S.C. 
        20911(7))''.

SEC. 11. TITLE 28, UNITED STATES CODE.

            (1) Section 2546(a)(2) of the Comprehensive Thrift and Bank 
        Fraud Prosecution and Taxpayer Recovery Act of 1990 (Public Law 
        101-647, 28 U.S.C. 522 note) is amended by striking ``section 
        2539(c)(2)'' and inserting ``section 2539(c)(3) (34 U.S.C. 
        41501(c)(3))''.
            (2) Section 110(1) of H.R. 2076, One Hundred Fourth 
        Congress, as passed by the House of Representatives on December 
        6, 1995, and as enacted into law by section 101(a) of Public 
        Law 104-91 (28 U.S.C. 524 note) is amended by striking 
        ``section 10601 of title 42 of the United States Code'' and 
        inserting ``section 1402 of the Victims of Crime Act of 1984 
        (34 U.S.C. 20101)''.
            (3) Section 1605A(e)(2) of title 28, United States Code, is 
        amended by striking ``(42 U.S.C. 10603c)'' and inserting ``(34 
        U.S.C. 20106)''.
            (4) Section 1863(b)(5)(B) of title 28, United States Code, 
        is amended by striking ``section 1203(6) of title I of the 
        Omnibus Crime Control and Safe Streets Act of 1968'' and 
        inserting ``section 1204(8) of title I of the Omnibus Crime 
        Control and Safe Streets Act of 1968 (34 U.S.C. 10284(8))''.

SEC. 12. TITLE 29, UNITED STATES CODE.

            (1) Section 3 of the Workforce Innovation and Opportunity 
        Act (29 U.S.C. 3102) is amended as follows:
                    (A) Paragraph (24)(G) is amended by striking ``(42 
                U.S.C. 14043e-2(6))'' and inserting ``(34 U.S.C. 
                12473(6))''.
                    (B) Paragraph (36)(A)(iii) is amended by striking 
                ``(42 U.S.C. 14043e-2(6))'' and inserting ``(34 U.S.C. 
                12473(6))''.
            (2) Section 103(a)(2)(K) of the Workforce Innovation and 
        Opportunity Act (29 U.S.C. 3113(a)(2)(K)) is amended by 
        striking ``(42 U.S.C. 17532)'' and inserting ``(34 U.S.C. 
        60532)''.
            (3) Section 121(b)(1)(B)(xii) of the Workforce Innovation 
        and Opportunity Act (29 U.S.C. 3151(b)(1)(B)(xii)) is amended 
        by striking ``(42 U.S.C. 17532)'' and inserting ``(34 U.S.C. 
        60532)''.
            (4) Section 129(a)(1) of the Workforce Innovation and 
        Opportunity Act (29 U.S.C. 3164(a)(1)) is amended as follows:
                    (A) Subparagraph (B)(iii)(V) is amended by striking 
                ``(42 U.S.C. 14043e-2(6))'' and inserting ``(34 U.S.C. 
                12473(6))''.
                    (B) Subparagraph (C)(iv)(IV) is amended by striking 
                ``(42 U.S.C. 14043e-2(6))'' and inserting ``(34 U.S.C. 
                12473(6))''.
            (5) Section 144(a)(3)(C) of the Workforce Innovation and 
        Opportunity Act (29 U.S.C. 3194(a)(3)(C)) is amended by 
        striking ``(42 U.S.C. 14043e-2(6))'' and inserting ``(34 U.S.C. 
        12473(6))''.
            (6) Section 171(b)(4) of the Workforce Innovation and 
        Opportunity Act (29 U.S.C. 3226(b)(4)) is amended by striking 
        ``(42 U.S.C. 14043e-2(6))'' and inserting ``(34 U.S.C. 
        12473(6))''.

SEC. 13. TITLE 31, UNITED STATES CODE.

            (1) Section 1102(36) of the Federal Reporting Act of 2000 
        (Public Law 106-569, 31 U.S.C. 1113 note) is amended by 
        striking ``(28 U.S.C. 522 note)'' and inserting ``(34 U.S.C. 
        41306)''.
            (2) Section 1 of Public Law 106-197 (31 U.S.C. 1113 note) 
        is amended as follows:
                    (A) Paragraph (4) is amended by striking ``(28 
                U.S.C. 522 note)'' and inserting ``(34 U.S.C. 41301)''.
                    (B) Paragraph (6) is amended by striking ``sections 
                102(b) (42 U.S.C. 3712(b)), 520 (42 U.S.C. 3766), 522 
                (42 U.S.C. 3766b), and 810 (42 U.S.C. 3789e)'' and 
                inserting ``sections 102(b) (34 U.S.C. 10102(b)), 520 
                (34 U.S.C. 10201), 522 (34 U.S.C. 10203), and 810 (34 
                U.S.C. 10229)''.

SEC. 14. TITLE 33, UNITED STATES CODE.

    Section 3547 of the National Defense Authorization Act for Fiscal 
Year 2017 (33 U.S.C. 894f) is amended by striking ``(42 U.S.C. 
13925(a))'' and inserting ``(34 U.S.C. 12291(a))''.

SEC. 15. TITLE 34, UNITED STATES CODE.

            (1) Section 103(b) of the Omnibus Crime Control and Safe 
        Streets Act of 1968 (34 U.S.C. 10103(b)) is amended by 
        inserting ``(34 U.S.C. 10104)'' after ``section 104''.
            (2) Section 104(a) (matter before paragraph (1)) of the 
        Omnibus Crime Control and Safe Streets Act of 1968 (34 U.S.C. 
        10104(a) (matter before paragraph (1)) is amended by inserting 
        ``(34 U.S.C. 10103(c))'' after ``section 103(c)''.
            (3) Section 105 of the Omnibus Crime Control and Safe 
        Streets Act of 1968 (34 U.S.C. 10105) is amended by inserting 
        ``(34 U.S.C. 10103, 10104)'' after ``sections 103 and 104''.
            (4) Section 1158(b) of the Department of Justice 
        Appropriations Authorization Act of 2005 (Public Law 109-162, 
        title XI, 34 U.S.C. 10109 note) is amended as follows:
                    (A) Paragraph (1) is amended by striking ``(42 
                U.S.C. 3712d)'' and inserting ``(34 U.S.C. 10109)''.
                    (B) Paragraph (2) is amended by striking ``(42 
                U.S.C. 3712d)'' and inserting ``(34 U.S.C. 10109(c)-
                (e))''.
            (5) Section 112 of the Department of Justice Appropriations 
        Act, 1999 (34 U.S.C. 10110) is amended as follows:
                    (A) Paragraph (1) is amended by striking ``title 1 
                of Public Law 90-351'' and inserting ``title I of the 
                Omnibus Crime Control and Safe Streets Act of 1968 (34 
                U.S.C. 10101 et seq.)''.
                    (B) Paragraph (2) is amended by striking ``title 1 
                of Public Law 90-351'' and inserting ``title I of the 
                Omnibus Crime Control and Safe Streets Act of 1968''.
            (6) Section 108(a) of the Department of Justice 
        Appropriations Act, 2000 (Public Law 106-113, division B, 
        section 1000(a)(1) [title I], 34 U.S.C. 10110 note) is amended 
        as follows:
                    (A) Paragraph (1) is amended by striking ``title 1 
                of Public Law 90-351'' and inserting ``title I of the 
                Omnibus Crime Control and Safe Streets Act of 1968 (34 
                U.S.C. 10101 et seq.)''.
                    (B) Paragraph (2) is amended by--
                            (i) striking ``title 1 of Public Law 90-
                        351'' and inserting ``title I of the Omnibus 
                        Crime Control and Safe Streets Act of 1968'';
                            (ii) inserting ``(34 U.S.C. 10121, 10122, 
                        10131, 10132)'' after ``sections 201, 202, 301, 
                        and 302 of the Omnibus Crime Control and Safe 
                        Streets Act of 1968''; and
                            (iii) striking ``sections 204(b)(3),'' and 
                        inserting ``section 204(b)(3) (34 U.S.C. 
                        11114(b)(3)) and sections''.
            (7) Section 302(c)(22) of the Omnibus Crime Control and 
        Safe Streets Act of 1968 (34 U.S.C. 10132(c)(22)) is amended by 
        inserting ``(34 U.S.C. 10231)'' after ``section 812''.
            (8) Section 108(b) of the Department of Justice 
        Appropriations Act, 2000 (Public Law 106-113, division B, 
        section 1000(a)(1) [title I], 34 U.S.C. 10141 note) is amended 
        by striking ``the Omnibus Crime Control and Safe Streets Act, 
        as amended, 42 U.S.C. 3742(3) through (6)'' and inserting ``the 
        Omnibus Crime Control and Safe Streets Act of 1968, as amended 
        (34 U.S.C. 10142(3)-(6))''.
            (9) Section 501(a) of the Omnibus Crime Control and Safe 
        Streets Act of 1968 (34 U.S.C. 10152(a)) is amended as follows:
                    (A) Paragraph (1) (matter before subparagraph (A)) 
                is amended by inserting ``(34 U.S.C. 10156)'' after 
                ``section 505''.
                    (B) Paragraph (2) is amended by inserting ``(34 
                U.S.C. 10151(b))'' after ``section 500(b)''.
            (10) Section 502 of the Omnibus Crime Control and Safe 
        Streets Act of 1968 (34 U.S.C. 10153) is amended as follows:
                    (A) The designation for the first subsection is 
                amended by striking ``(A)'' and inserting ``(a)''.
                    (B) Subsection (a)(6)(B), as redesignated, is 
                amended by inserting ``(34 U.S.C. 10152(a)(1)(A)-(G))'' 
                after ``section 501(a)(1)''.
                    (C) Subsection (a)(6)(E)(ii), as redesignated, is 
                amended by inserting ``(34 U.S.C. 10152(a)(1)(A)-(G))'' 
                after ``section 501(a)(1)''.
            (11) Section 14(c) of the Effective Administration of 
        Criminal Justice Act of 2016 (Public Law 114-324, section 14, 
        34 U.S.C. 10153 note) is amended by--
                    (A) striking ``section 501(a)(6) of title I of the 
                Omnibus Crime Control and Safe Streets Act of 1968'' 
                and inserting ``section 502(a)(6) of title I of the 
                Omnibus Crime Control and Safe Streets Act of 1968 (34 
                U.S.C. 10153(a)(6))''; and
                    (B) striking ``such section 501'' and inserting 
                ``such section 502''.
            (12) Section 505 of the Omnibus Crime Control and Safe 
        Streets Act of 1968 (34 U.S.C. 10156) is amended as follows:
                    (A) Subsection (c)(1) (matter before subparagraph 
                (A)) is amended by inserting ``(34 U.S.C. 10152)'' 
                after ``section 501''.
                    (B) Subsection (c)(2) is amended by inserting ``(34 
                U.S.C. 10152)'' after ``section 501''.
                    (C) Subsection (d)(1) is amended by inserting ``(34 
                U.S.C. 10152)'' after ``section 501''.
                    (D) Subsection (e)(2) is amended by inserting ``(34 
                U.S.C. 10152)'' after ``section 501''.
            (13) Section 506(b) of the Omnibus Crime Control and Safe 
        Streets Act of 1968 (34 U.S.C. 10157(b)) is amended as follows:
                    (A) The matter before paragraph (1) is amended by 
                inserting ``(34 U.S.C. 10152)'' after ``section 501''.
                    (B) Paragraph (2) is amended by inserting ``(34 
                U.S.C. 10156)'' after ``section 505''.
            (14) Section 507(c) of the Omnibus Crime Control and Safe 
        Streets Act of 1968 (34 U.S.C. 10158(c)) is amended by 
        inserting ``(34 U.S.C. 10108)'' after ``section 108 of this 
        title''.
            (15) Section 516 of the Omnibus Crime Control and Safe 
        Streets Act of 1968 (34 U.S.C. 10172) is amended as follows:
                    (A) Subsection (a) is amended by--
                            (i) inserting ``(34 U.S.C. 10171(a)(1))'' 
                        after ``section 515(a)(1)'';
                            (ii) inserting ``(34 U.S.C. 10171(a)(2))'' 
                        after ``section 515(a)(2)'';
                            (iii) inserting ``(34 U.S.C. 10171(a)(3))'' 
                        after ``section 515(a)(3)''; and
                            (iv) inserting ``(34 U.S.C. 10171(a)(4))'' 
                        after ``section 515(a)(4)''.
                    (B) Subsection (b) is amended by inserting ``(34 
                U.S.C. 10171(a)(1), (3))'' after ``section 515(a)''.
            (16) Section 517(a)(1) of the Omnibus Crime Control and 
        Safe Streets Act of 1968 (34 U.S.C. 10181(a)(1)) is amended by 
        inserting ``(34 U.S.C. 10171)'' after ``section 515''.
            (17) Section 520 of the Omnibus Crime Control and Safe 
        Streets Act of 1968 (34 U.S.C. 10201) is amended as follows:
                    (A) Subsection (a)(2) is amended by striking 
                ``section 505 (formula grants) and section 515 
                (discretionary grants)'' and inserting ``section 505 
                (34 U.S.C. 10156) (formula grants) and section 515 (34 
                U.S.C. 10171) (discretionary grants)''.
                    (B) Subsection (b)(2) is amended by striking 
                ``section 505 (formula grants)'' and inserting 
                ``section 505 (34 U.S.C. 10156) (formula grants)''.
            (18) Section 521(c)(2) of the Omnibus Crime Control and 
        Safe Streets Act of 1968 (34 U.S.C. 10202(c)(2)) is amended by 
        inserting ``(34 U.S.C. 10533)'' after ``section 2503''.
            (19) Section 522(a) (matter before paragraph (1)) of the 
        Omnibus Crime Control and Safe Streets Act of 1968 (34 U.S.C. 
        10203(a) (matter before paragraph (1))) is amended by inserting 
        ``(34 U.S.C. 10156)'' after ``section 505''.
            (20) Section 801(b) of the Omnibus Crime Control and Safe 
        Streets Act of 1968 (34 U.S.C. 10221(b)) is amended as follows:
                    (A) The matter before paragraph (1) is amended by 
                inserting ``(34 U.S.C. 10151 et seq., 10321, 10331 et 
                seq., 10351 et seq., 10461 et seq.)'' after ``parts E, 
                M, N, O, and U''.
                    (B) The matter after paragraph (5) is amended by--
                            (i) inserting ``(34 U.S.C. 10151 et seq.)'' 
                        after ``applicants under subpart 1 of part E''; 
                        and
                            (ii) inserting ``(34 U.S.C. 10153)'' after 
                        ``section 502 of this title''.
            (21) Section 808 of the Omnibus Crime Control and Safe 
        Streets Act of 1968 (34 U.S.C. 10227) is amended by inserting 
        ``(34 U.S.C. 10158)'' after ``section 507''.
            (22) Section 901(a)(2) of the Omnibus Crime Control and 
        Safe Streets Act of 1968 (34 U.S.C. 10251(a)(2)) is amended by 
        inserting ``(34 U.S.C. 10156(a))'' after ``section 505(a)''.
            (23) Section 1086(d)(2) of the Dale Long Public Safety 
        Officers' Benefits Improvements Act of 2012 (Public Law 112-
        239, division A, title X, section 1086, 34 U.S.C. 10251 note) 
        is amended as follows:
                    (A) Subparagraph (A) is amended by--
                            (i) inserting ``(34 U.S.C. 10284(7))'' 
                        after ``section 1204(7) of title I of the 
                        Omnibus Crime Control and Safe Streets Act of 
                        1968''; and
                            (ii) striking ``(42 U.S.C. 3796b)'' and 
                        inserting ``(34 U.S.C. 10284)''.
                    (B) Subparagraph (B) is amended by inserting ``(34 
                U.S.C. 10281(k))'' after ``Section 1201(k) of title I 
                of the Omnibus Crime Control and Safe Streets Act of 
                1968''.
            (24) Section 1001 of the Omnibus Crime Control and Safe 
        Streets Act of 1968 (34 U.S.C. 10261) is amended as follows:
                    (A) Subsection (a)(3) is amended by inserting ``(34 
                U.S.C. 10141 et seq., 10151 et seq., 10211, 10281 et 
                seq., 10321, 10331 et seq., 10351 et seq., 10361 et 
                seq., 10381 et seq., 10401 et seq., 10421 et seq., 
                10441 et seq., 10461 et seq., 10491 et seq., 10511 et 
                seq., 10611 et seq.)'' after ``parts D, E, F, G, L, M, 
                N, O, P, Q, R, S, T, U, V, W, and X or EE''.
                    (B) Subsection (a)(4) is amended by inserting ``(34 
                U.S.C. 10281 et seq.)'' after ``part L of this title''.
                    (C) Subsection (a)(5) is amended by--
                            (i) inserting ``(34 U.S.C. 10141 et seq., 
                        10151 et seq.)'' after ``parts D and E'';
                            (ii) striking ``(other than chapter B of 
                        subpart 2)''; and
                            (iii) inserting ``(34 U.S.C. 10171 et 
                        seq.)'' after ``chapter B of subpart 2 of part 
                        E''.
                    (D) Subsection (a)(6) is amended by inserting ``(34 
                U.S.C. 10171 et seq.)'' after ``chapter B of subpart 2 
                of part E of this title''.
                    (E) Subsection (a)(7) is amended by inserting ``(34 
                U.S.C. 10331 et seq.)'' after ``part N''.
                    (F) Subsection (a)(9) (matter before subparagraph 
                (A)) is amended by inserting ``(34 U.S.C. 10351 et 
                seq.)'' after ``part O''.
                    (G) Subsection (a)(10) is amended by inserting 
                ``(34 U.S.C. 10361 et seq.)'' after ``part P''.
                    (H) Subsection (a)(11) is amended as follows:
                            (i) Subparagraph (A) is amended by 
                        inserting ``(34 U.S.C. 10381 et seq.)'' after 
                        ``part Q''.
                            (ii) Subparagraph (B) is amended by--
                                    (I) inserting ``(34 U.S.C. 10381 et 
                                seq.)'' after ``Of funds available 
                                under part Q''; and
                                    (II) inserting ``(34 U.S.C. 
                                10381(d))'' after ``section 1701(d)''.
                    (I) Subsection (a)(16) (matter before subparagraph 
                (A)) is amended by inserting ``(34 U.S.C. 10401 et 
                seq.)'' after ``part R''.
                    (J) Subsection (a)(17) (matter before subparagraph 
                (A)) is amended by inserting ``(34 U.S.C. 10421 et 
                seq.)'' after ``part S''.
                    (K) Subsection (a)(18) is amended by inserting 
                ``(34 U.S.C. 10441 et seq.)'' after ``part T''.
                    (L) Subsection (a)(19) is amended by inserting 
                ``(34 U.S.C. 10461 et seq.)'' after ``part U''.
                    (M) Subsection (a)(21) (matter before subparagraph 
                (A)) is amended by inserting ``(34 U.S.C. 10491 et 
                seq.)'' after ``part W''.
                    (N) Subsection (a)(22) (matter before subparagraph 
                (A)) is amended by inserting ``(34 U.S.C. 10511 et 
                seq.)'' after ``part X''.
                    (O) Subsection (a)(23) is amended by inserting 
                ``(34 U.S.C. 10531 et seq.)'' after ``part Y''.
                    (P) Subsection (a)(24) (matter before subparagraph 
                (A)) is amended by inserting ``(34 U.S.C. 10561 et 
                seq.)'' after ``part BB''.
                    (Q) Subsection (a)(25)(A) is amended by inserting 
                ``(34 U.S.C. 10611 et seq.)'' after ``part EE''.
                    (R) Subsection (a)(25)(C) is amended by inserting 
                ``(34 U.S.C. 10611 et seq.)'' after ``part EE''.
                    (S) Subsection (a)(26) is amended by inserting 
                ``(34 U.S.C. 10581)'' after ``part CC''.
                    (T) Subsection (a)(27) is amended by inserting 
                ``(34 U.S.C. 10701 et seq.)'' after ``part LL''.
                    (U) Subsection (c) is amended by inserting ``(34 
                U.S.C. 10151 et seq.)'' after ``part E of this title''.
            (25) Section 4 of the Violence Against Women and Department 
        of Justice Reauthorization Act of 2005 (Public Law 109-162, 34 
        U.S.C. 10261 note) is amended by inserting ``(34 U.S.C. 
        10461(d))'' after ``section 2101(d) of the Omnibus Crime 
        Control and Safe Streets Act of 1968''.
            (26) Section 1201(a)(6) of the Omnibus Crime Control and 
        Safe Streets Act of 1968 (34 U.S.C. 10281(a)(6)) is amended by 
        inserting ``(34 U.S.C. 10284)'' after ``section 1204''.
            (27) Section 2 of Public Law 102-520 (34 U.S.C. 10281 note) 
        is amended by inserting ``(34 U.S.C. 10281(a))'' after 
        ``section 1201(a) of title I of the Omnibus Crime Control and 
        Safe Streets Act of 1968''.
            (28) Section 6(2) (matter before subparagraph (A)) of the 
        Public Safety Officers' Benefits Improvement Act of 2017 
        (Public Law 115-36, 34 U.S.C. 10282 note) is amended by 
        striking ``(42 U.S.C. 3796 et seq.)'' and inserting ``(34 
        U.S.C. 10281 et seq.)''.
            (29) Section 305(b) of the Disaster Mitigation Act of 2000 
        (Public Law 106-390, 34 U.S.C. 10284 note) is amended by 
        inserting ``(34 U.S.C. 10284(7)(B), (C))'' after 
        ``subparagraphs (B) and (C) of section 1204(7) of the Omnibus 
        Crime Control and Safe Streets Act of 1968''.
            (30) Section 1205 of the Omnibus Crime Control and Safe 
        Streets Act of 1968 (34 U.S.C. 10285) is amended as follows:
                    (A) Subsection (b)(1) is amended by inserting ``(34 
                U.S.C. 10281)'' after ``section 1201''.
                    (B) Subsection (e)(2)(O) (matter before clause (i)) 
                is amended by inserting ``(34 U.S.C. 10281(f)(3))'' 
                after ``section 1201(f)(3)''.
                    (C) Subsection (e)(3)(A) is amended by inserting 
                ``(34 U.S.C. 10281(f)(3))'' after ``section 
                1201(f)(3)''.
                    (D) Subsection (e)(4)(C) is amended by inserting 
                ``(34 U.S.C. 10301 et seq.)'' after ``subpart 2''.
            (31) Section 611 of the Uniting and Strengthening America 
        by Providing Appropriate Tools Required to Intercept and 
        Obstruct Terrorism Act of 2001 (34 U.S.C. 10286) is amended as 
        follows:
                    (A) Subsection (a) is amended by--
                            (i) striking ``(42 U.S.C. 3796, 3796a)'' 
                        and inserting ``(34 U.S.C. 10281, 10282)'';
                            (ii) striking ``(42 U.S.C. 3796b(7)(B))'' 
                        and inserting ``(34 U.S.C. 10284(7)(B))''; and
                            (iii) striking ``subpart 1 of part L of 
                        such Act (42 U.S.C. 3796 et seq.)'' and 
                        inserting ``subpart 1 of part L of title I of 
                        such Act (34 U.S.C. 10281 et seq.)''.
                    (B) Subsection (b) is amended by striking ``(42 
                U.S.C. 3796b)'' and inserting ``(34 U.S.C. 10284)''.
            (32) The provisos in the 1st paragraph under the heading 
        ``PUBLIC SAFETY OFFICERS BENEFITS'' in the Department of 
        Justice Appropriations Act, 2008, at 121 Stat. 1912 (34 U.S.C. 
        10287) are amended as follows:
                    (A) The first proviso is amended by--
                            (i) inserting ``(34 U.S.C. 10285(c))'' 
                        after ``section 1205(c) of the 1968 Act'';
                            (ii) inserting ``(34 U.S.C. 10301 et 
                        seq.)'' after ``subpart 2 of such part L''; and
                            (iii) inserting ``(34 U.S.C. 10281 et 
                        seq.)'' after ``subpart 1 thereof''.
                    (B) The second proviso is amended as follows:
                            (i) Paragraph (1) is amended by striking 
                        ``(42 U.S.C. 3793(a)(4))'' and inserting ``(34 
                        U.S.C. 10261(a)(4))'';
                            (ii) Paragraph (2) is amended by striking 
                        ``(42 U.S.C. 3796c-1)'' and inserting ``(34 
                        U.S.C. 10286)''; and
                            (iii) Paragraph (3) is amended by inserting 
                        ``(34 U.S.C. 10282)'' after ``section 1202 of 
                        such title I''.
            (33) Section 1212(a)(3) of the Omnibus Crime Control and 
        Safe Streets Act of 1968 (34 U.S.C. 10302(a)(3)) is amended by 
        inserting ``(34 U.S.C. 10304(b))'' after ``section 1214(b)''.
            (34) Section 1214(b) of the Omnibus Crime Control and Safe 
        Streets Act of 1968 (34 U.S.C. 10304(b)) is amended by 
        inserting ``(34 U.S.C. 10303(b))'' after ``section 1213(b)''.
            (35) Section 1403 (matter before paragraph (1)) of the 
        Omnibus Crime Control and Safe Streets Act of 1968 (34 U.S.C. 
        10333 (matter before paragraph (1))) is amended by inserting 
        ``(34 U.S.C. 10332)'' after ``section 1402''.
            (36) Section 1404 of the Omnibus Crime Control and Safe 
        Streets Act of 1968 (34 U.S.C. 10334) is amended as follows:
                    (A) Subsection (a)(3) is amended by inserting ``(34 
                U.S.C. 10332)'' after ``section 1402''.
                    (B) Subsection (b) is amended by inserting ``(34 
                U.S.C. 10333)'' after ``section 1403''.
            (37) Section 1406(a)(1) of the Omnibus Crime Control and 
        Safe Streets Act of 1968 is amended by inserting ``(34 U.S.C. 
        10333)'' after ``section 1403 of this title''.
            (38) Section 1407(a) of the Omnibus Crime Control and Safe 
        Streets Act of 1968 (34 U.S.C. 10336(a)) is amended by 
        inserting ``(34 U.S.C. 10332)'' after ``section 1402''.
            (39) Section 1502 of the Omnibus Crime Control and Safe 
        Streets Act of 1968 (34 U.S.C. 10352) is amended as follows:
                    (A) The matter before paragraph (1) is amended by--
                            (i) inserting ``(34 U.S.C. 10151 et seq., 
                        10201 et seq.)'' after ``Subparts 1 and 3 of 
                        part E of this title''; and
                            (ii) inserting ``(34 U.S.C. 10151 et 
                        seq.)'' after ``part E''.
                    (B) Paragraph (1) is amended by inserting ``(34 
                U.S.C. 10156(a))'' after ``section 505(a) of this 
                title''.
                    (C) Paragraph (2) is amended by--
                            (i) inserting ``(34 U.S.C. 10153)'' after 
                        ``section 502''; and
                            (ii) inserting ``(34 U.S.C. 10156)'' after 
                        ``section 505 of this title''.
            (40) Section 1602(b) (matter before paragraph (1)) of the 
        Omnibus Crime Control and Safe Streets Act of 1968 (34 U.S.C. 
        10362 (matter before paragraph (1))) is amended by inserting 
        ``(34 U.S.C. 10158)'' after ``section 507''.
            (41) Section 1603 of the Omnibus Crime Control and Safe 
        Streets Act of 1968 (34 U.S.C. 10363) is amended as follows:
                    (A) Subsection (a) (matter before paragraph (1)) is 
                amended by--
                            (i) inserting ``(34 U.S.C. 10361(a))'' 
                        after ``section 1601(a)''; and
                            (ii) inserting ``(34 U.S.C. 10362)'' after 
                        ``section 1602''.
                    (B) Subsection (b) is amended by inserting ``(34 
                U.S.C. 10362)'' after ``section 1602''.
            (42) Section 1604 of the Omnibus Crime Control and Safe 
        Streets Act of 1968 (34 U.S.C. 10364) is amended as follows:
                    (A) Subsection (a)(1) is amended by inserting ``(34 
                U.S.C. 10362(b))'' after ``section 1602(b)''.
                    (B) Subsection (b) is amended by inserting ``(34 
                U.S.C. 10361)'' after ``section 1601''.
            (43) Section 1605 of the Omnibus Crime Control and Safe 
        Streets Act of 1968 (34 U.S.C. 10365) is amended by inserting 
        ``(34 U.S.C. 10362(a))'' after ``section 1602(a)''.
            (44) Section 1701 of the Omnibus Crime Control and Safe 
        Streets Act of 1968 (34 U.S.C. 10381) is amended as follows:
                    (A) Subsection (g) is amended by inserting ``(34 
                U.S.C. 10382(c)(8))'' after ``section 1702(c)(8)''.
                    (B) Subsection (h) is amended by inserting ``(34 
                U.S.C. 10261(a)(11)(B))'' after ``section 
                1001(a)(11)(B)''.
                    (C) Subsection (j)(1) is amended by inserting ``(34 
                U.S.C. 10383)'' after ``section 1703''.
            (45) Section 247 of the Tribal Law and Order Act of 2010 
        (Public Law 111-211, 34 U.S.C. 10381 note) is amended as 
        follows:
                    (A) Subsection (b) is amended by striking ``(42 
                U.S.C. 3796dd)'' and inserting ``(34 U.S.C. 10381)''.
                    (B) Subsection (d)(2) is amended by striking ``(42 
                U.S.C. 3796dd)'' and inserting ``(34 U.S.C. 10381)''.
            (46) Section 1702(d)(2) of the Omnibus Crime Control and 
        Safe Streets Act of 1968 (34 U.S.C. 10382(d)(2)) is amended by 
        inserting ``(34 U.S.C. 10381(b))'' after ``section 1701(b)''.
            (47) Section 1706 of the Omnibus Crime Control and Safe 
        Streets Act of 1968 (34 U.S.C. 10386) is amended by--
                    (A) inserting ``(34 U.S.C. 10385)'' after ``section 
                1705''; and
                    (B) inserting ``(34 U.S.C. 10382)'' after ``section 
                1702''.
            (48) Section 1802 of the Omnibus Crime Control and Safe 
        Streets Act of 1968 (34 U.S.C. 10403) is amended as follows:
                    (A) Subsection (a)(2) is amended by inserting ``(34 
                U.S.C. 10404(b))'' after ``section 1803(b)''.
                    (B) Subsection (b)(2) is amended by inserting ``(34 
                U.S.C. 10404(e))'' after ``section 1803(e)''.
            (49) Section 1803 of the Omnibus Crime Control and Safe 
        Streets Act of 1968 (34 U.S.C. 10404) is amended as follows:
                    (A) Subsection (b)(1) is amended by inserting ``(34 
                U.S.C. 10401)'' after ``section 1801''.
                    (B) Subsection (e)(1) is amended by inserting ``(34 
                U.S.C. 10403)'' after ``section 1802''.
            (50) Section 1804(a) of the Omnibus Crime Control and Safe 
        Streets Act of 1968 (34 U.S.C. 10405(a)) is amended by 
        inserting ``(34 U.S.C. 10404)'' after ``section 1803''.
            (51) Section 1805(a) (matter before paragraph (1)) of the 
        Omnibus Crime Control and Safe Streets Act of 1968 (34 U.S.C. 
        10406(a) (matter before paragraph (1))) is amended by inserting 
        ``(34 U.S.C. 10404)'' after ``section 1803''.
            (52) Section 1806 of the Omnibus Crime Control and Safe 
        Streets Act of 1968 (34 U.S.C. 10407) is amended by inserting 
        ``(34 U.S.C. 10401(b))'' after ``section 1801(b)''.
            (53) Section 1807(a)(2) of the Omnibus Crime Control and 
        Safe Streets Act of 1968 (34 U.S.C. 10408(a)(2)) is amended 
        by--
                    (A) inserting ``(34 U.S.C. 10406(b)(1))'' after 
                ``section 1805(b)(1)''; and
                    (B) inserting ``(34 U.S.C. 10406(b)(2))'' after 
                ``section 1805(b)(2)''.
            (54) Section 1809 of the Omnibus Crime Control and Safe 
        Streets Act of 1968 (34 U.S.C. 10410) is amended as follows:
                    (A) Paragraph (2) is amended by inserting ``(34 
                U.S.C. 10404(e))'' after ``section 1803(e)''.
                    (B) Paragraph (3)(B) is amended by inserting ``(34 
                U.S.C. 10404(a))'' after ``section 1803(a)''.
                    (C) Paragraph (5)(A) is amended by inserting ``(34 
                U.S.C. 10401(b))'' after ``section 1801(b)''.
            (55) Section 1902(e) (matter before paragraph (1)) of the 
        Omnibus Crime Control and Safe Streets Act of 1968 (34 U.S.C. 
        10422(e) (matter before paragraph (1))) is amended by inserting 
        ``(34 U.S.C. 10158)'' after ``section 507''.
            (56) Section 1903 of the Omnibus Crime Control and Safe 
        Streets Act of 1968 (34 U.S.C. 10423) is amended as follows:
                    (A) Subsection (a) (matter before paragraph (1)) is 
                amended by--
                            (i) inserting ``(34 U.S.C. 10421)'' after 
                        ``section 1901''; and
                            (ii) inserting ``(34 U.S.C. 10422)'' after 
                        ``section 1902''.
                    (B) Subsection (b) is amended by inserting ``(34 
                U.S.C. 10422)'' after ``section 1902''.
                    (C) Subsection (e) is amended by inserting ``(34 
                U.S.C. 10422)'' after ``section 1902''.
            (57) Section 1904(b) of the Omnibus Crime Control and Safe 
        Streets Act of 1968 (34 U.S.C. 10424(b)) is amended by 
        inserting ``(34 U.S.C. 10422)'' after ``section 1902''.
            (58) Section 2001(d)(2)(A)(i) of the Omnibus Crime Control 
        and Safe Streets Act of 1968 (34 U.S.C. 10441(d)(2)(A)(i)) is 
        amended by striking ``(42 U.S.C. 13925(a))'' and inserting 
        ``(34 U.S.C. 12291(a))''.
            (59) Section 2002(c) of the Omnibus Crime Control and Safe 
        Streets Act of 1968 (34 U.S.C. 10442(c)) is amended as follows:
                    (A) Paragraph (1) is amended by inserting ``(34 
                U.S.C. 10444)'' after ``section 2004''.
                    (B) Paragraph (2) is amended by striking ``(title 
                VI of Public 103-322)'' and inserting ``(title IV of 
                Public Law 103-322)''.
            (60) Section 2007 of the Omnibus Crime Control and Safe 
        Streets Act of 1968 (34 U.S.C. 10446) is amended as follows:
                    (A) Subsection (a) is amended by inserting ``(34 
                U.S.C. 10441(b))'' after ``section 2001(b)''.
                    (B) Subsection (b)(1) is amended by--
                            (i) inserting ``(34 U.S.C. 10452)'' after 
                        ``section 2015''; and
                            (ii) inserting ``(34 U.S.C. 10447)'' after 
                        ``section 2008''.
                    (C) Subsection (b)(2) is amended by inserting ``(34 
                U.S.C. 10441(c))'' after ``section 2001(c)''.
                    (D) Subsection (b)(4) is amended by inserting ``(34 
                U.S.C. 10441(d))'' after ``section 2001(d)''.
                    (E) Subsection (c)(1) is amended by inserting ``(34 
                U.S.C. 10441(b))'' after ``section 2001(b)''.
                    (F) Subsection (c)(3) is amended by striking ``(42 
                U.S.C. 10603)'' and inserting ``(34 U.S.C. 20103)''.
                    (G) Subsection (d)(2) is amended by inserting ``(34 
                U.S.C. 10449)'' after ``section 2010''.
                    (H) Subsection (d)(3) is amended by inserting ``(34 
                U.S.C. 10450)'' after ``section 2011 of this title''.
                    (I) Subsection (d)(4) is amended by inserting ``(34 
                U.S.C. 10451)'' after ``section 2013 of this title''.
                    (J) Subsection (e)(1)(B) is amended by striking 
                ``section 513'' and inserting ``section 517 (34 U.S.C. 
                10181)''.
                    (K) Subsection (f) is amended by striking ``(42 
                U.S.C. 13925(b)(1))'' and inserting ``(34 U.S.C. 
                12291(b)(1))''.
            (61) Section 2008 of the Omnibus Crime Control and Safe 
        Streets Act of 1968 (34 U.S.C. 10447) is amended by inserting 
        ``(34 U.S.C. 12291)'' after ``section 40002 of the Violence 
        Against Women Act of 1994''.
            (62) Section 2016(b)(1)(E) of the Omnibus Crime Control and 
        Safe Streets Act of 1968 (34 U.S.C. 10453(b)(1)(E)) is amended 
        by inserting ``of the Violence Against Women and Department of 
        Justice Reauthorization Act of 2005 (34 U.S.C. 20126)'' after 
        ``section 903''.
            (63) Section 2101 of the Omnibus Crime Control and Safe 
        Streets Act of 1968 (34 U.S.C. 10461) is amended as follows:
                    (A) Subsection (e)(1) is amended by inserting ``(34 
                U.S.C. 10452)'' after ``section 2015''.
                    (B) Subsection (f) is amended by striking ``(42 
                U.S.C. 3796gg)'' and inserting ``(34 U.S.C. 10441)''.
            (64) Section 2102 of the Omnibus Crime Control and Safe 
        Streets Act of 1968 (34 U.S.C. 10462) is amended as follows:
                    (A) Subsection (a)(1) (matter before subparagraph 
                (A)) is amended by inserting ``(34 U.S.C. 10461(c))'' 
                after ``section 2101(c)''.
                    (B) Subsection (a)(1)(B) is amended by--
                            (i) striking ``subsection 2101(c)(4)'' and 
                        inserting ``section 2101(c)(1)(D) (34 U.S.C. 
                        10461(c)(1)(D))''; and
                            (ii) striking ``the date the of the 
                        enactment of the Violence Against Women Act of 
                        2000'' and inserting ``the date of the 
                        enactment of the Violence Against Women Act of 
                        2000''.
                    (C) Subsection (a)(2) is amended by inserting ``(34 
                U.S.C. 10461(a))'' after ``section 2101(a)''.
                    (D) Subsection (b)(4) is amended by inserting ``(34 
                U.S.C. 10461(b)(4), (7))'' after ``paragraph (4) or (7) 
                of section 2101(b)''.
            (65) Section 2105 of the Omnibus Crime Control and Safe 
        Streets Act of 1968 (34 U.S.C. 10465) is amended by inserting 
        ``(34 U.S.C. 12291)'' after ``section 40002 of the Violence 
        Against Women Act of 1994''.
            (66) Section 2205 of the Omnibus Crime Control and Safe 
        Streets Act of 1968 (34 U.S.C. 10475) is amended by inserting 
        ``(34 U.S.C. 10474)'' after ``section 2204''.
            (67) Section 2403 of the Omnibus Crime Control and Safe 
        Streets Act of 1968 (34 U.S.C. 10513) is amended as follows:
                    (A) Paragraph (1) is amended by striking ``1994.'' 
                and inserting ``1994 (34 U.S.C. 12591);''.
                    (B) Paragraph (3) is amended by inserting ``(34 
                U.S.C. 12591)'' after ``section 210303 of the DNA 
                Identification Act of 1994''.
            (68) Section 2406(1) of the Omnibus Crime Control and Safe 
        Streets Act of 1968 (34 U.S.C. 10516(1)) is amended by 
        inserting ``(34 U.S.C. 10512)'' after ``section 2402''.
            (69) Section 3(e) of the Bulletproof Vest Partnership Grant 
        Act of 2000 (Public Law 106-517, 34 U.S.C. 10533 note) is 
        amended by--
                    (A) inserting ``(34 U.S.C. 10531 et seq.)'' after 
                ``part Y of title I of the Omnibus Crime Control and 
                Safe Streets Act of 1968''; and
                    (B) striking ``(42 U.S.C. 3796ll-2)'' and inserting 
                ``(34 U.S.C. 10533)''.
            (70) Section 2601(i) of the Omnibus Crime Control and Safe 
        Streets Act of 1968 (34 U.S.C. 10541(i)) is amended by 
        inserting ``(34 U.S.C. 11101 et seq.)'' after ``the provisions 
        of the Juvenile Justice and Delinquency Prevention Act of 
        1974''.
            (71) Section 2802 of the Omnibus Crime Control and Safe 
        Streets Act of 1968 (34 U.S.C. 10562) is amended as follows:
                    (A) Paragraph (1) is amended by inserting ``(34 
                U.S.C. 10564(a))'' after ``section 2804(a)''.
                    (B) Paragraph (2) is amended by inserting ``(34 
                U.S.C. 10561)'' after ``section 2801''.
                    (C) Paragraph (3) is amended by inserting ``(34 
                U.S.C. 10564(c))'' after ``section 2804(c)''.
            (72) Section 2803(a)(1) of the Omnibus Crime Control and 
        Safe Streets Act of 1968 (34 U.S.C. 10563(a)(1)) is amended by 
        inserting ``(34 U.S.C. 10562)'' after ``section 2802''.
            (73) Section 2805(a) of the Omnibus Crime Control and Safe 
        Streets Act of 1968 (34 U.S.C. 10565(a)) is amended by 
        inserting ``(34 U.S.C. 10562)'' after ``section 2802''.
            (74) Section 2901(c)(2)(B) of the Omnibus Crime Control and 
        Safe Streets Act of 1968 (34 U.S.C. 10581(c)(2)(B)) is amended 
        by inserting ``(34 U.S.C. 60521(e))'' after ``section 201(e) of 
        the Second Chance Act of 2007''.
            (75) Section 2922 (matter before paragraph (1)) of the 
        Omnibus Crime Control and Safe Streets Act of 1968 (34 U.S.C. 
        10592 (matter before paragraph (1))) is amended by inserting 
        ``(34 U.S.C. 10591)'' after ``section 2921''.
            (76) Section 2923 of the Omnibus Crime Control and Safe 
        Streets Act of 1968 (34 U.S.C. 10593) is amended as follows:
                    (A) Subsection (a) (matter before paragraph (1)) is 
                amended by inserting ``(34 U.S.C. 10591(1))'' after 
                ``section 2921(1)''.
                    (B) Subsection (a)(2) is amended by inserting ``(34 
                U.S.C. 60521(e))'' after ``section 201(e) of the Second 
                Chance Act of 2007''.
                    (C) Subsection (b) (matter before paragraph (1)) is 
                amended by inserting ``(34 U.S.C. 10591(2))'' after 
                ``section 2921(2)''.
            (77) Section 2924(a) of the Omnibus Crime Control and Safe 
        Streets Act of 1968 (34 U.S.C. 10594(a)) is amended by 
        inserting ``(34 U.S.C. 10591)'' after ``section 2921''.
            (78) Section 103(c) of the Second Chance Act of 2007: 
        Community Safety Through Recidivism Prevention (Public Law 110-
        199, 34 U.S.C. 10612 note) is amended by--
                    (A) striking ``(42 U.S.C. 3797u-1)'' and inserting 
                ``(34 U.S.C. 10612)''; and
                    (B) inserting ``(34 U.S.C. 10611 et seq.)'' after 
                ``part EE of such Act''.
            (79) Section 103(b) of the Second Chance Act of 2007: 
        Community Safety Through Recidivism Prevention (Public Law 110-
        199, 34 U.S.C. 10613 note) is amended by--
                    (A) striking ``(42 U.S.C. 3797u-1(2))'' and 
                inserting ``(34 U.S.C. 10612(2))''; and
                    (B) inserting ``(34 U.S.C. 10611 et seq.)'' after 
                ``part EE of such Act''.
            (80) Section 2956(a) of the Omnibus Crime Control and Safe 
        Streets Act of 1968 (34 U.S.C. 10616(a)) is amended by 
        inserting ``(34 U.S.C. 10615)'' after ``section 2955''.
            (81) Section 2976(j)(2)(A) of the Omnibus Crime Control and 
        Safe Streets Act of 1968 (34 U.S.C. 10631(j)(2)(A)) is amended 
        by striking ``section 234(c)(2) of the Second Chance Act of 
        2007'' and inserting ``section 231(d)(3)(B) of the Second 
        Chance Act of 2007 (34 U.S.C. 60541(d)(3)(B))''.
            (82) Section 2977(a) of the Omnibus Crime Control and Safe 
        Streets Act of 1968 (34 U.S.C. 10632(a)) is amended by 
        inserting ``(34 U.S.C. 10631)'' after ``section 2976''.
            (83) Section 2978(d)(4)(C) of the Omnibus Crime Control and 
        Safe Streets Act of 1968 (34 U.S.C. 10633(d)(4)(C)) is amended 
        by inserting ``(34 U.S.C. 60521(e))'' after ``section 201(e) of 
        the Second Chance Act of 2007''.
            (84) Section 2986(a) of the Omnibus Crime Control and Safe 
        Streets Act of 1968 (34 U.S.C.10642(a)) is amended by inserting 
        ``(34 U.S.C. 10643)'' after ``section 2987''.
            (85) Section 2991(a)(9)(A)(iv)(I) of the Omnibus Crime 
        Control and Safe Streets Act of 1968 (34 U.S.C. 
        10651(a)(9)(A)(iv)(I)) is amended by striking ``(42 U.S.C. 
        16911)'' and inserting ``(34 U.S.C. 20911)''.
            (86) Section 2996(a)(1) (matter before subparagraph (A)) of 
        the Omnibus Crime Control and Safe Streets Act of 1968 (34 
        U.S.C. 10661(a)(1) (matter before subparagraph (A))) is amended 
        by inserting ``(34 U.S.C. 10554)'' after ``section 2704''.
            (87) Section 755(a) of the Combat Methamphetamine Epidemic 
        Act of 2005 (34 U.S.C. 10663(a)) is amended by striking ``(42 
        U.S.C. 3797d)'' and inserting ``(34 U.S.C. 10554)''.
            (88) Section 756(b) of the Combat Methamphetamine Epidemic 
        Act of 2005 (34 U.S.C. 10664(b)) is amended as follows:
                    (A) The designation for the third paragraph is 
                amended by striking ``(C)'' and inserting ``(3)''.
                    (B) Paragraph (3), as redesignated, is amended by 
                striking ``(42 U.S.C. 3797d)'' and inserting ``(34 
                U.S.C. 10554)''.
            (89) Section 3021(a) of the Omnibus Crime Control and Safe 
        Streets Act of 1968 (34 U.S.C. 10701(a)) is amended as follows:
                    (A) Paragraph (1)(A) is amended by inserting ``(34 
                U.S.C. 10591 et seq., 10651 et seq.)'' after ``part DD 
                or HH of this title''.
                    (B) Paragraph (1)(C) is amended by inserting ``(34 
                U.S.C. 10471 et seq.)'' after ``part V of this title''.
                    (C) Paragraph (1)(D) is amended by inserting ``(34 
                U.S.C. 10611 et seq.)'' after ``part EE of this 
                title''.
                    (D) Paragraph (1)(E) is amended by inserting ``(34 
                U.S.C. 10651(i))'' after ``subsection (i) of section 
                2991 of this title''.
                    (E) Paragraph (5) is amended by inserting ``(34 
                U.S.C. 10421 et seq.)'' after ``part S of this title''.
            (90) Section 3022(1) of the Omnibus Crime Control and Safe 
        Streets Act of 1968 (34 U.S.C. 10702(1)) is amended by 
        inserting ``(34 U.S.C. 10701(a))'' after ``section 3021(a)''.
            (91) Section 3026(b)(2) of the Omnibus Crime Control and 
        Safe Streets Act of 1968 (34 U.S.C.10706(b)(2)) is amended as 
        follows:
                    (A) Subparagraph (B)(i) is amended by inserting 
                ``(34 U.S.C. 10701(b))'' after ``section 3021(b)''.
                    (B) Subparagraph (C) is amended by inserting ``(34 
                U.S.C. 10701(b))'' after ``section 3021(b)''.
            (92) Section 701(b) of the Comprehensive Addiction and 
        Recovery Act of 2016 (34 U.S.C. 10707) is amended as follows:
                    (A) Paragraph (1) is amended by inserting ``(34 
                U.S.C. 10701 et seq.)'' after ``part LL of title I of 
                the Omnibus Crime Control and Safe Streets Act of 
                1968''.
                    (B) Paragraph (4) is amended by inserting ``(34 
                U.S.C. 10701(b))'' after ``section 3021(b) of part LL 
                of title I of the Omnibus Crime Control and Safe 
                Streets Act of 1968''.
            (93) Section 12223(a) of the Juvenile Justice and 
        Delinquency Prevention Act of 2002 (Public Law 107-273, 
        division C, title II, subtitle B, 34 U.S.C. 11101 note) is 
        amended by inserting ``(34 U.S.C. 10401 note)'' after ``section 
        12102(b)''.
            (94) Section 7296(b)(3) of the Anti-Drug Abuse Act of 1988 
        (Public Law 100-690, 34 U.S.C. 11101 note) is amended as 
        follows:
                    (A) Subparagraph (A) is amended by striking ``(42 
                U.S.C. 5611 et seq.)'' and inserting ``(34 U.S.C. 
                11117)''.
                    (B) Subparagraph (B) is amended by striking ``(42 
                U.S.C. 5701 et seq.)'' and inserting ``(34 U.S.C. 
                11273)''.
                    (C) Subparagraph (C) is amended by striking 
                ``section 404(a)(5) of the Missing Children's 
                Assistance Act (42 U.S.C. 5773(a)(5))'' and inserting 
                ``section 404(a)(6) of the Missing Children's 
                Assistance Act (34 U.S.C. 11293(a)(6))''.
            (95) Section 103 of the Juvenile Justice and Delinquency 
        Prevention Act of 1974 (34 U.S.C. 11103) is amended as follows:
                    (A) Paragraph (4)(A) is amended by inserting ``(34 
                U.S.C. 10141)'' after ``section 401 of title I of the 
                Omnibus Crime Control and Safe Streets Act of 1968''.
                    (B) Paragraph (4)(B) is amended by inserting ``(34 
                U.S.C. 10101)'' after ``section 101 of title I of the 
                Omnibus Crime Control and Safe Streets Act of 1968''.
                    (C) Paragraph (4)(C) is amended by inserting ``(34 
                U.S.C. 10122(a))'' after ``section 202(a) of title I of 
                the Omnibus Crime Control and Safe Streets Act of 
                1968''.
                    (D) Paragraph (4)(D) is amended by inserting ``(34 
                U.S.C. 10132(a))'' after ``section 302(a) of title I of 
                the Omnibus Crime Control and Safe Streets Act of 
                1968''.
                    (E) Paragraph (5) is amended by inserting ``(34 
                U.S.C. 11111(b))'' after ``section 201(b)''.
                    (F) Paragraph (17) is amended by inserting ``(34 
                U.S.C. 11116(a)(1))'' after ``section 206(a)(1)''.
            (96) Section 223 of the Juvenile Justice and Delinquency 
        Prevention Act of 1974 (34 U.S.C. 11133) is amended as follows:
                    (A) Subsection (a)(1) is amended by inserting ``(34 
                U.S.C. 11181(c)(1))'' after ``section 299(c)(1)''.
                    (B) Subsection (a)(5) (matter before subparagraph 
                (A)) is amended by--
                            (i) inserting ``(34 U.S.C. 11132)'' after 
                        ``section 222''; and
                            (ii) inserting ``(34 U.S.C. 11132(d))'' 
                        after ``section 222(d)''.
                    (C) Subsection (a)(6) is amended by inserting ``(34 
                U.S.C. 11132)'' after ``section 222''.
                    (D) Subsection (a)(9) (matter before subparagraph 
                (A)) is amended by--
                            (i) inserting ``(34 U.S.C. 11132)'' after 
                        ``section 222''; and
                            (ii) inserting ``(34 U.S.C. 11132(d))'' 
                        after ``section 222(d)''.
                    (E) Subsection (a)(24) is amended by inserting 
                ``(34 U.S.C. 11132)'' after ``section 222''.
                    (F) Subsection (a)(25) is amended by--
                            (i) inserting ``(34 U.S.C. 11132)'' after 
                        ``section 222''; and
                            (ii) inserting ``(34 U.S.C. 11132(d))'' 
                        after ``section 222(d)''.
                    (G) Subsection (c)(1) is amended by inserting ``(34 
                U.S.C. 11132)'' after ``section 222''.
                    (H) Subsection (d) is amended by--
                            (i) striking ``sections 802, 803'' and 
                        inserting ``sections 802 (34 U.S.C. 10222), 803 
                        (34 U.S.C. 10223)''.
                            (ii) inserting ``(34 U.S.C. 11132(a))'' 
                        after ``section 222(a)''; and
                            (iii) inserting ``(34 U.S.C. 11132(d))'' 
                        after ``section 222(d)''.
            (97) Section 2(f)(3)(B) of Public Law 102-586 (34 U.S.C. 
        11133 note) is amended by striking ``(42 U.S.C. 5633(c)(3))'' 
        and inserting ``(34 U.S.C. 11133(c)(3))''.
            (98) Section 299A of the Juvenile Justice and Delinquency 
        Prevention Act of 1974 (34 U.S.C. 11182) as amended as follows:
                    (A) Subsection (b) (matter before paragraph (1)) is 
                amended by inserting ``(34 U.S.C. 10228(c), 10230(a), 
                10230(b), 10230(c), 10231(a), 10231(b), 10231(d))'' 
                after ``Sections 809(c), 811(a), 811(b), 811(c), 
                812(a), 812(b), and 812(d) of the Omnibus Crime Control 
                and Safe Streets Act of 1968''.
                    (B) Subsection (c) (matter before paragraph (1)) is 
                amended by inserting ``(34 U.S.C. 10221(a), 10221(c), 
                10225)'' after ``Sections 801(a), 801(c), and 806 of 
                the Omnibus Crime Control and Safe Streets Act of 
                1968''.
                    (C) Subsection (e) is amended by inserting ``(34 
                U.S.C. 11133(a))'' after ``section 223(a)''.
            (99) Section 12222(b) of the Juvenile Justice and 
        Delinquency Prevention Act of 2002 (Public Law 107-273, 
        division C, title II, subtitle B, 34 U.S.C. 11311 note) is 
        amended by inserting ``(34 U.S.C. 10401 note)'' after ``section 
        12102(b)''.
            (100) Section 5(b) of Public Law 102-586 (34 U.S.C. 11311 
        note) is amended by striking ``(42 U.S.C. 5631-5633)'' and 
        inserting ``(34 U.S.C. 11131-11133)''.
            (101) Section 20102 of the Violent Crime Control and Law 
        Enforcement Act of 1994 (34 U.S.C. 12102) is amended as 
        follows:
                    (A) Subsection (a) (matter before paragraph (1)) is 
                amended by--
                            (i) inserting ``(34 U.S.C. 12103)'' after 
                        ``section 20103''; and
                            (ii) inserting ``(34 U.S.C. 12104)'' after 
                        ``section 20104''.
                    (B) Subsection (a)(4) is amended by striking ``(42 
                U.S.C. 3797w(b))'' and inserting ``(34 U.S.C. 
                10631(b))''.
                    (C) Subsection (b)(2) is amended by inserting ``(34 
                U.S.C. 12103, 12104)'' after ``section 20103 or 
                20104''.
                    (D) Subsection (c) is amended by--
                            (i) inserting ``(34 U.S.C. 12104)'' after 
                        ``section 20104''; and
                            (ii) inserting ``(34 U.S.C. 12104)'' after 
                        ``section 20104 of this subtitle''.
            (102) The 5th proviso in the 1st paragraph under the 
        heading ``VIOLENT CRIME REDUCTION PROGRAMS, STATE AND LOCAL LAW 
        ENFORCEMENT ASSISTANCE'' in the Department of Justice 
        Appropriations Act, 1997, at 110 Stat. 3009-14 (Public Law 104-
        208, division A, title I, section 101(a) [title I], 34 U.S.C. 
        12103 note) is amended by inserting ``(34 U.S.C. 12103, 
        12104)'' after ``section 20103 or section 20104 of the Violent 
        Crime Control and Law Enforcement Act of 1994''.
            (103) Section 20105(e) of the Violent Crime Control and Law 
        Enforcement Act of 1994 (34 U.S.C. 12105(e)) is amended by 
        striking ``section 20101(3)'' and inserting ``section 20101(2) 
        (34 U.S.C. 12101(2))''.
            (104) Section 20107 of the Violent Crime Control and Law 
        Enforcement Act of 1994 (34 U.S.C. 12107) is amended as 
        follows:
                    (A) Subsection (a) is amended by inserting ``(34 
                U.S.C. 12102(a))'' after ``section 20102(a)''.
                    (B) Subsection (b) is amended by inserting ``(34 
                U.S.C. 10221, 10222)'' after ``sections 801 and 802 of 
                the Omnibus Crime Control and Safe Streets Act of 
                1968''.
            (105) Section 2001(e)(1) of Aimee's Law (34 U.S.C. 
        12113(e)(1)) is amended by inserting ``(34 U.S.C. 10156)'' 
        after ``section 505 of the Omnibus Crime Control and Safe 
        Streets Act of 1968''.
            (106) Section 31702(4) of the Violent Crime Control and Law 
        Enforcement Act of 1994 (34 U.S.C. 12222(4)) is amended by 
        striking ``(42 U.S.C. 3796bb(B))'' and inserting ``(34 U.S.C. 
        10351(b))''.
            (107) Section 40002 of the Violence Against Women Act of 
        1994 (34 U.S.C. 12291) is amended as follows:
                    (A) Subsection (a)(12) is amended by inserting 
                ``(34 U.S.C. 12473(6))'' after ``section 41403(6)''.
                    (B) Subsection (a)(25) is amended by inserting 
                ``(34 U.S.C. 12511(b)(2)(C))'' after ``section 
                41601(b)(2)(C)''.
                    (C) Subsection (b)(12) is amended by striking ``(42 
                U.S.C. 3796gg-6(d))'' and inserting ``(34 U.S.C. 
                20121(d))''.
                    (D) Subsection (b)(13)(C) is amended by striking 
                ``section 3789d of title 42, United States Code'' and 
                inserting ``section 809 of the Omnibus Crime Control 
                and Safe Streets Act of 1968 (34 U.S.C. 10228)''.
            (108) Section 40295 of the Safe Homes for Women Act of 1994 
        (34 U.S.C. 12341) is amended as follows:
                    (A) Subsection (d)(1)(A) is amended by striking 
                ``(42 U.S.C. 3796gg-10)'' and inserting ``(34 U.S.C. 
                10452)''.
                    (B) Subsection (e)(2) is amended by striking ``(42 
                U.S.C. 3796dd et seq.)'' and inserting ``(34 U.S.C. 
                10381 et seq.)''.
            (109) Section 40299(g)(3)(C)(i)(I) of the Safe Homes for 
        Women Act of 1994 (34 U.S.C. 12351(g)(3)(C)(i)(I)) is amended 
        by striking ``(42 U.S.C. 3796gg-10)'' and inserting ``(34 
        U.S.C. 10452)''.
            (110) Section 40412(10) of the Equal Justice for Women in 
        the Courts Act of 1994 (34 U.S.C. 12372(10)) is amended by 
        striking ``section 2003 of title I of the Omnibus Crime Control 
        and Safe Streets Act of 1968 (42 U.S.C. 3996gg-2)'' and 
        inserting ``section 2008 of title I of the Omnibus Crime 
        Control and Safe Streets Act of 1968''.
            (111) Section 115(b)(2) of the Department of Justice 
        Appropriations Act, 1998 (Public Law 105-119, title I, 34 
        U.S.C. 12409 note) is amended by striking ``(42 U.S.C. 14039)'' 
        and inserting ``(34 U.S.C. 12409)''.
            (112) Section 40901(d) of the Violence Against Women Act of 
        1994 (34 U.S.C. 12431(d)) is amended by striking `` section 
        2003 of title I of the Omnibus Crime Control and Safe Streets 
        Act of 1968 (42 U.S.C. 3796gg-2(1))'' and inserting ``section 
        2008 of title I of the Omnibus Crime Control and Safe Streets 
        Act of 1968''.
            (113) Section 41201 of the Violence Against Women Act of 
        1994 (34 U.S.C. 12451) is amended as follows:
                    (A) Subsection (e) is amended by inserting ``(34 
                U.S.C. 12291)'' after ``section 40002''.
                    (B) Subsection (g)(2) is amended by inserting ``(34 
                U.S.C. 10452)'' after ``section 2015 of the Omnibus 
                Crime Control and Safe Streets Act of 1968''.
            (114) Section 1301(f)(1) of the Violence Against Women Act 
        of 2000 (34 U.S.C. 12464(f)(1)) is amended by striking 
        ``section 3796gg-10 of this title'' and inserting ``section 
        2015 of the Omnibus Crime Control and Safe Streets Act of 1968 
        (34 U.S.C. 10452)''.
            (115) Section 200103 (definition of ``participant'') of the 
        Police Corps Act (34 U.S.C. 12552 (definition of 
        ``participant'')) is amended by striking ``section 200106'' and 
        inserting ``section 200107 (34 U.S.C. 12556)''.
            (116) Section 200108(c) of the Police Corps Act (34 U.S.C. 
        12557(c)) is amended by striking ``section 10'' and inserting 
        ``section 200110 (34 U.S.C. 12559)''.
            (117) Section 200204(b)(1) of the Law Enforcement 
        Scholarships and Recruitment Act (34 U.S.C. 12573(b)(1)) is 
        amended by striking ``pursuant to section 200203'' and 
        inserting ``pursuant to section 200207 (34 U.S.C. 12576)''.
            (118) Section 210303(c)(3) of the DNA Identification Act of 
        1994 (34 U.S.C. 12591(c)(3)) is amended by striking ``part X of 
        Title I of the Omnibus Crime Control and Safe Streets Act of 
        1968'' and inserting ``part X of title I of the Omnibus Crime 
        Control and Safe Streets Act of 1968 (34 U.S.C. 10511 et 
        seq.)''.
            (119) Section 210304 of the DNA Identification Act of 1994 
        (34 U.S.C. 12592) is amended as follows:
                    (A) Subsection (b)(2)(B) is amended by inserting 
                ``(34 U.S.C. 12591(a)(5))'' after ``section 
                210303(a)(5)''.
                    (B) Subsection (d)(1)(A)(i) is amended by striking 
                ``(42 U.S.C. 14135a, 14135b)'' and inserting ``(34 
                U.S.C. 40702, 40703)''.
                    (C) Subsection (d)(1)(B)(i) is amended by inserting 
                ``(34 U.S.C. 40702)'' after ``section 3 of the DNA 
                Analysis Backlog Elimination Act of 2000''.
                    (D) Subsection (d)(1)(B)(ii) is amended by 
                inserting ``(34 U.S.C. 40703)'' after ``section 4 of 
                the DNA Analysis Backlog Elimination Act of 2000''.
            (120) Section 310004(d) of the Violent Crime Control and 
        Law Enforcement Act of 1994 (34 U.S.C. 12633(d)) is amended as 
        follows:
                    (A) The definition of ``Federal law enforcement 
                program'' is amended by--
                            (i) inserting ``(34 U.S.C. 12532)'' after 
                        ``section 150008'' in paragraph (7);
                            (ii) inserting ``(34 U.S.C. 12611)'' after 
                        ``section 220002'' in paragraph (8); and
                            (iii) inserting ``(34 U.S.C. 12591-12593, 
                        42 U.S.C. 14134)'' after ``sections 210303-
                        210306'' in paragraph (14).
                    (B) The definition of ``State and local law 
                enforcement program'' is amended by--
                            (i) inserting ``(34 U.S.C. 12542)'' after 
                        ``section 180103'' in paragraph (5);
                            (ii) inserting ``(34 U.S.C. 12221-12227, 42 
                        U.S.C. 13867)'' after ``sections 31701-31708'' 
                        in paragraph (6);
                            (iii) inserting ``(34 U.S.C. 12171, 42 
                        U.S.C. 13812)'' after ``sections 30801-30802'' 
                        in paragraph (8);
                            (iv) inserting ``(34 U.S.C. 12101-12109)'' 
                        after ``sections 20101-20109'' in paragraph 
                        (13); and
                            (v) inserting ``(34 U.S.C. 12271)'' after 
                        ``section 32201'' in paragraph (15).
                    (C) The definition of ``prevention program'' is 
                amended by--
                            (i) inserting ``(34 U.S.C. 12131-12133, 42 
                        U.S.C. 13744)'' after ``sections 30101-30104'' 
                        in paragraph (2);
                            (ii) inserting ``(34 U.S.C. 12141-12146, 42 
                        U.S.C. 13777)'' after ``sections 30301-30307'' 
                        in paragraph (4);
                            (iii) inserting ``(34 U.S.C. 12161, 42 
                        U.S.C. 13793)'' after ``sections 30401-30403'' 
                        in paragraph (5);
                            (iv) inserting ``(34 U.S.C. 10101 note, 
                        12181-12212, 42 U.S.C. 13852)'' after 
                        ``sections 31101-31133'' in paragraph (8);
                            (v) inserting ``(34 U.S.C. 10101 note, 
                        12241-12262, 42 U.S.C. 13883)'' after 
                        ``sections 31901-31922'' in paragraph (10);
                            (vi) inserting ``(34 U.S.C. 12281)'' after 
                        ``section 32401'' in paragraph (13);
                            (vii) inserting ``(34 U.S.C. 12311)'' after 
                        ``section 40152'' in paragraph (17);
                            (viii) inserting ``(34 U.S.C. 12332)'' 
                        after ``section 40292'' in paragraph (25);
                            (ix) inserting ``(34 U.S.C. 12333)'' after 
                        ``section 40293'' in paragraph (26);
                            (x) inserting ``(34 U.S.C. 12341)'' after 
                        ``section 40295'' in paragraph (27);
                            (xi) inserting ``(34 U.S.C. 12371-12373, 42 
                        U.S.C. 13994)'' after ``sections 40411-40414'' 
                        in paragraph (28);
                            (xii) inserting ``(34 U.S.C. 12381, 42 
                        U.S.C. 14002)'' after ``sections 40421-40422'' 
                        in paragraph (29);
                            (xiii) inserting ``(42 U.S.C. 14012)'' 
                        after ``section 40506'' in paragraph (30);
                            (xiv) inserting ``(34 U.S.C. 12401-12410)'' 
                        after ``sections 40601-40611'' in paragraph 
                        (31); and
                            (xv) striking ``section 24001'' and 
                        inserting ``section 240001 (34 U.S.C. 12621)'' 
                        in paragraph (32).
            (121) Section 320919 of the Violent Crime Control and Law 
        Enforcement Act of 1994 (34 U.S.C. 12643) is amended by 
        striking ``subpart 1 of part E of the Omnibus Crime Control and 
        Safe Streets Act of 1968'' and inserting ``subpart 1 of part E 
        of title I of the Omnibus Crime Control and Safe Streets Act of 
        1968 (34 U.S.C. 10151 et seq.)''.
            (122) Section 510 of the Commerce, Justice, Science, and 
        Related Agencies Appropriations Act, 2017 (Public Law 115-31, 
        34 U.S.C. 20101 note) is amended by striking ``(42 U.S.C. 
        10601)'' and inserting ``(34 U.S.C. 20101)''.
            (123) Section 621(e)(2) of the Uniting and Strengthening 
        America by Providing Appropriate Tools Required to Intercept 
        and Obstruct Terrorism Act of 2001 (Public Law 107-56, 34 
        U.S.C. 20101 note) is amended by striking ``(42 U.S.C. 10601)'' 
        and inserting ``(34 U.S.C. 20101)''.
            (124) Section 104(b) of the Child Abuse Prevention and 
        Enforcement Act (Public Law 106-177, 34 U.S.C. 20101 note) is 
        amended by inserting ``(34 U.S.C. 20101 et seq.)'' after 
        ``Victims of Crime Act of 1984''.
            (125) Section 7129 of the Anti-Drug Abuse Act of 1988 
        (Public Law 100-690, 34 U.S.C. 20101 note) is amended by 
        striking ``chapter'' and inserting ``subtitle''.
            (126) Section 7130 of the Anti-Drug Abuse Act of 1988 
        (Public Law 100-690, 34 U.S.C. 20101 note) is amended by 
        inserting ``of 1984 (34 U.S.C. 20101(b))'' after ``section 
        1402(b) of the Victims of Crime Act''.
            (127) Section 234(a)(2) of the Justice for Victims of 
        Terrorism Act of 1996 (Public Law 104-132, 34 U.S.C. 20102 
        note) is amended by inserting ``(34 U.S.C. 20102(b)(8))'' after 
        ``Section 1403(b)(8) of the Victims of Crime Act of 1984''.
            (128) Section 2003(a)(3) of the Victims of Trafficking and 
        Violence Protection Act of 2000 (Public Law 106-386, 34 U.S.C. 
        20105 note) is amended by striking ``(42 U.S.C. 10604(a))'' and 
        inserting ``(34 U.S.C. 20110(a))''.
            (129) Section 1201 of the Violence Against Women Act of 
        2000 (34 U.S.C. 20121) is amended as follows:
                    (A) Subsection (b) is amended by inserting ``(34 
                U.S.C. 12291)'' after ``section 40002 of the Violence 
                Against Women Act of 1994''.
                    (B) Subsection (f)(2)(B)(i) is amended by striking 
                ``(42 U.S.C. 3796gg-10)'' and inserting ``(34 U.S.C. 
                10452)''.
            (130) Section 120 of the Violence Against Women and 
        Department of Justice Reauthorization Act of 2005 (34 U.S.C. 
        20123) is amended as follows:
                    (A) Subsection (a)(2)(A) is amended by inserting 
                ``(34 U.S.C. 10441)'' after ``Section 2001 of the 
                Omnibus Crime Control and Safe Streets Act of 1968''.
                    (B) Subsection (a)(2)(B) is amended by inserting 
                ``(34 U.S.C. 10461)'' after ``Section 2101 of the 
                Omnibus Crime Control and Safe Streets Act of 1968''.
                    (C) Subsection (h) is amended by striking ``(42 
                U.S.C. 13925)'' and inserting ``(34 U.S.C. 12291)''.
            (131) Section 121 of the Violence Against Women and 
        Department of Justice Reauthorization Act of 2005 (34 U.S.C. 
        20124) as amended as follows:
                    (A) Subsection (a)(2)(A) is amended by inserting 
                ``(34 U.S.C. 10461)'' after ``Section 2101 of the 
                Omnibus Crime Control and Safe Streets Act of 1968''.
                    (B) Subsection (a)(2)(B) is amended by striking 
                ``Section 14201 of division B of the Victims of 
                Trafficking and Violence Protection Act of 2000 (42 
                U.S.C. 3796gg-6)'' and inserting ``Section 1201 of 
                division B of the Victims of Trafficking and Violence 
                Protection Act of 2000 (34 U.S.C. 20121)''.
                    (C) Subsection (a)(2)(C) is amended by striking 
                ``(42 U.S.C. 13971)'' and inserting ``(34 U.S.C. 
                12341)''.
                    (D) Subsection (a)(2)(D) is amended by striking 
                ``(42 U.S.C. 14041a) (Enhanced Training and Services to 
                End Violence Against Women Later in Life)'' and 
                inserting ``(Enhanced Training and Services to End 
                Violence Against and Abuse of Women Later in Life)''.
                    (E) Subsection (a)(2)(E) is amended by striking 
                ``(42 U.S.C. 3796gg-7)'' and inserting ``(34 U.S.C. 
                20122)''.
                    (F) Subsection (h) is amended by inserting ``(34 
                U.S.C. 12291)'' after ``section 40002 of the Violence 
                Against Women Act of 1994''.
            (132) Section 304(g) of the Violence Against Women and 
        Department of Justice Reauthorization Act of 2005 (34 U.S.C. 
        20125(g)) is amended by inserting ``(34 U.S.C. 12291)'' after 
        ``section 40002 of the Violence Against Women Act of 1994''.
            (133) Section 214A(c)(2) of the Victims of Child Abuse Act 
        of 1990 (34 U.S.C. 20305(c)(2)) is amended by inserting ``(34 
        U.S.C. 20301 et seq.)'' after ``this title''.
            (134) Section 214C(3)(A) of the Victims of Child Abuse Act 
        of 1990 (34 U.S.C. 20307(3)(A)) is amended by inserting ``(34 
        U.S.C. 20301 et seq.)'' after ``this Act''.
            (135) Section 1302(d)(1) of the Violence Against Women Act 
        of 2000 (Public Law 106-386, 34 U.S.C. 20324 note) is amended 
        by--
                    (A) striking ``section 218(a) of the Victims of 
                Child Abuse Act of 1990 (42 U.S.C. 13014(a))'' and 
                inserting ``section 219(a) of the Victims of Child 
                Abuse Act of 1990 (34 U.S.C. 20324(a))'';
                    (B) striking ``(42 U.S.C. 13024(a))'' and inserting 
                ``(34 U.S.C. 20334(a))''; and
                    (C) striking ``section 1007(a)(7) of title I of the 
                Omnibus Crime Control and Safe Streets Act of 1968 (42 
                U.S.C. 3793(a)(7))'' and inserting ``section 1001(a)(7) 
                of title I of the Omnibus Crime Control and Safe 
                Streets Act of 1968 (34 U.S.C. 10261(a)(7))''.
            (136) Section 203(k)(2) of the Trafficking Victims 
        Protection Reauthorization Act of 2005 (34 U.S.C. 20703(k)(2)) 
        is amended by striking ``(42 U.S.C. 13001 et seq.)'' and 
        inserting ``(34 U.S.C. 20301 et seq.)''.
            (137) Section 117(a) of the Justice for Victims of 
        Trafficking Act of 2015 (34 U.S.C. 20704(a)) is amended by 
        striking ``(42 U.S.C. 14044b)'' and inserting ``(34 U.S.C. 
        20703)''.
            (138) Section 111 of the Sex Offender Registration and 
        Notification Act (34 U.S.C. 20911) is amended as follows:
                    (A) Paragraph (5)(B) is amended by inserting ``(34 
                U.S.C. 20912)'' after ``section 112''.
                    (B) Paragraph (10)(H) is amended by inserting ``(34 
                U.S.C. 20929)'' after ``section 127''.
            (139) Section 112(a) of the Sex Offender Registration and 
        Notification Act (34 U.S.C. 20912(a)) is amended by inserting 
        ``(34 U.S.C. 20901 et seq.)'' after ``this title''.
            (140) Section 113(d) of the Sex Offender Registration and 
        Notification Act (34 U.S.C. 20913(d)) is amended by inserting 
        ``(34 U.S.C. 20901 et seq.)'' after ``this title''.
            (141) Section 115(b)(2)(B) of the Sex Offender Registration 
        and Notification Act (34 U.S.C. 20915(b)(2)(B)) is amended by 
        inserting ``(34 U.S.C. 20901 et seq.)'' after ``this title''.
            (142) Section 2 of the Keeping the Internet Devoid of 
        Sexual Predators Act of 2008 (34 U.S.C. 20916) is amended as 
        follows:
                    (A) Subsection (a) is amended by--
                            (i) inserting ``(34 U.S.C. 20914(a)(7))'' 
                        after ``section 114(a)(7) of the Sex Offender 
                        Registration and Notification Act''; and
                            (ii) inserting ``(34 U.S.C. 20901 et 
                        seq.)'' after ``that Act''.
                    (B) Subsection (b) is amended by inserting ``(34 
                U.S.C. 20912(b))'' after ``section 112(b) of the Sex 
                Offender Registration and Notification Act''.
                    (C) Subsection (c) is amended by inserting ``(34 
                U.S.C. 20920(b)(4))'' after ``section 118(b)(4) of the 
                Sex Offender Registration and Notification Act''.
                    (D) Subsection (e)(3) is amended by inserting ``(34 
                U.S.C. 20901 et seq.)'' after ``Sex Offender 
                Registration and Notification Act''.
            (143) Section 117(a)(1) of the Sex Offender Registration 
        and Notification Act (34 U.S.C. 20919(a)(1)) is amended by 
        inserting ``(34 U.S.C. 20901 et seq.)'' after ``this title''.
            (144) Section 123(b) of the Sex Offender Registration and 
        Notification Act (34 U.S.C. 20925(b)) is amended as follows:
                    (A) Paragraph (3) is amended by inserting ``(34 
                U.S.C. 20901 et seq.)'' after ``this title''.
                    (B) Paragraph (4) is amended by inserting ``(34 
                U.S.C. 20923)'' after ``section 121''.
            (145) Section 124(a) of the Sex Offender Registration and 
        Notification Act (34 U.S.C. 20926(a)) is amended as follows:
                    (A) The matter before paragraph (1) is amended by 
                inserting ``(34 U.S.C. 20901 et seq.)'' after ``this 
                title''.
                    (B) Paragraph (2) is amended by inserting ``(34 
                U.S.C. 20925)'' after ``section 123''.
            (146) Section 125(a) of the Sex Offender Registration and 
        Notification Act (34 U.S.C. 20927(a)) is amended by--
                    (A) inserting ``(34 U.S.C. 20901 et seq.)'' after 
                ``this title''; and
                    (B) striking ``(42 U.S.C. 3750 et seq.)'' and 
                inserting ``(34 U.S.C. 10151 et seq.)''.
            (147) Section 126(a) of the Sex Offender Registration and 
        Notification Act (34 U.S.C. 20928(a)) is amended by inserting 
        ``(34 U.S.C. 20901 et seq.)'' after ``in this title''.
            (148) Section 128 of the Sex Offender Registration and 
        Notification Act (34 U.S.C. 20930) is amended by inserting 
        ``(34 U.S.C. 20901 et seq.)'' after ``this title''.
            (149) Section 128A of the Sex Offender Registration and 
        Notification Act (34 U.S.C. 20931) is amended as follows:
                    (A) The matter before paragraph (1) is amended by 
                inserting ``(34 U.S.C. 20914)'' after ``section 114''.
                    (B) Paragraph (2) is amended by inserting ``(34 
                U.S.C. 20901 et seq.)'' after ``this title''.
            (150) Section 131 of the Sex Offender Registration and 
        Notification Act (34 U.S.C. 20932) is amended by inserting 
        ``(34 U.S.C. 20901 et seq.)'' after ``this title''.
            (151) Section 143(b)(1)(A) of the Sex Offender Registration 
        and Notification Act (34 U.S.C. 20942(b)(1)(A)) is amended by 
        striking ``(42 U.S.C. 5771 et seq.)'' and inserting ``(34 
        U.S.C. 11291 et seq.)''.
            (152) Section 301(e)(3) of the Adam Walsh Child Protection 
        and Safety Act of 2006 (34 U.S.C. 20971(e)(3)) is amended by 
        inserting ``(34 U.S.C. 20911)'' after ``section 111''.
            (153) Section 628(a)(5) of the Adam Walsh Child Protection 
        and Safety Act of 2006 (34 U.S.C. 20985(a)(5)) is amended by--
                    (A) inserting ``of 1984 (34 U.S.C. 20101 et seq.)'' 
                after ``the Victims of Crime Act''; and
                    (B) inserting ``of 1994'' after ``Violence Against 
                Women Act''.
            (154) Section 635 of the Adam Walsh Child Protection and 
        Safety Act of 2006 (34 U.S.C. 20991) is amended as follows:
                    (A) Paragraph (3) is amended by inserting ``(34 
                U.S.C. 20901 et seq.)'' after ``Sex Offender 
                Registration and Notification Act''.
                    (B) Paragraph (4) is amended by inserting ``(34 
                U.S.C. 20927)'' after ``section 125''.
            (155) Section 102(a)(2) of the Providing Resources, 
        Officers, and Technology To Eradicate Cyber Threats to Our 
        Children Act of 2008 (34 U.S.C. 21112(a)(2)) is amended by 
        inserting ``(34 U.S.C. 11291 et seq.)'' after ``title IV of the 
        Juvenile Justice and Delinquency Prevention Act of 1974''.
            (156) Section 104 of the Providing Resources, Officers, and 
        Technology To Eradicate Cyber Threats to Our Children Act of 
        2008 (34 U.S.C. 21114) is amended as follows:
                    (A) Paragraph (2) is amended by inserting ``(34 
                U.S.C. 21113)'' after ``section 103''.
                    (B) Paragraph (8) is amended by inserting ``(34 
                U.S.C. 21115)'' after ``section 105''.
            (157) Section 105 of the Providing Resources, Officers, and 
        Technology To Eradicate Cyber Threats to Our Children Act of 
        2008 (34 U.S.C. 21115) is amended as follows:
                    (A) Subsection (c)(2) is amended by inserting ``(34 
                U.S.C. 21112)'' after ``section 102''.
                    (B) Subsection (e)(1)(C) is amended by inserting 
                ``(34 U.S.C. 21111(c)(16))'' after ``section 
                101(c)(16)''.
            (158) Section 106 of the Providing Resources, Officers, and 
        Technology To Eradicate Cyber Threats to Our Children Act of 
        2008 (34 U.S.C. 21116) is amended as follows:
                    (A) Subsection (a)(1) is amended by inserting ``(34 
                U.S.C. 21114)'' after ``section 104''.
                    (B) Subsection (d)(2)(A) is amended by inserting 
                ``(34 U.S.C. 21112)'' after ``section 102''.
            (159) Section 402(1) of the Rape Survivor Child Custody Act 
        (34 U.S.C. 21301(1)) is amended as follows:
                    (A) Subparagraph (A) is amended by striking ``(42 
                U.S.C. 3796gg et seq.)'' and inserting ``(34 U.S.C. 
                10441 et seq.)''.
                    (B) Subparagraph (B) is amended by striking ``(42 
                U.S.C. 14043g)'' and inserting ``(34 U.S.C. 12511)''.
            (160) Section 3 of the International Megan's Law to Prevent 
        Child Exploitation and Other Sexual Crimes Through Advanced 
        Notification of Traveling Sex Offenders (34 U.S.C. 21502) is 
        amended as follows:
                    (A) The matter before paragraph (1) is amended by 
                inserting ``(34 U.S.C. 21501 et seq.)'' after ``this 
                Act''.
                    (B) Paragraph (1) is amended by inserting ``(34 
                U.S.C. 21503(a))'' after ``section 4(a)''.
                    (C) Paragraph (2) is amended by striking ``(42 
                U.S.C. 16911)'' and inserting ``(34 U.S.C. 20911)''.
                    (D) Paragraph (6)(H) is amended by striking ``(42 
                U.S.C. 16927)'' and inserting ``(34 U.S.C. 20929)''.
                    (E) Paragraph (8) is amended by striking ``(42 
                U.S.C. 16919)'' and inserting ``(34 U.S.C. 20921)''.
                    (F) Paragraph (9) is amended by striking ``(42 
                U.S.C. 16911)'' and inserting ``(34 U.S.C. 20911)''.
                    (G) Paragraph (10)(A) is amended by striking ``(42 
                U.S.C. 16911)'' and inserting ``(34 U.S.C. 20911)''.
                    (H) Paragraph (10)(B) is amended by striking ``(42 
                U.S.C. 16911(5)(A))'' and inserting ``(34 U.S.C. 
                20911(5)(A))''.
                    (I) Paragraph (10)(C) is amended by striking ``(42 
                U.S.C. 16911(5))'' and inserting ``(34 U.S.C. 
                20911(5)(B), (C))''.
            (161) Section 4(e) of the International Megan's Law to 
        Prevent Child Exploitation and Other Sexual Crimes Through 
        Advanced Notification of Traveling Sex Offenders (34 U.S.C. 
        21503(e)) is amended as follows:
                    (A) Paragraph (1)(C) is amended by striking ``(42 
                U.S.C. 16901 et seq.)'' and inserting ``(34 U.S.C. 
                20901 et seq.)''.
                    (B) Paragraph (5)(B) is amended by inserting ``(34 
                U.S.C. 21507)'' after ``section 9''.
                    (C) Paragraph (7)(D) (matter before clause (i)) is 
                amended by inserting ``(34 U.S.C. 21507)'' after 
                ``section 9''.
                    (D) Paragraph (8) is amended by inserting ``(34 
                U.S.C. 21501 et seq.)'' after ``under this Act''.
            (162) Section 5 of the International Megan's Law to Prevent 
        Child Exploitation and Other Sexual Crimes Through Advanced 
        Notification of Traveling Sex Offenders (34 U.S.C. 21504) is 
        amended as follows:
                    (A) Subsection (c) (matter before paragraph (1)) is 
                amended by inserting ``(34 U.S.C. 21501 et seq.)'' 
                after ``this Act''.
                    (B) Subsection (c)(2) is amended by--
                            (i) striking ``(42 U.S.C. 16901 et seq.)'' 
                        and inserting ``(34 U.S.C. 20901 et seq.)''; 
                        and
                            (ii) inserting ``(34 U.S.C. 
                        21503(e)(1)(C))'' after ``section 4(e)(1)(C)''.
                    (C) Subsection (g)(4) (matter before subparagraph 
                (A)) is amended by inserting ``(34 U.S.C. 21507)'' 
                after ``section 9''.
            (163) Section 6(c) of the International Megan's Law to 
        Prevent Child Exploitation and Other Sexual Crimes Through 
        Advanced Notification of Traveling Sex Offenders (34 U.S.C. 
        21505) is amended by inserting ``(34 U.S.C. 21501 et seq.)'' 
        after ``In carrying out this Act''.
            (164) Section 7 of the International Megan's Law to Prevent 
        Child Exploitation and Other Sexual Crimes Through Advanced 
        Notification of Traveling Sex Offenders (34 U.S.C. 21506) is 
        amended by--
                    (A) inserting ``(34 U.S.C. 21501 et seq.)'' after 
                ``this Act''; and
                    (B) striking ``(42 U.S.C. 16901 et seq.)'' and 
                inserting ``(34 U.S.C. 20901 et seq.)''.
            (165) Section 9(a) of the International Megan's Law to 
        Prevent Child Exploitation and Other Sexual Crimes Through 
        Advanced Notification of Traveling Sex Offenders (34 U.S.C. 
        21507(a)) is amended by inserting ``(34 U.S.C. 21503(e)(5))'' 
        after ``section 4(e)(5)''.
            (166) Section 10 of the International Megan's Law to 
        Prevent Child Exploitation and Other Sexual Crimes Through 
        Advanced Notification of Traveling Sex Offenders (34 U.S.C. 
        21508) is amended by inserting ``(34 U.S.C. 21501 et seq.)'' 
        after ``this Act''.
            (167) Section 11 of the International Megan's Law to 
        Prevent Child Exploitation and Other Sexual Crimes Through 
        Advanced Notification of Traveling Sex Offenders (34 U.S.C. 
        21509) is amended by inserting ``(34 U.S.C. 21501 et seq.)'' 
        after ``this Act''.
            (168) Section 12 of the International Megan's Law to 
        Prevent Child Exploitation and Other Sexual Crimes Through 
        Advanced Notification of Traveling Sex Offenders (34 U.S.C. 
        21510) is amended by inserting ``(34 U.S.C. 21501 et seq.)'' 
        after ``this Act''.
            (169) Section 302(a) of the Elder Abuse Prevention and 
        Prosecution Act (34 U.S.C. 21731(a)) is amended by--
                    (A) inserting ``(34 U.S.C. 21722(a)(1))'' after 
                ``section 202(a)(1)''; and
                    (B) striking ``(42 U.S.C. 10601 et seq.)'' and 
                inserting ``(34 U.S.C. 20101 et seq.)''.
            (170) Section 401(b)(2)(C) of the Prioritizing Resources 
        and Organization for Intellectual Property Act of 2008 (34 
        U.S.C. 30103(b)(2)(C)) is amended by striking ``(42 U.S.C. 3750 
        et seq.)'' and inserting ``(34 U.S.C. 10151 et seq.)''.
            (171) Section 404 of the Prioritizing Resources and 
        Organization for Intellectual Property Act of 2008 (34 U.S.C. 
        30106) is amended as follows:
                    (A) Subsection (a) (matter before paragraph (1)) is 
                amended by inserting ``(34 U.S.C. 30103-30106)'' after 
                ``this title''.
                    (B) Subsection (a)(1) is amended by--
                            (i) inserting ``(34 U.S.C. 30103)'' after 
                        ``section 401'';
                            (ii) inserting ``(34 U.S.C. 30103(b))'' 
                        after ``section 401(b)''; and
                            (iii) inserting ``(34 U.S.C. 30103-30106)'' 
                        after ``this title''.
                    (C) Subsection (a)(2) is amended by inserting ``(34 
                U.S.C. 30104(a)(1), (2))'' after ``paragraphs (1) and 
                (2) of section 402(a)''.
                    (D) Subsection (a)(3) is amended by inserting ``(34 
                U.S.C. 30104(a)(4))'' after ``section 402(a)(4)''.
                    (E) Subsection (a)(4) is amended by inserting ``(34 
                U.S.C. 30104(b))'' after ``section 402(b)''.
                    (F) Subsection (a)(5) (matter before paragraph (A)) 
                is amended by inserting ``(34 U.S.C. 30105)'' after 
                ``section 403''.
                    (G) Subsection (a)(6) is amended by inserting ``(34 
                U.S.C. 30103, 30104, 30105)'' after ``sections 401, 
                402, and 403''.
                    (H) Subsection (c) (matter before paragraph (1)) is 
                amended by inserting ``(34 U.S.C. 30103-30106)'' after 
                ``this title''.
            (172) Section 4(a)(7) of the Prison Rape Elimination Act of 
        2003 (34 U.S.C. 30303(a)(7)) is amended by striking ``(42 
        U.S.C. 3735, 3789g)'' and inserting ``(34 U.S.C. 10134, 
        10231)''.
            (173) Section 6(e)(2) of the Prison Rape Elimination Act of 
        2003 (34 U.S.C. 30305(e)(2)) is amended by inserting ``(34 
        U.S.C. 30304)'' after ``section 5''.
            (174) Section 8 of the Prison Rape Elimination Act of 2003 
        (34 U.S.C. 30307) is amended as follows:
                    (A) Subsection (a)(1) is amended by inserting ``(34 
                U.S.C. 30306(d)(3))'' after ``section 7(d)(3)''.
                    (B) Subsection (a)(2) is amended by inserting ``(34 
                U.S.C. 30306(e))'' after ``section 7(e)''.
                    (C) Subsection (c)(4) is amended by inserting ``(34 
                U.S.C. 30306(e))'' after ``section 7(e)''.
                    (D) Subsection (d)(4) is amended by inserting ``(34 
                U.S.C. 30306(e))'' after ``section 7(e)''.
                    (E) Subsection (e)(4) is amended by inserting ``(34 
                U.S.C. 30303(c)(2)(C))'' after ``section 4(c)(2)(C)''.
            (175) Section 9(b)(2) of the Prison Rape Elimination Act of 
        2003 (34 U.S.C. 30308(b)(2)) is amended by inserting ``(34 
        U.S.C. 30307(a)(4))'' after ``section 8(a)(4)''.
            (176) Section 108 of the Prosecutorial Remedies and Other 
        Tools to end the Exploitation of Children Today Act of 2003 
        (Public Law 108-21, 34 U.S.C. 40102 note) is amended as 
        follows:
                    (A) Subsection (a)(3)(B)(i)(IV) is amended by 
                striking ``(42 U.S.C. 5119c)'' and inserting ``(34 
                U.S.C. 40104)''.
                    (B) Subsection (a)(3)(G)(i) is amended by striking 
                ``National Child Protection Act (42 U.S.C. 5119)'' and 
                inserting ``National Child Protection Act of 1993 (34 
                U.S.C. 40101 et seq.)''.
                    (C) Subsection (d)(3) is amended by inserting ``of 
                1993 (34 U.S.C. 40101 et seq.)'' after ``National Child 
                Protection Act''.
            (177) Section 4(c) of the National Child Protection Act of 
        1993 (34 U.S.C. 40103(c)) is amended by inserting ``(34 U.S.C. 
        10101 et seq.)'' after ``title I of the Omnibus Crime Control 
        and Safe Streets Act of 1968''.
            (178) Section 102 of the Crime Identification Technology 
        Act of 1998 (34 U.S.C. 40301) is amended as follows:
                    (A) Subsection (b)(6) is amended by striking ``(18 
                U.S.C. 922 note)'' and inserting ``(34 U.S.C. 
                40901(b))''.
                    (B) Subsection (b)(8) is amended by striking ``(18 
                U.S.C. 922 note)'' and inserting ``(34 U.S.C. 
                40901(b))''.
                    (C) Subsection (c)(1) is amended by striking ``(18 
                U.S.C. 922 note)'' and inserting ``(34 U.S.C. 
                40901(b))''.
                    (D) Subsection (c)(2)(G) is amended by inserting 
                ``(34 U.S.C. 10381 et seq.)'' after ``part Q of title I 
                of the Omnibus Crime Control and Safe Streets Act of 
                1968''.
            (179) Section 213(2) of the National Crime Prevention and 
        Privacy Compact Act of 1998 (34 U.S.C. 40312(2)) is amended by 
        inserting ``(34 U.S.C. 40316)'' after ``section 217''.
            (180) Section 214 of the National Crime Prevention and 
        Privacy Compact Act of 1998 (34 U.S.C. 40313) is amended by 
        inserting ``(34 U.S.C. 40316)'' after ``section 217''.
            (181) Section 204 of Jennifer's Law (34 U.S.C. 40503) is 
        amended by--
                    (A) inserting ``(34 U.S.C. 40501 et seq.)'' after 
                ``this title''; and
                    (B) inserting ``(34 U.S.C. 40502(b))'' after 
                ``section 203(b)''.
            (182) Section 2 of the DNA Analysis Backlog Elimination Act 
        of 2000 (34 U.S.C. 40701) is amended as follows:
                    (A) Subsection (b)(2) is amended by striking ``(42 
                U.S.C. 14132(b)(3))'' and inserting ``(34 U.S.C. 
                12592(b)(3))''.
                    (B) Subsection (d)(2)(B) is amended by striking 
                ``(42 U.S.C. 14132(b))'' and inserting ``(34 U.S.C. 
                12592(b)(1), (2))''.
                    (C) Subsection (n)(5)(C)(ii) is amended by striking 
                ``(42 U.S.C. 14131)'' and inserting ``(34 U.S.C. 
                12591)''.
            (183) Section 1003 of the Sexual Assault Forensic Evidence 
        Reporting Act of 2013 (Public Law 113-4, title X, 34 U.S.C. 
        40701 note) is amended as follows:
                    (A) The matter before paragraph (1) is amended by 
                inserting ``(34 U.S.C. 40701(a)(7))'' after ``section 
                2(a)(7) of the DNA Analysis Backlog Elimination Act of 
                2000''.
                    (B) Paragraph (2) is amended by inserting ``(34 
                U.S.C. 40701(n)(3))'' after ``section 2(n)(3) of the 
                DNA Analysis Backlog Elimination Act of 2000''.
                    (C) Paragraph (3) is amended by inserting ``(34 
                U.S.C. 40701(n)(4))'' after ``section 2(n)(4) of the 
                DNA Analysis Backlog Elimination Act of 2000''.
            (184) Section 1006 of the Sexual Assault Forensic Evidence 
        Reporting Act of 2013 (Public Law 113-4, title X, 34 U.S.C. 
        40701 note) is amended by striking ``(42 U.S.C. 14135(a)(6) and 
        (n))'' and inserting ``(34 U.S.C. 40701(a)(6), (n))''.
            (185) Section 10(b) of the DNA Analysis Backlog Elimination 
        Act of 2000 (34 U.S.C. 40706(b)) is amended by striking ``(42 
        U.S.C. 14132(b)(3))'' and inserting ``(34 U.S.C. 
        12592(b)(3)(A)-(D))''.
            (186) Section 304(c)(1)(A) of the DNA Sexual Assault 
        Justice Act of 2004 (34 U.S.C. 40723(c)(1)(A)) is amended by 
        striking ``section 4002 of the Violence Against Women Act of 
        1994 (42 U.S.C. 13925)'' and inserting ``section 40002 of the 
        Violence Against Women Act of 1994 (34 U.S.C. 12291)''.
            (187) Section 2(1) (matter before subparagraph (A)) of the 
        Katie Sepich Enhanced DNA Collection Act of 2012 (34 U.S.C. 
        40741(1) (matter before subparagraph (A))) is amended by 
        striking ``(42 U.S.C. 14132(a))'' and inserting ``(34 U.S.C. 
        12592(a))''.
            (188) Section 4 of the Katie Sepich Enhanced DNA Collection 
        Act of 2012 (34 U.S.C. 40743) is amended by striking ``(42 
        U.S.C. 14132(d))'' and inserting ``(34 U.S.C. 12592(d))''.
            (189) Section 5 of the Katie Sepich Enhanced DNA Collection 
        Act of 2012 (34 U.S.C. 40744) is amended by striking ``(42 
        U.S.C. 14135)'' and inserting ``(34 U.S.C. 40701(j))''.
            (190) Section 102(a) of the NICS Improvement Amendments Act 
        of 2007 (34 U.S.C. 40912(a)) is amended by striking ``Crime 
        Identification Technology Act of 1988 (42 U.S.C. 14601)'' and 
        inserting ``Crime Identification Technology Act of 1998 (34 
        U.S.C. 40301)''.
            (191) Section 104 of the NICS Improvement Amendments Act of 
        2007 (34 U.S.C. 40914) is amended as follows:
                    (A) Subsection (a)(1) is amended by inserting ``(34 
                U.S.C. 40912, 40913)'' after ``under sections 102 and 
                103''.
                    (B) Subsection (b)(1)(A) is amended by--
                            (i) striking ``(42 U.S.C. 3755)'' and 
                        inserting ``(34 U.S.C. 10156)''; and
                            (ii) inserting ``(34 U.S.C. 40912, 40913)'' 
                        after ``sections 102 and 103''.
                    (C) Subsection (d) is amended by--
                            (i) inserting ``(34 U.S.C. 
                        40912(b)(1)(A))'' after ``section 
                        102(b)(1)(A)'';
                            (ii) inserting ``(34 U.S.C. 40912, 40913)'' 
                        after ``sections 102 and 103''; and
                            (iii) inserting ``(34 U.S.C. 
                        40912(b)(1)(C))'' after ``section 
                        102(b)(1)(C)''.
            (192) Section 609M(c)(6) of the Justice Assistance Act of 
        1984 (34 U.S.C. 50101(c)(6)) is amended by inserting ``(34 
        U.S.C. 10101 et seq.)'' after ``title I of the Omnibus Crime 
        Control and Safe Streets Act of 1968''.
            (193) Section 609P(b) of the Justice Assistance Act of 1984 
        (34 U.S.C. 50104(b)) is amended by inserting ``(34 U.S.C. 
        10228(c)(3), (4))'' after ``Paragraph (3) and paragraph (4) of 
        section 809(c) of part H of title I of the Omnibus Crime 
        Control and Safe Streets Act of 1968''.
            (194) Section 609Q (matter before paragraph (1)) of the 
        Justice Assistance Act of 1984 (34 U.S.C. 50105 (matter before 
        paragraph (1))) is amended by inserting ``(34 U.S.C. 10231)'' 
        after ``Section 812 of part H of title I of the Omnibus Crime 
        Control and Safe Streets Act of 1968''.
            (195) Section 609S(a) of the Justice Assistance Act of 1984 
        (34 U.S.C. 50107(a)) is amended by striking ``section 554'' and 
        inserting ``section 609P of Public Law 98-473 (34 U.S.C. 
        50104)''.
            (196) Section 2 of the Law Enforcement Congressional Badge 
        of Bravery Act of 2008 (34 U.S.C. 50301) is amended as follows:
                    (A) Paragraph (2) is amended by inserting ``(34 
                U.S.C. 50313(a))'' after ``section 103(a)''.
                    (B) Paragraph (3) is amended by inserting ``(34 
                U.S.C. 50313(c))'' after ``section 103(c)''.
                    (C) Paragraph (4) is amended by inserting ``(34 
                U.S.C. 50311)'' after ``section 101''.
                    (D) Paragraph (6) is amended by inserting ``(34 
                U.S.C. 50331(a))'' after ``section 301(a)''.
                    (E) Paragraph (7) is amended by inserting ``(34 
                U.S.C. 50323(a))'' after ``section 203(a)''.
                    (F) Paragraph (8) is amended by inserting ``(34 
                U.S.C. 50323(c))'' after ``section 203(c)''.
                    (G) Paragraph (9) is amended by inserting ``(34 
                U.S.C. 50321)'' after ``section 201''.
            (197) Section 103(b) of the Law Enforcement Congressional 
        Badge of Bravery Act of 2008 (34 U.S.C. 50313(b)) is amended as 
        follows:
                    (A) Paragraph (4) is amended by inserting ``(34 
                U.S.C. 50312(a))'' after ``section 102(a)''.
                    (B) Paragraph (5)(D) is amended by inserting ``(34 
                U.S.C. 50314)'' after ``section 104''.
            (198) Section 203(b) of the Law Enforcement Congressional 
        Badge of Bravery Act of 2008 (34 U.S.C. 50323(b)) is amended as 
        follows:
                    (A) Paragraph (4) is amended by inserting ``(34 
                U.S.C. 50322(a))'' after ``section 202(a)''.
                    (B) Paragraph (5)(D) is amended by inserting ``(34 
                U.S.C. 50324)'' after ``section 204''.
            (199) Section 301(b) of the Law Enforcement Congressional 
        Badge of Bravery Act of 2008 (34 U.S.C. 50331(b)) is amended as 
        follows:
                    (A) Paragraph (1) is amended by inserting ``(34 
                U.S.C. 50313(d)(2))'' after ``section 103(d)(2)''.
                    (B) Paragraph (2) is amended by inserting ``(34 
                U.S.C. 50323(d)(2))'' after ``section 203(d)(2)''.
                    (C) Paragraph (3) is amended by--
                            (i) inserting ``(34 U.S.C. 50313(b))'' 
                        after ``section 103(b)''; and
                            (ii) inserting ``(34 U.S.C. 50323(b))'' 
                        after ``section 203(b)''.
            (200) Section 2 of the Rafael Ramos and Wenjian Liu 
        National Blue Alert Act of 2015 (34 U.S.C. 50501) is amended as 
        follows:
                    (A) Paragraph (1) is amended by inserting ``(34 
                U.S.C. 50503(a))'' after ``section 4(a)''.
                    (B) Paragraph (4) is amended by striking ``(42 
                U.S.C. 3796b)'' and inserting ``(34 U.S.C. 10284)''.
                    (C) Paragraph (5) is amended by inserting ``(34 
                U.S.C. 50502)'' after ``section 3''.
            (201) Section 2 of the Death in Custody Reporting Act of 
        2013 (34 U.S.C. 60105) is amended as follows:
                    (A) Subsection (c)(2) is amended by striking ``(42 
                U.S.C. 3750 et seq.)'' and inserting ``(34 U.S.C. 10151 
                et seq.)''.
                    (B) Subsection (e) is amended by striking ``(42 
                U.S.C. 3791(a))'' and inserting ``(34 U.S.C. 
                10251(a))''.
            (202) Section 4 of the Second Chance Act of 2007: Community 
        Safety Through Recidivism Prevention (34 U.S.C. 60502) is 
        amended by striking ``(42 U.S.C. 3791)'' and inserting ``(34 
        U.S.C. 10251)''.
            (203) Section 6(1) of the Second Chance Act of 2007: 
        Community Safety Through Recidivism Prevention (34 U.S.C. 
        60504(1)) is amended by--
                    (A) inserting ``(34 U.S.C. 60521)'' after ``201'';
                    (B) inserting ``(34 U.S.C. 60531)'' after ``211''; 
                and
                    (C) inserting ``(34 U.S.C. 60532)'' after ``212''.
            (204) Section 211(d) of the Second Chance Act of 2007: 
        Community Safety Through Recidivism Prevention (34 U.S.C. 
        60531(d)) is amended by inserting ``(34 U.S.C. 60551(b)(6))'' 
        after ``section 241(b)(6)''.
            (205) Section 212(d)(1)(B)(iii) of the Second Chance Act of 
        2007: Community Safety Through Recidivism Prevention (34 U.S.C. 
        60532(d)(1)(B)(iii)) is amended by inserting ``(34 U.S.C. 
        10631)'' after ``section 2976 of the Omnibus Crime Control and 
        Safe Streets Act of 1968''.
            (206) Section 231 of the Second Chance Act of 2007: 
        Community Safety Through Recidivism Prevention (34 U.S.C. 
        60541) is amended as follows:
                    (A) Subsection (d)(3)(B) is amended by inserting 
                ``(34 U.S.C. 60551(b)(6))'' after ``section 
                241(b)(6)''.
                    (B) Subsection (g)(5)(A)(ii) is amended by 
                inserting ``(34 U.S.C. 20911(5))'' after ``section 
                111(5) of the Sex Offender Registration and 
                Notification Act''.

SEC. 16. TITLE 35, UNITED STATES CODE.

    Section 4(b) of the Plant Patents Amendments Act of 1998 (Public 
Law 105-289, 35 U.S.C. 41 note) is amended by striking ``(42 U.S.C. 
379bb(b))'' and inserting ``(34 U.S.C. 10351(b))''.

SEC. 17. TITLE 38, UNITED STATES CODE.

    Section 2411(b)(4)(A) of title 38, United States Code, is amended 
by striking ``(42 U.S.C. 16901 et seq.)'' and inserting ``(34 U.S.C. 
20901 et seq.)''.

SEC. 18. TITLE 40, UNITED STATES CODE.

    Section 590(f)(2) of title 40, United States Code, is amended by 
striking ``(42 U.S.C. 13041)'' and inserting ``(34 U.S.C. 20351)''.

SEC. 19. TITLE 42, UNITED STATES CODE.

            (1) Section 266(a) of the Public Health Service Act (42 
        U.S.C. 239e(a)) is amended as follows:
                    (A) Paragraph (1) is amended by striking ``(42 
                U.S.C. 3796 et seq.)'' and inserting ``(34 U.S.C. 10281 
                et seq.)''.
                    (B) Paragraph (2)(A) is amended by striking ``(42 
                U.S.C. 3796 et seq.)'' and inserting ``(34 U.S.C. 10281 
                et seq.)''.
                    (C) Paragraph (3)(A)(i) is amended by striking 
                ``(42 U.S.C. 3796 et seq.)'' and inserting ``(34 U.S.C. 
                10281 et seq.)''.
                    (D) Paragraph (3)(A)(ii) is amended by striking 
                ``(42 U.S.C. 3796 et seq.)'' and inserting ``(34 U.S.C. 
                10281 et seq.)''.
                    (E) Paragraph (3)(B) is amended by striking ``(42 
                U.S.C. 3796 et seq.)'' and inserting ``(34 U.S.C. 10281 
                et seq.)''.
            (2) Section 399P of the Public Health Service Act (42 
        U.S.C. 280g-4) is amended as follows:
                    (A) Subsection (c)(1)(A) is amended by inserting 
                ``(34 U.S.C. 12291(b)(2))'' after ``section 40002(b)(2) 
                of the Violence Against Women Act of 1994''.
                    (B) Subsection (h) is amended by inserting ``(34 
                U.S.C. 12291)'' after ``section 40002 of the Violence 
                Against Women Act of 1994''.
            (3) Section 401(c)(2)(A)(ii) of Public Law 98-473 (42 
        U.S.C. 1397b note) is amended by striking ``Public Law 92-544 
        (86 Stat. 115)'' and inserting ``Public Law 92-544 (86 Stat. 
        1115; 34 U.S.C. 41101)''.
            (4) Section 9(b) of the Richard B. Russell National School 
        Lunch Act (42 U.S.C. 1758(b)) is amended as follows:
                    (A) Paragraph (5)(C) is amended by striking ``(42 
                U.S.C. 5701 et seq.)'' and inserting ``(34 U.S.C. 11201 
                et seq.)''.
                    (B) Paragraph (12)(A)(v) is amended by striking 
                ``(42 U.S.C. 5701 et seq.)'' and inserting ``(34 U.S.C. 
                11201 et seq.)''.
            (5) Section 161A(c) of the Atomic Energy Act of 1954 (42 
        U.S.C. 2201a(c)) is amended by striking ``(Public Law 103-159; 
        18 U.S.C. 922 note)'' and inserting ``(Public Law 103-159; 34 
        U.S.C. 40901(b))''.
            (6) Section 102(49) of the Older Americans Act of 1965 (42 
        U.S.C. 3002(49)) is amended by striking ``section 2003 of the 
        Omnibus Crime Control and Safe Streets Act of 1968 (42 U.S.C. 
        3796gg-2)'' and inserting ``section 2008 of the Omnibus Crime 
        Control and Safe Streets Act of 1968''.
            (7) Section 203(b)(18) of the Older Americans Act of 1965 
        (42 U.S.C. 3013(b)(18)) is amended by striking ``(42 U.S.C. 
        3750-3766b))'' and inserting ``(34 U.S.C. 10151 et seq.)''.
            (8) Section 106(b)(2)(B)(xvi)(VI) of the Child Abuse 
        Prevention and Treatment Act (42 U.S.C. 
        5106a(b)(2)(B)(xvi)(VI)) is amended by striking ``(42 U.S.C. 
        16913(a))'' and inserting ``(34 U.S.C. 20913(a))''.
            (9) Section 107(f) of the Child Abuse Prevention and 
        Treatment Act (42 U.S.C. 5106c(f)) is amended by striking ``(42 
        U.S.C. 10603a)'' and inserting ``(34 U.S.C. 20104)''.
            (10) Section 327(h)(4) of the Robert T. Stafford Disaster 
        Relief and Emergency Assistance Act (42 U.S.C. 5165f(h)(4)) is 
        amended by--
                    (A) striking ``(42 U.S.C. 3796b)'' and inserting 
                ``(34 U.S.C. 10284)''; and
                    (B) striking ``(42 U.S.C. 3796 et seq.)'' and 
                inserting ``(34 U.S.C. 10281 et seq.)''.
            (11) Section 658H of the Child Care and Development Block 
        Grant Act of 1990 (42 U.S.C. 9858f) is amended as follows:
                    (A) Subsection (b)(5) is amended by striking ``(42 
                U.S.C. 16901 et seq.)''.
                    (B) Subsection (c)(1)(C) is amended by striking 
                ``(42 U.S.C. 16901 et seq.)''.
            (12) Section 309(a) of the Family Violence Prevention and 
        Services Act (42 U.S.C. 10409(a)) is amended by striking ``(42 
        U.S.C. 14045d)'' and inserting ``(34 U.S.C. 20126)''.
            (13) Section 310 of the Family Violence Prevention and 
        Services Act (42 U.S.C. 10410) is amended as follows:
                    (A) Subsection (b)(1)(B)(i) is amended by striking 
                ``(42 U.S.C. 3796gg-10 note)'' and inserting ``(34 
                U.S.C. 10452 note)''.
                    (B) Subsection (b)(1)(B)(ii) is amended by striking 
                ``(42 U.S.C. 3796gg-10 note)'' and inserting ``(34 
                U.S.C. 10452 note)''.
                    (C) Subsection (c)(2)(A) is amended by striking 
                ``(42 U.S.C. 3796gg-10 note)'' and inserting ``(34 
                U.S.C. 10452 note)''.
                    (D) Subsection (c)(2)(B) is amended by striking 
                ``(42 U.S.C. 3796gg-10 note)'' and inserting ``(34 
                U.S.C. 10452 note)''.
            (14) Section 311(e) of the Family Violence Prevention and 
        Services Act (42 U.S.C. 10411(e)) is amended as follows:
                    (A) Paragraph (1) is amended by striking ``(42 
                U.S.C. 3796gg(c)(1))'' and inserting ``(34 U.S.C. 
                10441(c)(1))''.
                    (B) Paragraph (2) is amended by striking ``(42 
                U.S.C. 3796gg et seq.)'' and inserting ``(34 U.S.C. 
                10441 et seq.)''.
            (15) Section 722 of the McKinney-Vento Homeless Assistance 
        Act (42 U.S.C. 11432) is amended as follows:
                    (A) Subsection (f)(4)(B) is amended by striking 
                ``(42 U.S.C. 5701 et seq.)'' and inserting ``(34 U.S.C. 
                11201 et seq.).
                    (B) Subsection (g)(5)(A)(i) is amended by striking 
                ``(42 U.S.C. 5701 et seq.)'' and inserting ``(34 U.S.C. 
                11201 et seq.)''.
            (16) Section 3504 of the Anti-Drug Abuse Act of 1988 (42 
        U.S.C. 11804) is amended by inserting ``(34 U.S.C. 11101 et 
        seq.)'' after ``Juvenile Justice and Delinquency Prevention Act 
        of 1974''.
            (17) Section 189D of the National and Community Service Act 
        of 1990 (42 U.S.C. 12645g) is amended as follows:
                    (A) Subsection (b)(1) is amended by striking ``(42 
                U.S.C. 16901 et seq.)''.
                    (B) Subsection (c)(3) is amended by striking ``(42 
                U.S.C. 16901 et seq.)''.
                    (C) Subsection (d)(1)(A) is amended by striking 
                ``(42 U.S.C. 16901 et seq.)''.
            (18) Section 4(f)(1)(B) of the Volunteer Protection Act of 
        1997 (42 U.S.C. 14503(f)(1)(B)) is amended by striking ``(28 
        U.S.C. 534 note)'' and inserting ``(34 U.S.C. 41305, 41305 
        note)''.
            (19) Section 6(4) of the Volunteer Protection Act of 1997 
        (42 U.S.C. 14505(4)) is amended as follows:
                    (A) Subparagraph (A) is amended by striking ``(28 
                U.S.C. 534 note)'' and inserting ``(34 U.S.C. 41305, 
                41305 note)''.
                    (B) Subparagraph (B) is amended by striking ``(28 
                U.S.C. 534 note)'' and inserting ``(34 U.S.C. 41305, 
                41305 note)''.

SEC. 20. TITLE 49, UNITED STATES CODE.

            (1) Section 622(e)(2) of the Uniting and Strengthening 
        America by Providing Appropriate Tools Required to Intercept 
        and Obstruct Terrorism Act of 2001 (Public Law 107-56, 49 
        U.S.C. 40101 note) is amended by--
                    (A) striking ``(42 U.S.C. 10602)'' and inserting 
                ``(34 U.S.C. 20102)''; and
                    (B) inserting ``(34 U.S.C. 20101 et seq.)'' after 
                ``grants under the Victims of Crime Act of 1984''.
            (2) Section 40130(a)(1)(A) of title 49, United States Code, 
        is amended by striking ``(42 U.S.C. 14616)'' and inserting 
        ``(34 U.S.C. 40316)''.

SEC. 21. TITLE 50, UNITED STATES CODE.

    Section 4(e)(4) of the Subversive Activities Control Act of 1950 
(50 U.S.C. 783(e)(4)) is amended by striking ``(42 U.S.C. 10601)'' and 
inserting ``(34 U.S.C. 20101)''.
                                 <all>