CONFORMING AMENDMENTS.

SEC. 803. CONFORMING AMENDMENTS. (a) Central Intelligence Agency Act of 1949.— (1) Section 14.—Section 14(a) of the Central Intelligence Agency Act of 1949 (50 U.S.C. 403n(a)) is amended by striking out “sections 204, 221(b) (1)–(3), 221(f), 221(g)(2), 221(1), 221(m), 221(n), 221(o), 222, 223, 224, 225, 232(b), 234(c) 234(d), 234(e), and 263(b) of the Central Intelligence Agency Retirement Act 106 STAT. 3252of 1964 for Certain Employees” and inserting in lieu thereof “sections 102, 221(b) (1)–(3), 221(f), 221(g), 221(hX2), 221(i), 221(1), 222, 223, 224, 225, 232(b), 241(b), 241(d), and 264(b) of the Central Intelligence Agency Retirement Act”. (2) Section 18.—Section 18(a) of such Act (50 U.S.C. 403r(a)) is amended by striking out “the Central Intelligence Agency Retirement Act of 1964 for Certain Employees” and inserting in lieu thereof “the Central Intelligence Agency Retirement Act”. (3) Section 19.—Section 19 of such Act (50 U.S.C. 403s) is amended— (A) in subsection (a)— (i) by inserting “Officers and Employees To Whom CIARDS Section 231 Rules Apply.—” after “(a)”; (ii) by striking out “the Central Intelligence Agency Retirement Act of 1964 for Certain Employees, as amended” in clause (ii) and inserting in lieu thereof “the Central Intelligence Agency Retirement Act”; (iii) by inserting “such” in clause (iii) before “section 203”; (iv) by striking out “such section 231” in the matter after clause (iv) and inserting in lieu thereof “section 231 of such Act”; and (v) by redesignating clauses (i) through (iv) as paragraphs (1) through (4), respectively; (B) in subsection (b)— (i) by inserting “Survivors of Officers and Employees To Whom CIARDS Section 231 Rules Apply.—” after “(b)”; (ii) by striking out “the Central Intelligence Agency Retirement Act of 1964 for Certain Employees, as amended” in clause (ii) and inserting in lieu thereof “the Central Intelligence Agency Retirement Act”; (iii) by striking out “widow or widower, former spouse, and/or child or children as defined in section 204 and section 232 of such the Central Intelligence Agency Retirement Act of 1964 for Certain Employees” in clause (iv) and inserting in lieu thereof “surviving spouse, former spouse, or child as defined in section 102 of the Central Intelligence Agency Retirement Act”; (iv) by striking out “widow or widower, former spouse, and/or child or children” in the matter after clause (iv) and inserting in lieu thereof “surviving spouse, former spouse, or child”; (v) by striking out “such section 232” in the matter after clause (iv) and inserting in lieu thereof “section 231 of such Act”; and (vi) by redesignating clauses (i) through (iv) as paragraphs (1) through (4), respectively; (C) by striking out subsections (c) and (d); and (D) by redesignating subsection (e) as subsection (c) and in that subsection— (i) by striking out “(1)” and inserting in lieu thereof “Annuities Under This Section Deemed Annuities Under CSRS.—”; 106 STAT. 3253 (ii) by striking out “established by section 202 of the Central Intelligence Agency Retirement Act of 1964 for Certain Employees” and inserting in lieu thereof “maintained pursuant to section 202 of the Central Intelligence Agency Retirement Act”; and (iii) by striking out paragraph (2). (b) National Security Agency Act of 1959.—Section 9(b)(3) of the National Security Agency Act of 1959 (50 U.S.C. 402 note) is amended by striking out “the Central Intelligence Agency Retirement Act of 1964 for Certain Employees” and inserting in lieu thereof “the Central Intelligence Agency Retirement Act”. (c) Title 5, United States Code.—Sections 8347(n)(4)(A) and 8423(a)(1)(B)(i) of title 5, United States Code, are amended by striking out “the Central Intelligence Agency Retirement Act of 1964 for Certain Employees” and inserting in lieu thereof “the Central Intelligence Agency Retirement Act”. (d) Title 10, United States Code.—Section 1605(a) of title 10, United States Code, is amended in the second sentence— (1) striking out “the Central Intelligence Agency Retirement Act of 1964 for Certain Employees” and inserting in lieu thereof “the Central Intelligence Agency Retirement Act”; and (2) by inserting “(50 U.S.C. 403r)” after “the Central Intelligence Agency Act of 1949”.