Updated todo, fixed renaming bugs