; and (3) in subsection (k)(2), by striking by . (b) Section 505 Section 505(e)(2) ( 8 U.S.C. 1535(e)(2) ) is amended by inserting and the Secretary after Attorney General . 807. Other amendments (a) Correction of commissioner of immigration and naturalization (1) In general The Immigration and Nationality Act ( 8 U.S.C. 1101 et seq.) as amended by this Act, is further amended by striking Commissioner and Commissioner of Immigration and Naturalization each place those terms appear and inserting Secretary . (2) Exception for commissioner of social security The amendment made by paragraph (1) shall not apply to any reference to the Commissioner of Social Security . (b) Correction of immigration and naturalization service The Immigration and Nationality Act ( 8 U.S.C. 1101 et seq.), as amended by this Act, is further amended by striking Service and Immigration and Naturalization Service each place those terms appear and inserting Department . (c) Correction of department of justice (1) In general The Immigration and Nationality Act ( 8 U.S.C. 1101 et seq.), as amended by this Act, is further amended by striking Department of Justice each place that term appears and inserting Department . (2) Exceptions The amendment made by paragraph (1) shall not apply in subsections (d)(3)(A) and (r)(5)(A) of section 214 ( 8 U.S.C. 1184 ), section 274B(c)(1) ( 8 U.S.C. 1324b(c)(1) ), or title V ( 8 U.S.C. 1531 et seq.). (d) Correction of attorney general The Immigration and Nationality Act ( 8 U.S.C. 1101 et seq.) as amended by this Act, is further amended by striking Attorney General each place that term appears and inserting Secretary , except for in the following: (1) Any joint references to the Attorney General and the Secretary of Homeland Security or the Secretary of Homeland Security and the Attorney General . (2) Section 101(a)(5). (3) Subparagraphs (S), (T), and (V) of section 101(a)(15). (4) Section 101(a)(47)(A). (5) Section 101(b)(4). (6) Section 103(a)(1). (7) Section 103(g). (8) Section 105(b)(1). (9) Section 105(c).