H. R. 3359—11 
inserting 
‘‘Cybersecurity 
and 
Infrastructure 
Security 
Agency’’; 
(G) by redesignating section 210E (6 U.S.C. 124l) as 
section 2214 and transferring such section to appear after 
section 2213 (as redesignated by subparagraph (I)); 
(H) in subtitle B, by redesignating sections 211 through 
215 (6 U.S.C. 101 note, and 131 through 134) as sections 
2221 through 2225, respectively, and transferring such sub-
title, including the enumerator and heading of subtitle 
B and such sections, to appear after section 2214 (as 
redesignated by subparagraph (G)); 
(I) by redesignating sections 223 through 230 (6 U.S.C. 
143 through 151) as sections 2205 through 2213, respec-
tively, and transferring such sections to appear after section 
2204, as added by this Act; 
(J) by redesignating section 210F as section 210E; and 
(K) by redesignating subtitles C and D as subtitles 
B and C, respectively; 
(3) in title III (6 U.S.C. 181 et seq.)— 
(A) in section 302 (6 U.S.C. 182)— 
(i) by striking ‘‘biological,,’’ each place that term 
appears and inserting ‘‘biological,’’; and 
(ii) in paragraph (3), by striking ‘‘Assistant Sec-
retary for Infrastructure Protection’’ and inserting 
‘‘Director of the Cybersecurity and Infrastructure Secu-
rity Agency’’; 
(B) by redesignating the second section 319 (6 U.S.C. 
195f) (relating to EMP and GMD mitigation research and 
development) as section 320; and 
(C) in section 320(c)(1), as so redesignated, by striking 
‘‘Section 214’’ and inserting ‘‘Section 2224’’; 
(4) in title V (6 U.S.C. 311 et seq.)— 
(A) in section 508(d)(2)(D) (6 U.S.C. 318(d)(2)(D)), by 
striking ‘‘The Director of the Office of Emergency Commu-
nications of the Department of Homeland Security’’ and 
inserting ‘‘The Assistant Director for Emergency Commu-
nications’’; 
(B) in section 514 (6 U.S.C. 321c)— 
(i) by striking subsection (b); and 
(ii) by redesignating subsection (c) as subsection 
(b); and 
(C) in section 523 (6 U.S.C. 321l)— 
(i) in subsection (a), in the matter preceding para-
graph (1), by striking ‘‘Assistant Secretary for Infra-
structure Protection’’ and inserting ‘‘Director of Cyber-
security and Infrastructure Security’’; and 
(ii) in subsection (c), by striking ‘‘Assistant Sec-
retary for Infrastructure Protection’’ and inserting 
‘‘Director of Cybersecurity and Infrastructure Secu-
rity’’; 
(5) in title VIII (6 U.S.C. 361 et seq.)— 
(A) in section 884(d)(4)(A)(ii) (6 U.S.C. 464(d)(4)(A)(ii)), 
by striking ‘‘Under Secretary responsible for overseeing 
critical infrastructure protection, cybersecurity, and other 
related programs of the Department’’ and inserting 
‘‘Director of Cybersecurity and Infrastructure Security’’; 
and
H. R. 3359—12 
(B) in section 899B(a) (6 U.S.C. 488a(a)), by adding 
at the end the following: ‘‘Such regulations shall be carried 
out by the Cybersecurity and Infrastructure Security 
Agency.’’; 
(6) in title XVIII (6 U.S.C. 571 et seq.)— 
(A) in section 1801 (6 U.S.C. 571)— 
(i) in the section heading, by striking ‘‘OFFICE 
OF
EMERGENCY
COMMUNICATIONS’’ and inserting 
‘‘EMERGENCY COMMUNICATIONS DIVISION’’; 
(ii) in subsection (a)— 
(I) by striking ‘‘Office of Emergency Commu-
nications’’ and inserting ‘‘Emergency Communica-
tions Division’’; and 
(II) by adding at the end the following: ‘‘The 
Division shall be located in the Cybersecurity and 
Infrastructure Security Agency.’’; 
(iii) by amending subsection (b) to read as follows: 
‘‘(b) ASSISTANT DIRECTOR.—The head of the Division shall be 
the Assistant Director for Emergency Communications. The Assist-
ant Director shall report to the Director of Cybersecurity and Infra-
structure Security. All decisions of the Assistant Director that entail 
the exercise of significant authority shall be subject to the approval 
of the Director of Cybersecurity and Infrastructure Security.’’; 
(iv) in subsection (c)— 
(I) in the matter preceding paragraph (1), by 
inserting ‘‘Assistant’’ before ‘‘Director’’; 
(II) in paragraph (14), by striking ‘‘and’’ at 
the end; 
(III) in paragraph (15), by striking the period 
at the end and inserting ‘‘; and’’; and 
(IV) by inserting after paragraph (15) the fol-
lowing: 
‘‘(16) fully participate in the mechanisms required under 
section 2202(c)(7).’’; 
(v) in subsection (d), in the matter preceding para-
graph (1), by inserting ‘‘Assistant’’ before ‘‘Director’’; 
and 
(vi) in subsection (e), in the matter preceding para-
graph (1), by inserting ‘‘Assistant’’ before ‘‘Director’’; 
(B) in sections 1802 through 1805 (6 U.S.C. 572 
through 575), by striking ‘‘Director for Emergency Commu-
nications’’ each place that term appears and inserting 
‘‘Assistant Director for Emergency Communications’’; 
(C) in section 1809 (6 U.S.C. 579)— 
(i) by striking ‘‘Director of Emergency Communica-
tions’’ each place that term appears and inserting 
‘‘Assistant Director for Emergency Communications’’; 
(ii) in subsection (b)— 
(I) by striking ‘‘Director for Emergency 
Communications’’ 
and 
inserting 
‘‘Assistant 
Director for Emergency Communications’’; and 
(II) by striking ‘‘Office of Emergency Commu-
nications’’ and inserting ‘‘Emergency Communica-
tions Division’’; 
(iii) in subsection (e)(3), by striking ‘‘the Director’’ 
and inserting ‘‘the Assistant Director’’; and 
(iv) in subsection (m)(1)—
H. R. 3359—13 
(I) by striking ‘‘The Director’’ and inserting 
‘‘The Assistant Director’’; 
(II) by striking ‘‘the Director determines’’ and 
inserting ‘‘the Assistant Director determines’’; and 
(III) by striking ‘‘Office of Emergency Commu-
nications’’ and inserting ‘‘Cybersecurity and Infra-
structure Security Agency’’; 
(D) in section 1810 (6 U.S.C. 580)— 
(i) in subsection (a)(1), by striking ‘‘Director of 
the Office of Emergency Communications (referred to 
in this section as the ‘Director’)’’ and inserting ‘‘Assist-
ant Director for Emergency Communications (referred 
to in this section as the ‘Assistant Director’)’’; 
(ii) in subsection (c), by striking ‘‘Office of Emer-
gency Communications’’ and inserting ‘‘Emergency 
Communications Division’’; and 
(iii) by striking ‘‘Director’’ each place that term 
appears and inserting ‘‘Assistant Director’’; 
(7) in title XX (6 U.S.C. 601 et seq.)— 
(A) in paragraph (4)(A)(iii)(II) of section 2001 (6 U.S.C. 
601), by striking ‘‘section 210E(a)(2)’’ and inserting ‘‘section 
2214(a)(2)’’; 
(B) in section 2008(a)(3) (6 U.S.C. 609(a)(3)), by striking 
‘‘section 210E(a)(2)’’ and inserting ‘‘section 2214(a)(2)’’; and 
(C) in section 2021 (6 U.S.C. 611)— 
(i) by striking subsection (c); and 
(ii) by redesignating subsection (d) as subsection 
(c); 
(8) in title XXI (6 U.S.C. 621 et seq.)— 
(A) in section 2102(a)(1) (6 U.S.C. 622(a)(1)), by 
inserting ‘‘, which shall be located in the Cybersecurity 
and Infrastructure Security Agency’’ before the period at 
the end; and 
(B) in section 2104(c)(2) (6 U.S.C. 624(c)(2)), by striking 
‘‘Under Secretary responsible for overseeing critical infra-
structure protection, cybersecurity, and other related pro-
grams of the Department appointed under section 
103(a)(1)(H)’’ and inserting ‘‘Director of Cybersecurity and 
Infrastructure Security’’; and 
(9) in title XXII, as added by this Act— 
(A) in subtitle A— 
(i) in section 2205, as so redesignated— 
(I) in the matter preceding paragraph (1)— 
(aa) 
by 
striking 
‘‘section 
201’’ 
and 
inserting ‘‘section 2202’’; and 
(bb) 
by 
striking 
‘‘Under 
Secretary 
appointed under section 103(a)(1)(H)’’ and 
inserting ‘‘Director of Cybersecurity and Infra-
structure Security’’; and 
(II) in paragraph (1)(B), by striking ‘‘and’’ at 
the end; 
(ii) in section 2206, as so redesignated, by striking 
‘‘Assistant Secretary for Infrastructure Protection’’ and 
inserting ‘‘Director of Cybersecurity and Infrastructure 
Security’’; 
(iii) in section 2209, as so redesignated—
H. R. 3359—14 
(I) by striking ‘‘Under Secretary appointed 
under section 103(a)(1)(H)’’ each place that term 
appears and inserting ‘‘Director’’; 
(II) in subsection (a)(4), by striking ‘‘section 
212(5)’’ and inserting ‘‘section 2222(5)’’; 
(III) in subsection (b), by adding at the end 
the following: ‘‘The Center shall be located in the 
Cybersecurity and Infrastructure Security Agency. 
The head of the Center shall report to the Assist-
ant Director for Cybersecurity.’’; and 
(IV) in subsection (c)(11), by striking ‘‘Office 
of Emergency Communications’’ and inserting 
‘‘Emergency Communications Division’’; 
(iv) in section 2210, as so redesignated— 
(I) by striking ‘‘section 227’’ each place that 
term appears and inserting ‘‘section 2209’’; and 
(II) in subsection (c)— 
(aa) 
by 
striking 
‘‘Under 
Secretary 
appointed under section 103(a)(1)(H)’’ and 
inserting ‘‘Director of Cybersecurity and Infra-
structure Security’’; and 
(bb) by striking ‘‘section 212(5)’’ and 
inserting ‘‘section 2222(5)’’; 
(v) in section 2211(b)(2)(A), as so redesignated, 
by striking ‘‘the section 227’’ and inserting ‘‘section 
2209’’; 
(vi) in section 2212, as so redesignated, by striking 
‘‘section 212(5)’’ and inserting ‘‘section 2222(5)’’; 
(vii) in section 2213(a), as so redesignated— 
(I) in paragraph (3), by striking ‘‘section 228’’ 
and inserting ‘‘section 2210’’; and 
(II) in paragraph (4), by striking ‘‘section 227’’ 
and inserting ‘‘section 2209’’; and 
(viii) in section 2214, as so redesignated— 
(I) by striking subsection (e); and 
(II) by redesignating subsection (f) as sub-
section (e); and 
(B) in subtitle B— 
(i) in section 2222(8), as so redesignated, by 
striking ‘‘section 227’’ and inserting ‘‘section 2209’’; and 
(ii) in section 2224(h), as so redesignated, by 
striking ‘‘section 213’’ and inserting ‘‘section 2223’’; 
(h) TECHNICAL
AND CONFORMING AMENDMENTS
TO OTHER 
LAWS.— 
(1) CYBERSECURITY ACT OF 2015.—The Cybersecurity Act 
of 2015 (6 U.S.C. 1501 et seq.) is amended— 
(A) in section 202(2) (6 U.S.C. 131 note)— 
(i) by striking ‘‘section 227’’ and inserting ‘‘section 
2209’’; and 
(ii) by striking ‘‘, as so redesignated by section 
223(a)(3) of this division’’; 
(B) in section 207(2) (Public Law 114–113; 129 Stat. 
2962)— 
(i) by striking ‘‘section 227’’ and inserting ‘‘section 
2209’’; and 
(ii) by striking ‘‘, as redesignated by section 223(a) 
of this division,’’;
H. R. 3359—15 
(C) in section 208 (Public Law 114–113; 129 Stat. 
2962), by striking ‘‘Under Secretary appointed under sec-
tion 103(a)(1)(H) of the Homeland Security Act of 2002 
(6 U.S.C. 113(a)(1)(H))’’ and inserting ‘‘Director of Cyberse-
curity and Infrastructure Security of the Department’’; 
(D) in section 222 (6 U.S.C. 1521)— 
(i) in paragraph (2)— 
(I) by striking ‘‘section 228’’ and inserting ‘‘sec-
tion 2210’’; and 
(II) by striking ‘‘, as added by section 223(a)(4) 
of this division’’; and 
(ii) in paragraph (4)— 
(I) by striking ‘‘section 227’’ and inserting ‘‘sec-
tion 2209’’; and 
(II) by striking ‘‘, as so redesignated by section 
223(a)(3) of this division’’; 
(E) in section 223(b) (6 U.S.C. 151 note)— 
(i) by striking ‘‘section 230(b)(1) of the Homeland 
Security Act of 2002, as added by subsection (a)’’ each 
place that term appears and inserting ‘‘section 
2213(b)(1) of the Homeland Security Act of 2002’’; and 
(ii) in paragraph (1)(B), by striking ‘‘section 
230(b)(2) of the Homeland Security Act of 2002, as 
added by subsection (a)’’ and inserting ‘‘section 
2213(b)(2) of the Homeland Security Act of 2002’’; 
(F) in section 226 (6 U.S.C. 1524)— 
(i) in subsection (a)— 
(I) in paragraph (1)— 
(aa) 
by 
striking 
‘‘section 
230’’ 
and 
inserting ‘‘section 2213’’; and 
(bb) by striking ‘‘, as added by section 
223(a)(6) of this division’’; 
(II) in paragraph (4)— 
(aa) by striking ‘‘section 228(b)(1)’’ and 
inserting ‘‘section 2210(b)(1)’’; and 
(bb) by striking ‘‘, as added by section 
223(a)(4) of this division’’; and 
(III) in paragraph (5)— 
(aa) by striking ‘‘section 230(b)’’ and 
inserting ‘‘section 2213(b)’’; and 
(bb) by striking ‘‘, as added by section 
223(a)(6) of this division’’; and 
(ii) in subsection (c)(1)(A)(vi)— 
(I) by striking ‘‘section 230(c)(5)’’ and inserting 
‘‘section 2213(c)(5)’’; and 
(II) by striking ‘‘, as added by section 223(a)(6) 
of this division’’; 
(G) in section 227 (6 U.S.C. 1525)— 
(i) in subsection (a)— 
(I) by striking ‘‘section 230’’ and inserting ‘‘sec-
tion 2213’’; and 
(II) by striking ‘‘, as added by section 223(a)(6) 
of this division,’’; and 
(ii) in subsection (b)— 
(I) by striking ‘‘section 230(d)(2)’’ and inserting 
‘‘section 2213(d)(2)’’; and
H. R. 3359—16 
(II) by striking ‘‘, as added by section 223(a)(6) 
of this division,’’; and 
(H) in section 404 (6 U.S.C. 1532)— 
(i) by striking ‘‘Director for Emergency Commu-
nications’’ each place that term appears and inserting 
‘‘Assistant Director for Emergency Communications’’; 
and 
(ii) in subsection (a)— 
(I) by striking ‘‘section 227’’ and inserting ‘‘sec-
tion 2209’’; and 
(II) by striking ‘‘, as redesignated by section 
223(a)(3) of this division,’’. 
(2) SMALL BUSINESS ACT.—Section 21(a)(8)(B) of the Small 
Business Act (15 U.S.C. 648(a)(8)(B)) is amended by striking 
‘‘section 227(a) of the Homeland Security Act of 2002 (6 U.S.C. 
148(a))’’ and inserting ‘‘section 2209(a) of the Homeland Secu-
rity Act of 2002’’. 
(3) TITLE 5.—Subchapter II of chapter 53 of title 5, United 
States Code, is amended— 
(A) in section 5314, by inserting after ‘‘Under Secre-
taries, Department of Homeland Security.’’ the following: 
‘‘Director, 
Cybersecurity 
and 
Infrastructure 
Security 
Agency.’’; and 
(B) in section 5315, by inserting after ‘‘Assistant Secre-
taries, Department of Homeland Security.’’ the following: 
‘‘Assistant Director for Cybersecurity, Cybersecurity and 
Infrastructure Security Agency. 
‘‘Assistant Director for Infrastructure Security, Cybersecu-
rity and Infrastructure Security Agency.’’. 
(i) TABLE OF CONTENTS AMENDMENTS.—The table of contents 
in section 1(b) of the Homeland Security Act of 2002 (Public Law 
107–296; 116 Stat. 2135) is amended— 
(1) by striking the item relating to title II and inserting 
the following: 
‘‘TITLE II—INFORMATION ANALYSIS’’; 
(2) by striking the item relating to subtitle A of title II 
and inserting the following: 
‘‘Subtitle A—Information and Analysis; Access to Information’’; 
(3) by striking the item relating to section 201 and inserting 
the following: 
‘‘Sec. 201. Information and analysis.’’; 
(4) by striking the items relating to sections 210E and 
210F and inserting the following: 
‘‘Sec. 210E. Classified Information Advisory Officer.’’; 
(5) by striking the items relating to subtitle B of title 
II and sections 211 through 215; 
(6) by striking the items relating to section 223 through 
section 230; 
(7) by striking the item relating to subtitle C and inserting 
the following: