Rename polluters to wrappers