Refactoring partial names