Merge "Make key names unique."