Change to having only one type of key name uniqueness

Rather than tracking names and aliases separately, we should just track names, as we're not allowed collisions anyway