Merge naming conventions