CRM-16189: remove ts from name for more instances