remap

UiBase to UiN / add UiS for starling