Start with some renaming.