Fixing naming bugs