; comprehensive geriatric education), by striking 2014 and inserting 2022 ; and (4) in section 871 ( 42 U.S.C. 298d ; funding for carrying out parts B, C, and section 831)— (A) by striking 2016 and inserting 2022 ; and (B) by striking B, C, and D and inserting B and C and section 831 . (b) Nurse education, practice, quality, and retention grants Section 831 of the Public Health Service Act ( 42 U.S.C. 296p ) is amended— (1) in the section heading, by striking and quality and inserting quality, and retention ; (2) in subsection (c)(1)— (A) by amending subparagraph (A) to read as follows: (A) to promote career advancement for— (i) for nursing personnel in a variety of training settings, cross training or specialty training among diverse population groups, and the advancement of individuals including to become professional nurses, advanced education nurses, licensed practical nurses, certified nurse assistants, and home health aides; and (ii) individuals including licensed practical nurses, licensed vocational nurses, certified nurse assistants, home health aides, diploma degree or associate degree nurses, to become baccalaureate prepared registered nurses or advanced education nurses in order to meet the needs of the registered nurse workforce; ; (B) in subparagraph (B), by striking the period and inserting ; and ; and (C) by adding at the end the following: (C) developing and implementing internships and residency programs in collaboration with an accredited school of nursing, as defined by section 801(2), to encourage mentoring and the development of specialties. ; (3) in subsection (g)— (A) by striking ,, and inserting , ; (B) by striking or ; and (C) by inserting , or a nurse-managed health clinic before the period; and (4) by striking subsection (h).