Adjusted variable naming for consistency