You could probably put the sorting in the Query here, too.

We could maybe simplify this one at some point by adding a getAndValidateName() (or getNameForClassMap()?) method that handles the validation inside the MapQuery:

$name = $this->getName();
// validate here
return $name;

I think getType is not guaranteed to be unique. It describes a resource type, but multiple blueprints can provide different ways to build the same sort of resource (for example, an "EC2" blueprint and a "WindowsAzure" blueprint could both build "host" resources).

This one is correct, I believe.

I think these weren't sorted before, although I think sorting them is OK.

Missed this -- this one used to key by classname, which is used elsewhere, but now keys by human-readable name. See T8780.