; and (cc) in clause (iv), by striking Not later than 180 days after and inserting After ; (V) in subparagraph (D), by striking Assistant Secretary of Homeland Security (Transportation Security Administration) and inserting Administrator ; (VI) in subparagraph (E)(i), by striking Not later than 90 days after the date on which the Assistant Secretary assumes the performance of the advanced passenger prescreening function under subparagraph (C)(ii), the and inserting The Administrator ; and (VII) by striking Assistant Secretary each place it appears and inserting Administrator ; (G) in subsection (l), by striking Under Secretary for Border and Transportation Security of the Department of Homeland Security and inserting Administrator ; (H) in subsection (m)— (i) in paragraph (1), by striking Assistant Secretary of Homeland Security (Transportation Security Administration) and inserting Administrator ; and (ii) by striking Assistant Secretary each place it appears and inserting Administrator ; and (I) by striking Under Secretary each place it appears and inserting Administrator ; (4) section 44904 is amended— (A) in subsection (a), by striking Under Secretary of Transportation for Security and inserting Administrator of the Transportation Security Administration ; (B) in subsection (c)— (i) by striking section 114(t)(3) and inserting section 114(s)(3) ; and (ii) by striking section 114(t) and inserting section 114(s) ; (C) in subsection (d)— (i) by striking Not later than 90 days after the date of the submission of the National Strategy for Transportation Security under section 114(t)(4)(A), the Assistant Secretary of Homeland Security (Transportation Security Administration) and inserting The Administrator of the Transportation Security Administration ; and (ii) by striking section 114(t)(1) and inserting section 114(s)(1) ; and (D) by striking Under Secretary each place it appears and inserting Administrator of the Transportation Security Administration