Change variable naming convention