renamed most core classes