Since the "ubuntu" is redundant and we discourage that maybe we should drop that and go: with desktop-edition
server-edition
netbook-edition
desktop-edition
server-edition
netbook-edition
For sure we can drop "unr" and any mention of the "netbook remix" as those terms are deprecated in newer versions, though I suspect there are plenty of people using old UNR happily.