correct the evil-surround name changes