diff --git a/schema/ACL/ACL.entityType.php b/schema/ACL/ACL.entityType.php
index dac170ef598e..78f5965bffe6 100644
--- a/schema/ACL/ACL.entityType.php
+++ b/schema/ACL/ACL.entityType.php
@@ -5,8 +5,8 @@
   'table' => 'civicrm_acl',
   'class' => 'CRM_ACL_DAO_ACL',
   'getInfo' => fn() => [
-    'title' => ts('Acl'),
-    'title_plural' => ts('Acls'),
+    'title' => ts('ACL'),
+    'title_plural' => ts('ACLs'),
     'description' => ts('Access Control List'),
     'add' => '1.6',
   ],
diff --git a/schema/ACL/ACLCache.entityType.php b/schema/ACL/ACLCache.entityType.php
index 190921a93dd9..c9cfd79671f0 100644
--- a/schema/ACL/ACLCache.entityType.php
+++ b/schema/ACL/ACLCache.entityType.php
@@ -5,8 +5,8 @@
   'table' => 'civicrm_acl_cache',
   'class' => 'CRM_ACL_DAO_ACLCache',
   'getInfo' => fn() => [
-    'title' => ts('Aclcache'),
-    'title_plural' => ts('Aclcaches'),
+    'title' => ts('ACLCache'),
+    'title_plural' => ts('ACLCaches'),
     'description' => ts('Cache for acls and contacts'),
     'add' => '1.6',
   ],
diff --git a/schema/Activity/ActivityContact.entityType.php b/schema/Activity/ActivityContact.entityType.php
index d258dddbe61f..64e92063457c 100644
--- a/schema/Activity/ActivityContact.entityType.php
+++ b/schema/Activity/ActivityContact.entityType.php
@@ -5,8 +5,8 @@
   'table' => 'civicrm_activity_contact',
   'class' => 'CRM_Activity_DAO_ActivityContact',
   'getInfo' => fn() => [
-    'title' => ts('Activitycontact'),
-    'title_plural' => ts('Activitycontacts'),
+    'title' => ts('Activity Contact'),
+    'title_plural' => ts('Activity Contacts'),
     'description' => ts('Activity Contact'),
     'log' => TRUE,
     'add' => '4.4',
@@ -81,7 +81,7 @@
       'title' => ts('Activity Contact Type'),
       'sql_type' => 'int unsigned',
       'input_type' => 'Select',
-      'description' => 'Determines the contact\'s role in the activity (source, target, or assignee).',
+      'description' => ts('Determines the contact\'s role in the activity (source, target, or assignee).'),
       'add' => '4.4',
       'input_attrs' => [
         'label' => ts('Contact Role'),
diff --git a/schema/Batch/EntityBatch.entityType.php b/schema/Batch/EntityBatch.entityType.php
index 9f14e086b052..0b8610c7f451 100644
--- a/schema/Batch/EntityBatch.entityType.php
+++ b/schema/Batch/EntityBatch.entityType.php
@@ -5,8 +5,8 @@
   'table' => 'civicrm_entity_batch',
   'class' => 'CRM_Batch_DAO_EntityBatch',
   'getInfo' => fn() => [
-    'title' => ts('Entitybatch'),
-    'title_plural' => ts('Entitybatches'),
+    'title' => ts('Entity Batch'),
+    'title_plural' => ts('Entity Batches'),
     'description' => ts('Batch entities (Contributions, Participants, Contacts) to a batch.'),
     'add' => '3.3',
   ],
diff --git a/schema/Campaign/CampaignGroup.entityType.php b/schema/Campaign/CampaignGroup.entityType.php
index cae1e5739b5f..f08c1c9930e9 100644
--- a/schema/Campaign/CampaignGroup.entityType.php
+++ b/schema/Campaign/CampaignGroup.entityType.php
@@ -5,8 +5,8 @@
   'table' => 'civicrm_campaign_group',
   'class' => 'CRM_Campaign_DAO_CampaignGroup',
   'getInfo' => fn() => [
-    'title' => ts('Campaigngroup'),
-    'title_plural' => ts('Campaigngroups'),
+    'title' => ts('Campaign Group'),
+    'title_plural' => ts('Campaign Groups'),
     'description' => ts('Campaign Group Details.'),
     'add' => '3.3',
   ],
diff --git a/schema/Case/CaseActivity.entityType.php b/schema/Case/CaseActivity.entityType.php
index 614265521949..722ea2ea9458 100644
--- a/schema/Case/CaseActivity.entityType.php
+++ b/schema/Case/CaseActivity.entityType.php
@@ -5,8 +5,8 @@
   'table' => 'civicrm_case_activity',
   'class' => 'CRM_Case_DAO_CaseActivity',
   'getInfo' => fn() => [
-    'title' => ts('Caseactivity'),
-    'title_plural' => ts('Caseactivities'),
+    'title' => ts('Case Activity'),
+    'title_plural' => ts('Case Activities'),
     'description' => ts('Joining table for case-activity associations.'),
     'log' => TRUE,
     'add' => '1.8',
diff --git a/schema/Case/CaseContact.entityType.php b/schema/Case/CaseContact.entityType.php
index a29ff513bcbd..2641fafc195e 100644
--- a/schema/Case/CaseContact.entityType.php
+++ b/schema/Case/CaseContact.entityType.php
@@ -5,8 +5,8 @@
   'table' => 'civicrm_case_contact',
   'class' => 'CRM_Case_DAO_CaseContact',
   'getInfo' => fn() => [
-    'title' => ts('Casecontact'),
-    'title_plural' => ts('Casecontacts'),
+    'title' => ts('Case Contact'),
+    'title_plural' => ts('Case Contacts'),
     'description' => ts('Joining table for case-contact associations.'),
     'log' => TRUE,
     'add' => '2.1',
diff --git a/schema/Case/CaseType.entityType.php b/schema/Case/CaseType.entityType.php
index 7fa1be759b6b..1318d88a80a5 100644
--- a/schema/Case/CaseType.entityType.php
+++ b/schema/Case/CaseType.entityType.php
@@ -5,8 +5,8 @@
   'table' => 'civicrm_case_type',
   'class' => 'CRM_Case_DAO_CaseType',
   'getInfo' => fn() => [
-    'title' => ts('Casetype'),
-    'title_plural' => ts('Casetypes'),
+    'title' => ts('Case Type'),
+    'title_plural' => ts('Case Types'),
     'description' => ts('Case type definition'),
     'log' => TRUE,
     'add' => '4.5',
diff --git a/schema/Contact/ACLContactCache.entityType.php b/schema/Contact/ACLContactCache.entityType.php
index 499de1552c24..b8d9571c9822 100644
--- a/schema/Contact/ACLContactCache.entityType.php
+++ b/schema/Contact/ACLContactCache.entityType.php
@@ -5,8 +5,8 @@
   'table' => 'civicrm_acl_contact_cache',
   'class' => 'CRM_Contact_DAO_ACLContactCache',
   'getInfo' => fn() => [
-    'title' => ts('Aclcontactcache'),
-    'title_plural' => ts('Aclcontactcaches'),
+    'title' => ts('ACLContact Cache'),
+    'title_plural' => ts('ACLContact Caches'),
     'description' => ts('Join table cache for contacts that a user has permission on.'),
     'add' => '3.1',
   ],
diff --git a/schema/Contact/ContactType.entityType.php b/schema/Contact/ContactType.entityType.php
index 53bf05463001..1d3b93d50199 100644
--- a/schema/Contact/ContactType.entityType.php
+++ b/schema/Contact/ContactType.entityType.php
@@ -5,8 +5,8 @@
   'table' => 'civicrm_contact_type',
   'class' => 'CRM_Contact_DAO_ContactType',
   'getInfo' => fn() => [
-    'title' => ts('Contacttype'),
-    'title_plural' => ts('Contacttypes'),
+    'title' => ts('Contact Type'),
+    'title_plural' => ts('Contact Types'),
     'description' => ts('Provide type information for contacts'),
     'add' => '3.1',
     'label_field' => 'label',
diff --git a/schema/Contact/DashboardContact.entityType.php b/schema/Contact/DashboardContact.entityType.php
index c326193cc230..420dde558a6c 100644
--- a/schema/Contact/DashboardContact.entityType.php
+++ b/schema/Contact/DashboardContact.entityType.php
@@ -5,8 +5,8 @@
   'table' => 'civicrm_dashboard_contact',
   'class' => 'CRM_Contact_DAO_DashboardContact',
   'getInfo' => fn() => [
-    'title' => ts('Dashboardcontact'),
-    'title_plural' => ts('Dashboardcontacts'),
+    'title' => ts('Dashboard Contact'),
+    'title_plural' => ts('Dashboard Contacts'),
     'description' => ts('Table to store dashboard for each contact.'),
     'add' => '3.1',
   ],
diff --git a/schema/Contact/GroupContact.entityType.php b/schema/Contact/GroupContact.entityType.php
index 967aaf3b4507..f0341720cbbb 100644
--- a/schema/Contact/GroupContact.entityType.php
+++ b/schema/Contact/GroupContact.entityType.php
@@ -5,9 +5,9 @@
   'table' => 'civicrm_group_contact',
   'class' => 'CRM_Contact_DAO_GroupContact',
   'getInfo' => fn() => [
-    'title' => ts('Groupcontact'),
-    'title_plural' => ts('Groupcontacts'),
-    'description' => 'Join table sets membership for \'static\' groups. Also used to store \'opt-out\' entries for \'query\' type groups (status = \'OUT\')',
+    'title' => ts('Group Contact'),
+    'title_plural' => ts('Group Contacts'),
+    'description' => ts('Join table sets membership for \'static\' groups. Also used to store \'opt-out\' entries for \'query\' type groups (status = \'OUT\')'),
     'log' => TRUE,
     'add' => '1.1',
   ],
diff --git a/schema/Contact/GroupContactCache.entityType.php b/schema/Contact/GroupContactCache.entityType.php
index c59c493f3f66..55cbb4cd1b00 100644
--- a/schema/Contact/GroupContactCache.entityType.php
+++ b/schema/Contact/GroupContactCache.entityType.php
@@ -5,9 +5,9 @@
   'table' => 'civicrm_group_contact_cache',
   'class' => 'CRM_Contact_DAO_GroupContactCache',
   'getInfo' => fn() => [
-    'title' => ts('Groupcontactcache'),
-    'title_plural' => ts('Groupcontactcaches'),
-    'description' => 'Join table cache for \'static\' groups.',
+    'title' => ts('Group Contact Cache'),
+    'title_plural' => ts('Group Contact Caches'),
+    'description' => ts('Join table cache for \'static\' groups.'),
     'add' => '2.1',
   ],
   'getIndices' => fn() => [
diff --git a/schema/Contact/GroupNesting.entityType.php b/schema/Contact/GroupNesting.entityType.php
index 0202ea848260..746f1a803cb0 100644
--- a/schema/Contact/GroupNesting.entityType.php
+++ b/schema/Contact/GroupNesting.entityType.php
@@ -5,8 +5,8 @@
   'table' => 'civicrm_group_nesting',
   'class' => 'CRM_Contact_DAO_GroupNesting',
   'getInfo' => fn() => [
-    'title' => ts('Groupnesting'),
-    'title_plural' => ts('Groupnestings'),
+    'title' => ts('Group Nesting'),
+    'title_plural' => ts('Group Nestings'),
     'description' => ts('Provide parent-child relationships for groups'),
     'log' => TRUE,
     'add' => '2.0',
diff --git a/schema/Contact/GroupOrganization.entityType.php b/schema/Contact/GroupOrganization.entityType.php
index f796d06d8f02..f501381a1f20 100644
--- a/schema/Contact/GroupOrganization.entityType.php
+++ b/schema/Contact/GroupOrganization.entityType.php
@@ -5,8 +5,8 @@
   'table' => 'civicrm_group_organization',
   'class' => 'CRM_Contact_DAO_GroupOrganization',
   'getInfo' => fn() => [
-    'title' => ts('Grouporganization'),
-    'title_plural' => ts('Grouporganizations'),
+    'title' => ts('Group Organization'),
+    'title_plural' => ts('Group Organizations'),
     'description' => ts('Integrate Organization information into Groups'),
     'log' => TRUE,
     'add' => '2.0',
diff --git a/schema/Contact/RelationshipType.entityType.php b/schema/Contact/RelationshipType.entityType.php
index 95f1001bedf0..686bf281eaae 100644
--- a/schema/Contact/RelationshipType.entityType.php
+++ b/schema/Contact/RelationshipType.entityType.php
@@ -5,9 +5,9 @@
   'table' => 'civicrm_relationship_type',
   'class' => 'CRM_Contact_DAO_RelationshipType',
   'getInfo' => fn() => [
-    'title' => ts('Relationshiptype'),
-    'title_plural' => ts('Relationshiptypes'),
-    'description' => 'Relationship types s/b structured with contact_a as the \'subject/child\' contact and contact_b as the \'object/parent\' contact (e.g. Individual A is Employee of Org B).',
+    'title' => ts('Relationship Type'),
+    'title_plural' => ts('Relationship Types'),
+    'description' => ts('Relationship types s/b structured with contact_a as the \'subject/child\' contact and contact_b as the \'object/parent\' contact (e.g. Individual A is Employee of Org B).'),
     'log' => TRUE,
     'add' => '1.1',
     'label_field' => 'label_a_b',
diff --git a/schema/Contact/SavedSearch.entityType.php b/schema/Contact/SavedSearch.entityType.php
index b9804c6b4b12..d9a112d8f230 100644
--- a/schema/Contact/SavedSearch.entityType.php
+++ b/schema/Contact/SavedSearch.entityType.php
@@ -5,8 +5,8 @@
   'table' => 'civicrm_saved_search',
   'class' => 'CRM_Contact_DAO_SavedSearch',
   'getInfo' => fn() => [
-    'title' => ts('Savedsearch'),
-    'title_plural' => ts('Savedsearches'),
+    'title' => ts('Saved Search'),
+    'title_plural' => ts('Saved Searches'),
     'description' => ts('Users can save their complex SQL queries and use them later.'),
     'add' => '1.1',
     'icon' => 'fa-search-plus',
diff --git a/schema/Contact/SubscriptionHistory.entityType.php b/schema/Contact/SubscriptionHistory.entityType.php
index fdb2f3ee04cf..fa764eca5b2a 100644
--- a/schema/Contact/SubscriptionHistory.entityType.php
+++ b/schema/Contact/SubscriptionHistory.entityType.php
@@ -5,8 +5,8 @@
   'table' => 'civicrm_subscription_history',
   'class' => 'CRM_Contact_DAO_SubscriptionHistory',
   'getInfo' => fn() => [
-    'title' => ts('Subscriptionhistory'),
-    'title_plural' => ts('Subscriptionhistories'),
+    'title' => ts('Subscription History'),
+    'title_plural' => ts('Subscription Histories'),
     'description' => ts('History information of subscribe/unsubscribe actions'),
     'log' => TRUE,
     'add' => '1.1',
diff --git a/schema/Contribute/ContributionPage.entityType.php b/schema/Contribute/ContributionPage.entityType.php
index c164b24757f5..23165b3d2179 100644
--- a/schema/Contribute/ContributionPage.entityType.php
+++ b/schema/Contribute/ContributionPage.entityType.php
@@ -5,8 +5,8 @@
   'table' => 'civicrm_contribution_page',
   'class' => 'CRM_Contribute_DAO_ContributionPage',
   'getInfo' => fn() => [
-    'title' => ts('Contributionpage'),
-    'title_plural' => ts('Contributionpages'),
+    'title' => ts('Contribution Page'),
+    'title_plural' => ts('Contribution Pages'),
     'description' => ts('A Contribution object store meta information about a single customized contribution page'),
     'log' => TRUE,
     'add' => '1.3',
diff --git a/schema/Contribute/ContributionProduct.entityType.php b/schema/Contribute/ContributionProduct.entityType.php
index 4d6726f68d72..caedaa78b15e 100644
--- a/schema/Contribute/ContributionProduct.entityType.php
+++ b/schema/Contribute/ContributionProduct.entityType.php
@@ -5,8 +5,8 @@
   'table' => 'civicrm_contribution_product',
   'class' => 'CRM_Contribute_DAO_ContributionProduct',
   'getInfo' => fn() => [
-    'title' => ts('Contributionproduct'),
-    'title_plural' => ts('Contributionproducts'),
+    'title' => ts('Contribution Product'),
+    'title_plural' => ts('Contribution Products'),
     'description' => ts('FIXME'),
     'log' => TRUE,
     'add' => '1.4',
diff --git a/schema/Core/ActionLog.entityType.php b/schema/Core/ActionLog.entityType.php
index f91ce8154899..a9e6d578f8f7 100644
--- a/schema/Core/ActionLog.entityType.php
+++ b/schema/Core/ActionLog.entityType.php
@@ -5,8 +5,8 @@
   'table' => 'civicrm_action_log',
   'class' => 'CRM_Core_DAO_ActionLog',
   'getInfo' => fn() => [
-    'title' => ts('Actionlog'),
-    'title_plural' => ts('Actionlogs'),
+    'title' => ts('Action Log'),
+    'title_plural' => ts('Action Logs'),
     'description' => ts('Table to store log for the reminder.'),
     'add' => '3.4',
   ],
diff --git a/schema/Core/AddressFormat.entityType.php b/schema/Core/AddressFormat.entityType.php
index 999bc4d24ed4..4a40ade7e60f 100644
--- a/schema/Core/AddressFormat.entityType.php
+++ b/schema/Core/AddressFormat.entityType.php
@@ -5,8 +5,8 @@
   'table' => 'civicrm_address_format',
   'class' => 'CRM_Core_DAO_AddressFormat',
   'getInfo' => fn() => [
-    'title' => ts('Addressformat'),
-    'title_plural' => ts('Addressformats'),
+    'title' => ts('Address Format'),
+    'title_plural' => ts('Address Formats'),
     'description' => ts('FIXME'),
     'add' => '3.2',
   ],
diff --git a/schema/Core/CustomField.entityType.php b/schema/Core/CustomField.entityType.php
index 55b49f86428e..e4c90b90334f 100644
--- a/schema/Core/CustomField.entityType.php
+++ b/schema/Core/CustomField.entityType.php
@@ -5,8 +5,8 @@
   'table' => 'civicrm_custom_field',
   'class' => 'CRM_Core_DAO_CustomField',
   'getInfo' => fn() => [
-    'title' => ts('Customfield'),
-    'title_plural' => ts('Customfields'),
+    'title' => ts('Custom Field'),
+    'title_plural' => ts('Custom Fields'),
     'description' => ts('Stores info about an extended (custom) property (data and form field info).'),
     'log' => TRUE,
     'add' => '1.1',
diff --git a/schema/Core/EntityFile.entityType.php b/schema/Core/EntityFile.entityType.php
index 665644fc901c..cd8dbdfef100 100644
--- a/schema/Core/EntityFile.entityType.php
+++ b/schema/Core/EntityFile.entityType.php
@@ -5,8 +5,8 @@
   'table' => 'civicrm_entity_file',
   'class' => 'CRM_Core_DAO_EntityFile',
   'getInfo' => fn() => [
-    'title' => ts('Entityfile'),
-    'title_plural' => ts('Entityfiles'),
+    'title' => ts('Entity File'),
+    'title_plural' => ts('Entity Files'),
     'description' => ts('Attaches (joins) uploaded files (images, documents, etc.) to entities (Contacts, Groups, Actions).'),
     'log' => TRUE,
     'add' => '1.5',
diff --git a/schema/Core/EntityTag.entityType.php b/schema/Core/EntityTag.entityType.php
index c99853ad2890..ec80c449f825 100644
--- a/schema/Core/EntityTag.entityType.php
+++ b/schema/Core/EntityTag.entityType.php
@@ -5,8 +5,8 @@
   'table' => 'civicrm_entity_tag',
   'class' => 'CRM_Core_DAO_EntityTag',
   'getInfo' => fn() => [
-    'title' => ts('Entitytag'),
-    'title_plural' => ts('Entitytags'),
+    'title' => ts('Entity Tag'),
+    'title_plural' => ts('Entity Tags'),
     'description' => ts('Tag entities (Contacts, Groups, Actions) to categories.'),
     'log' => TRUE,
     'add' => '1.1',
diff --git a/schema/Core/JobLog.entityType.php b/schema/Core/JobLog.entityType.php
index 211dab636d33..ac8125e542b2 100644
--- a/schema/Core/JobLog.entityType.php
+++ b/schema/Core/JobLog.entityType.php
@@ -5,8 +5,8 @@
   'table' => 'civicrm_job_log',
   'class' => 'CRM_Core_DAO_JobLog',
   'getInfo' => fn() => [
-    'title' => ts('Joblog'),
-    'title_plural' => ts('Joblogs'),
+    'title' => ts('Job Log'),
+    'title_plural' => ts('Job Logs'),
     'description' => ts('Scheduled jobs log.'),
     'log' => FALSE,
     'add' => '4.1',
diff --git a/schema/Core/LocationType.entityType.php b/schema/Core/LocationType.entityType.php
index d7d76b40c695..53a04b73bab2 100644
--- a/schema/Core/LocationType.entityType.php
+++ b/schema/Core/LocationType.entityType.php
@@ -5,8 +5,8 @@
   'table' => 'civicrm_location_type',
   'class' => 'CRM_Core_DAO_LocationType',
   'getInfo' => fn() => [
-    'title' => ts('Locationtype'),
-    'title_plural' => ts('Locationtypes'),
+    'title' => ts('Location Type'),
+    'title_plural' => ts('Location Types'),
     'description' => ts('FIXME'),
     'log' => TRUE,
     'add' => '1.1',
diff --git a/schema/Core/MappingField.entityType.php b/schema/Core/MappingField.entityType.php
index 7cec1870d8cd..d9278c340a46 100644
--- a/schema/Core/MappingField.entityType.php
+++ b/schema/Core/MappingField.entityType.php
@@ -5,8 +5,8 @@
   'table' => 'civicrm_mapping_field',
   'class' => 'CRM_Core_DAO_MappingField',
   'getInfo' => fn() => [
-    'title' => ts('Mappingfield'),
-    'title_plural' => ts('Mappingfields'),
+    'title' => ts('Mapping Field'),
+    'title_plural' => ts('Mapping Fields'),
     'description' => ts('Individual field mappings for Mapping'),
     'add' => '1.2',
   ],
diff --git a/schema/Core/OpenID.entityType.php b/schema/Core/OpenID.entityType.php
index 1dd6df0b3256..740011f0cde9 100644
--- a/schema/Core/OpenID.entityType.php
+++ b/schema/Core/OpenID.entityType.php
@@ -5,8 +5,8 @@
   'table' => 'civicrm_openid',
   'class' => 'CRM_Core_DAO_OpenID',
   'getInfo' => fn() => [
-    'title' => ts('Openid'),
-    'title_plural' => ts('Openids'),
+    'title' => ts('Open ID'),
+    'title_plural' => ts('Open IDs'),
     'description' => ts('OpenID information for a specific location.'),
     'add' => '2.0',
   ],
diff --git a/schema/Core/OptionGroup.entityType.php b/schema/Core/OptionGroup.entityType.php
index 5def82838773..31c66d33efc6 100644
--- a/schema/Core/OptionGroup.entityType.php
+++ b/schema/Core/OptionGroup.entityType.php
@@ -5,8 +5,8 @@
   'table' => 'civicrm_option_group',
   'class' => 'CRM_Core_DAO_OptionGroup',
   'getInfo' => fn() => [
-    'title' => ts('Optiongroup'),
-    'title_plural' => ts('Optiongroups'),
+    'title' => ts('Option Group'),
+    'title_plural' => ts('Option Groups'),
     'description' => ts('FIXME'),
     'log' => TRUE,
     'add' => '1.5',
diff --git a/schema/Core/OptionValue.entityType.php b/schema/Core/OptionValue.entityType.php
index 7730f50458c1..f919b06e525c 100644
--- a/schema/Core/OptionValue.entityType.php
+++ b/schema/Core/OptionValue.entityType.php
@@ -5,8 +5,8 @@
   'table' => 'civicrm_option_value',
   'class' => 'CRM_Core_DAO_OptionValue',
   'getInfo' => fn() => [
-    'title' => ts('Optionvalue'),
-    'title_plural' => ts('Optionvalues'),
+    'title' => ts('Option Value'),
+    'title_plural' => ts('Option Values'),
     'description' => ts('FIXME'),
     'log' => TRUE,
     'add' => '1.5',
diff --git a/schema/Core/PrevNextCache.entityType.php b/schema/Core/PrevNextCache.entityType.php
index 87b4fa489db5..80aaf5560087 100644
--- a/schema/Core/PrevNextCache.entityType.php
+++ b/schema/Core/PrevNextCache.entityType.php
@@ -5,8 +5,8 @@
   'table' => 'civicrm_prevnext_cache',
   'class' => 'CRM_Core_DAO_PrevNextCache',
   'getInfo' => fn() => [
-    'title' => ts('Prevnextcache'),
-    'title_plural' => ts('Prevnextcaches'),
+    'title' => ts('Prev Next Cache'),
+    'title_plural' => ts('Prev Next Caches'),
     'description' => ts('Table to cache items for navigation on civicrm searched results.'),
     'add' => '3.4',
   ],
diff --git a/schema/Core/PrintLabel.entityType.php b/schema/Core/PrintLabel.entityType.php
index 6a5b2fec0825..9174e91389b5 100644
--- a/schema/Core/PrintLabel.entityType.php
+++ b/schema/Core/PrintLabel.entityType.php
@@ -5,8 +5,8 @@
   'table' => 'civicrm_print_label',
   'class' => 'CRM_Core_DAO_PrintLabel',
   'getInfo' => fn() => [
-    'title' => ts('Printlabel'),
-    'title_plural' => ts('Printlabels'),
+    'title' => ts('Print Label'),
+    'title_plural' => ts('Print Labels'),
     'description' => ts('Table to store the labels created by user.'),
     'add' => '4.4',
   ],
diff --git a/schema/Core/RecurringEntity.entityType.php b/schema/Core/RecurringEntity.entityType.php
index d792e0525bba..6d1beb8fc944 100644
--- a/schema/Core/RecurringEntity.entityType.php
+++ b/schema/Core/RecurringEntity.entityType.php
@@ -5,8 +5,8 @@
   'table' => 'civicrm_recurring_entity',
   'class' => 'CRM_Core_DAO_RecurringEntity',
   'getInfo' => fn() => [
-    'title' => ts('Recurringentity'),
-    'title_plural' => ts('Recurringentities'),
+    'title' => ts('Recurring Entity'),
+    'title_plural' => ts('Recurring Entities'),
     'description' => ts('FIXME'),
     'log' => TRUE,
     'add' => '4.6',
diff --git a/schema/Core/StatusPreference.entityType.php b/schema/Core/StatusPreference.entityType.php
index e0dead356f8b..36149e738398 100644
--- a/schema/Core/StatusPreference.entityType.php
+++ b/schema/Core/StatusPreference.entityType.php
@@ -5,8 +5,8 @@
   'table' => 'civicrm_status_pref',
   'class' => 'CRM_Core_DAO_StatusPreference',
   'getInfo' => fn() => [
-    'title' => ts('Statuspreference'),
-    'title_plural' => ts('Statuspreferences'),
+    'title' => ts('Status Preference'),
+    'title_plural' => ts('Status Preferences'),
     'description' => ts('Preferences controlling status checks called in system.check.'),
     'add' => '4.7',
   ],
@@ -98,7 +98,7 @@
       'title' => ts('Status Preferences'),
       'sql_type' => 'varchar(255)',
       'input_type' => 'Text',
-      'description' => 'These settings are per-check, and can\'t be compared across checks.',
+      'description' => ts('These settings are per-check, and can\'t be compared across checks.'),
       'add' => '4.7',
       'input_attrs' => [
         'maxlength' => 255,
@@ -108,7 +108,7 @@
       'title' => ts('Check Info'),
       'sql_type' => 'varchar(255)',
       'input_type' => 'Text',
-      'description' => 'These values are per-check, and can\'t be compared across checks.',
+      'description' => ts('These values are per-check, and can\'t be compared across checks.'),
       'add' => '4.7',
       'input_attrs' => [
         'maxlength' => 255,
diff --git a/schema/Core/SystemLog.entityType.php b/schema/Core/SystemLog.entityType.php
index f52db0c1b7f2..bcce8174696c 100644
--- a/schema/Core/SystemLog.entityType.php
+++ b/schema/Core/SystemLog.entityType.php
@@ -5,8 +5,8 @@
   'table' => 'civicrm_system_log',
   'class' => 'CRM_Core_DAO_SystemLog',
   'getInfo' => fn() => [
-    'title' => ts('Systemlog'),
-    'title_plural' => ts('Systemlogs'),
+    'title' => ts('System Log'),
+    'title_plural' => ts('System Logs'),
     'description' => ts('FIXME'),
     'add' => '4.5',
   ],
diff --git a/schema/Core/UserJob.entityType.php b/schema/Core/UserJob.entityType.php
index 08dfd0c50115..77dc68a39663 100644
--- a/schema/Core/UserJob.entityType.php
+++ b/schema/Core/UserJob.entityType.php
@@ -5,8 +5,8 @@
   'table' => 'civicrm_user_job',
   'class' => 'CRM_Core_DAO_UserJob',
   'getInfo' => fn() => [
-    'title' => ts('Userjob'),
-    'title_plural' => ts('Userjobs'),
+    'title' => ts('User Job'),
+    'title_plural' => ts('User Jobs'),
     'description' => ts('Tracking for user jobs (eg. imports).'),
     'log' => FALSE,
     'add' => '5.50',
diff --git a/schema/Core/WordReplacement.entityType.php b/schema/Core/WordReplacement.entityType.php
index bdf46d6707c2..e3a1f0594099 100644
--- a/schema/Core/WordReplacement.entityType.php
+++ b/schema/Core/WordReplacement.entityType.php
@@ -5,8 +5,8 @@
   'table' => 'civicrm_word_replacement',
   'class' => 'CRM_Core_DAO_WordReplacement',
   'getInfo' => fn() => [
-    'title' => ts('Wordreplacement'),
-    'title_plural' => ts('Wordreplacements'),
+    'title' => ts('Word Replacement'),
+    'title_plural' => ts('Word Replacements'),
     'description' => ts('Top-level hierarchy to support word replacement.'),
     'add' => '4.4',
   ],
diff --git a/schema/Core/Worldregion.entityType.php b/schema/Core/WorldRegion.entityType.php
similarity index 91%
rename from schema/Core/Worldregion.entityType.php
rename to schema/Core/WorldRegion.entityType.php
index 372c77776056..2461ed415bb5 100644
--- a/schema/Core/Worldregion.entityType.php
+++ b/schema/Core/WorldRegion.entityType.php
@@ -5,8 +5,8 @@
   'table' => 'civicrm_worldregion',
   'class' => 'CRM_Core_DAO_Worldregion',
   'getInfo' => fn() => [
-    'title' => ts('Worldregion'),
-    'title_plural' => ts('Worldregions'),
+    'title' => ts('World Region'),
+    'title_plural' => ts('World Regions'),
     'description' => ts('FIXME'),
     'add' => '1.8',
   ],
diff --git a/schema/Dedupe/DedupeException.entityType.php b/schema/Dedupe/DedupeException.entityType.php
index 069053f98740..5c41778b726b 100644
--- a/schema/Dedupe/DedupeException.entityType.php
+++ b/schema/Dedupe/DedupeException.entityType.php
@@ -5,8 +5,8 @@
   'table' => 'civicrm_dedupe_exception',
   'class' => 'CRM_Dedupe_DAO_DedupeException',
   'getInfo' => fn() => [
-    'title' => ts('Dedupeexception'),
-    'title_plural' => ts('Dedupeexceptions'),
+    'title' => ts('Dedupe Exception'),
+    'title_plural' => ts('Dedupe Exceptions'),
     'description' => ts('Dedupe exceptions'),
     'add' => '3.3',
   ],
diff --git a/schema/Dedupe/DedupeRule.entityType.php b/schema/Dedupe/DedupeRule.entityType.php
index 501d39a7bd5a..96ad4a0b18fb 100644
--- a/schema/Dedupe/DedupeRule.entityType.php
+++ b/schema/Dedupe/DedupeRule.entityType.php
@@ -5,8 +5,8 @@
   'table' => 'civicrm_dedupe_rule',
   'class' => 'CRM_Dedupe_DAO_DedupeRule',
   'getInfo' => fn() => [
-    'title' => ts('Deduperule'),
-    'title_plural' => ts('Deduperules'),
+    'title' => ts('Dedupe Rule'),
+    'title_plural' => ts('Dedupe Rules'),
     'description' => ts('Dedupe rules for use by rule groups'),
     'add' => '1.8',
   ],
diff --git a/schema/Dedupe/DedupeRuleGroup.entityType.php b/schema/Dedupe/DedupeRuleGroup.entityType.php
index bec94a695788..3a6e3c69daba 100644
--- a/schema/Dedupe/DedupeRuleGroup.entityType.php
+++ b/schema/Dedupe/DedupeRuleGroup.entityType.php
@@ -5,8 +5,8 @@
   'table' => 'civicrm_dedupe_rule_group',
   'class' => 'CRM_Dedupe_DAO_DedupeRuleGroup',
   'getInfo' => fn() => [
-    'title' => ts('Deduperulegroup'),
-    'title_plural' => ts('Deduperulegroups'),
+    'title' => ts('Dedupe Rule Group'),
+    'title_plural' => ts('Dedupe Rule Groups'),
     'description' => ts('Dedupe rule groups'),
     'add' => '1.8',
   ],
diff --git a/schema/Event/Cart/Cart.entityType.php b/schema/Event/Cart.entityType.php
similarity index 100%
rename from schema/Event/Cart/Cart.entityType.php
rename to schema/Event/Cart.entityType.php
diff --git a/schema/Event/Cart/EventInCart.entityType.php b/schema/Event/EventInCart.entityType.php
similarity index 94%
rename from schema/Event/Cart/EventInCart.entityType.php
rename to schema/Event/EventInCart.entityType.php
index 82c8b8a5a344..f9cb2c84da02 100644
--- a/schema/Event/Cart/EventInCart.entityType.php
+++ b/schema/Event/EventInCart.entityType.php
@@ -5,8 +5,8 @@
   'table' => 'civicrm_events_in_carts',
   'class' => 'CRM_Event_Cart_DAO_EventInCart',
   'getInfo' => fn() => [
-    'title' => ts('Eventincart'),
-    'title_plural' => ts('Eventincarts'),
+    'title' => ts('Event In Cart'),
+    'title_plural' => ts('Event In Carts'),
     'description' => ts('FIXME'),
   ],
   'getFields' => fn() => [
diff --git a/schema/Event/Participant.entityType.php b/schema/Event/Participant.entityType.php
index b9c7f93691e7..835e8f26a84c 100644
--- a/schema/Event/Participant.entityType.php
+++ b/schema/Event/Participant.entityType.php
@@ -7,7 +7,7 @@
   'getInfo' => fn() => [
     'title' => ts('Participant'),
     'title_plural' => ts('Participants'),
-    'description' => 'Records of contacts\' attendance and roles in events.',
+    'description' => ts('Records of contacts\' attendance and roles in events.'),
     'log' => TRUE,
     'add' => '1.7',
     'icon' => 'fa-ticket',
diff --git a/schema/Event/ParticipantPayment.entityType.php b/schema/Event/ParticipantPayment.entityType.php
index 4170b84d7ab3..52af89de32bf 100644
--- a/schema/Event/ParticipantPayment.entityType.php
+++ b/schema/Event/ParticipantPayment.entityType.php
@@ -5,8 +5,8 @@
   'table' => 'civicrm_participant_payment',
   'class' => 'CRM_Event_DAO_ParticipantPayment',
   'getInfo' => fn() => [
-    'title' => ts('Participantpayment'),
-    'title_plural' => ts('Participantpayments'),
+    'title' => ts('Participant Payment'),
+    'title_plural' => ts('Participant Payments'),
     'description' => ts('FIXME'),
     'log' => TRUE,
     'add' => '1.7',
diff --git a/schema/Event/ParticipantStatusType.entityType.php b/schema/Event/ParticipantStatusType.entityType.php
index dfa88b34a8b3..394173792c2d 100644
--- a/schema/Event/ParticipantStatusType.entityType.php
+++ b/schema/Event/ParticipantStatusType.entityType.php
@@ -5,8 +5,8 @@
   'table' => 'civicrm_participant_status_type',
   'class' => 'CRM_Event_DAO_ParticipantStatusType',
   'getInfo' => fn() => [
-    'title' => ts('Participantstatustype'),
-    'title_plural' => ts('Participantstatustypes'),
+    'title' => ts('Participant Status Type'),
+    'title_plural' => ts('Participant Status Types'),
     'description' => ts('various types of CiviEvent participant statuses'),
     'log' => TRUE,
     'add' => '3.0',
diff --git a/schema/Financial/EntityFinancialAccount.entityType.php b/schema/Financial/EntityFinancialAccount.entityType.php
index aa27fa147a8e..77108d2d3910 100644
--- a/schema/Financial/EntityFinancialAccount.entityType.php
+++ b/schema/Financial/EntityFinancialAccount.entityType.php
@@ -5,8 +5,8 @@
   'table' => 'civicrm_entity_financial_account',
   'class' => 'CRM_Financial_DAO_EntityFinancialAccount',
   'getInfo' => fn() => [
-    'title' => ts('Entityfinancialaccount'),
-    'title_plural' => ts('Entityfinancialaccounts'),
+    'title' => ts('Entity Financial Account'),
+    'title_plural' => ts('Entity Financial Accounts'),
     'description' => ts('Map between an entity and a financial account, where there is a specific relationship between the financial account and the entity, e.g. Income Account for or AR Account for'),
     'log' => TRUE,
     'add' => '4.3',
diff --git a/schema/Financial/EntityFinancialTrxn.entityType.php b/schema/Financial/EntityFinancialTrxn.entityType.php
index 58c01501e9dd..f020f73e6d92 100644
--- a/schema/Financial/EntityFinancialTrxn.entityType.php
+++ b/schema/Financial/EntityFinancialTrxn.entityType.php
@@ -5,8 +5,8 @@
   'table' => 'civicrm_entity_financial_trxn',
   'class' => 'CRM_Financial_DAO_EntityFinancialTrxn',
   'getInfo' => fn() => [
-    'title' => ts('Entityfinancialtrxn'),
-    'title_plural' => ts('Entityfinancialtrxns'),
+    'title' => ts('Entity Financial Trxn'),
+    'title_plural' => ts('Entity Financial Trxns'),
     'description' => ts('FIXME'),
     'add' => '3.2',
   ],
diff --git a/schema/Financial/FinancialAccount.entityType.php b/schema/Financial/FinancialAccount.entityType.php
index d2e290c7fdfb..5dfed7cd3f63 100644
--- a/schema/Financial/FinancialAccount.entityType.php
+++ b/schema/Financial/FinancialAccount.entityType.php
@@ -5,8 +5,8 @@
   'table' => 'civicrm_financial_account',
   'class' => 'CRM_Financial_DAO_FinancialAccount',
   'getInfo' => fn() => [
-    'title' => ts('Financialaccount'),
-    'title_plural' => ts('Financialaccounts'),
+    'title' => ts('Financial Account'),
+    'title_plural' => ts('Financial Accounts'),
     'description' => ts('FIXME'),
     'log' => TRUE,
     'add' => '3.2',
diff --git a/schema/Financial/FinancialItem.entityType.php b/schema/Financial/FinancialItem.entityType.php
index bcb73ad6c241..d69f11249ac7 100644
--- a/schema/Financial/FinancialItem.entityType.php
+++ b/schema/Financial/FinancialItem.entityType.php
@@ -5,8 +5,8 @@
   'table' => 'civicrm_financial_item',
   'class' => 'CRM_Financial_DAO_FinancialItem',
   'getInfo' => fn() => [
-    'title' => ts('Financialitem'),
-    'title_plural' => ts('Financialitems'),
+    'title' => ts('Financial Item'),
+    'title_plural' => ts('Financial Items'),
     'description' => ts('Financial data for civicrm_line_item, etc.'),
     'log' => TRUE,
     'add' => '4.3',
diff --git a/schema/Financial/FinancialTrxn.entityType.php b/schema/Financial/FinancialTrxn.entityType.php
index acfe6d8f175f..a6ceabbb89bc 100644
--- a/schema/Financial/FinancialTrxn.entityType.php
+++ b/schema/Financial/FinancialTrxn.entityType.php
@@ -5,8 +5,8 @@
   'table' => 'civicrm_financial_trxn',
   'class' => 'CRM_Financial_DAO_FinancialTrxn',
   'getInfo' => fn() => [
-    'title' => ts('Financialtrxn'),
-    'title_plural' => ts('Financialtrxns'),
+    'title' => ts('Financial Trxn'),
+    'title_plural' => ts('Financial Trxns'),
     'description' => ts('FIXME'),
     'log' => TRUE,
     'add' => '1.3',
diff --git a/schema/Financial/FinancialType.entityType.php b/schema/Financial/FinancialType.entityType.php
index 67d3ada76eac..a0ae6493c4ad 100644
--- a/schema/Financial/FinancialType.entityType.php
+++ b/schema/Financial/FinancialType.entityType.php
@@ -5,8 +5,8 @@
   'table' => 'civicrm_financial_type',
   'class' => 'CRM_Financial_DAO_FinancialType',
   'getInfo' => fn() => [
-    'title' => ts('Financialtype'),
-    'title_plural' => ts('Financialtypes'),
+    'title' => ts('Financial Type'),
+    'title_plural' => ts('Financial Types'),
     'description' => ts('Formerly civicrm_contribution_type merged into this table in 4.3'),
     'log' => TRUE,
     'add' => '1.3',
diff --git a/schema/Financial/PaymentProcessor.entityType.php b/schema/Financial/PaymentProcessor.entityType.php
index 83305e83e02a..511068ef648b 100644
--- a/schema/Financial/PaymentProcessor.entityType.php
+++ b/schema/Financial/PaymentProcessor.entityType.php
@@ -5,8 +5,8 @@
   'table' => 'civicrm_payment_processor',
   'class' => 'CRM_Financial_DAO_PaymentProcessor',
   'getInfo' => fn() => [
-    'title' => ts('Paymentprocessor'),
-    'title_plural' => ts('Paymentprocessors'),
+    'title' => ts('Payment Processor'),
+    'title_plural' => ts('Payment Processors'),
     'description' => ts('FIXME'),
     'add' => '1.8',
   ],
diff --git a/schema/Financial/PaymentProcessorType.entityType.php b/schema/Financial/PaymentProcessorType.entityType.php
index b3589aedb067..896fcf306138 100644
--- a/schema/Financial/PaymentProcessorType.entityType.php
+++ b/schema/Financial/PaymentProcessorType.entityType.php
@@ -5,8 +5,8 @@
   'table' => 'civicrm_payment_processor_type',
   'class' => 'CRM_Financial_DAO_PaymentProcessorType',
   'getInfo' => fn() => [
-    'title' => ts('Paymentprocessortype'),
-    'title_plural' => ts('Paymentprocessortypes'),
+    'title' => ts('Payment Processor Type'),
+    'title_plural' => ts('Payment Processor Types'),
     'description' => ts('FIXME'),
     'add' => '1.8',
   ],
diff --git a/schema/Financial/PaymentToken.entityType.php b/schema/Financial/PaymentToken.entityType.php
index c3c73b1bfd01..70e611e17c2b 100644
--- a/schema/Financial/PaymentToken.entityType.php
+++ b/schema/Financial/PaymentToken.entityType.php
@@ -5,8 +5,8 @@
   'table' => 'civicrm_payment_token',
   'class' => 'CRM_Financial_DAO_PaymentToken',
   'getInfo' => fn() => [
-    'title' => ts('Paymenttoken'),
-    'title_plural' => ts('Paymenttokens'),
+    'title' => ts('Payment Token'),
+    'title_plural' => ts('Payment Tokens'),
     'description' => ts('Payment Token'),
     'add' => '4.6',
   ],
diff --git a/schema/Mailing/BouncePattern.entityType.php b/schema/Mailing/BouncePattern.entityType.php
index 5b8daafa9c4b..05a2a61edcda 100644
--- a/schema/Mailing/BouncePattern.entityType.php
+++ b/schema/Mailing/BouncePattern.entityType.php
@@ -5,8 +5,8 @@
   'table' => 'civicrm_mailing_bounce_pattern',
   'class' => 'CRM_Mailing_DAO_BouncePattern',
   'getInfo' => fn() => [
-    'title' => ts('Bouncepattern'),
-    'title_plural' => ts('Bouncepatterns'),
+    'title' => ts('Bounce Pattern'),
+    'title_plural' => ts('Bounce Patterns'),
     'description' => ts('Pseudo-constant table of patterns for bounce classification'),
   ],
   'getFields' => fn() => [
diff --git a/schema/Mailing/BounceType.entityType.php b/schema/Mailing/BounceType.entityType.php
index 187390c302b1..c325e48f0250 100644
--- a/schema/Mailing/BounceType.entityType.php
+++ b/schema/Mailing/BounceType.entityType.php
@@ -5,8 +5,8 @@
   'table' => 'civicrm_mailing_bounce_type',
   'class' => 'CRM_Mailing_DAO_BounceType',
   'getInfo' => fn() => [
-    'title' => ts('Bouncetype'),
-    'title_plural' => ts('Bouncetypes'),
+    'title' => ts('Bounce Type'),
+    'title_plural' => ts('Bounce Types'),
     'description' => ts('Table to index the various bounce types and their properties'),
   ],
   'getFields' => fn() => [
diff --git a/schema/Mailing/MailingAB.entityType.php b/schema/Mailing/MailingAB.entityType.php
index 29e942a575af..baf5b5de7a83 100644
--- a/schema/Mailing/MailingAB.entityType.php
+++ b/schema/Mailing/MailingAB.entityType.php
@@ -5,8 +5,8 @@
   'table' => 'civicrm_mailing_abtest',
   'class' => 'CRM_Mailing_DAO_MailingAB',
   'getInfo' => fn() => [
-    'title' => ts('Mailingab'),
-    'title_plural' => ts('Mailingabs'),
+    'title' => ts('Mailing AB'),
+    'title_plural' => ts('Mailing ABs'),
     'description' => ts('Stores information about abtesting'),
   ],
   'getFields' => fn() => [
diff --git a/schema/Mailing/MailingComponent.entityType.php b/schema/Mailing/MailingComponent.entityType.php
index 05bc11aad9a1..50e72d62f213 100644
--- a/schema/Mailing/MailingComponent.entityType.php
+++ b/schema/Mailing/MailingComponent.entityType.php
@@ -5,8 +5,8 @@
   'table' => 'civicrm_mailing_component',
   'class' => 'CRM_Mailing_DAO_MailingComponent',
   'getInfo' => fn() => [
-    'title' => ts('Mailingcomponent'),
-    'title_plural' => ts('Mailingcomponents'),
+    'title' => ts('Mailing Component'),
+    'title_plural' => ts('Mailing Components'),
     'description' => ts('Stores information about the mailing components (header/footer).'),
   ],
   'getPaths' => fn() => [
diff --git a/schema/Mailing/Event/MailingEventBounce.entityType.php b/schema/Mailing/MailingEventBounce.entityType.php
similarity index 100%
rename from schema/Mailing/Event/MailingEventBounce.entityType.php
rename to schema/Mailing/MailingEventBounce.entityType.php
diff --git a/schema/Mailing/Event/MailingEventConfirm.entityType.php b/schema/Mailing/MailingEventConfirm.entityType.php
similarity index 100%
rename from schema/Mailing/Event/MailingEventConfirm.entityType.php
rename to schema/Mailing/MailingEventConfirm.entityType.php
diff --git a/schema/Mailing/Event/MailingEventDelivered.entityType.php b/schema/Mailing/MailingEventDelivered.entityType.php
similarity index 100%
rename from schema/Mailing/Event/MailingEventDelivered.entityType.php
rename to schema/Mailing/MailingEventDelivered.entityType.php
diff --git a/schema/Mailing/Event/MailingEventForward.entityType.php b/schema/Mailing/MailingEventForward.entityType.php
similarity index 100%
rename from schema/Mailing/Event/MailingEventForward.entityType.php
rename to schema/Mailing/MailingEventForward.entityType.php
diff --git a/schema/Mailing/Event/MailingEventOpened.entityType.php b/schema/Mailing/MailingEventOpened.entityType.php
similarity index 100%
rename from schema/Mailing/Event/MailingEventOpened.entityType.php
rename to schema/Mailing/MailingEventOpened.entityType.php
diff --git a/schema/Mailing/Event/MailingEventQueue.entityType.php b/schema/Mailing/MailingEventQueue.entityType.php
similarity index 100%
rename from schema/Mailing/Event/MailingEventQueue.entityType.php
rename to schema/Mailing/MailingEventQueue.entityType.php
diff --git a/schema/Mailing/Event/MailingEventReply.entityType.php b/schema/Mailing/MailingEventReply.entityType.php
similarity index 100%
rename from schema/Mailing/Event/MailingEventReply.entityType.php
rename to schema/Mailing/MailingEventReply.entityType.php
diff --git a/schema/Mailing/Event/MailingEventSubscribe.entityType.php b/schema/Mailing/MailingEventSubscribe.entityType.php
similarity index 100%
rename from schema/Mailing/Event/MailingEventSubscribe.entityType.php
rename to schema/Mailing/MailingEventSubscribe.entityType.php
diff --git a/schema/Mailing/Event/MailingEventTrackableURLOpen.entityType.php b/schema/Mailing/MailingEventTrackableURLOpen.entityType.php
similarity index 100%
rename from schema/Mailing/Event/MailingEventTrackableURLOpen.entityType.php
rename to schema/Mailing/MailingEventTrackableURLOpen.entityType.php
diff --git a/schema/Mailing/Event/MailingEventUnsubscribe.entityType.php b/schema/Mailing/MailingEventUnsubscribe.entityType.php
similarity index 100%
rename from schema/Mailing/Event/MailingEventUnsubscribe.entityType.php
rename to schema/Mailing/MailingEventUnsubscribe.entityType.php
diff --git a/schema/Mailing/MailingGroup.entityType.php b/schema/Mailing/MailingGroup.entityType.php
index 3cb6482fce65..a1b3fb0460a6 100644
--- a/schema/Mailing/MailingGroup.entityType.php
+++ b/schema/Mailing/MailingGroup.entityType.php
@@ -5,8 +5,8 @@
   'table' => 'civicrm_mailing_group',
   'class' => 'CRM_Mailing_DAO_MailingGroup',
   'getInfo' => fn() => [
-    'title' => ts('Mailinggroup'),
-    'title_plural' => ts('Mailinggroups'),
+    'title' => ts('Mailing Group'),
+    'title_plural' => ts('Mailing Groups'),
     'description' => ts('Stores information about the groups that participate in this mailing..'),
   ],
   'getFields' => fn() => [
diff --git a/schema/Member/Membership.entityType.php b/schema/Member/Membership.entityType.php
index 26661652e686..8476d37c196c 100644
--- a/schema/Member/Membership.entityType.php
+++ b/schema/Member/Membership.entityType.php
@@ -7,7 +7,7 @@
   'getInfo' => fn() => [
     'title' => ts('Membership'),
     'title_plural' => ts('Memberships'),
-    'description' => 'Records of contacts belonging to an organization\'s membership program.',
+    'description' => ts('Records of contacts belonging to an organization\'s membership program.'),
     'log' => TRUE,
     'add' => '1.5',
     'icon' => 'fa-id-badge',
@@ -197,7 +197,7 @@
       'title' => ts('Status Override End Date'),
       'sql_type' => 'date',
       'input_type' => 'Select Date',
-      'description' => 'Then end date of membership status override if \'Override until selected date\' override type is selected.',
+      'description' => ts('Then end date of membership status override if \'Override until selected date\' override type is selected.'),
       'add' => '4.7',
       'default' => NULL,
       'usage' => [
diff --git a/schema/Member/MembershipBlock.entityType.php b/schema/Member/MembershipBlock.entityType.php
index ef09c166fc83..49bdfe07b032 100644
--- a/schema/Member/MembershipBlock.entityType.php
+++ b/schema/Member/MembershipBlock.entityType.php
@@ -5,8 +5,8 @@
   'table' => 'civicrm_membership_block',
   'class' => 'CRM_Member_DAO_MembershipBlock',
   'getInfo' => fn() => [
-    'title' => ts('Membershipblock'),
-    'title_plural' => ts('Membershipblocks'),
+    'title' => ts('Membership Block'),
+    'title_plural' => ts('Membership Blocks'),
     'description' => ts('A Membership Block stores admin configurable status options and rules'),
     'log' => TRUE,
     'add' => '1.5',
diff --git a/schema/Member/MembershipLog.entityType.php b/schema/Member/MembershipLog.entityType.php
index 3a921e68e474..633c2c982894 100644
--- a/schema/Member/MembershipLog.entityType.php
+++ b/schema/Member/MembershipLog.entityType.php
@@ -5,8 +5,8 @@
   'table' => 'civicrm_membership_log',
   'class' => 'CRM_Member_DAO_MembershipLog',
   'getInfo' => fn() => [
-    'title' => ts('Membershiplog'),
-    'title_plural' => ts('Membershiplogs'),
+    'title' => ts('Membership Log'),
+    'title_plural' => ts('Membership Logs'),
     'description' => ts('Logs actions which affect a Membership record (signup, status override, renewal, etc.)'),
     'log' => TRUE,
     'add' => '1.5',
diff --git a/schema/Member/MembershipPayment.entityType.php b/schema/Member/MembershipPayment.entityType.php
index bc7259f12a79..add6be48a304 100644
--- a/schema/Member/MembershipPayment.entityType.php
+++ b/schema/Member/MembershipPayment.entityType.php
@@ -5,8 +5,8 @@
   'table' => 'civicrm_membership_payment',
   'class' => 'CRM_Member_DAO_MembershipPayment',
   'getInfo' => fn() => [
-    'title' => ts('Membershippayment'),
-    'title_plural' => ts('Membershippayments'),
+    'title' => ts('Membership Payment'),
+    'title_plural' => ts('Membership Payments'),
     'description' => ts('Membership Payment'),
     'log' => TRUE,
     'add' => '1.5',
diff --git a/schema/Member/MembershipStatus.entityType.php b/schema/Member/MembershipStatus.entityType.php
index 3325e315c37a..2204f56dfd88 100644
--- a/schema/Member/MembershipStatus.entityType.php
+++ b/schema/Member/MembershipStatus.entityType.php
@@ -5,8 +5,8 @@
   'table' => 'civicrm_membership_status',
   'class' => 'CRM_Member_DAO_MembershipStatus',
   'getInfo' => fn() => [
-    'title' => ts('Membershipstatus'),
-    'title_plural' => ts('Membershipstatuses'),
+    'title' => ts('Membership Status'),
+    'title_plural' => ts('Membership Statuses'),
     'description' => ts('Membership Status stores admin configurable rules for assigning status to memberships.'),
     'log' => TRUE,
     'add' => '1.5',
diff --git a/schema/Member/MembershipType.entityType.php b/schema/Member/MembershipType.entityType.php
index a33053724a97..061354fc9786 100644
--- a/schema/Member/MembershipType.entityType.php
+++ b/schema/Member/MembershipType.entityType.php
@@ -5,8 +5,8 @@
   'table' => 'civicrm_membership_type',
   'class' => 'CRM_Member_DAO_MembershipType',
   'getInfo' => fn() => [
-    'title' => ts('Membershiptype'),
-    'title_plural' => ts('Membershiptypes'),
+    'title' => ts('Membership Type'),
+    'title_plural' => ts('Membership Types'),
     'description' => ts('Sites can configure multiple types of memberships. They encode the owner organization, fee, and the rules needed to set start and end (expire) dates when a member signs up for that type.'),
     'log' => TRUE,
     'add' => '1.5',
diff --git a/schema/Pledge/PledgeBlock.entityType.php b/schema/Pledge/PledgeBlock.entityType.php
index bce9d7b83021..ee7b4317c5af 100644
--- a/schema/Pledge/PledgeBlock.entityType.php
+++ b/schema/Pledge/PledgeBlock.entityType.php
@@ -5,8 +5,8 @@
   'table' => 'civicrm_pledge_block',
   'class' => 'CRM_Pledge_DAO_PledgeBlock',
   'getInfo' => fn() => [
-    'title' => ts('Pledgeblock'),
-    'title_plural' => ts('Pledgeblocks'),
+    'title' => ts('Pledge Block'),
+    'title_plural' => ts('Pledge Blocks'),
     'description' => ts('FIXME'),
     'log' => TRUE,
     'add' => '2.1',
diff --git a/schema/Pledge/PledgePayment.entityType.php b/schema/Pledge/PledgePayment.entityType.php
index 091c5b166003..3a374dc96323 100644
--- a/schema/Pledge/PledgePayment.entityType.php
+++ b/schema/Pledge/PledgePayment.entityType.php
@@ -5,8 +5,8 @@
   'table' => 'civicrm_pledge_payment',
   'class' => 'CRM_Pledge_DAO_PledgePayment',
   'getInfo' => fn() => [
-    'title' => ts('Pledgepayment'),
-    'title_plural' => ts('Pledgepayments'),
+    'title' => ts('Pledge Payment'),
+    'title_plural' => ts('Pledge Payments'),
     'description' => ts('Pledge Payment'),
     'log' => TRUE,
     'add' => '2.1',
diff --git a/schema/Price/LineItem.entityType.php b/schema/Price/LineItem.entityType.php
index e0e84117977c..367454ab464f 100644
--- a/schema/Price/LineItem.entityType.php
+++ b/schema/Price/LineItem.entityType.php
@@ -5,8 +5,8 @@
   'table' => 'civicrm_line_item',
   'class' => 'CRM_Price_DAO_LineItem',
   'getInfo' => fn() => [
-    'title' => ts('Lineitem'),
-    'title_plural' => ts('Lineitems'),
+    'title' => ts('Line Item'),
+    'title_plural' => ts('Line Items'),
     'description' => ts('FIXME'),
     'log' => TRUE,
     'add' => '1.7',
diff --git a/schema/Price/PriceField.entityType.php b/schema/Price/PriceField.entityType.php
index e8e077b2cf61..d640fe03552f 100644
--- a/schema/Price/PriceField.entityType.php
+++ b/schema/Price/PriceField.entityType.php
@@ -5,8 +5,8 @@
   'table' => 'civicrm_price_field',
   'class' => 'CRM_Price_DAO_PriceField',
   'getInfo' => fn() => [
-    'title' => ts('Pricefield'),
-    'title_plural' => ts('Pricefields'),
+    'title' => ts('Price Field'),
+    'title_plural' => ts('Price Fields'),
     'description' => ts('FIXME'),
     'log' => TRUE,
     'add' => '1.8',
@@ -209,7 +209,7 @@
       'title' => ts('Price Field Visibility'),
       'sql_type' => 'int unsigned',
       'input_type' => 'Select',
-      'description' => 'Implicit FK to civicrm_option_group with name = \'visibility\'',
+      'description' => ts('Implicit FK to civicrm_option_group with name = \'visibility\''),
       'add' => '3.2',
       'default' => 1,
       'pseudoconstant' => [
diff --git a/schema/Price/PriceFieldValue.entityType.php b/schema/Price/PriceFieldValue.entityType.php
index d594f57cbf40..74f02f28279b 100644
--- a/schema/Price/PriceFieldValue.entityType.php
+++ b/schema/Price/PriceFieldValue.entityType.php
@@ -5,8 +5,8 @@
   'table' => 'civicrm_price_field_value',
   'class' => 'CRM_Price_DAO_PriceFieldValue',
   'getInfo' => fn() => [
-    'title' => ts('Pricefieldvalue'),
-    'title_plural' => ts('Pricefieldvalues'),
+    'title' => ts('Price Field Value'),
+    'title_plural' => ts('Price Field Values'),
     'description' => ts('FIXME'),
     'add' => '3.3',
   ],
@@ -235,7 +235,7 @@
       'title' => ts('Price Field Option Visibility'),
       'sql_type' => 'int unsigned',
       'input_type' => 'Select',
-      'description' => 'Implicit FK to civicrm_option_group with name = \'visibility\'',
+      'description' => ts('Implicit FK to civicrm_option_group with name = \'visibility\''),
       'add' => '4.7',
       'default' => 1,
       'pseudoconstant' => [
diff --git a/schema/Price/PriceSet.entityType.php b/schema/Price/PriceSet.entityType.php
index 5e2b257800fe..ea7e85ea8016 100644
--- a/schema/Price/PriceSet.entityType.php
+++ b/schema/Price/PriceSet.entityType.php
@@ -5,8 +5,8 @@
   'table' => 'civicrm_price_set',
   'class' => 'CRM_Price_DAO_PriceSet',
   'getInfo' => fn() => [
-    'title' => ts('Priceset'),
-    'title_plural' => ts('Pricesets'),
+    'title' => ts('Price Set'),
+    'title_plural' => ts('Price Sets'),
     'description' => ts('FIXME'),
     'log' => TRUE,
     'add' => '1.8',
diff --git a/schema/Price/PriceSetEntity.entityType.php b/schema/Price/PriceSetEntity.entityType.php
index 1be20ad16c97..c97117e7da6a 100644
--- a/schema/Price/PriceSetEntity.entityType.php
+++ b/schema/Price/PriceSetEntity.entityType.php
@@ -5,8 +5,8 @@
   'table' => 'civicrm_price_set_entity',
   'class' => 'CRM_Price_DAO_PriceSetEntity',
   'getInfo' => fn() => [
-    'title' => ts('Pricesetentity'),
-    'title_plural' => ts('Pricesetentities'),
+    'title' => ts('Price Set Entity'),
+    'title_plural' => ts('Price Set Entities'),
     'description' => ts('FIXME'),
     'log' => TRUE,
     'add' => '1.8',
diff --git a/schema/Queue/QueueItem.entityType.php b/schema/Queue/QueueItem.entityType.php
index d88b4bbf44ed..c8a286c2246c 100644
--- a/schema/Queue/QueueItem.entityType.php
+++ b/schema/Queue/QueueItem.entityType.php
@@ -5,8 +5,8 @@
   'table' => 'civicrm_queue_item',
   'class' => 'CRM_Queue_DAO_QueueItem',
   'getInfo' => fn() => [
-    'title' => ts('Queueitem'),
-    'title_plural' => ts('Queueitems'),
+    'title' => ts('Queue Item'),
+    'title_plural' => ts('Queue Items'),
     'description' => ts('Stores a list of queue items'),
     'add' => '4.2',
   ],