chaning variable names to conform with naming convention