renamed examples with new variable names
Also including changes from master's 4fd5ba1d21098cacb675286f64dd73743832b984