variable naming updates