Make naming consistent

* And fix error with naming. "+" is not a valid option

Signed-off-by: Chester Kener <Cl3Kener@gmail.com>