cleaning up variable names to make sure class members are identifiable