fixed variable naming from merge