; (II) has been restored to sanity or cured of mental disease or defect; (III) has been restored to competency; or (IV) no longer requires involuntary inpatient or outpatient treatment by a psychiatric hospital; or (iii) an order or finding with respect to which the person who is subject to the order or finding has been granted relief from disabilities under section 925(c) of this title, under a program described in section 101(c)(2)(A) or 105 of the NICS Improvement Amendments Act of 2007 ( 34 U.S.C. 40911(c)(2)(A) ; 34 U.S.C. 40915 ), or under any other State-authorized relief from disabilities program of the State in which the original commitment or adjudication occurred. (C) For the purposes of this paragraph, the term actual notice means notice that was served to the individually personally and does not mean notice by publication or other general means. (39) The term psychiatric hospital includes a mental health facility, a mental hospital, a sanitarium, or a psychiatric facility, including a psychiatric ward in a general hospital. ; and (2) in section 922— (A) in subsection (d)(4)— (i) by striking as a mental defective and inserting mentally incompetent ; 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 amendments 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 ; (3) in section 101(c)— (A) in paragraph (1), in the matter preceding subparagraph (A), by striking to the mental health of a person and inserting to whether a person is mentally incompetent