Updates to naming conventions and other minor edits