Class name fixes

this includes the other whitespacing one (it might make sense for me to clean that out of it once you have merged it)