(ii) in subsection (a)— 
(I) by striking ‘‘Office of Emer-
gency Communications’’ and inserting 
‘‘Emergency Communications Divi-
sion’’; and 
(II) by adding at the end the fol-
lowing new sentence: ‘‘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 office 
shall be the Assistant Director for Emergency Commu-
nications. The Assistant Director shall report to the Direc-
tor of the Cybersecurity and Infrastructure Security Agen-
cy. All decisions of the Assistant Director that entail the 
exercise of significant authority shall be subject to the ap-
proval of the Director.’’; 
(iv) in subsection (c)— 
(I) in the matter preceding para-
graph (1), by inserting ‘‘Assistant’’ 
before ‘‘Director’’; 
(II) in paragraph (14), by strik-
ing ‘‘and’’ at the end;
(III) by redesignating paragraph 
(15) as paragraph (16); and 
(IV) by inserting after paragraph 
(14) the following new paragraph: 
‘‘(15) fully participate in the mechanisms re-
quired under subsection (c)(7) of section 2202; 
and’’; 
(v) in subsection (d), by inserting 
‘‘Assistant’’ before ‘‘Director’’; and 
(vi) in subsection (e), in the matter 
preceding paragraph (1), by inserting ‘‘As-
sistant’’ before ‘‘Director’’; 
(B) in sections 1802 through 1805 (6 
U.S.C. 575), by striking ‘‘Director for Emer-
gency Communications’’ each place it appears 
and inserting ‘‘Assistant Director for Emer-
gency Communications’’; 
(C) in section 1809 (6 U.S.C. 579)— 
(i) by striking ‘‘Director for Emer-
gency Communications’’ and inserting ‘‘As-
sistant Director for Emergency Commu-
nications’’; and 
(ii) by striking ‘‘Office of Emergency 
Communications’’ each place it appears
and inserting ‘‘Emergency Communica-
tions Division’’; and 
(D) in section 1810 (6 U.S.C. 580)— 
(i) in subsection (a)(1), by striking 
‘‘Director of the Office of Emergency Com-
munications (referred to in this section as 
the ‘Director’)’’ and inserting ‘‘Assistant 
Director for the Emergency Communica-
tions Division (referred to in this section 
as the ‘Assistant Director’)’’; 
(ii) in subsection (c), by striking ‘‘Of-
fice of Emergency Communications’’ and 
inserting ‘‘Emergency Communications Di-
vision’’; and 
(iii) by striking ‘‘Director’’ each place 
it appears and inserting ‘‘Assistant Direc-
tor’’; 
(7) in title XXI (6 U.S.C. 621 et seq.)— 
(A) in section 2101 (6 U.S.C. 621)— 
(i) by redesignating paragraphs (4) 
through (14) as paragraphs (5) through 
(15), respectively; and 
(ii) by inserting after paragraph (3) 
the following new paragraph:
‘‘(4) the term ‘Director’ means the Director of 
the Cybersecurity and Infrastructure Security Agen-
cy;’’; 
(B) in paragraph (1) of section 2102(a) (6 
U.S.C. 622(a)), by inserting at the end the fol-
lowing new sentence: ‘‘Such Program shall be 
located in the Cybersecurity and Infrastructure 
Security Agency.’’; and 
(C) in paragraph (2) of section 2104(c) (6 
U.S.C. 624(c)), by striking ‘‘Under Secretary 
responsible for overseeing critical infrastructure 
protection, cybersecurity, and other related pro-
grams of the Department appointed under sec-
tion 103(a)(1)(H)’’ and inserting ‘‘Director of 
the Cybersecurity and Infrastructure Security 
Agency’’; and 
(8) in title XXII, as added by this Act— 
(A) in section 2205, as so redesignated, in 
the matter preceding paragraph (1), by striking 
‘‘Under Secretary appointed under section 
103(a)(1)(H)’’ and inserting ‘‘Director of the 
Cybersecurity 
and 
Infrastructure 
Security 
Agency’’; 
(B) in section 2206, as so redesignated, by 
striking ‘‘Assistant Secretary for Infrastructure