Adopt a different convention for type names

[RickMoynihan]

We should perhaps adopt a different convention so that non dataset types aren't named dataset_<type-name> but instead had a different prefix perhaps something like measure_type_dataset_earnings, etc.

By changing the convention dataset query-roots and other types will sort together and be more easily identifiable.