; and (ii) have experience in a field directly related to transportation or security. ; (3) in subsections (c) through (n), (p), (q), and (r), by striking Under Secretary each place it appears and inserting Administrator ; and (4) by amending subsection (d) to read as follows: (d) Functions The Administrator shall be responsible for— (1) carrying out chapter 449, relating to civil aviation security, and related research and development activities; (2) security in land-based transportation, including railroad, highway, pipeline, public transportation, and over-the-road bus; and (3) supporting the Coast Guard with maritime security. . (b) Technical and conforming amendments Section 114, as amended by subsection (a), is further amended— (1) in subsection (g)— (A) 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 (B) in paragraph (3), by inserting of Homeland Security after Secretary ; (2) in subsection (j)(1)(D), by inserting of Homeland Security after Secretary ; (3) 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 ; (4) in subsection (l)(4)(B), by striking Administrator under subparagraph (A) and inserting Administrator of the Federal Aviation Administration under subparagraph (A) ; (5) in subsection (n), by striking Department of Transportation and inserting Department of Homeland Security ; (6) in subsection (o), by striking Department of Transportation and inserting Department of Homeland Security ; (7) in subsection (p)(4), by striking Secretary of Transportation and inserting Secretary of Homeland Security ; (8) in subsection (s)— (A) in paragraph (3)(B), by inserting ) after Act of 2007