Who voices Aeris/Aerith in Advent Children: Complete?

I curious who voices in the remake of the movie. Is the one from KH2 and regular Advent Children or the much better replacement in Crisis Core? I doubt it's Mandy Moore.