Fix remaining renames