White space wrap update

“has” prefix removed and some rename