; and (B) in paragraph (2)(A), by striking was suffered and all that follows through the period at the end and inserting resulted from military sexual trauma. ; and (2) by striking subsections (f) and (g) and inserting the following new subsection (f): (f) In this section: (1) The term former member of the Armed Forces means a person who served on active duty, active duty for training, or inactive duty training, and who was discharged or released therefrom under any condition that is not— (A) a discharge by court-martial