Now doesn't require different key => values, just translate key to name, and value to value