renaming and correcting errors