; (ii) in paragraph (2)— (I) in the heading, by striking Computer-Assisted Passenger Prescreening System and inserting Secure Flight program ; (II) in subparagraph (A)— (aa) by striking Computer-Assisted Passenger Prescreening System and inserting Secure Flight program ; and (bb) by striking system each place it appears and inserting program ; (III) in subparagraph (B), by striking Computer-Assisted Passenger Prescreening System and inserting Secure Flight program ; (IV) in subparagraph (C)— (aa) in clause (i), by striking Not later than January 1, 2005, the Assistant Secretary of Homeland Security (Transportation Security Administration), or the designee of the Assistant Secretary, and inserting The Administrator ; (bb) in clause (ii), by striking Not later than 180 days after completion of testing under clause (i), the and inserting The ; 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 ; (VII) by striking Assistant Secretary each place it appears and inserting Administrator ; and (VIII) by striking Secretary of Transportation each place it appears and inserting Administrator ; and (G) 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 ; (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