; (iv) by striking paragraph (4); and (v) by redesignating paragraph (5) as paragraph (4); (G) in subsection (h)— (i) in paragraph (1), by striking Under Secretary and inserting Administrator of the Transportation Security Administration ; and (ii) in paragraph (2)— (I) by striking Under Secretary the first place it appears and inserting Administrator of the Transportation Security Administration ; and (II) by striking Under Secretary each place it appears and inserting Administrator ; (H) in subsection (i)— (i) in the matter preceding paragraph (1), by striking Under Secretary and inserting Administrator of the Transportation Security Administration ; and (ii) in paragraph (2), by striking Under Secretary and inserting Administrator ; (I) in subsection (j)(1)— (i) in the matter preceding subparagraph (A), by striking Before January 1, 2008, the and inserting The ; and (ii) in subparagraph (A), by striking the date of enactment of this subsection and inserting August 3, 2007 ; (J) in subsection (k)— (i) in paragraph (1), by striking Not later than one year after the date of enactment of this subsection, the and inserting The ; (ii) in paragraph (2), by striking Not later than 6 months after the date of enactment of this subsection, the and inserting The ; and (iii) in paragraph (3), by striking Not later than 180 days after the date of enactment of this subsection, the in paragraph (3) and inserting The ; and (K) in subsection (l)— (i) in paragraph (2)— (I) in the matter preceding subparagraph (A), by striking Beginning June 1, 2012, the Assistant Secretary of Homeland Security (Transportation Security Administration) and inserting The Administrator of the Transportation Security Administration ; and (II) in subparagraph (B), by striking Assistant Secretary and inserting Administrator ; (ii) in paragraph (3)— (I) in subparagraph (A)— (aa) by striking Assistant Secretary the first place it appears and inserting Administrator of the Transportation Security Administration