Updates to Naming Conventions, docs, etc