Renaming and fixing errors.