Fix some renames that got missed