Standardizing names of classes