Fixed a few naming conventions and punctuation