; and (2) in section 924— (A) in subsection (a)(6), by striking handgun each place the term appears and inserting firearm ; and (B) in subsection (d)(3)(C), by striking 922(b)(3) each place the term appears and inserting 922(b)(2) . (b) Technical and conforming amendments (1) Section 4182(d) of the Internal Revenue Code of 1986 is amended by striking 922(b)(5) and inserting 922(b)(4) . (2) Section 161A(b) of the Atomic Energy Act of 1954 ( 42 U.S.C. 2201a(b) ) is amended, in the matter preceding paragraph (1), by striking (b)(2), (b)(4) and inserting (b)(1), (b)(3) . 304. Secure gun storage by owners Section 922(z) of title 18, United States Code, is amended by adding at the end the following: (4) Secure gun storage by owners (A) Offense (i) In general Except as provided in clause (ii), it shall be unlawful for a person to store or keep any firearm that has moved in, or that has otherwise affected, interstate or foreign commerce on the premises of a residence under the control of the person if the person knows, or reasonably should know, that— (I) a minor is likely to gain access to the firearm without the permission of the parent or guardian of the minor; or (II) a resident of the residence is ineligible to possess a firearm under Federal, State, or local law. (ii) Exception Clause (i) shall not apply to a person if the person— (I) keeps the firearm— (aa) secure using a secure gun storage or safety device; or (bb) in a location which a reasonable person would believe to be secure