Keep variable naming consistent