Improved variable naming convention