; and (3) in subsections (c) through (n), (p), (q), and (r), by striking Under Secretary each place it appears and inserting Administrator . (b) Technical and conforming amendments (1) In general Section 114, as amended by subsection (a) of this section, is further amended— (A) in subsection (g)— (i) in paragraph (1)— (I) in the matter preceding subparagraph (A), by striking Subject to the direction and control of the Secretary and inserting Subject to the direction and control of the Secretary of Homeland Security ; and (II) in subparagraph (D), by inserting of Homeland Security after Secretary ; and (ii) in paragraph (3), by inserting of Homeland Security after Secretary ; (B) in subsection (j)(1)(D), by inserting of Homeland Security after Secretary ; (C) in subsection (k), by striking functions transferred, on or after the date of enactment of the Aviation and Transportation Security Act, and inserting functions assigned ; (D) in subsection (l)(4)(B), by striking Administrator under subparagraph (A) and inserting Administrator of the Federal Aviation Administration under subparagraph (A) ; (E) in subsection (n), by striking Department of Transportation and inserting Department of Homeland Security ; (F) in subsection (o), by striking Department of Transportation and inserting Department of Homeland Security ; (G) in subsection (p)(4), by striking Secretary of Transportation and inserting Secretary of Homeland Security ; (H) in subsection (s)— (i) in paragraph (3)(B), by inserting ) after Act of 2007 ; and (ii) in paragraph (4)— (I) in the heading, by striking Submissions of plans to Congress and inserting Submission of plans ; (II) by striking subparagraph (A); (III) by redesignating subparagraphs (B) through (E) as subparagraphs (A) through (D), respectively; (IV) in subparagraph (A), as redesignated— (aa) in the heading, by striking Subsequent versions and inserting In general ; and (bb) by striking After December 31, 2015, the and inserting The