Fixes forgotten renames