Improved variable name consistency