fixing naming bugs