Use some more sensible names.
Basic core/ui split of the resource browser.