Fixed constant variable names