; (B) in each of paragraphs (1) and (2), by striking Federal Election Commission and inserting Election Assistance Commission ; and (C) by striking paragraph (3). (2) Conforming amendments relating to references The Voting Accessibility for the Elderly and Handicapped Act ( 52 U.S.C. 20101 et seq. ), as amended by paragraph (1), is amended— (A) by striking handicapped and elderly individuals each place it appears and inserting individuals with disabilities and older individuals ; (B) by striking handicapped and elderly voters each place it appears and inserting individuals with disabilities and older individuals ; (C) in section 3(b)(2)(B), by striking handicapped or elderly voter and inserting individual with a disability or older individual ; (D) in section 5(b), by striking handicapped voter and inserting individual with a disability ; and (E) in section 8— (i) by striking paragraphs (1) and (2) and inserting the following: (1) accessible has the meaning given that term in section 307 of the Help America Vote Act of 2002, as added by section 1102(a) of the Freedom to Vote Act ; (2) older individual has the meaning given that term in such section 307; ; and (ii) by striking paragraph (4), and inserting the following: (4) individual with a disability has the meaning given that term in such section 306; and . (3) Short title amendment (A) In general Section 1 of the Voting Accessibility for the Elderly and Handicapped Act ( Public Law 98–435