Update key names