Fixing naming conventions for variables