; and (ii) by striking clause (ii); and (B) in section 3020— (i) in subsection (f)(1), by striking Subject to the time limitation for use of entitlement under section 3031 of this title, an and inserting An ; and (ii) in subsection (h), by striking Notwithstanding section 3031 of this title, a and inserting A . (b) Post-Vietnam Era Veterans’ Educational Assistance Program (1) In general Section 3232 of title 38, United States Code, is amended— (A) by striking subsections (a) and (b); and (B) by redesignating subsections (c) and (d) as subsections (a) and (b), respectively. (2) Conforming amendment Section 3035(b)(1) of title 38, United States Code, is amended by striking and from and all that follows through title . (c) Post-9/11 GI Bill (1) In general Section 3321 of chapter 30 of title 38, United States Code, is amended to read as follows: 3321. Extension of entitlement to educational assistance expiring during a quarter or semester or after a major portion of a course is complete Section 3031 shall apply with respect to the termination of an individual’s entitlement to educational assistance under this chapter in the same manner as such section applies to the termination of an individual’s entitlement to educational assistance under chapter 30, except that, in the administration of such section for purposes of this chapter, the reference to section 3013 shall be deemed to be a reference to section 3312 of this title. . (2) Clerical amendment The table of sections at the beginning of such chapter is amended by striking the item relating to section 3321 and inserting the following new item: 3321. Extension of entitlement to educational assistance expiring during a quarter or semester or after a major portion of a course is complete. . (3) Conforming amendments Chapter 33 of title 38, United States Code, is amended— (A) in section 3312(b), by striking 3321(b)(2) and inserting 3321 ; (B) in section 3319— (i) in subsection (f)(1), by striking Subject to and all that follows through an and inserting An