SECTION 1. REDESIGNATION OF TITLE OF NATIONAL CEMETERY SYSTEM.

    The title of the National Cemetery System of the Department of 
Veterans Affairs is hereby redesignated as the National Cemetery 
Administration.

SEC. 2. REDESIGNATION OF POSITION OF DIRECTOR OF THE NATIONAL CEMETERY 
              SYSTEM.

    The position of Director of the National Cemetery System of the 
Department of Veterans Affairs is hereby redesignated as Assistant 
Secretary for Memorial Affairs.

SEC. 3. ASSISTANT SECRETARIES.

    Section 308(a) of title 38, United States Code, is amended by--
            (1) in subsection (a) thereof, changing the period at the 
        end of the first sentence of that subsection to a comma and 
        adding the following at the end of that sentence: ``in addition 
        to the Assistant Secretary for Memorial Affairs'';
            (2) in subsection (b) thereof, by inserting ``other than 
        the Assistant Secretary for Memorial Affairs'' after 
        ``Assistant Secretaries''; and
            (3) in subsection (c) thereof, by inserting ``pursuant to 
        subsection (b)'' after ``Assistant Secretary''.

SEC. 4. TITLE 38 CONFORMING AMENDMENTS.

    (a) Title 38, United States Code, is amended by striking out 
``Director of the National Cemetery System'' each place it appears 
(including in headings and tables) and inserting in lieu thereof 
``Assistant Secretary for Memorial Affairs''.
    (b) Section 301(c) of title 38, United States Code, is amended by 
striking out ``System'' in subsection (c)(4) and inserting in lieu 
thereof ``Administration''.
    (c) Section 307 of title 38, United States Code, is amended--
            (1) by striking out ``a'' in the first sentence and 
        inserting in lieu thereof ``an'';
            (2) by striking out ``Director'' in the second sentence and 
        inserting in lieu thereof ``Assistant Secretary for Memorial 
        Affairs''; and
            (3) by striking out ``System'' in the second sentence and 
        inserting in lieu thereof ``Administration''.
    (d)(1) Section 2306(d) of title 38, United States Code, is amended 
by striking out ``within the National Cemetery System'' in the first 
sentence of subsection (d)(1) and inserting in lieu thereof ``under the 
control of the National Cemetery Administration''.
    (2) Section 2306(d) of title 38, United States Code, is amended by 
striking out ``within the National Cemetery System'' in subsection 
(d)(2) and inserting in lieu thereof ``under the control of the 
National Cemetery Administration''.
    (e)(1) The table of sections at the beginning of chapter 24 of 
title 38, United States Code, is amended by striking out 
``Establishment of National Cemetery System; composition of such 
system; appointment of director.'' and inserting in lieu thereof 
``Establishment of National Cemetery Administration; authority of such 
Administration; appointment of Assistant Secretary.''.
    (2) The heading of section 2400 of title 38, United States Code, is 
amended by striking out ``Establishment of National Cemetery System; 
composition of such system; appointment of director'' and inserting in 
lieu thereof ``Establishment of National Cemetery Administration; 
authority of such Administration; appointment of Assistant Secretary''.
    (3) Section 2400(a) of title 38, United States Code, is amended by 
striking out ``shall be within the Department a National Cemetery 
System'' in the first sentence and inserting in lieu thereof ``is 
within the Department a National Cemetery Administration responsible'' 
in the first sentence and by striking out ``Such system'' in the second 
sentence and inserting in lieu thereof ``The National Cemetery 
Administration''.
    (4) Section 2400(b) of title 38, United States Code, is amended by 
striking out ``The National Cemetery System'' and inserting ``National 
cemeteries and other facilities under the control of the National 
Cemetery Administration'' in lieu thereof.
    (5) Section 2402 of title 38, United States Code, is amended by 
striking out ``in the National Cemetery System'' and inserting ``under 
the control of the National Cemetery Administration'' in lieu thereof.
    (6) Section 2403(c) of title 38, United States Code, is amended by 
striking out ``in the National Cemetery System created by this 
chapter'' and inserting ``under the control of the National Cemetery 
Administration'' in lieu thereof.
    (7) Section 2405(c) of title 38, United States Code, is amended by 
striking out ``within the National Cemetery System'' and inserting in 
lieu thereof ``under the control of the National Cemetery 
Administration'' and by striking out ``within such System'' and 
inserting in lieu thereof ``under the control of such Administration''.
    (8) Section 2408(c) of title 38, United States Code, is amended by 
striking out ``in the National Cemetery System'' in subsection (c)(1) 
and inserting ``under the control of the National Cemetery 
Administration'' in lieu thereof.

SEC. 5. EXECUTIVE SCHEDULE CONFORMING AMENDMENT.

    Section 5315 of title 5, United States Code, is amended by striking 
out ``(6)'' following ``Assistant Secretaries, Department of Veterans 
Affairs'' and inserting in lieu thereof ``(7)'' and by striking out 
``Director of the National Cemetery System.''

SEC. 6. REFERENCES IN OTHER LAWS.

    (a) Any reference to the National Cemetery System in any Federal 
law, Executive order, rule, regulation, delegation of authority, or 
document of or pertaining to the Department of Veterans Affairs, which 
reference pertains to the organization within that Department which 
controls the Department's national cemeteries shall be deemed to refer 
to the National Cemetery Administration.
    (b) Any reference to the Director of the National Cemetery System 
in any Federal law, Executive order, rule, regulation, delegation of 
authority, or document of or pertaining to the Department of Veterans 
Affairs shall be deemed to refer to the Assistant Secretary for 
Memorial Affairs.
Redesignates the:  (1) National Cemetery System of the Department of Veterans Affairs as the National Cemetery Administration; and (2) position of Director of the System as the Assistant Secretary for Memorial Affairs.
A bill to redesignate the title of the National Cemetery System and the position of the Director of the National Cemetery System.