Normalize server version checks and more unique set names.