[1603] Fix multiple EP references in c.e.core.ui