Changing Variable Names

Changing variable names to follow the naming convention used.