All class and file name changes together

This makes it a bit easier to do the initial configuration