Performed renaming and refactoring