- renamed the classes