First round of suggestions by pull request committee

Changed some minor things like naming conventions.