This reverts commit d0ea117ccac64e7222e590fd3bf8a280b9e5e156.
Revert "flip unit instance names, so flip how we make RR entries"

This reverts commit 245bcb5d33f056ef473b39a594df86ff37deb81f.