BC-2009 refix with tenantId in name