Correct some variable names
Fix spec typos