Typically the accepted style is to map actual present land use rather than zoning designation of parcels. I've updated a couple of these commercial areas near Hanna, UT as an example: Changeset 151511195