updated variables to be consistent within all classes