Naming refactoring
Complete refactoring