Refactor unique column key naming to check for collisions