Refactoring classes name