Updates to naming conventions and other minor edits
merging pr #2188