Rename ENSURE-SUBNET-MASK to ENSURE-NETMASK and make it obsolete.