refactored classes name