variable naming changed