Reverted prior commit changing keys back to associative names