; and (II) by striking Administrator shall and inserting Administrator of the Federal Aviation Administration shall ; (ii) in paragraphs (3), (4), (5), (6), (7), and (8), by striking Administrator each place it appears and inserting Administrator of the Federal Aviation Administration ; and (iii) in paragraph (8), by striking Under Secretary and inserting Administrator of the Transportation Security Administration ; (C) in subsection (e), by inserting of Transportation after Secretary ; (D) in subsection (g), by striking Administrator and inserting Administrator of the Federal Aviation Administration ; and (E) in subsection (h)(2)— (i) by striking Under Secretary of Transportation for Security with respect to security duties and powers designated to be carried out by the Under Secretary and inserting Administrator of the Transportation Security Administration with respect to security duties and powers designated to be carried out by the Administrator of the Transportation Security Administration ; and (ii) by striking or the Administrator with respect to aviation safety duties and powers designated to be carried out by the Administrator and inserting or the Administrator of the Federal Aviation Administration with respect to aviation safety duties and powers designated to be carried out by the Administrator of the Federal Aviation Administration ; (2) in section 46304(b), by striking or the Administrator of the Federal Aviation Administration with respect to aviation safety duties and powers designated to be carried out by the Administrator and inserting or the Administrator of the Federal Aviation Administration with respect to aviation safety duties and powers designated to be carried out by the Administrator of the Federal Aviation Administration