; (IV) by striking paragraph (23), as so redesignated; and (V) by redesignating paragraph (24), as so redesignated, as paragraph (23); (vi) in subsection (e)(1), by striking and the Office of Infrastructure Protection ; and (vii) in subsection (f)(1), by striking and the Office of Infrastructure Protection ; (D) in section 204 ( 6 U.S.C. 124a )— (i) in subsection (c)(1), in the matter preceding subparagraph (A), by striking Assistant Secretary for Infrastructure Protection and inserting Director of the Cybersecurity and Infrastructure Security Agency ; and (ii) in subsection (d)(1), in the matter preceding subparagraph (A), by striking Assistant Secretary for Infrastructure Protection and inserting Director of the Cybersecurity and Infrastructure Security Agency ; (E) in subparagraph (B) of section 210A(c)(2) ( 6 U.S.C. 124h(c)(2) ), by striking Office of Infrastructure Protection and inserting Cybersecurity and Infrastructure Security Agency ; (F) by transferring section 210E ( 6 U.S.C. 124 ) to appear after section 2212 (as redesignated by subparagraph (G) of this paragraph) and redesignating such section 210E as section 2214; (G) in subtitle B, by redesignating sections 211 through 215 ( 6 U.S.C. 101 note through 134) as sections 2221 through 2225, respectively, and inserting such redesignated sections, including the enumerator and heading of subtitle B (containing such redesignated sections), after section 2213, as redesignated by subparagraph (E) of this paragraph; and (H) by redesignating sections 223 through 230 ( 6 U.S.C. 143 through 151) as sections 2205 through 2213, respectively, and inserting such redesignated sections after section 2204, as added by this Act; (3) in title III, in paragraph (3) of section 302 ( 6 U.S.C. 182 ), by striking Assistant Secretary for Infrastructure Protection and inserting Director of the Cybersecurity and Infrastructure Security Agency ; (4) in title V— (A) in section 514 ( 6 U.S.C. 321(c) ), by— (i) striking subsection (b)