Naming Conventions update

Added naming conventions guide, and also updated all the code so it
actually follows those conventions.