Changed class names