Revert "No reason to replace space with - in key"

This reverts commit 4dd4293c71269a98606729799b9c9d2a4ade7e01.
Trying again.