Some more renaming cleanup.