Renaming some core classes