Rename vars without '_'
Revert to defaults for terminuses