Bug 1000614

Prefer `*_DNS` to `*_UUID`.