Merge Naming Improvements