diff --git a/ext/afform/admin/CRM/AfformAdmin/Page/Base.php b/ext/afform/admin/CRM/AfformAdmin/Page/Base.php
index fc22b35b94d0..b01400badb77 100644
--- a/ext/afform/admin/CRM/AfformAdmin/Page/Base.php
+++ b/ext/afform/admin/CRM/AfformAdmin/Page/Base.php
@@ -8,6 +8,7 @@
  | and copyright information, see https://civicrm.org/licensing       |
  +--------------------------------------------------------------------+
  */
+use CRM_AfformAdmin_ExtensionUtil as E;
 
 /**
  * Base page for Afform admin
@@ -16,7 +17,7 @@ class CRM_AfformAdmin_Page_Base extends CRM_Core_Page {
 
   public function run() {
     $breadCrumb = [
-      'title' => ts('Form Builder'),
+      'title' => E::ts('Form Builder'),
       'url' => CRM_Utils_System::url('civicrm/admin/afform', NULL, FALSE, '/'),
     ];
     CRM_Utils_System::appendBreadCrumb([$breadCrumb]);
diff --git a/ext/afform/admin/Civi/AfformAdmin/AfformAdminMeta.php b/ext/afform/admin/Civi/AfformAdmin/AfformAdminMeta.php
index 3b8a0614e804..1b20accd47c5 100644
--- a/ext/afform/admin/Civi/AfformAdmin/AfformAdminMeta.php
+++ b/ext/afform/admin/Civi/AfformAdmin/AfformAdminMeta.php
@@ -18,10 +18,10 @@ public static function getAdminSettings() {
       ->execute();
     // Pluralize tabs (too bad option groups only store a single label)
     $plurals = [
-      'form' => ts('Custom Forms'),
-      'search' => ts('Search Displays'),
-      'block' => ts('Field Blocks'),
-      'system' => ts('System Forms'),
+      'form' => E::ts('Custom Forms'),
+      'search' => E::ts('Search Displays'),
+      'block' => E::ts('Field Blocks'),
+      'system' => E::ts('System Forms'),
     ];
     foreach ($afformTypes as $index => $type) {
       $afformTypes[$index]['plural'] = $plurals[$type['name']] ?? \CRM_Utils_String::pluralize($type['label']);
diff --git a/ext/afform/admin/ang/afAdmin/afAdminList.controller.js b/ext/afform/admin/ang/afAdmin/afAdminList.controller.js
index 9c912bf6ca0f..e16398426044 100644
--- a/ext/afform/admin/ang/afAdmin/afAdminList.controller.js
+++ b/ext/afform/admin/ang/afAdmin/afAdminList.controller.js
@@ -2,7 +2,7 @@
   "use strict";
 
   angular.module('afAdmin').controller('afAdminList', function($scope, afforms, crmApi4, crmStatus) {
-    var ts = $scope.ts = CRM.ts(),
+    var ts = $scope.ts = CRM.ts('org.civicrm.afform_admin'),
       ctrl = $scope.$ctrl = this;
 
     $scope.crmUrl = CRM.url;
diff --git a/ext/afform/admin/ang/afGuiEditor/afGuiEditOptions.component.js b/ext/afform/admin/ang/afGuiEditor/afGuiEditOptions.component.js
index ac1886ec36ed..58759986a149 100644
--- a/ext/afform/admin/ang/afGuiEditor/afGuiEditOptions.component.js
+++ b/ext/afform/admin/ang/afGuiEditor/afGuiEditOptions.component.js
@@ -6,7 +6,7 @@
     templateUrl: '~/afGuiEditor/afGuiEditOptions.html',
     require: {field: '^^afGuiField'},
     controller: function($scope) {
-      var ts = $scope.ts = CRM.ts(),
+      var ts = $scope.ts = CRM.ts('org.civicrm.afform_admin'),
         ctrl = this;
 
       this.$onInit = function() {
diff --git a/ext/afform/admin/ang/afGuiEditor/afGuiEditor.component.js b/ext/afform/admin/ang/afGuiEditor/afGuiEditor.component.js
index 587d74cdd21b..17b9be23b0d6 100644
--- a/ext/afform/admin/ang/afGuiEditor/afGuiEditor.component.js
+++ b/ext/afform/admin/ang/afGuiEditor/afGuiEditor.component.js
@@ -19,7 +19,7 @@
     },
     controllerAs: 'editor',
     controller: function($scope, crmApi4, afGui, $parse, $timeout, $location) {
-      var ts = $scope.ts = CRM.ts('afform');
+      var ts = $scope.ts = CRM.ts('org.civicrm.afform_admin');
       $scope.crmUrl = CRM.url;
 
       $scope.afform = null;
diff --git a/ext/afform/admin/ang/afGuiEditor/afGuiEntity.component.js b/ext/afform/admin/ang/afGuiEditor/afGuiEntity.component.js
index b4f67341bbcb..818d4d825cd3 100644
--- a/ext/afform/admin/ang/afGuiEditor/afGuiEntity.component.js
+++ b/ext/afform/admin/ang/afGuiEditor/afGuiEntity.component.js
@@ -9,7 +9,7 @@
     },
     require: {editor: '^^afGuiEditor'},
     controller: function ($scope, $timeout, afGui) {
-      var ts = $scope.ts = CRM.ts();
+      var ts = $scope.ts = CRM.ts('org.civicrm.afform_admin');
       var ctrl = this;
       $scope.controls = {};
       $scope.fieldList = [];
diff --git a/ext/afform/admin/ang/afGuiEditor/afGuiFieldValue.directive.js b/ext/afform/admin/ang/afGuiEditor/afGuiFieldValue.directive.js
index 4fa0dd36df90..57dab3b1191a 100644
--- a/ext/afform/admin/ang/afGuiEditor/afGuiFieldValue.directive.js
+++ b/ext/afform/admin/ang/afGuiEditor/afGuiFieldValue.directive.js
@@ -10,7 +10,7 @@
       },
       require: 'ngModel',
       link: function (scope, element, attrs, ctrl) {
-        var ts = scope.ts = CRM.ts(),
+        var ts = scope.ts = CRM.ts('org.civicrm.afform_admin'),
           multi;
 
         function destroyWidget() {
diff --git a/ext/afform/admin/ang/afGuiEditor/afGuiMenuItemBackground.component.js b/ext/afform/admin/ang/afGuiEditor/afGuiMenuItemBackground.component.js
index bc2014588bd4..e7580230ed6d 100644
--- a/ext/afform/admin/ang/afGuiEditor/afGuiMenuItemBackground.component.js
+++ b/ext/afform/admin/ang/afGuiEditor/afGuiMenuItemBackground.component.js
@@ -9,7 +9,7 @@
       node: '='
     },
     controller: function($scope, afGui) {
-      var ts = $scope.ts = CRM.ts(),
+      var ts = $scope.ts = CRM.ts('org.civicrm.afform_admin'),
         ctrl = this;
 
       $scope.getSetBackgroundColor = function(color) {
diff --git a/ext/afform/admin/ang/afGuiEditor/afGuiMenuItemBorder.component.js b/ext/afform/admin/ang/afGuiEditor/afGuiMenuItemBorder.component.js
index e22ec9c84798..c17cea201106 100644
--- a/ext/afform/admin/ang/afGuiEditor/afGuiMenuItemBorder.component.js
+++ b/ext/afform/admin/ang/afGuiEditor/afGuiMenuItemBorder.component.js
@@ -9,7 +9,7 @@
       node: '='
     },
     controller: function($scope, afGui) {
-      var ts = $scope.ts = CRM.ts(),
+      var ts = $scope.ts = CRM.ts('org.civicrm.afform_admin'),
         ctrl = this;
 
       $scope.getSetBorderWidth = function(width) {
diff --git a/ext/afform/admin/ang/afGuiEditor/afGuiSaveBlock.controller.js b/ext/afform/admin/ang/afGuiEditor/afGuiSaveBlock.controller.js
index e1546eff40f5..bded48582a53 100644
--- a/ext/afform/admin/ang/afGuiEditor/afGuiSaveBlock.controller.js
+++ b/ext/afform/admin/ang/afGuiEditor/afGuiSaveBlock.controller.js
@@ -3,7 +3,7 @@
   "use strict";
 
   angular.module('afGuiEditor').controller('afGuiSaveBlock', function($scope, crmApi4, dialogService) {
-    var ts = $scope.ts = CRM.ts(),
+    var ts = $scope.ts = CRM.ts('org.civicrm.afform_admin'),
       model = $scope.model,
       original = $scope.original = {
         title: model.title,
diff --git a/ext/afform/admin/ang/afGuiEditor/afGuiSearch.component.js b/ext/afform/admin/ang/afGuiEditor/afGuiSearch.component.js
index cf251992b8eb..46c9486c0047 100644
--- a/ext/afform/admin/ang/afGuiEditor/afGuiSearch.component.js
+++ b/ext/afform/admin/ang/afGuiEditor/afGuiSearch.component.js
@@ -9,7 +9,7 @@
     },
     require: {editor: '^^afGuiEditor'},
     controller: function ($scope, $timeout, afGui) {
-      var ts = $scope.ts = CRM.ts();
+      var ts = $scope.ts = CRM.ts('org.civicrm.afform_admin');
       var ctrl = this;
       $scope.controls = {};
       $scope.fieldList = [];
diff --git a/ext/afform/admin/ang/afGuiEditor/elements/afGuiButton.component.js b/ext/afform/admin/ang/afGuiEditor/elements/afGuiButton.component.js
index 47773ef52250..a6bca1b5674a 100644
--- a/ext/afform/admin/ang/afGuiEditor/elements/afGuiButton.component.js
+++ b/ext/afform/admin/ang/afGuiEditor/elements/afGuiButton.component.js
@@ -9,7 +9,7 @@
       deleteThis: '&'
     },
     controller: function($scope, afGui) {
-      var ts = $scope.ts = CRM.ts(),
+      var ts = $scope.ts = CRM.ts('org.civicrm.afform_admin'),
         ctrl = this;
 
       // TODO: Add action selector to UI
diff --git a/ext/afform/admin/ang/afGuiEditor/elements/afGuiContainer.component.js b/ext/afform/admin/ang/afGuiEditor/elements/afGuiContainer.component.js
index 963a68eab23b..4f5fb1f70784 100644
--- a/ext/afform/admin/ang/afGuiEditor/elements/afGuiContainer.component.js
+++ b/ext/afform/admin/ang/afGuiEditor/elements/afGuiContainer.component.js
@@ -12,7 +12,7 @@
     },
     require: {editor: '^^afGuiEditor'},
     controller: function($scope, crmApi4, dialogService, afGui) {
-      var ts = $scope.ts = CRM.ts(),
+      var ts = $scope.ts = CRM.ts('org.civicrm.afform_admin'),
         ctrl = this;
 
       this.$onInit = function() {
diff --git a/ext/afform/admin/ang/afGuiEditor/elements/afGuiField.component.js b/ext/afform/admin/ang/afGuiEditor/elements/afGuiField.component.js
index c2215bee5ede..95d71176f01c 100644
--- a/ext/afform/admin/ang/afGuiEditor/elements/afGuiField.component.js
+++ b/ext/afform/admin/ang/afGuiEditor/elements/afGuiField.component.js
@@ -13,7 +13,7 @@
       container: '^^afGuiContainer'
     },
     controller: function($scope, afGui) {
-      var ts = $scope.ts = CRM.ts(),
+      var ts = $scope.ts = CRM.ts('org.civicrm.afform_admin'),
         ctrl = this;
 
       $scope.editingOptions = false;
diff --git a/ext/afform/admin/ang/afGuiEditor/elements/afGuiMarkup.component.js b/ext/afform/admin/ang/afGuiEditor/elements/afGuiMarkup.component.js
index 24482e4d3529..8a7ace51f66f 100644
--- a/ext/afform/admin/ang/afGuiEditor/elements/afGuiMarkup.component.js
+++ b/ext/afform/admin/ang/afGuiEditor/elements/afGuiMarkup.component.js
@@ -11,7 +11,7 @@
       deleteThis: '&'
     },
     controller: function($scope, $sce, $timeout) {
-      var ts = $scope.ts = CRM.ts(),
+      var ts = $scope.ts = CRM.ts('org.civicrm.afform_admin'),
         ctrl = this;
 
       this.$onInit = function() {
diff --git a/ext/afform/admin/ang/afGuiEditor/elements/afGuiSearchDisplay.component.js b/ext/afform/admin/ang/afGuiEditor/elements/afGuiSearchDisplay.component.js
index f8426a8adf5a..9a7a0c037272 100644
--- a/ext/afform/admin/ang/afGuiEditor/elements/afGuiSearchDisplay.component.js
+++ b/ext/afform/admin/ang/afGuiEditor/elements/afGuiSearchDisplay.component.js
@@ -8,7 +8,7 @@
       node: '='
     },
     controller: function($scope, afGui) {
-      var ts = $scope.ts = CRM.ts(),
+      var ts = $scope.ts = CRM.ts('org.civicrm.afform_admin'),
         ctrl = this;
 
       this.$onInit = function() {
diff --git a/ext/afform/admin/ang/afGuiEditor/elements/afGuiText.component.js b/ext/afform/admin/ang/afGuiEditor/elements/afGuiText.component.js
index 6c045edd2f45..f632c45976f1 100644
--- a/ext/afform/admin/ang/afGuiEditor/elements/afGuiText.component.js
+++ b/ext/afform/admin/ang/afGuiEditor/elements/afGuiText.component.js
@@ -9,7 +9,7 @@
       deleteThis: '&'
     },
     controller: function($scope, afGui) {
-      var ts = $scope.ts = CRM.ts(),
+      var ts = $scope.ts = CRM.ts('org.civicrm.afform_admin'),
         ctrl = this;
 
       $scope.tags = {
diff --git a/ext/afform/core/CRM/Afform/Page/AfformBase.php b/ext/afform/core/CRM/Afform/Page/AfformBase.php
index fae234bcd079..6725d15dc9c7 100644
--- a/ext/afform/core/CRM/Afform/Page/AfformBase.php
+++ b/ext/afform/core/CRM/Afform/Page/AfformBase.php
@@ -27,7 +27,7 @@ public function run() {
 
     // If the user has "access civicrm" append home breadcrumb
     if (CRM_Core_Permission::check('access CiviCRM')) {
-      CRM_Utils_System::appendBreadCrumb([['title' => ts('CiviCRM'), 'url' => CRM_Utils_System::url('civicrm')]]);
+      CRM_Utils_System::appendBreadCrumb([['title' => E::ts('CiviCRM'), 'url' => CRM_Utils_System::url('civicrm')]]);
       // If the user has "admin civicrm" & the admin extension is enabled
       if (CRM_Core_Permission::check('administer CiviCRM') && CRM_Utils_Array::findAll(
           \CRM_Extension_System::singleton()->getMapper()->getActiveModuleFiles(),
diff --git a/ext/afform/core/Civi/Afform/AfformMetadataInjector.php b/ext/afform/core/Civi/Afform/AfformMetadataInjector.php
index 7ac941fedfc2..992adfdbf307 100644
--- a/ext/afform/core/Civi/Afform/AfformMetadataInjector.php
+++ b/ext/afform/core/Civi/Afform/AfformMetadataInjector.php
@@ -11,6 +11,8 @@
 
 namespace Civi\Afform;
 
+use CRM_Afform_ExtensionUtil as E;
+
 /**
  * Class AfformMetadataInjector
  * @package Civi\Afform
@@ -109,13 +111,13 @@ private static function fillFieldMetadata($entityName, $action, \DOMElement $afF
       }
       // Default placeholder for select inputs
       if ($fieldInfo['input_type'] === 'Select') {
-        $fieldInfo['input_attrs'] = ($fieldInfo['input_attrs'] ?? []) + ['placeholder' => ts('Select')];
+        $fieldInfo['input_attrs'] = ($fieldInfo['input_attrs'] ?? []) + ['placeholder' => E::ts('Select')];
       }
 
       $fieldDefn = $existingFieldDefn ? \CRM_Utils_JS::getRawProps($existingFieldDefn) : [];
 
       if ('Date' === $fieldInfo['input_type'] && !empty($fieldDefn['input_type']) && \CRM_Utils_JS::decode($fieldDefn['input_type']) === 'Select') {
-        $fieldInfo['input_attrs']['placeholder'] = ts('Select');
+        $fieldInfo['input_attrs']['placeholder'] = E::ts('Select');
         $fieldInfo['options'] = \CRM_Utils_Array::makeNonAssociative(\CRM_Core_OptionGroup::values('relative_date_filters'), 'id', 'label');
       }
 
diff --git a/ext/afform/core/Civi/Api4/Action/Afform/Get.php b/ext/afform/core/Civi/Api4/Action/Afform/Get.php
index 00d86e39f147..7da0b19c643a 100644
--- a/ext/afform/core/Civi/Api4/Action/Afform/Get.php
+++ b/ext/afform/core/Civi/Api4/Action/Afform/Get.php
@@ -4,6 +4,7 @@
 
 use Civi\Api4\CustomField;
 use Civi\Api4\CustomGroup;
+use CRM_Afform_ExtensionUtil as E;
 
 /**
  * @inheritDoc
@@ -126,7 +127,7 @@ protected function getAutoGenerated(&$names, $toGet, $getLayout) {
         'name' => $name,
         'type' => 'block',
         'requires' => [],
-        'title' => ts('%1 block (default)', [1 => $custom['title']]),
+        'title' => E::ts('%1 block (default)', [1 => $custom['title']]),
         'description' => '',
         'is_dashlet' => FALSE,
         'is_public' => FALSE,
diff --git a/ext/afform/core/afform.php b/ext/afform/core/afform.php
index e34c55892265..4018b779df89 100644
--- a/ext/afform/core/afform.php
+++ b/ext/afform/core/afform.php
@@ -12,7 +12,7 @@
  */
 function _afform_fields_filter($params) {
   $result = [];
-  $fields = \Civi\Api4\Afform::getfields()->setCheckPermissions(FALSE)->setAction('create')->execute()->indexBy('name');
+  $fields = \Civi\Api4\Afform::getfields(FALSE)->setAction('create')->execute()->indexBy('name');
   foreach ($fields as $fieldName => $field) {
     if (isset($params[$fieldName])) {
       $result[$fieldName] = $params[$fieldName];
@@ -156,7 +156,7 @@ function afform_civicrm_managed(&$entities) {
         'domain_id' => CRM_Core_BAO_Domain::getDomain()->id,
         'is_active' => TRUE,
         'name' => $afform['name'],
-        'label' => $afform['title'] ?? ts('(Untitled)'),
+        'label' => $afform['title'] ?? E::ts('(Untitled)'),
         'directive' => _afform_angular_module_name($afform['name'], 'dash'),
         'permission' => "@afform:" . $afform['name'],
       ],
@@ -348,7 +348,7 @@ function afform_civicrm_permissionList(&$permissions) {
   foreach ($scanner->getMetas() as $name => $meta) {
     $permissions['@afform:' . $name] = [
       'group' => 'afform',
-      'title' => ts('Afform: Inherit permission of %1', [
+      'title' => E::ts('Afform: Inherit permission of %1', [
         1 => $name,
       ]),
     ];
diff --git a/ext/afform/core/ang/af/afField.component.js b/ext/afform/core/ang/af/afField.component.js
index 439f3ddcfe5c..4264f45b661c 100644
--- a/ext/afform/core/ang/af/afField.component.js
+++ b/ext/afform/core/ang/af/afField.component.js
@@ -13,7 +13,7 @@
       defn: '='
     },
     controller: function($scope, $element, crmApi4) {
-      var ts = $scope.ts = CRM.ts('afform'),
+      var ts = $scope.ts = CRM.ts('org.civicrm.afform'),
         ctrl = this,
         boolOptions = [{id: true, label: ts('Yes')}, {id: false, label: ts('No')}],
         // Only used for is_primary radio button
diff --git a/ext/search/CRM/Search/Page/Admin.php b/ext/search/CRM/Search/Page/Admin.php
index 5ab061f1dcee..0d6cc55fad4d 100644
--- a/ext/search/CRM/Search/Page/Admin.php
+++ b/ext/search/CRM/Search/Page/Admin.php
@@ -9,6 +9,8 @@
  +--------------------------------------------------------------------+
  */
 
+use CRM_Search_ExtensionUtil as E;
+
 /**
  * Angular base page for search admin
  */
@@ -16,7 +18,7 @@ class CRM_Search_Page_Admin extends CRM_Core_Page {
 
   public function run() {
     $breadCrumb = [
-      'title' => ts('Search Kit'),
+      'title' => E::ts('Search Kit'),
       'url' => CRM_Utils_System::url('civicrm/admin/search', NULL, FALSE, '/list'),
     ];
     CRM_Utils_System::appendBreadCrumb([$breadCrumb]);
diff --git a/ext/search/Civi/Search/Actions.php b/ext/search/Civi/Search/Actions.php
index c72a5970699e..9671d45676f8 100644
--- a/ext/search/Civi/Search/Actions.php
+++ b/ext/search/Civi/Search/Actions.php
@@ -11,6 +11,8 @@
 
 namespace Civi\Search;
 
+use CRM_Search_ExtensionUtil as E;
+
 /**
  * Class Tasks
  * @package Civi\Search
@@ -47,7 +49,7 @@ public static function getTasks():array {
     // Note: the placeholder %1 will be replaced with entity name on the clientside
     $tasks = [
       'export' => [
-        'title' => ts('Export %1'),
+        'title' => E::ts('Export %1'),
         'icon' => 'fa-file-excel-o',
         'entities' => array_keys(\CRM_Export_BAO_Export::getComponents()),
         'crmPopup' => [
@@ -56,13 +58,13 @@ public static function getTasks():array {
         ],
       ],
       'update' => [
-        'title' => ts('Update %1'),
+        'title' => E::ts('Update %1'),
         'icon' => 'fa-save',
         'entities' => [],
         'uiDialog' => ['templateUrl' => '~/crmSearchActions/crmSearchActionUpdate.html'],
       ],
       'delete' => [
-        'title' => ts('Delete %1'),
+        'title' => E::ts('Delete %1'),
         'icon' => 'fa-trash',
         'entities' => [],
         'uiDialog' => ['templateUrl' => '~/crmSearchActions/crmSearchActionDelete.html'],
diff --git a/ext/search/ang/crmSearchActions/SaveSmartGroup.ctrl.js b/ext/search/ang/crmSearchActions/SaveSmartGroup.ctrl.js
index 7b89a9dc2852..0580ad86d374 100644
--- a/ext/search/ang/crmSearchActions/SaveSmartGroup.ctrl.js
+++ b/ext/search/ang/crmSearchActions/SaveSmartGroup.ctrl.js
@@ -2,7 +2,7 @@
   "use strict";
 
   angular.module('crmSearchActions').controller('SaveSmartGroup', function ($scope, $element, $timeout, crmApi4, dialogService, searchMeta) {
-    var ts = $scope.ts = CRM.ts(),
+    var ts = $scope.ts = CRM.ts('org.civicrm.search'),
       model = $scope.model;
     $scope.groupEntityRefParams = {
       entity: 'Group',
diff --git a/ext/search/ang/crmSearchActions/crmSearchActionDelete.ctrl.js b/ext/search/ang/crmSearchActions/crmSearchActionDelete.ctrl.js
index 6408a5918fc6..07753fb9ba68 100644
--- a/ext/search/ang/crmSearchActions/crmSearchActionDelete.ctrl.js
+++ b/ext/search/ang/crmSearchActions/crmSearchActionDelete.ctrl.js
@@ -2,7 +2,7 @@
   "use strict";
 
   angular.module('crmSearchActions').controller('crmSearchActionDelete', function($scope, dialogService) {
-    var ts = $scope.ts = CRM.ts(),
+    var ts = $scope.ts = CRM.ts('org.civicrm.search'),
       model = $scope.model,
       ctrl = $scope.$ctrl = this;
 
diff --git a/ext/search/ang/crmSearchActions/crmSearchActionUpdate.ctrl.js b/ext/search/ang/crmSearchActions/crmSearchActionUpdate.ctrl.js
index b55b605d2723..7eb4878f5d47 100644
--- a/ext/search/ang/crmSearchActions/crmSearchActionUpdate.ctrl.js
+++ b/ext/search/ang/crmSearchActions/crmSearchActionUpdate.ctrl.js
@@ -2,7 +2,7 @@
   "use strict";
 
   angular.module('crmSearchActions').controller('crmSearchActionUpdate', function ($scope, $timeout, crmApi4, dialogService) {
-    var ts = $scope.ts = CRM.ts(),
+    var ts = $scope.ts = CRM.ts('org.civicrm.search'),
       model = $scope.model,
       ctrl = $scope.$ctrl = this;
 
diff --git a/ext/search/ang/crmSearchActions/crmSearchActions.component.js b/ext/search/ang/crmSearchActions/crmSearchActions.component.js
index 1c300db7b5a3..46a9cdb2aec7 100644
--- a/ext/search/ang/crmSearchActions/crmSearchActions.component.js
+++ b/ext/search/ang/crmSearchActions/crmSearchActions.component.js
@@ -9,7 +9,7 @@
     },
     templateUrl: '~/crmSearchActions/crmSearchActions.html',
     controller: function($scope, crmApi4, dialogService) {
-      var ts = $scope.ts = CRM.ts(),
+      var ts = $scope.ts = CRM.ts('org.civicrm.search'),
         ctrl = this,
         initialized = false,
         unwatchIDs = $scope.$watch('$ctrl.ids.length', watchIDs);
diff --git a/ext/search/ang/crmSearchActions/crmSearchBatchRunner.component.js b/ext/search/ang/crmSearchActions/crmSearchBatchRunner.component.js
index 0eaca53384d3..7be101beea7d 100644
--- a/ext/search/ang/crmSearchActions/crmSearchBatchRunner.component.js
+++ b/ext/search/ang/crmSearchActions/crmSearchBatchRunner.component.js
@@ -12,7 +12,7 @@
     },
     templateUrl: '~/crmSearchActions/crmSearchBatchRunner.html',
     controller: function($scope, $timeout, $interval, crmApi4) {
-      var ts = $scope.ts = CRM.ts(),
+      var ts = $scope.ts = CRM.ts('org.civicrm.search'),
         ctrl = this,
         currentBatch = 0,
         totalBatches,
diff --git a/ext/search/ang/crmSearchActions/crmSearchInput/crmSearchInput.component.js b/ext/search/ang/crmSearchActions/crmSearchInput/crmSearchInput.component.js
index c37d99948a01..c52c0e7092c9 100644
--- a/ext/search/ang/crmSearchActions/crmSearchInput/crmSearchInput.component.js
+++ b/ext/search/ang/crmSearchActions/crmSearchInput/crmSearchInput.component.js
@@ -11,7 +11,7 @@
     require: {ngModel: 'ngModel'},
     templateUrl: '~/crmSearchActions/crmSearchInput/crmSearchInput.html',
     controller: function($scope) {
-      var ts = $scope.ts = CRM.ts(),
+      var ts = $scope.ts = CRM.ts('org.civicrm.search'),
         ctrl = this;
 
       this.isMulti = function() {
diff --git a/ext/search/ang/crmSearchActions/crmSearchInput/crmSearchInputVal.component.js b/ext/search/ang/crmSearchActions/crmSearchInput/crmSearchInputVal.component.js
index 3a6e30066f48..afe2e1e7e9e1 100644
--- a/ext/search/ang/crmSearchActions/crmSearchInput/crmSearchInputVal.component.js
+++ b/ext/search/ang/crmSearchActions/crmSearchInput/crmSearchInputVal.component.js
@@ -10,7 +10,7 @@
     require: {ngModel: 'ngModel'},
     template: '<div class="form-group" ng-include="$ctrl.getTemplate()"></div>',
     controller: function($scope, formatForSelect2) {
-      var ts = $scope.ts = CRM.ts(),
+      var ts = $scope.ts = CRM.ts('org.civicrm.search'),
         ctrl = this;
 
       this.$onInit = function() {
diff --git a/ext/search/ang/crmSearchActions/saveSmartGroup.directive.js b/ext/search/ang/crmSearchActions/saveSmartGroup.directive.js
index bd68699d8577..49a32c5ef040 100644
--- a/ext/search/ang/crmSearchActions/saveSmartGroup.directive.js
+++ b/ext/search/ang/crmSearchActions/saveSmartGroup.directive.js
@@ -10,7 +10,7 @@
       },
       restrict: 'A',
       controller: function ($scope, $element, dialogService) {
-        var ts = $scope.ts = CRM.ts(),
+        var ts = $scope.ts = CRM.ts('org.civicrm.search'),
           ctrl = this;
 
         $scope.saveGroup = function () {
diff --git a/ext/search/ang/crmSearchAdmin/crmSearchAdmin.component.js b/ext/search/ang/crmSearchAdmin/crmSearchAdmin.component.js
index a74fdf9acaaa..befa88f3529f 100644
--- a/ext/search/ang/crmSearchAdmin/crmSearchAdmin.component.js
+++ b/ext/search/ang/crmSearchAdmin/crmSearchAdmin.component.js
@@ -7,7 +7,7 @@
     },
     templateUrl: '~/crmSearchAdmin/crmSearchAdmin.html',
     controller: function($scope, $element, $location, $timeout, crmApi4, dialogService, searchMeta, formatForSelect2) {
-      var ts = $scope.ts = CRM.ts(),
+      var ts = $scope.ts = CRM.ts('org.civicrm.search'),
         ctrl = this;
 
       this.DEFAULT_AGGREGATE_FN = 'GROUP_CONCAT';
diff --git a/ext/search/ang/crmSearchAdmin/crmSearchAdminDisplay.component.js b/ext/search/ang/crmSearchAdmin/crmSearchAdminDisplay.component.js
index 83323e732dc3..2e1e07654c7b 100644
--- a/ext/search/ang/crmSearchAdmin/crmSearchAdminDisplay.component.js
+++ b/ext/search/ang/crmSearchAdmin/crmSearchAdminDisplay.component.js
@@ -33,7 +33,7 @@
       return html;
     },
     controller: function($scope, $timeout, searchMeta) {
-      var ts = $scope.ts = CRM.ts(),
+      var ts = $scope.ts = CRM.ts('org.civicrm.search'),
         ctrl = this;
 
       this.preview = this.stale = false;
diff --git a/ext/search/ang/crmSearchAdmin/crmSearchAdminLinkGroup.component.js b/ext/search/ang/crmSearchAdmin/crmSearchAdminLinkGroup.component.js
index 2708c98909bb..b528ad0ba614 100644
--- a/ext/search/ang/crmSearchAdmin/crmSearchAdminLinkGroup.component.js
+++ b/ext/search/ang/crmSearchAdmin/crmSearchAdminLinkGroup.component.js
@@ -10,7 +10,7 @@
     },
     templateUrl: '~/crmSearchAdmin/crmSearchAdminLinkGroup.html',
     controller: function ($scope, $element, $timeout, searchMeta) {
-      var ts = $scope.ts = CRM.ts(),
+      var ts = $scope.ts = CRM.ts('org.civicrm.search'),
         ctrl = this;
 
       this.styles = CRM.crmSearchAdmin.styles;
diff --git a/ext/search/ang/crmSearchAdmin/crmSearchAdminLinkSelect.component.js b/ext/search/ang/crmSearchAdmin/crmSearchAdminLinkSelect.component.js
index 2bac3383c037..394f8158e478 100644
--- a/ext/search/ang/crmSearchAdmin/crmSearchAdminLinkSelect.component.js
+++ b/ext/search/ang/crmSearchAdmin/crmSearchAdminLinkSelect.component.js
@@ -10,7 +10,7 @@
     },
     templateUrl: '~/crmSearchAdmin/crmSearchAdminLinkSelect.html',
     controller: function ($scope, $element, $timeout) {
-      var ts = $scope.ts = CRM.ts(),
+      var ts = $scope.ts = CRM.ts('org.civicrm.search'),
         ctrl = this;
 
       this.setValue = function(val) {
diff --git a/ext/search/ang/crmSearchAdmin/crmSearchAdminTokenSelect.component.js b/ext/search/ang/crmSearchAdmin/crmSearchAdminTokenSelect.component.js
index c2c4b2ea126a..f03318acbe4f 100644
--- a/ext/search/ang/crmSearchAdmin/crmSearchAdminTokenSelect.component.js
+++ b/ext/search/ang/crmSearchAdmin/crmSearchAdminTokenSelect.component.js
@@ -10,7 +10,7 @@
     },
     templateUrl: '~/crmSearchAdmin/crmSearchAdminTokenSelect.html',
     controller: function ($scope, $element, searchMeta) {
-      var ts = $scope.ts = CRM.ts(),
+      var ts = $scope.ts = CRM.ts('org.civicrm.search'),
         ctrl = this;
 
       this.initTokens = function() {
diff --git a/ext/search/ang/crmSearchAdmin/crmSearchClause.component.js b/ext/search/ang/crmSearchAdmin/crmSearchClause.component.js
index de5ce60e43d8..70b5a5b63fec 100644
--- a/ext/search/ang/crmSearchAdmin/crmSearchClause.component.js
+++ b/ext/search/ang/crmSearchAdmin/crmSearchClause.component.js
@@ -13,7 +13,7 @@
     },
     templateUrl: '~/crmSearchAdmin/crmSearchClause.html',
     controller: function ($scope, $element, $timeout, searchMeta) {
-      var ts = $scope.ts = CRM.ts(),
+      var ts = $scope.ts = CRM.ts('org.civicrm.search'),
         ctrl = this,
         meta = {};
       this.conjunctions = {AND: ts('And'), OR: ts('Or'), NOT: ts('Not')};
diff --git a/ext/search/ang/crmSearchAdmin/crmSearchFunction.component.js b/ext/search/ang/crmSearchAdmin/crmSearchFunction.component.js
index 0f0e5d2b909b..7a4af26ad364 100644
--- a/ext/search/ang/crmSearchAdmin/crmSearchFunction.component.js
+++ b/ext/search/ang/crmSearchAdmin/crmSearchFunction.component.js
@@ -8,7 +8,7 @@
     },
     templateUrl: '~/crmSearchAdmin/crmSearchFunction.html',
     controller: function($scope, formatForSelect2, searchMeta) {
-      var ts = $scope.ts = CRM.ts(),
+      var ts = $scope.ts = CRM.ts('org.civicrm.search'),
         ctrl = this;
 
       this.$onInit = function() {
diff --git a/ext/search/ang/crmSearchAdmin/displays/searchAdminDisplayList.component.js b/ext/search/ang/crmSearchAdmin/displays/searchAdminDisplayList.component.js
index 546fdb84d028..5780a6789564 100644
--- a/ext/search/ang/crmSearchAdmin/displays/searchAdminDisplayList.component.js
+++ b/ext/search/ang/crmSearchAdmin/displays/searchAdminDisplayList.component.js
@@ -12,7 +12,7 @@
     },
     templateUrl: '~/crmSearchAdmin/displays/searchAdminDisplayList.html',
     controller: function($scope) {
-      var ts = $scope.ts = CRM.ts(),
+      var ts = $scope.ts = CRM.ts('org.civicrm.search'),
         ctrl = this;
 
       this.symbols = {
diff --git a/ext/search/ang/crmSearchAdmin/displays/searchAdminDisplayTable.component.js b/ext/search/ang/crmSearchAdmin/displays/searchAdminDisplayTable.component.js
index 72b48eaaea89..ab839cbb183b 100644
--- a/ext/search/ang/crmSearchAdmin/displays/searchAdminDisplayTable.component.js
+++ b/ext/search/ang/crmSearchAdmin/displays/searchAdminDisplayTable.component.js
@@ -12,7 +12,7 @@
     },
     templateUrl: '~/crmSearchAdmin/displays/searchAdminDisplayTable.html',
     controller: function($scope) {
-      var ts = $scope.ts = CRM.ts(),
+      var ts = $scope.ts = CRM.ts('org.civicrm.search'),
         ctrl = this;
 
       this.$onInit = function () {
diff --git a/ext/search/ang/crmSearchAdmin/searchList.controller.js b/ext/search/ang/crmSearchAdmin/searchList.controller.js
index f6f1d66dab7c..e554164c3f1d 100644
--- a/ext/search/ang/crmSearchAdmin/searchList.controller.js
+++ b/ext/search/ang/crmSearchAdmin/searchList.controller.js
@@ -2,7 +2,7 @@
   "use strict";
 
   angular.module('crmSearchAdmin').controller('searchList', function($scope, savedSearches, crmApi4) {
-    var ts = $scope.ts = CRM.ts(),
+    var ts = $scope.ts = CRM.ts('org.civicrm.search'),
       ctrl = $scope.$ctrl = this;
     this.savedSearches = savedSearches;
     this.afformEnabled = CRM.crmSearchAdmin.afformEnabled;
diff --git a/ext/search/ang/crmSearchDisplayList/crmSearchDisplayList.component.js b/ext/search/ang/crmSearchDisplayList/crmSearchDisplayList.component.js
index 255814f5e182..3245db91c280 100644
--- a/ext/search/ang/crmSearchDisplayList/crmSearchDisplayList.component.js
+++ b/ext/search/ang/crmSearchDisplayList/crmSearchDisplayList.component.js
@@ -15,7 +15,7 @@
     },
     templateUrl: '~/crmSearchDisplayList/crmSearchDisplayList.html',
     controller: function($scope, crmApi4, searchDisplayUtils) {
-      var ts = $scope.ts = CRM.ts(),
+      var ts = $scope.ts = CRM.ts('org.civicrm.search'),
         ctrl = this;
 
       this.page = 1;
diff --git a/ext/search/ang/crmSearchDisplayTable/crmSearchDisplayTable.component.js b/ext/search/ang/crmSearchDisplayTable/crmSearchDisplayTable.component.js
index 8ba836c4cbfe..27a8aa11c8d9 100644
--- a/ext/search/ang/crmSearchDisplayTable/crmSearchDisplayTable.component.js
+++ b/ext/search/ang/crmSearchDisplayTable/crmSearchDisplayTable.component.js
@@ -14,7 +14,7 @@
     },
     templateUrl: '~/crmSearchDisplayTable/crmSearchDisplayTable.html',
     controller: function($scope, crmApi4, searchDisplayUtils) {
-      var ts = $scope.ts = CRM.ts(),
+      var ts = $scope.ts = CRM.ts('org.civicrm.search'),
         ctrl = this;
 
       this.page = 1;