; (4) in section 1905(d)— (A) in the matter before paragraph (1), by striking thereof) for the mentally retarded or persons and inserting thereof) for individuals with intellectual or developmental disabilities or ; (B) in paragraph (1), by striking mentally retarded individuals and inserting individuals with intellectual or developmental disabilities ; and (C) in paragraph (2), by striking the mentally retarded individual and inserting the individual with an intellectual or developmental disability ; (5) in section 1915(c)(7)(C), by striking mental retardation and inserting intellectual or developmental disabilities ; (6) in section 1919(b)— (A) in paragraph (3)— (i) in subparagraph (E), by striking mentally retarded and inserting has intellectual or developmental disabilities ; and (ii) in subparagraph (F)— (I) in the heading, by striking and mentally retarded individuals and inserting individuals and individuals with intellectual or developmental disabilities ; and (II) in clause (ii)— (aa) by striking is mentally retarded and inserting has an intellectual or developmental disability ; and (bb) by striking for mental retardation and inserting for intellectual or developmental disabilities ; (B) in paragraph (4)— (i) in subparagraph (A)(vii), by striking mentally ill and mentally retarded residents and inserting residents who are mentally ill or who have intellectual or developmental disabilities ; and (ii) in subparagraph (C)(ii)(IV), by striking the mentally retarded and inserting individuals with intellectual or developmental disabilities ; and (7) in section 1919(e)— (A) in paragraph (7)— (i) in subparagraph (A)(i), by striking mentally ill and mentally retarded individuals and inserting individuals who are mentally ill or who have intellectual or developmental disabilities ; (ii) in subparagraph (B)— (I) by striking mental retardation each place such term appears and inserting intellectual or developmental disability