Changed classes' names, to the new choosen names.