End the renaming of the core classes