Fixed renaming bugs and simplified some goals.