Fixed a few bad renames.