Fix intra-package references in the ui package