Fix /ui namespace after merge