More renaming cleanups