; and (ii) by striking any mental institution and inserting a psychiatric hospital ; and (B) in subsection (g)(4)— (i) by striking as a mental defective or who has and inserting mentally incompetent or has ; and (ii) by striking mental institution and inserting psychiatric hospital . (b) Technical and conforming amendment The NICS Improvement Amendments Act of 2007 ( 34 U.S.C. 40902 et seq.) is amended— (1) by striking as a mental defective each place that term appears and inserting mentally incompetent ; (2) by striking mental institution each place that term appears and inserting psychiatric hospital ; and (3) in section 102(c)(3) ( 34 U.S.C. 40912(c)(3) )— (A) in the paragraph heading, by striking as a mental defective or committed to a mental institution and inserting mentally incompetent or committed to a psychiatric hospital