A bunch of stuff and class name changes