Fix for r59289 and 59293: finish to rename the class, really sorry for that :(