Fixed some missed renames.