‘‘(B) be appointed by the President with-
out the advice and consent of the Senate; and 
‘‘(C) report to the Director. 
‘‘(3) REFERENCE.—Any reference to the Assist-
ant Secretary for Infrastructure Protection in any 
law, regulation, map, document, record, or other 
paper of the United States shall be deemed to be a 
reference to the Assistant Director for Infrastruc-
ture Security. 
‘‘(b) FUNCTIONS.—The Assistant Director shall— 
‘‘(1) direct the critical infrastructure security 
efforts of the Agency; 
‘‘(2) carry, at the direction of the Director, the 
Chemical Facilities Anti-Terrorism Standards Pro-
gram established under title XXI and the secure 
handling of ammonium nitrate established under 
subtitle J of title VIII or successor program; 
‘‘(3) fully participate in the mechanisms re-
quired under subsection (c)(7) of section 2202; and 
‘‘(4) carry out such other duties and powers as 
prescribed by the Director.’’. 
(b) TREATMENT OF CERTAIN POSITIONS.— 
(1) UNDER SECRETARY.—The individual serv-
ing as the Under Secretary appointed pursuant to 
section 103(a)(1)(H) of the Homeland Security Act
of 2002 (6 U.S.C. 113(a)(1)) of the Department of 
Homeland Security on the day before the date of the 
enactment of this Act may continue to serve as the 
Director of the Cybersecurity and Infrastructure Se-
curity Agency of the Department on and after such 
date. 
(2) DIRECTOR
FOR
EMERGENCY
COMMUNICA-
TIONS.—The individual serving as the Director for 
Emergency Communications of the Department of 
Homeland Security on the day before the date of the 
enactment of this Act may continue to serve as the 
Assistant Director for Emergency Communications 
of the Department on and after such date. 
(3) ASSISTANT
SECRETARY
FOR
CYBERSECU-
RITY AND COMMUNICATIONS.—The individual serv-
ing as the Assistant Secretary for Cybersecurity and 
Communications on the day before the date of the 
enactment of this Act may continue to serve as the 
Assistant Director for Cybersecurity on and after 
such date. 
(4) ASSISTANT SECRETARY FOR INFRASTRUC-
TURE SECURITY.—The individual serving as the As-
sistant Secretary for Infrastructure Protection on 
the day before the date of the enactment of this Act
may continue to serve as the Assistant Director for 
Infrastructure Security on and after such date. 
(c) REFERENCE.—Any reference to— 
(1) the Office of Emergency Communications in 
any law, regulation, map, document, record, or other 
paper of the United States shall be deemed to be a 
reference to the Emergency Communications Divi-
sion; and 
(2) the Director for Emergency Communica-
tions in any law, regulation, map, document, record, 
or other paper of the United States shall be deemed 
to be a reference to the Assistant Director for Emer-
gency Communications. 
(d) OVERSIGHT.—The Director of the Cybersecurity 
and Infrastructure Security Agency of the Department of 
Homeland Security shall provide to Congress, in accord-
ance with the deadlines specified in paragraphs (1) and 
(2), information on the following: 
(1) Not later than 60 days after the date of the 
enactment of this Act, a briefing on the activities of 
the Agency relating to the development and use of 
the mechanisms required pursuant to section 
2202(c)(6) of the Homeland Security Act of 2002 
(as added by subsection (a) of this section).
(2) Not later than 1 year after the date of the 
enactment of this Act, a briefing on the activities of 
the Agency relating to its use and improvement of 
the mechanisms required pursuant to section 
2202(c)(6) of the Homeland Security Act of 2002 
and how such activities have impacted coordination, 
situational awareness, and communications with Sec-
tor-Specific Agencies. 
(3) Not later than 90 days after the date of the 
enactment of this Act, information on the Agency’s 
mechanisms for regular and ongoing consultation 
and collaboration, as required pursuant to section 
2202(c)(7) of the Homeland Security Act of 2002 
(as added by subsection (a) of this section). 
(4) Not later than 1 year after the date of the 
enactment of this Act, the activities of the Agency’s 
consultation and collaboration mechanisms as re-
quired pursuant to section 2202(c)(7) of the Home-
land Security Act of 2002, and how such mecha-
nisms have impacted operational coordination, situa-
tional awareness, and integration across the Agency. 
(e) CYBER WORKFORCE.—Not later than 90 days 
after the date of the enactment of this subtitle, the Direc-
tor of the Cybersecurity and Infrastructure Security Agen-
cy of the Department of Homeland Security shall submit
to Congress a report detailing how the Agency is meeting 
legislative requirements under the Cybersecurity Work-
force Assessment Act (Public Law 113–246) and the 
Homeland Security Cybersecurity Workforce Assessment 
Act (enacted as section 4 of the Border Patrol Agent Pay 
Reform Act of 2014; Public Law 113–277) to address 
cyber workforce needs. 
(f) FACILITY.—Not later than 180 days after the 
date of the enactment of this Act, the Director of the Cy-
bersecurity and Infrastructure Security Agency of the De-
partment of Homeland Security shall report to Congress 
on the most efficient and effective methods of consoli-
dating Agency facilities, personnel, and programs to most 
effectively carry out the Agency’s mission. 
(g) CONFORMING AMENDMENTS TO THE HOMELAND 
SECURITY ACT OF 2002.—The Homeland Security Act of 
2002 is amended— 
(1) in title I, by amending subparagraph (H) of 
section 103(a)(1) (6 U.S.C. 113(a)(1)) to read as 
follows: 
‘‘(H) A Director of the Cybersecurity and 
Infrastructure Security Agency.’’; 
(2) in title II (6 U.S.C. 121 et seq.)— 
(A) in the title heading, by striking ‘‘AND 
INFRASTRUCTURE PROTECTION’’;
(B) in the subtitle A heading, by striking 
‘‘and Infrastructure Protection’’; 
(C) in section 201 (6 U.S.C. 121)— 
(i) in the section heading, by striking 
‘‘AND
INFRASTRUCTURE
PROTEC-
TION’’; 
(ii) in subsection (a)— 
(I) in the heading, by striking 
‘‘AND
INFRASTRUCTURE
PROTEC-
TION’’; and 
(II) by striking ‘‘and an Office of 
Infrastructure Protection’’; 
(iii) in subsection (b)— 
(I) in the heading, by striking 
‘‘AND ASSISTANT SECRETARY FOR IN-
FRASTRUCTURE PROTECTION’’; and 
(II) by striking paragraph (3); 
(iv) in subsection (c)— 
(I) by striking ‘‘and infrastruc-
ture protection’’; and 
(II) by striking ‘‘or the Assistant 
Secretary for Infrastructure Protec-
tion, as appropriate’’; 
(v) in subsection (d)—
(I) in the heading, by striking 
‘‘AND
INFRASTRUCTURE
PROTEC-
TION’’; 
(II) in the matter preceding 
paragraph (1), by striking ‘‘and infra-
structure protection’’; 
(III) by striking paragraphs (5) 
and (6) and redesignating paragraphs 
(7) through (26) as paragraphs (5) 
through (24), respectively; 
(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 Protec-
tion’’; and 
(vii) in subsection (f)(1), by striking 
‘‘and the Office of Infrastructure Protec-
tion’’; 
(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 in-
serting ‘‘Cybersecurity and Infrastructure Secu-
rity Agency’’; 
(F) by transferring section 210E (6 U.S.C. 
124) to appear after section 2213 (as redesig-
nated by subparagraph (H) 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, respec-
tively, and inserting such redesignated sections, 
including the enumerator and heading of sub-
title B (containing such redesignated sections),
after section 2214, as redesignated by subpara-
graph (F) 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. 321c), by— 
(i) striking subsection (b); and 
(ii) redesignating subsection (c) as 
subsection (b); 
(B) in section 523 (6 U.S.C. 321l)— 
(i) in subsection (a), in the matter 
preceding paragraph (1), by striking ‘‘As-
sistant Secretary for Infrastructure Protec-
tion’’ and inserting ‘‘Director of the Cyber-
security and Infrastructure Security Agen-
cy’’; and
(ii) in subsection (c), by striking ‘‘As-
sistant Secretary for Infrastructure Protec-
tion’’ and inserting ‘‘Director of the Cyber-
security and Infrastructure Security Agen-
cy’’; and 
(C) in section 524(a)(2)(B) (6 U.S.C. 
321m(a)(2)(B)), in the matter preceding clause 
(i)— 
(i) by striking ‘‘Assistant Secretary 
for Infrastructure Protection’’ and insert-
ing ‘‘Director of the Cybersecurity and In-
frastructure Security Agency’’; and 
(ii) by striking ‘‘of the Assistant Sec-
retary’’ and inserting ‘‘of the Director’’; 
(5) in title VIII, in section 899B(a) (6 U.S.C. 
488a(a)), by inserting at the end the following new 
sentence: ‘‘Such regulations shall be carried out by 
the Cybersecurity and Infrastructure Security Agen-
cy.’’; 
(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
COMMU-
NICATIONS’’ and inserting ‘‘EMERGENCY 
COMMUNICATIONS DIVISION’’;