Items renamed after refactoring