change class name to proper