; (7) in section 46105(c), by striking When the Administrator and inserting When the Administrator of the Federal Aviation Administration ; (8) in section 46109, by inserting (or the Administrator of the Transportation Security Administration with respect to security duties and powers designated to be carried out by the Administrator of the Transportation Security Administration or the Administrator of the Federal Aviation Administration with respect to aviation safety duties and powers designated to be carried out by the Administrator) after Secretary of Transportation ; and (9) in section 46111— (A) in subsection (a)— (i) by inserting the before Federal Aviation Administration ; (ii) by striking Administrator is and inserting Administrator of the Federal Aviation Administration is ; and (iii) by striking Under Secretary for Border and Transportation Security of the Department of Homeland Security and inserting Administrator of the Transportation Security Administration ; (B) in subsections (b), (c), (e), and (g), by striking Administrator each place it appears and inserting Administrator of the Federal Aviation Administration ; (C) in subsection (g)(2)(A), by striking (18 U.S.C. App.) and inserting (18 U.S.C. App.)) ; and (D) by striking Under Secretary each place it appears and inserting Administrator of the Transportation Security Administration . (g) Chapter 463 amendments Chapter 463 is amended— (1) in section 46301— (A) in subsection (a)(5)— (i) in subparagraph (A)(i), by striking or chapter 451 and inserting chapter 451 ; and (ii) in subparagraph (D), by inserting of Transportation after Secretary ; (B) in subsection (d)— (i) in paragraph (2)— (I) by striking defined by the Secretary and inserting defined by the Secretary of Transportation ; and (II) by striking Administrator shall and inserting Administrator of the Federal Aviation Administration shall