Added some classes and renamed others