X/Y Names Refactoring