Fix renaming regression