rename 'domain' to 'zone' everywhere