Fixed minor renaming bugs.