; and (ii) in subparagraph (C)(ii)(IV) by striking the mentally ill and the mentally retarded and inserting individuals with mental illnesses or intellectual disabilities ; and (C) in subsection (e)(7)— (i) in subparagraph (A)(i) by striking mentally ill and mentally retarded individuals and inserting individuals with mental illnesses or intellectual disabilities ; (ii) in subparagraph (B)— (I) by striking State mental retardation and inserting State intellectual each place it appears; (II) in clause (ii)— (aa) in the clause heading by striking mentally retarded residents and inserting residents with intellectual disabilities ; (bb) in the matter preceding clause (I) by striking is mentally retarded and inserting has an intellectual disability ; and (cc) in subclause (II) by striking mental retardation and inserting an intellectual disability ; and (III) in clause (iii) by striking mentally ill or mentally retarded resident and inserting resident who has a mental illness or intellectual disability ; (iii) in subparagraph (C) by striking mental retardation and inserting intellectual disability in each place it appears; (iv) in subparagraph (E)— (I) by striking are mentally retarded or mentally ill and inserting have an intellectual disability or mental illness ; and (II) by striking mental retardation and inserting intellectual disability ; and (v) in subparagraph (G)— (I) in clause (i) by inserting or have a mental illness after mentally ill ; and (II) in clause (ii) by striking be mentally retarded if the individual is mentally retarded or a person with and inserting have an intellectual disability if the individual has an intellectual disability or