EUCA-7660 Account for new eustore naming convention