Great renaming: propagate throughout the rest of the codebase