OZP-692: rename deregister to unregister