fixing some typos and inconsistencies in cli/set variable naming.