changed variable naming rules