Fix leftover rename issues