Corrected naming of certain classes