From cdbaee649fefc2ec79eaa62f245846fdf5227aad Mon Sep 17 00:00:00 2001
From: williambza <william.brander@gmail.com>
Date: Tue, 20 Aug 2024 09:35:49 +0200
Subject: [PATCH] Rename the replacement package for databus

---
 ...IApprovals.ApproveNServiceBus.approved.txt | 180 +++++++++---------
 .../Conventions/Conventions.cs                |   2 +-
 .../Conventions/ConventionsBuilder.cs         |   2 +-
 .../DataBus/ConfigureFileShareDataBus.cs      |   2 +-
 src/NServiceBus.Core/DataBus/DataBus.cs       |   2 +-
 .../DataBus/DataBusDefinition.cs              |   4 +-
 .../DataBus/DataBusExtensions.cs              |  12 +-
 .../DataBus/DataBusProperty.cs                |  18 +-
 .../DataBus/FileShareDataBus.cs               |   4 +-
 src/NServiceBus.Core/DataBus/IDataBus.cs      |   8 +-
 .../DataBus/IDataBusProperty.cs               |  12 +-
 .../DataBus/IDatabusSerializer.cs             |   8 +-
 .../DataBus/SystemJsonDataBusSerializer.cs    |   8 +-
 .../DataBus/UseDataBusExtensions.cs           |   6 +-
 src/NServiceBus.Core/Headers.cs               |   2 +-
 15 files changed, 135 insertions(+), 135 deletions(-)

diff --git a/src/NServiceBus.Core.Tests/ApprovalFiles/APIApprovals.ApproveNServiceBus.approved.txt b/src/NServiceBus.Core.Tests/ApprovalFiles/APIApprovals.ApproveNServiceBus.approved.txt
index 06d6ec60b1..622c81f03d 100644
--- a/src/NServiceBus.Core.Tests/ApprovalFiles/APIApprovals.ApproveNServiceBus.approved.txt
+++ b/src/NServiceBus.Core.Tests/ApprovalFiles/APIApprovals.ApproveNServiceBus.approved.txt
@@ -64,8 +64,8 @@ namespace NServiceBus
     public static class ConfigureFileShareDataBus
     {
         [System.Obsolete("The DataBus feature has been released as a dedicated package, \'NServiceBus.ClaimC" +
-            "heck.DataBus\'. Will be treated as an error from version 10.0.0. Will be removed " +
-            "in version 11.0.0.", false)]
+            "heck\'. Will be treated as an error from version 10.0.0. Will be removed in versi" +
+            "on 11.0.0.", false)]
         public static NServiceBus.DataBus.DataBusExtensions<NServiceBus.FileShareDataBus> BasePath(this NServiceBus.DataBus.DataBusExtensions<NServiceBus.FileShareDataBus> config, string basePath) { }
     }
     public static class ConfigureLicenseExtensions
@@ -115,8 +115,8 @@ namespace NServiceBus
         public void AddSystemMessagesConventions(System.Func<System.Type, bool> definesMessageType) { }
         public bool IsCommandType(System.Type t) { }
         [System.Obsolete("The DataBus feature has been released as a dedicated package, \'NServiceBus.ClaimC" +
-            "heck.DataBus\'. Will be treated as an error from version 10.0.0. Will be removed " +
-            "in version 11.0.0.", false)]
+            "heck\'. Will be treated as an error from version 10.0.0. Will be removed in versi" +
+            "on 11.0.0.", false)]
         public bool IsDataBusProperty(System.Reflection.PropertyInfo property) { }
         public bool IsEventType(System.Type t) { }
         public bool IsInSystemConventionList(System.Type t) { }
@@ -129,8 +129,8 @@ namespace NServiceBus
         public NServiceBus.ConventionsBuilder Add(NServiceBus.IMessageConvention messageConvention) { }
         public NServiceBus.ConventionsBuilder DefiningCommandsAs(System.Func<System.Type, bool> definesCommandType) { }
         [System.Obsolete("The DataBus feature has been released as a dedicated package, \'NServiceBus.ClaimC" +
-            "heck.DataBus\'. Will be treated as an error from version 10.0.0. Will be removed " +
-            "in version 11.0.0.", false)]
+            "heck\'. Will be treated as an error from version 10.0.0. Will be removed in versi" +
+            "on 11.0.0.", false)]
         public NServiceBus.ConventionsBuilder DefiningDataBusPropertiesAs(System.Func<System.Reflection.PropertyInfo, bool> definesDataBusProperty) { }
         public NServiceBus.ConventionsBuilder DefiningEventsAs(System.Func<System.Type, bool> definesEventType) { }
         public NServiceBus.ConventionsBuilder DefiningMessagesAs(System.Func<System.Type, bool> definesMessageType) { }
@@ -169,45 +169,45 @@ namespace NServiceBus
         public System.Func<System.Threading.CancellationToken, System.Threading.Tasks.Task> Stop { get; }
     }
     [System.Obsolete("The DataBus feature has been released as a dedicated package, \'NServiceBus.ClaimC" +
-        "heck.DataBus\'. Will be treated as an error from version 10.0.0. Will be removed " +
-        "in version 11.0.0.", false)]
+        "heck\'. Will be treated as an error from version 10.0.0. Will be removed in versi" +
+        "on 11.0.0.", false)]
     public class DataBusProperty<T> : NServiceBus.IDataBusProperty
         where T :  class
     {
         [System.Obsolete("The DataBus feature has been released as a dedicated package, \'NServiceBus.ClaimC" +
-            "heck.DataBus\'. Will be treated as an error from version 10.0.0. Will be removed " +
-            "in version 11.0.0.", false)]
+            "heck\'. Will be treated as an error from version 10.0.0. Will be removed in versi" +
+            "on 11.0.0.", false)]
         public DataBusProperty() { }
         [System.Obsolete("The DataBus feature has been released as a dedicated package, \'NServiceBus.ClaimC" +
-            "heck.DataBus\'. Will be treated as an error from version 10.0.0. Will be removed " +
-            "in version 11.0.0.", false)]
+            "heck\'. Will be treated as an error from version 10.0.0. Will be removed in versi" +
+            "on 11.0.0.", false)]
         public DataBusProperty(T value) { }
         [System.Obsolete("The DataBus feature has been released as a dedicated package, \'NServiceBus.ClaimC" +
-            "heck.DataBus\'. Will be treated as an error from version 10.0.0. Will be removed " +
-            "in version 11.0.0.", false)]
+            "heck\'. Will be treated as an error from version 10.0.0. Will be removed in versi" +
+            "on 11.0.0.", false)]
         public bool HasValue { get; set; }
         [System.Obsolete("The DataBus feature has been released as a dedicated package, \'NServiceBus.ClaimC" +
-            "heck.DataBus\'. Will be treated as an error from version 10.0.0. Will be removed " +
-            "in version 11.0.0.", false)]
+            "heck\'. Will be treated as an error from version 10.0.0. Will be removed in versi" +
+            "on 11.0.0.", false)]
         public string Key { get; set; }
         [System.Obsolete("The DataBus feature has been released as a dedicated package, \'NServiceBus.ClaimC" +
-            "heck.DataBus\'. Will be treated as an error from version 10.0.0. Will be removed " +
-            "in version 11.0.0.", false)]
+            "heck\'. Will be treated as an error from version 10.0.0. Will be removed in versi" +
+            "on 11.0.0.", false)]
         [System.Text.Json.Serialization.JsonIgnore]
         public System.Type Type { get; }
         [System.Obsolete("The DataBus feature has been released as a dedicated package, \'NServiceBus.ClaimC" +
-            "heck.DataBus\'. Will be treated as an error from version 10.0.0. Will be removed " +
-            "in version 11.0.0.", false)]
+            "heck\'. Will be treated as an error from version 10.0.0. Will be removed in versi" +
+            "on 11.0.0.", false)]
         [System.Text.Json.Serialization.JsonIgnore]
         [System.Xml.Serialization.XmlIgnore]
         public T Value { get; }
         [System.Obsolete("The DataBus feature has been released as a dedicated package, \'NServiceBus.ClaimC" +
-            "heck.DataBus\'. Will be treated as an error from version 10.0.0. Will be removed " +
-            "in version 11.0.0.", false)]
+            "heck\'. Will be treated as an error from version 10.0.0. Will be removed in versi" +
+            "on 11.0.0.", false)]
         public object GetValue() { }
         [System.Obsolete("The DataBus feature has been released as a dedicated package, \'NServiceBus.ClaimC" +
-            "heck.DataBus\'. Will be treated as an error from version 10.0.0. Will be removed " +
-            "in version 11.0.0.", false)]
+            "heck\'. Will be treated as an error from version 10.0.0. Will be removed in versi" +
+            "on 11.0.0.", false)]
         public void SetValue(object valueToSet) { }
     }
     public static class DateTimeOffsetHelper
@@ -322,14 +322,14 @@ namespace NServiceBus
         public System.Collections.Generic.HashSet<System.Type> UnrecoverableExceptionTypes { get; }
     }
     [System.Obsolete("The DataBus feature has been released as a dedicated package, \'NServiceBus.ClaimC" +
-        "heck.DataBus\'. Will be treated as an error from version 10.0.0. Will be removed " +
-        "in version 11.0.0.", false)]
+        "heck\'. Will be treated as an error from version 10.0.0. Will be removed in versi" +
+        "on 11.0.0.", false)]
     public class FileShareDataBus : NServiceBus.DataBus.DataBusDefinition
     {
         public FileShareDataBus() { }
         [System.Obsolete("The DataBus feature has been released as a dedicated package, \'NServiceBus.ClaimC" +
-            "heck.DataBus\'. Will be treated as an error from version 10.0.0. Will be removed " +
-            "in version 11.0.0.", false)]
+            "heck\'. Will be treated as an error from version 10.0.0. Will be removed in versi" +
+            "on 11.0.0.", false)]
         protected override System.Type ProvidedByFeature() { }
     }
     public static class HeaderOptionExtensions
@@ -344,8 +344,8 @@ namespace NServiceBus
         public const string ConversationId = "NServiceBus.ConversationId";
         public const string CorrelationId = "NServiceBus.CorrelationId";
         [System.Obsolete("The DataBus feature has been released as a dedicated package, \'NServiceBus.ClaimC" +
-            "heck.DataBus\'. Will be treated as an error from version 10.0.0. Will be removed " +
-            "in version 11.0.0.", false)]
+            "heck\'. Will be treated as an error from version 10.0.0. Will be removed in versi" +
+            "on 11.0.0.", false)]
         public const string DataBusConfigContentType = "NServiceBus.DataBusConfig.ContentType";
         public const string DelayedRetries = "NServiceBus.Retries";
         public const string DelayedRetriesTimestamp = "NServiceBus.Retries.Timestamp";
@@ -432,29 +432,29 @@ namespace NServiceBus
         System.Func<System.Threading.CancellationToken, System.Threading.Tasks.Task> Stop { get; }
     }
     [System.Obsolete("The DataBus feature has been released as a dedicated package, \'NServiceBus.ClaimC" +
-        "heck.DataBus\'. Will be treated as an error from version 10.0.0. Will be removed " +
-        "in version 11.0.0.", false)]
+        "heck\'. Will be treated as an error from version 10.0.0. Will be removed in versi" +
+        "on 11.0.0.", false)]
     public interface IDataBusProperty
     {
         [System.Obsolete("The DataBus feature has been released as a dedicated package, \'NServiceBus.ClaimC" +
-            "heck.DataBus\'. Will be treated as an error from version 10.0.0. Will be removed " +
-            "in version 11.0.0.", false)]
+            "heck\'. Will be treated as an error from version 10.0.0. Will be removed in versi" +
+            "on 11.0.0.", false)]
         bool HasValue { get; set; }
         [System.Obsolete("The DataBus feature has been released as a dedicated package, \'NServiceBus.ClaimC" +
-            "heck.DataBus\'. Will be treated as an error from version 10.0.0. Will be removed " +
-            "in version 11.0.0.", false)]
+            "heck\'. Will be treated as an error from version 10.0.0. Will be removed in versi" +
+            "on 11.0.0.", false)]
         string Key { get; set; }
         [System.Obsolete("The DataBus feature has been released as a dedicated package, \'NServiceBus.ClaimC" +
-            "heck.DataBus\'. Will be treated as an error from version 10.0.0. Will be removed " +
-            "in version 11.0.0.", false)]
+            "heck\'. Will be treated as an error from version 10.0.0. Will be removed in versi" +
+            "on 11.0.0.", false)]
         System.Type Type { get; }
         [System.Obsolete("The DataBus feature has been released as a dedicated package, \'NServiceBus.ClaimC" +
-            "heck.DataBus\'. Will be treated as an error from version 10.0.0. Will be removed " +
-            "in version 11.0.0.", false)]
+            "heck\'. Will be treated as an error from version 10.0.0. Will be removed in versi" +
+            "on 11.0.0.", false)]
         object GetValue();
         [System.Obsolete("The DataBus feature has been released as a dedicated package, \'NServiceBus.ClaimC" +
-            "heck.DataBus\'. Will be treated as an error from version 10.0.0. Will be removed " +
-            "in version 11.0.0.", false)]
+            "heck\'. Will be treated as an error from version 10.0.0. Will be removed in versi" +
+            "on 11.0.0.", false)]
         void SetValue(object value);
     }
     public interface IDistributionPolicy
@@ -1003,22 +1003,22 @@ namespace NServiceBus
         public static void Options(this NServiceBus.Serialization.SerializationExtensions<NServiceBus.SystemJsonSerializer> config, System.Text.Json.JsonSerializerOptions options) { }
     }
     [System.Obsolete("The DataBus feature has been released as a dedicated package, \'NServiceBus.ClaimC" +
-        "heck.DataBus\'. Will be treated as an error from version 10.0.0. Will be removed " +
-        "in version 11.0.0.", false)]
+        "heck\'. Will be treated as an error from version 10.0.0. Will be removed in versi" +
+        "on 11.0.0.", false)]
     public class SystemJsonDataBusSerializer : NServiceBus.DataBus.IDataBusSerializer
     {
         public SystemJsonDataBusSerializer() { }
         [System.Obsolete("The DataBus feature has been released as a dedicated package, \'NServiceBus.ClaimC" +
-            "heck.DataBus\'. Will be treated as an error from version 10.0.0. Will be removed " +
-            "in version 11.0.0.", false)]
+            "heck\'. Will be treated as an error from version 10.0.0. Will be removed in versi" +
+            "on 11.0.0.", false)]
         public string ContentType { get; }
         [System.Obsolete("The DataBus feature has been released as a dedicated package, \'NServiceBus.ClaimC" +
-            "heck.DataBus\'. Will be treated as an error from version 10.0.0. Will be removed " +
-            "in version 11.0.0.", false)]
+            "heck\'. Will be treated as an error from version 10.0.0. Will be removed in versi" +
+            "on 11.0.0.", false)]
         public object Deserialize(System.Type propertyType, System.IO.Stream stream) { }
         [System.Obsolete("The DataBus feature has been released as a dedicated package, \'NServiceBus.ClaimC" +
-            "heck.DataBus\'. Will be treated as an error from version 10.0.0. Will be removed " +
-            "in version 11.0.0.", false)]
+            "heck\'. Will be treated as an error from version 10.0.0. Will be removed in versi" +
+            "on 11.0.0.", false)]
         public void Serialize(object dataBusProperty, System.IO.Stream stream) { }
     }
     public class SystemJsonSerializer : NServiceBus.Serialization.SerializationDefinition
@@ -1072,17 +1072,17 @@ namespace NServiceBus
     public static class UseDataBusExtensions
     {
         [System.Obsolete("The DataBus feature has been released as a dedicated package, \'NServiceBus.ClaimC" +
-            "heck.DataBus\'. Will be treated as an error from version 10.0.0. Will be removed " +
-            "in version 11.0.0.", false)]
+            "heck\'. Will be treated as an error from version 10.0.0. Will be removed in versi" +
+            "on 11.0.0.", false)]
         public static NServiceBus.DataBus.DataBusExtensions UseDataBus(this NServiceBus.EndpointConfiguration config, System.Func<System.IServiceProvider, NServiceBus.DataBus.IDataBus> dataBusFactory, NServiceBus.DataBus.IDataBusSerializer dataBusSerializer) { }
         [System.Obsolete("The DataBus feature has been released as a dedicated package, \'NServiceBus.ClaimC" +
-            "heck.DataBus\'. Will be treated as an error from version 10.0.0. Will be removed " +
-            "in version 11.0.0.", false)]
+            "heck\'. Will be treated as an error from version 10.0.0. Will be removed in versi" +
+            "on 11.0.0.", false)]
         public static NServiceBus.DataBus.DataBusExtensions<TDataBusDefinition> UseDataBus<TDataBusDefinition>(this NServiceBus.EndpointConfiguration config, NServiceBus.DataBus.IDataBusSerializer dataBusSerializer)
             where TDataBusDefinition : NServiceBus.DataBus.DataBusDefinition, new () { }
         [System.Obsolete("The DataBus feature has been released as a dedicated package, \'NServiceBus.ClaimC" +
-            "heck.DataBus\'. Will be treated as an error from version 10.0.0. Will be removed " +
-            "in version 11.0.0.", false)]
+            "heck\'. Will be treated as an error from version 10.0.0. Will be removed in versi" +
+            "on 11.0.0.", false)]
         public static NServiceBus.DataBus.DataBusExtensions<TDataBusDefinition> UseDataBus<TDataBusDefinition, TDataBusSerializer>(this NServiceBus.EndpointConfiguration config)
             where TDataBusDefinition : NServiceBus.DataBus.DataBusDefinition, new ()
             where TDataBusSerializer : NServiceBus.DataBus.IDataBusSerializer, new () { }
@@ -1142,81 +1142,81 @@ namespace NServiceBus.ConsistencyGuarantees
 namespace NServiceBus.DataBus
 {
     [System.Obsolete("The DataBus feature has been released as a dedicated package, \'NServiceBus.ClaimC" +
-        "heck.DataBus\'. Will be treated as an error from version 10.0.0. Will be removed " +
-        "in version 11.0.0.", false)]
+        "heck\'. Will be treated as an error from version 10.0.0. Will be removed in versi" +
+        "on 11.0.0.", false)]
     public abstract class DataBusDefinition
     {
         protected DataBusDefinition() { }
         [System.Obsolete("The DataBus feature has been released as a dedicated package, \'NServiceBus.ClaimC" +
-            "heck.DataBus\'. Will be treated as an error from version 10.0.0. Will be removed " +
-            "in version 11.0.0.", false)]
+            "heck\'. Will be treated as an error from version 10.0.0. Will be removed in versi" +
+            "on 11.0.0.", false)]
         protected abstract System.Type ProvidedByFeature();
     }
     [System.Obsolete("The DataBus feature has been released as a dedicated package, \'NServiceBus.ClaimC" +
-        "heck.DataBus\'. Will be treated as an error from version 10.0.0. Will be removed " +
-        "in version 11.0.0.", false)]
+        "heck\'. Will be treated as an error from version 10.0.0. Will be removed in versi" +
+        "on 11.0.0.", false)]
     public class DataBusExtensions : NServiceBus.Configuration.AdvancedExtensibility.ExposeSettings
     {
         [System.Obsolete("The DataBus feature has been released as a dedicated package, \'NServiceBus.ClaimC" +
-            "heck.DataBus\'. Will be treated as an error from version 10.0.0. Will be removed " +
-            "in version 11.0.0.", false)]
+            "heck\'. Will be treated as an error from version 10.0.0. Will be removed in versi" +
+            "on 11.0.0.", false)]
         public DataBusExtensions(NServiceBus.Settings.SettingsHolder settings) { }
         [System.Obsolete("The DataBus feature has been released as a dedicated package, \'NServiceBus.ClaimC" +
-            "heck.DataBus\'. Will be treated as an error from version 10.0.0. Will be removed " +
-            "in version 11.0.0.", false)]
+            "heck\'. Will be treated as an error from version 10.0.0. Will be removed in versi" +
+            "on 11.0.0.", false)]
         public NServiceBus.DataBus.DataBusExtensions AddDeserializer<TSerializer>()
             where TSerializer : NServiceBus.DataBus.IDataBusSerializer, new () { }
         [System.Obsolete("The DataBus feature has been released as a dedicated package, \'NServiceBus.ClaimC" +
-            "heck.DataBus\'. Will be treated as an error from version 10.0.0. Will be removed " +
-            "in version 11.0.0.", false)]
+            "heck\'. Will be treated as an error from version 10.0.0. Will be removed in versi" +
+            "on 11.0.0.", false)]
         public NServiceBus.DataBus.DataBusExtensions AddDeserializer<TSerializer>(TSerializer serializer)
             where TSerializer : NServiceBus.DataBus.IDataBusSerializer { }
     }
     [System.Obsolete("The DataBus feature has been released as a dedicated package, \'NServiceBus.ClaimC" +
-        "heck.DataBus\'. Will be treated as an error from version 10.0.0. Will be removed " +
-        "in version 11.0.0.", false)]
+        "heck\'. Will be treated as an error from version 10.0.0. Will be removed in versi" +
+        "on 11.0.0.", false)]
     public class DataBusExtensions<T> : NServiceBus.DataBus.DataBusExtensions
         where T : NServiceBus.DataBus.DataBusDefinition
     {
         [System.Obsolete("The DataBus feature has been released as a dedicated package, \'NServiceBus.ClaimC" +
-            "heck.DataBus\'. Will be treated as an error from version 10.0.0. Will be removed " +
-            "in version 11.0.0.", false)]
+            "heck\'. Will be treated as an error from version 10.0.0. Will be removed in versi" +
+            "on 11.0.0.", false)]
         public DataBusExtensions(NServiceBus.Settings.SettingsHolder settings) { }
     }
     [System.Obsolete("The DataBus feature has been released as a dedicated package, \'NServiceBus.ClaimC" +
-        "heck.DataBus\'. Will be treated as an error from version 10.0.0. Will be removed " +
-        "in version 11.0.0.", false)]
+        "heck\'. Will be treated as an error from version 10.0.0. Will be removed in versi" +
+        "on 11.0.0.", false)]
     public interface IDataBus
     {
         [System.Obsolete("The DataBus feature has been released as a dedicated package, \'NServiceBus.ClaimC" +
-            "heck.DataBus\'. Will be treated as an error from version 10.0.0. Will be removed " +
-            "in version 11.0.0.", false)]
+            "heck\'. Will be treated as an error from version 10.0.0. Will be removed in versi" +
+            "on 11.0.0.", false)]
         System.Threading.Tasks.Task<System.IO.Stream> Get(string key, System.Threading.CancellationToken cancellationToken = default);
         [System.Obsolete("The DataBus feature has been released as a dedicated package, \'NServiceBus.ClaimC" +
-            "heck.DataBus\'. Will be treated as an error from version 10.0.0. Will be removed " +
-            "in version 11.0.0.", false)]
+            "heck\'. Will be treated as an error from version 10.0.0. Will be removed in versi" +
+            "on 11.0.0.", false)]
         System.Threading.Tasks.Task<string> Put(System.IO.Stream stream, System.TimeSpan timeToBeReceived, System.Threading.CancellationToken cancellationToken = default);
         [System.Obsolete("The DataBus feature has been released as a dedicated package, \'NServiceBus.ClaimC" +
-            "heck.DataBus\'. Will be treated as an error from version 10.0.0. Will be removed " +
-            "in version 11.0.0.", false)]
+            "heck\'. Will be treated as an error from version 10.0.0. Will be removed in versi" +
+            "on 11.0.0.", false)]
         System.Threading.Tasks.Task Start(System.Threading.CancellationToken cancellationToken = default);
     }
     [System.Obsolete("The DataBus feature has been released as a dedicated package, \'NServiceBus.ClaimC" +
-        "heck.DataBus\'. Will be treated as an error from version 10.0.0. Will be removed " +
-        "in version 11.0.0.", false)]
+        "heck\'. Will be treated as an error from version 10.0.0. Will be removed in versi" +
+        "on 11.0.0.", false)]
     public interface IDataBusSerializer
     {
         [System.Obsolete("The DataBus feature has been released as a dedicated package, \'NServiceBus.ClaimC" +
-            "heck.DataBus\'. Will be treated as an error from version 10.0.0. Will be removed " +
-            "in version 11.0.0.", false)]
+            "heck\'. Will be treated as an error from version 10.0.0. Will be removed in versi" +
+            "on 11.0.0.", false)]
         string ContentType { get; }
         [System.Obsolete("The DataBus feature has been released as a dedicated package, \'NServiceBus.ClaimC" +
-            "heck.DataBus\'. Will be treated as an error from version 10.0.0. Will be removed " +
-            "in version 11.0.0.", false)]
+            "heck\'. Will be treated as an error from version 10.0.0. Will be removed in versi" +
+            "on 11.0.0.", false)]
         object Deserialize(System.Type propertyType, System.IO.Stream stream);
         [System.Obsolete("The DataBus feature has been released as a dedicated package, \'NServiceBus.ClaimC" +
-            "heck.DataBus\'. Will be treated as an error from version 10.0.0. Will be removed " +
-            "in version 11.0.0.", false)]
+            "heck\'. Will be treated as an error from version 10.0.0. Will be removed in versi" +
+            "on 11.0.0.", false)]
         void Serialize(object databusProperty, System.IO.Stream stream);
     }
 }
@@ -1326,8 +1326,8 @@ namespace NServiceBus.Features
         protected override void Setup(NServiceBus.Features.FeatureConfigurationContext context) { }
     }
     [System.Obsolete("The DataBus feature has been released as a dedicated package, \'NServiceBus.ClaimC" +
-        "heck.DataBus\'. Will be treated as an error from version 10.0.0. Will be removed " +
-        "in version 11.0.0.", false)]
+        "heck\'. Will be treated as an error from version 10.0.0. Will be removed in versi" +
+        "on 11.0.0.", false)]
     public class DataBus : NServiceBus.Features.Feature
     {
         protected override void Setup(NServiceBus.Features.FeatureConfigurationContext context) { }
diff --git a/src/NServiceBus.Core/Conventions/Conventions.cs b/src/NServiceBus.Core/Conventions/Conventions.cs
index 7fb1ed6ebf..db841c3d14 100644
--- a/src/NServiceBus.Core/Conventions/Conventions.cs
+++ b/src/NServiceBus.Core/Conventions/Conventions.cs
@@ -145,7 +145,7 @@ public bool IsCommandType(Type t)
     /// Returns true if the given property should be send via the DataBus.
     /// </summary>
     [ObsoleteEx(
-        Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck.DataBus'",
+        Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck'",
         RemoveInVersion = "11",
         TreatAsErrorFromVersion = "10")]
     public bool IsDataBusProperty(PropertyInfo property)
diff --git a/src/NServiceBus.Core/Conventions/ConventionsBuilder.cs b/src/NServiceBus.Core/Conventions/ConventionsBuilder.cs
index 0fea55df7d..2bc38a44ad 100644
--- a/src/NServiceBus.Core/Conventions/ConventionsBuilder.cs
+++ b/src/NServiceBus.Core/Conventions/ConventionsBuilder.cs
@@ -52,7 +52,7 @@ public ConventionsBuilder DefiningEventsAs(Func<Type, bool> definesEventType)
     /// Sets the function to be used to evaluate whether a property should be sent via the DataBus or not.
     /// </summary>
     [ObsoleteEx(
-        Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck.DataBus'",
+        Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck'",
         RemoveInVersion = "11",
         TreatAsErrorFromVersion = "10")]
     public ConventionsBuilder DefiningDataBusPropertiesAs(Func<PropertyInfo, bool> definesDataBusProperty)
diff --git a/src/NServiceBus.Core/DataBus/ConfigureFileShareDataBus.cs b/src/NServiceBus.Core/DataBus/ConfigureFileShareDataBus.cs
index 52bfbd6a24..6a90d5e34c 100644
--- a/src/NServiceBus.Core/DataBus/ConfigureFileShareDataBus.cs
+++ b/src/NServiceBus.Core/DataBus/ConfigureFileShareDataBus.cs
@@ -15,7 +15,7 @@ public static class ConfigureFileShareDataBus
     /// <param name="basePath">The location to which to write/read serialized properties for the databus.</param>
     /// <returns>The configuration.</returns>
     [ObsoleteEx(
-        Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck.DataBus'",
+        Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck'",
         RemoveInVersion = "11",
         TreatAsErrorFromVersion = "10")]
     public static DataBusExtensions<FileShareDataBus> BasePath(this DataBusExtensions<FileShareDataBus> config, string basePath)
diff --git a/src/NServiceBus.Core/DataBus/DataBus.cs b/src/NServiceBus.Core/DataBus/DataBus.cs
index 91cf9bc311..926a0b1f8a 100644
--- a/src/NServiceBus.Core/DataBus/DataBus.cs
+++ b/src/NServiceBus.Core/DataBus/DataBus.cs
@@ -13,7 +13,7 @@ namespace NServiceBus.Features;
 /// Used to configure the databus.
 /// </summary>
 [ObsoleteEx(
-    Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck.DataBus'",
+    Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck'",
     RemoveInVersion = "11",
     TreatAsErrorFromVersion = "10")]
 public class DataBus : Feature
diff --git a/src/NServiceBus.Core/DataBus/DataBusDefinition.cs b/src/NServiceBus.Core/DataBus/DataBusDefinition.cs
index 40c5997eda..35d71f8afe 100644
--- a/src/NServiceBus.Core/DataBus/DataBusDefinition.cs
+++ b/src/NServiceBus.Core/DataBus/DataBusDefinition.cs
@@ -6,7 +6,7 @@
 /// Defines a databus that can be used by NServiceBus.
 /// </summary>
 [ObsoleteEx(
-    Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck.DataBus'",
+    Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck'",
     RemoveInVersion = "11",
     TreatAsErrorFromVersion = "10")]
 public abstract class DataBusDefinition
@@ -15,7 +15,7 @@ public abstract class DataBusDefinition
     /// The feature to enable when this databus is selected.
     /// </summary>
     [ObsoleteEx(
-        Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck.DataBus'",
+        Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck'",
         RemoveInVersion = "11",
         TreatAsErrorFromVersion = "10")]
     protected internal abstract Type ProvidedByFeature();
diff --git a/src/NServiceBus.Core/DataBus/DataBusExtensions.cs b/src/NServiceBus.Core/DataBus/DataBusExtensions.cs
index bc0dc3c2db..adf2d622c6 100644
--- a/src/NServiceBus.Core/DataBus/DataBusExtensions.cs
+++ b/src/NServiceBus.Core/DataBus/DataBusExtensions.cs
@@ -11,7 +11,7 @@
 /// </summary>
 /// <typeparam name="T">The databus definition eg <see cref="FileShareDataBus" />.</typeparam>
 [ObsoleteEx(
-    Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck.DataBus'",
+    Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck'",
     RemoveInVersion = "11",
     TreatAsErrorFromVersion = "10")]
 public class DataBusExtensions<T> : DataBusExtensions where T : DataBusDefinition
@@ -20,7 +20,7 @@ public class DataBusExtensions<T> : DataBusExtensions where T : DataBusDefinitio
     /// Default constructor.
     /// </summary>
     [ObsoleteEx(
-        Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck.DataBus'",
+        Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck'",
         RemoveInVersion = "11",
         TreatAsErrorFromVersion = "10")]
     public DataBusExtensions(SettingsHolder settings)
@@ -33,7 +33,7 @@ public DataBusExtensions(SettingsHolder settings)
 /// This class provides implementers of databus with an extension mechanism for custom settings via extension methods.
 /// </summary>
 [ObsoleteEx(
-    Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck.DataBus'",
+    Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck'",
     RemoveInVersion = "11",
     TreatAsErrorFromVersion = "10")]
 public class DataBusExtensions : ExposeSettings
@@ -42,7 +42,7 @@ public class DataBusExtensions : ExposeSettings
     /// Default constructor.
     /// </summary>
     [ObsoleteEx(
-        Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck.DataBus'",
+        Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck'",
         RemoveInVersion = "11",
         TreatAsErrorFromVersion = "10")]
     public DataBusExtensions(SettingsHolder settings)
@@ -54,7 +54,7 @@ public DataBusExtensions(SettingsHolder settings)
     /// Configures additional deserializers to be considered when processing data bus properties. Can be called multiple times.
     /// </summary>
     [ObsoleteEx(
-        Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck.DataBus'",
+        Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck'",
         RemoveInVersion = "11",
         TreatAsErrorFromVersion = "10")]
     public DataBusExtensions AddDeserializer<TSerializer>() where TSerializer : IDataBusSerializer, new()
@@ -68,7 +68,7 @@ public DataBusExtensions(SettingsHolder settings)
     /// Configures additional deserializers to be considered when processing data bus properties. Can be called multiple times.
     /// </summary>
     [ObsoleteEx(
-        Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck.DataBus'",
+        Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck'",
         RemoveInVersion = "11",
         TreatAsErrorFromVersion = "10")]
     public DataBusExtensions AddDeserializer<TSerializer>(TSerializer serializer) where TSerializer : IDataBusSerializer
diff --git a/src/NServiceBus.Core/DataBus/DataBusProperty.cs b/src/NServiceBus.Core/DataBus/DataBusProperty.cs
index cb6dfee68a..579bc01d37 100644
--- a/src/NServiceBus.Core/DataBus/DataBusProperty.cs
+++ b/src/NServiceBus.Core/DataBus/DataBusProperty.cs
@@ -9,7 +9,7 @@
 /// </summary>
 /// <typeparam name="T">Type of data to store in <see cref="IDataBusProperty" />.</typeparam>
 [ObsoleteEx(
-    Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck.DataBus'",
+    Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck'",
     RemoveInVersion = "11",
     TreatAsErrorFromVersion = "10")]
 public class DataBusProperty<T> : IDataBusProperty where T : class
@@ -18,7 +18,7 @@ public class DataBusProperty<T> : IDataBusProperty where T : class
     /// Initializes a <see cref="DataBusProperty{T}" /> with no value set.
     /// </summary>
     [ObsoleteEx(
-        Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck.DataBus'",
+        Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck'",
         RemoveInVersion = "11",
         TreatAsErrorFromVersion = "10")]
     public DataBusProperty() { }
@@ -28,7 +28,7 @@ public DataBusProperty() { }
     /// </summary>
     /// <param name="value">The value to initialize with.</param>
     [ObsoleteEx(
-        Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck.DataBus'",
+        Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck'",
         RemoveInVersion = "11",
         TreatAsErrorFromVersion = "10")]
     public DataBusProperty(T value) => SetValue(value);
@@ -39,7 +39,7 @@ public DataBusProperty() { }
     [JsonIgnore]
     [XmlIgnore]
     [ObsoleteEx(
-        Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck.DataBus'",
+        Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck'",
         RemoveInVersion = "11",
         TreatAsErrorFromVersion = "10")]
     public T Value { get; private set; }
@@ -49,7 +49,7 @@ public DataBusProperty() { }
     /// </summary>
     [JsonIgnore]
     [ObsoleteEx(
-        Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck.DataBus'",
+        Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck'",
         RemoveInVersion = "11",
         TreatAsErrorFromVersion = "10")]
     public Type Type { get; } = typeof(T);
@@ -58,7 +58,7 @@ public DataBusProperty() { }
     /// The <see cref="IDataBusProperty" /> key.
     /// </summary>
     [ObsoleteEx(
-        Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck.DataBus'",
+        Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck'",
         RemoveInVersion = "11",
         TreatAsErrorFromVersion = "10")]
     public string Key { get; set; }
@@ -67,7 +67,7 @@ public DataBusProperty() { }
     /// <code>true</code> if <see cref="IDataBusProperty" /> has a value.
     /// </summary>
     [ObsoleteEx(
-        Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck.DataBus'",
+        Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck'",
         RemoveInVersion = "11",
         TreatAsErrorFromVersion = "10")]
     public bool HasValue { get; set; }
@@ -77,7 +77,7 @@ public DataBusProperty() { }
     /// </summary>
     /// <param name="valueToSet">The value to set.</param>
     [ObsoleteEx(
-        Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck.DataBus'",
+        Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck'",
         RemoveInVersion = "11",
         TreatAsErrorFromVersion = "10")]
     public void SetValue(object valueToSet)
@@ -91,7 +91,7 @@ public void SetValue(object valueToSet)
     /// </summary>
     /// <returns>The value.</returns>
     [ObsoleteEx(
-        Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck.DataBus'",
+        Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck'",
         RemoveInVersion = "11",
         TreatAsErrorFromVersion = "10")]
     public object GetValue() => Value;
diff --git a/src/NServiceBus.Core/DataBus/FileShareDataBus.cs b/src/NServiceBus.Core/DataBus/FileShareDataBus.cs
index 31131198e7..ae8907d8fa 100644
--- a/src/NServiceBus.Core/DataBus/FileShareDataBus.cs
+++ b/src/NServiceBus.Core/DataBus/FileShareDataBus.cs
@@ -8,7 +8,7 @@ namespace NServiceBus;
 /// Base class for data bus definitions.
 /// </summary>
 [ObsoleteEx(
-    Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck.DataBus'",
+    Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck'",
     RemoveInVersion = "11",
     TreatAsErrorFromVersion = "10")]
 public class FileShareDataBus : DataBusDefinition
@@ -17,7 +17,7 @@ public class FileShareDataBus : DataBusDefinition
     /// The feature to enable when this databus is selected.
     /// </summary>
     [ObsoleteEx(
-        Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck.DataBus'",
+        Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck'",
         RemoveInVersion = "11",
         TreatAsErrorFromVersion = "10")]
     protected internal override Type ProvidedByFeature()
diff --git a/src/NServiceBus.Core/DataBus/IDataBus.cs b/src/NServiceBus.Core/DataBus/IDataBus.cs
index 746dd7579a..e487d045dd 100644
--- a/src/NServiceBus.Core/DataBus/IDataBus.cs
+++ b/src/NServiceBus.Core/DataBus/IDataBus.cs
@@ -9,7 +9,7 @@ namespace NServiceBus.DataBus;
 /// The main interface for interactions with the databus.
 /// </summary>
 [ObsoleteEx(
-    Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck.DataBus'",
+    Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck'",
     RemoveInVersion = "11",
     TreatAsErrorFromVersion = "10")]
 public interface IDataBus
@@ -21,7 +21,7 @@ public interface IDataBus
     /// <param name="cancellationToken">A <see cref="CancellationToken"/> to observe.</param>
     /// <returns>The data <see cref="Stream" />.</returns>
     [ObsoleteEx(
-        Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck.DataBus'",
+        Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck'",
         RemoveInVersion = "11",
         TreatAsErrorFromVersion = "10")]
     Task<Stream> Get(string key, CancellationToken cancellationToken = default);
@@ -33,7 +33,7 @@ public interface IDataBus
     /// <param name="timeToBeReceived">The time to be received specified on the message type. TimeSpan.MaxValue is the default.</param>
     /// <param name="cancellationToken">A <see cref="CancellationToken"/> to observe.</param>
     [ObsoleteEx(
-        Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck.DataBus'",
+        Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck'",
         RemoveInVersion = "11",
         TreatAsErrorFromVersion = "10")]
     Task<string> Put(Stream stream, TimeSpan timeToBeReceived, CancellationToken cancellationToken = default);
@@ -42,7 +42,7 @@ public interface IDataBus
     /// Called when the bus starts up to allow the data bus to active background tasks.
     /// </summary>
     [ObsoleteEx(
-        Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck.DataBus'",
+        Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck'",
         RemoveInVersion = "11",
         TreatAsErrorFromVersion = "10")]
     Task Start(CancellationToken cancellationToken = default);
diff --git a/src/NServiceBus.Core/DataBus/IDataBusProperty.cs b/src/NServiceBus.Core/DataBus/IDataBusProperty.cs
index 03a27e9af7..86e4d9c521 100644
--- a/src/NServiceBus.Core/DataBus/IDataBusProperty.cs
+++ b/src/NServiceBus.Core/DataBus/IDataBusProperty.cs
@@ -6,7 +6,7 @@
 /// The contract to implement a <see cref="IDataBusProperty" />.
 /// </summary>
 [ObsoleteEx(
-    Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck.DataBus'",
+    Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck'",
     RemoveInVersion = "11",
     TreatAsErrorFromVersion = "10")]
 public interface IDataBusProperty
@@ -15,7 +15,7 @@ public interface IDataBusProperty
     /// The <see cref="IDataBusProperty" /> key.
     /// </summary>
     [ObsoleteEx(
-        Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck.DataBus'",
+        Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck'",
         RemoveInVersion = "11",
         TreatAsErrorFromVersion = "10")]
     string Key { get; set; }
@@ -24,7 +24,7 @@ public interface IDataBusProperty
     /// <code>true</code> if <see cref="IDataBusProperty" /> has a value.
     /// </summary>
     [ObsoleteEx(
-        Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck.DataBus'",
+        Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck'",
         RemoveInVersion = "11",
         TreatAsErrorFromVersion = "10")]
     bool HasValue { get; set; }
@@ -33,7 +33,7 @@ public interface IDataBusProperty
     /// Gets the value of the <see cref="IDataBusProperty" />.
     /// </summary>
     [ObsoleteEx(
-        Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck.DataBus'",
+        Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck'",
         RemoveInVersion = "11",
         TreatAsErrorFromVersion = "10")]
     object GetValue();
@@ -42,7 +42,7 @@ public interface IDataBusProperty
     /// Sets the value for <see cref="IDataBusProperty" />.
     /// </summary>
     [ObsoleteEx(
-        Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck.DataBus'",
+        Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck'",
         RemoveInVersion = "11",
         TreatAsErrorFromVersion = "10")]
     void SetValue(object value);
@@ -51,7 +51,7 @@ public interface IDataBusProperty
     /// The property <see cref="Type" />.
     /// </summary>
     [ObsoleteEx(
-        Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck.DataBus'",
+        Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck'",
         RemoveInVersion = "11",
         TreatAsErrorFromVersion = "10")]
     Type Type { get; }
diff --git a/src/NServiceBus.Core/DataBus/IDatabusSerializer.cs b/src/NServiceBus.Core/DataBus/IDatabusSerializer.cs
index 9babd2856a..e82d710132 100644
--- a/src/NServiceBus.Core/DataBus/IDatabusSerializer.cs
+++ b/src/NServiceBus.Core/DataBus/IDatabusSerializer.cs
@@ -7,7 +7,7 @@ namespace NServiceBus.DataBus;
 /// Interface used for serializing and deserializing of databus properties.
 /// </summary>
 [ObsoleteEx(
-    Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck.DataBus'",
+    Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck'",
     RemoveInVersion = "11",
     TreatAsErrorFromVersion = "10")]
 public interface IDataBusSerializer
@@ -18,7 +18,7 @@ public interface IDataBusSerializer
     /// <param name="databusProperty">The property to serialize.</param>
     /// <param name="stream">The stream to which to write the property.</param>
     [ObsoleteEx(
-        Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck.DataBus'",
+        Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck'",
         RemoveInVersion = "11",
         TreatAsErrorFromVersion = "10")]
     void Serialize(object databusProperty, Stream stream);
@@ -30,7 +30,7 @@ public interface IDataBusSerializer
     /// <param name="propertyType">The type of the property that should be deserialized.</param>
     /// <returns>The deserialized object.</returns>
     [ObsoleteEx(
-        Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck.DataBus'",
+        Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck'",
         RemoveInVersion = "11",
         TreatAsErrorFromVersion = "10")]
     object Deserialize(Type propertyType, Stream stream);
@@ -39,7 +39,7 @@ public interface IDataBusSerializer
     /// The content type this serializer handles. Used to populate the <see cref="Headers.DataBusConfigContentType"/> header.
     /// </summary>
     [ObsoleteEx(
-        Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck.DataBus'",
+        Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck'",
         RemoveInVersion = "11",
         TreatAsErrorFromVersion = "10")]
     string ContentType { get; }
diff --git a/src/NServiceBus.Core/DataBus/SystemJsonDataBusSerializer.cs b/src/NServiceBus.Core/DataBus/SystemJsonDataBusSerializer.cs
index 9b43be464f..bbd9a9c8d2 100644
--- a/src/NServiceBus.Core/DataBus/SystemJsonDataBusSerializer.cs
+++ b/src/NServiceBus.Core/DataBus/SystemJsonDataBusSerializer.cs
@@ -9,7 +9,7 @@
 /// Data bus serialization using the <see cref="JsonSerializer"/> serializer.
 /// </summary>
 [ObsoleteEx(
-    Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck.DataBus'",
+    Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck'",
     RemoveInVersion = "11",
     TreatAsErrorFromVersion = "10")]
 public class SystemJsonDataBusSerializer : IDataBusSerializer
@@ -18,7 +18,7 @@ public class SystemJsonDataBusSerializer : IDataBusSerializer
     /// Serializes the property.
     /// </summary>
     [ObsoleteEx(
-        Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck.DataBus'",
+        Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck'",
         RemoveInVersion = "11",
         TreatAsErrorFromVersion = "10")]
     public void Serialize(object dataBusProperty, Stream stream)
@@ -30,7 +30,7 @@ public void Serialize(object dataBusProperty, Stream stream)
     /// Deserializes the property.
     /// </summary>
     [ObsoleteEx(
-        Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck.DataBus'",
+        Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck'",
         RemoveInVersion = "11",
         TreatAsErrorFromVersion = "10")]
     public object Deserialize(Type propertyType, Stream stream)
@@ -42,7 +42,7 @@ public object Deserialize(Type propertyType, Stream stream)
     /// The content type this serializer handles. Used to populate the <see cref="Headers.DataBusConfigContentType"/> header.
     /// </summary>
     [ObsoleteEx(
-        Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck.DataBus'",
+        Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck'",
         RemoveInVersion = "11",
         TreatAsErrorFromVersion = "10")]
     public string ContentType { get; } = "application/json";
diff --git a/src/NServiceBus.Core/DataBus/UseDataBusExtensions.cs b/src/NServiceBus.Core/DataBus/UseDataBusExtensions.cs
index fff7903425..d8b087d148 100644
--- a/src/NServiceBus.Core/DataBus/UseDataBusExtensions.cs
+++ b/src/NServiceBus.Core/DataBus/UseDataBusExtensions.cs
@@ -14,7 +14,7 @@ public static partial class UseDataBusExtensions
     /// </summary>
     /// <param name="config">The <see cref="EndpointConfiguration" /> instance to apply the settings to.</param>
     [ObsoleteEx(
-        Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck.DataBus'",
+        Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck'",
         RemoveInVersion = "11",
         TreatAsErrorFromVersion = "10")]
     public static DataBusExtensions<TDataBusDefinition> UseDataBus<TDataBusDefinition, TDataBusSerializer>(this EndpointConfiguration config)
@@ -32,7 +32,7 @@ public static DataBusExtensions<TDataBusDefinition> UseDataBus<TDataBusDefinitio
     /// <param name="config">The <see cref="EndpointConfiguration" /> instance to apply the settings to.</param>
     /// <param name="dataBusSerializer">The <see cref="IDataBusSerializer" /> instance to use.</param>
     [ObsoleteEx(
-        Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck.DataBus'",
+        Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck'",
         RemoveInVersion = "11",
         TreatAsErrorFromVersion = "10")]
     public static DataBusExtensions<TDataBusDefinition> UseDataBus<TDataBusDefinition>(this EndpointConfiguration config, IDataBusSerializer dataBusSerializer)
@@ -57,7 +57,7 @@ public static DataBusExtensions<TDataBusDefinition> UseDataBus<TDataBusDefinitio
     /// <param name="dataBusFactory">The factory to create the custom <see cref="IDataBus" /> to use.</param>
     /// <param name="dataBusSerializer">The <see cref="IDataBusSerializer" /> instance to use.</param>
     [ObsoleteEx(
-        Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck.DataBus'",
+        Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck'",
         RemoveInVersion = "11",
         TreatAsErrorFromVersion = "10")]
     public static DataBusExtensions UseDataBus(this EndpointConfiguration config, Func<IServiceProvider, IDataBus> dataBusFactory, IDataBusSerializer dataBusSerializer)
diff --git a/src/NServiceBus.Core/Headers.cs b/src/NServiceBus.Core/Headers.cs
index e5a5d34b8c..edcbb8f45e 100644
--- a/src/NServiceBus.Core/Headers.cs
+++ b/src/NServiceBus.Core/Headers.cs
@@ -254,7 +254,7 @@ public static partial class Headers
     /// The content type used to serialize the data bus properties in the message.
     /// </summary>
     [ObsoleteEx(
-        Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck.DataBus'",
+        Message = "The DataBus feature has been released as a dedicated package, 'NServiceBus.ClaimCheck'",
         RemoveInVersion = "11",
         TreatAsErrorFromVersion = "10")]
     public const string DataBusConfigContentType = "NServiceBus.DataBusConfig.ContentType"; // NOTE: .DataConfig required for compatibility with the Gateway BLOB matching behavior.