diff --git a/managed/OptionValue_crm_search_display_contact_cat.mgd.php b/managed-hold/OptionValue_crm_search_display_contact_cat.mgdx.php
similarity index 89%
rename from managed/OptionValue_crm_search_display_contact_cat.mgd.php
rename to managed-hold/OptionValue_crm_search_display_contact_cat.mgdx.php
index 1f6aafd..c0071c9 100644
--- a/managed/OptionValue_crm_search_display_contact_cat.mgd.php
+++ b/managed-hold/OptionValue_crm_search_display_contact_cat.mgdx.php
@@ -26,16 +26,16 @@ return [
   ],
   // Weird, so this bit belongs elsewhere
   [
-    'name' => 'OptionValue_crm_search_display_contact_cat_SearchDisplay_Category_per_contact_Category_1',
+    'name' => 'OptionValue_crm_search_display_contact_cat_SearchDisplay_Category_by_contact_Category_1',
     'entity' => 'SearchDisplay',
     'cleanup' => 'unused',
     'update' => 'unmodified',
     'params' => [
       'version' => 4,
       'values' => [
-        'name' => 'Category_per_contact_Category_1',
+        'name' => 'Category_by_contact_Category_1',
         'label' => E::ts('Category Category'),
-        'saved_search_id.name' => 'Category_per_contact',
+        'saved_search_id.name' => 'Category_by_contact',
         'type' => 'contact-cat',
         'settings' => [
           'something' => 'nothing',
@@ -58,7 +58,6 @@ return [
         ],
       ],
       'match' => [
-        'saved_search_id',
         'name',
       ],
     ],
diff --git a/managed/SavedSearch_Contacts_by_category_uxxr.mgd.php b/managed/SavedSearch_Contacts_by_category.mgd.php
similarity index 96%
rename from managed/SavedSearch_Contacts_by_category_uxxr.mgd.php
rename to managed/SavedSearch_Contacts_by_category.mgd.php
index e839292..b3832d0 100644
--- a/managed/SavedSearch_Contacts_by_category_uxxr.mgd.php
+++ b/managed/SavedSearch_Contacts_by_category.mgd.php
@@ -3,14 +3,14 @@ use CRM_Contactcats_ExtensionUtil as E;
 
 return [
   [
-    'name' => 'SavedSearch_Contacts_by_category_uxxr',
+    'name' => 'SavedSearch_Contacts_by_category',
     'entity' => 'SavedSearch',
     'cleanup' => 'unused',
     'update' => 'unmodified',
     'params' => [
       'version' => 4,
       'values' => [
-        'name' => 'Contacts_by_category_uxxr',
+        'name' => 'Contacts_by_category',
         'label' => E::ts('Contacts by category'),
         'api_entity' => 'Contact',
         'api_params' => [
@@ -121,7 +121,6 @@ return [
         ],
       ],
       'match' => [
-        'saved_search_id',
         'name',
       ],
     ],