Refactor NamedApps a bit