Corrected naming of classes