diff --git a/force-app/main/default/classes/BDI_DataImportCTRL_TEST.cls b/force-app/main/default/classes/BDI_DataImportCTRL_TEST.cls
index b2ee7a55193..808f1cd34e4 100644
--- a/force-app/main/default/classes/BDI_DataImportCTRL_TEST.cls
+++ b/force-app/main/default/classes/BDI_DataImportCTRL_TEST.cls
@@ -300,16 +300,10 @@ private with sharing class BDI_DataImportCTRL_TEST {
         // should have matched
         System.assertEquals(null,testDIResultA.FailureInformation__c);
         System.assertEquals(BDI_DataImport_API.bdiDryRunValidated,testDIResultA.Status__c);
-        // Contact matching will not return an imported contact if contact name is encrypted
-        if (sObjectType.Contact.fields.Name.isEncrypted()) {
-            System.assertEquals(null,testDIResultA.Contact1Imported__c);
-        } else {
+        if (!sObjectType.Contact.fields.Name.isEncrypted()) {
             System.assertNotEquals(null,testDIResultA.Contact1Imported__c);
         }
-         // Contact matching status will be 'no match' if contact name is encrypted
-        if (sObjectType.Contact.fields.Name.isEncrypted()) {
-            System.assertEquals(System.label.bdiDryRunNoMatch,testDIResultA.Contact1ImportStatus__c);
-        } else {
+        if (!sObjectType.Contact.fields.Name.isEncrypted()) {
             System.assertEquals(System.label.bdiDryRunMatched,testDIResultA.Contact1ImportStatus__c);
         }
         System.assertEquals(null,testDIResultA.DonationImported__c);
diff --git a/force-app/main/default/objects/Account_Soft_Credit__c/Account_Soft_Credit__c.object-meta.xml b/force-app/main/default/objects/Account_Soft_Credit__c/Account_Soft_Credit__c.object-meta.xml
index 421881c0e9b..cad4018f271 100644
--- a/force-app/main/default/objects/Account_Soft_Credit__c/Account_Soft_Credit__c.object-meta.xml
+++ b/force-app/main/default/objects/Account_Soft_Credit__c/Account_Soft_Credit__c.object-meta.xml
@@ -60,6 +60,5 @@
     <pluralLabel>Account Soft Credits</pluralLabel>
     <searchLayouts/>
     <sharingModel>ControlledByParent</sharingModel>
-    <startsWith>Vowel</startsWith>
     <visibility>Public</visibility>
 </CustomObject>
diff --git a/force-app/main/default/objects/Address__c/Address__c.object-meta.xml b/force-app/main/default/objects/Address__c/Address__c.object-meta.xml
index edc620815df..d13f8052603 100644
--- a/force-app/main/default/objects/Address__c/Address__c.object-meta.xml
+++ b/force-app/main/default/objects/Address__c/Address__c.object-meta.xml
@@ -72,6 +72,5 @@
         <searchFilterFields>Address_Type__c</searchFilterFields>
     </searchLayouts>
     <sharingModel>ControlledByParent</sharingModel>
-    <startsWith>Vowel</startsWith>
     <visibility>Public</visibility>
 </CustomObject>
diff --git a/force-app/main/default/objects/Allocation__c/Allocation__c.object-meta.xml b/force-app/main/default/objects/Allocation__c/Allocation__c.object-meta.xml
index d1e75d34e91..d5d7d53e399 100644
--- a/force-app/main/default/objects/Allocation__c/Allocation__c.object-meta.xml
+++ b/force-app/main/default/objects/Allocation__c/Allocation__c.object-meta.xml
@@ -60,6 +60,5 @@
     <pluralLabel>GAU Allocations</pluralLabel>
     <searchLayouts/>
     <sharingModel>ReadWrite</sharingModel>
-    <startsWith>Vowel</startsWith>
     <visibility>Public</visibility>
 </CustomObject>
diff --git a/force-app/main/default/objects/AutoNumber__c/AutoNumber__c.object-meta.xml b/force-app/main/default/objects/AutoNumber__c/AutoNumber__c.object-meta.xml
index 52e458e9551..e00ab410606 100644
--- a/force-app/main/default/objects/AutoNumber__c/AutoNumber__c.object-meta.xml
+++ b/force-app/main/default/objects/AutoNumber__c/AutoNumber__c.object-meta.xml
@@ -162,6 +162,5 @@
     <pluralLabel>AutoNumbers</pluralLabel>
     <searchLayouts/>
     <sharingModel>ReadWrite</sharingModel>
-    <startsWith>Vowel</startsWith>
     <visibility>Protected</visibility>
 </CustomObject>
diff --git a/force-app/main/default/objects/Engagement_Plan_Task__c/Engagement_Plan_Task__c.object-meta.xml b/force-app/main/default/objects/Engagement_Plan_Task__c/Engagement_Plan_Task__c.object-meta.xml
index 047a9de0d85..b925aa88d8a 100644
--- a/force-app/main/default/objects/Engagement_Plan_Task__c/Engagement_Plan_Task__c.object-meta.xml
+++ b/force-app/main/default/objects/Engagement_Plan_Task__c/Engagement_Plan_Task__c.object-meta.xml
@@ -60,6 +60,5 @@
     <pluralLabel>Engagement Plan Tasks</pluralLabel>
     <searchLayouts/>
     <sharingModel>ControlledByParent</sharingModel>
-    <startsWith>Vowel</startsWith>
     <visibility>Public</visibility>
 </CustomObject>
diff --git a/force-app/main/default/objects/Engagement_Plan_Template__c/Engagement_Plan_Template__c.object-meta.xml b/force-app/main/default/objects/Engagement_Plan_Template__c/Engagement_Plan_Template__c.object-meta.xml
index ccf26727eea..7118793ebcb 100644
--- a/force-app/main/default/objects/Engagement_Plan_Template__c/Engagement_Plan_Template__c.object-meta.xml
+++ b/force-app/main/default/objects/Engagement_Plan_Template__c/Engagement_Plan_Template__c.object-meta.xml
@@ -64,6 +64,5 @@
     <pluralLabel>Engagement Plan Templates</pluralLabel>
     <searchLayouts/>
     <sharingModel>ReadWrite</sharingModel>
-    <startsWith>Vowel</startsWith>
     <visibility>Public</visibility>
 </CustomObject>
diff --git a/force-app/main/default/objects/Engagement_Plan__c/Engagement_Plan__c.object-meta.xml b/force-app/main/default/objects/Engagement_Plan__c/Engagement_Plan__c.object-meta.xml
index d264151dfe6..ac46fe4c61e 100644
--- a/force-app/main/default/objects/Engagement_Plan__c/Engagement_Plan__c.object-meta.xml
+++ b/force-app/main/default/objects/Engagement_Plan__c/Engagement_Plan__c.object-meta.xml
@@ -61,6 +61,5 @@
     <pluralLabel>Engagement Plans</pluralLabel>
     <searchLayouts/>
     <sharingModel>ControlledByParent</sharingModel>
-    <startsWith>Vowel</startsWith>
     <visibility>Public</visibility>
 </CustomObject>