(1)
in subsection (a), by striking “Department of Transportation” and inserting “Department of Homeland Security”;
(2)
in subsection (b)(1), by striking “Under Secretary of Transportation for Security” and inserting “Administrator of the Transportation Security Administration”;
(3)
by striking “Under Secretary” each place it appears and inserting “Administrator”;
(4)
in subsection (b), in the heading, by striking “Under Secretary” and inserting “Administrator”;
(5)
in subsection (e)(4), by striking “Secretary of Transportation” and inserting “Secretary of Homeland Security”;
(6)
in subsection (f)—
(A)
in paragraph (6), by striking “Federal Security Managers” and inserting “Federal Security Directors”; and
(B)
in paragraph (14), by inserting “air carriers or” before “foreign air carriers”;
(7)
in subsection (g)—
(A)
by striking “the Secretary” each place it appears and inserting “the Secretary of Homeland Security”; and
(B)
in paragraph (3), by striking “The Secretary” and inserting “The Secretary of Homeland Security”;
(8)
in subsection (j)(1)(D), by striking “the Secretary” and inserting “the Secretary of Homeland Security”;
(9)
in subsection (l)—
(A)
in paragraph (2)(A), by striking “the Secretary” and inserting “the Secretary of Homeland Security”; and
(B)
in paragraph (4)(B), by striking “the Administrator under subparagraph (A)” and inserting “the Administrator of the Federal Aviation Administration under subparagraph (A)”;
(10)
in subsection (m)—
(A)
in the heading, by striking “Under Secretary” and inserting “Administrator”; and
(B)
in paragraph (1), in the heading, by striking “Under Secretary” and inserting “Administrator”;
(11)
in subsection (n), by striking “Department of Transportation” and inserting “Department of Homeland Security”;
(12)
in subsection (o), by striking “Department of Transportation” and inserting “Department of Homeland Security”; and
(13)
in subsection (p)(4), by striking “Secretary of Transportation” and inserting “Secretary of Homeland Security”.