Subst and renaming separate now.