Ability to change more key names