Changed class names to appropriate.