Refactoring was made
Names refactored