Standardized some class names