Rename variables to use dashes.