Variable Naming Fixes