Renaming of ES classes