Renaming and removing some errors.