better names for core classes 2