More great renaming fixes