Rename and collapse some more.