Fixed variable naming conventions