more renaming bugs