Adding naming convention for variables

This pulls add the naming convention for variables that were missing.