Minor adjustments to key names