rename variables to conform to naming standard