Cleaned up class name.