diff --git a/src/CloudNative.CloudEvents.Avro/AvroEventFormatter.cs b/src/CloudNative.CloudEvents.Avro/AvroEventFormatter.cs
index 1099f46..4553932 100644
--- a/src/CloudNative.CloudEvents.Avro/AvroEventFormatter.cs
+++ b/src/CloudNative.CloudEvents.Avro/AvroEventFormatter.cs
@@ -11,7 +11,7 @@
 using System.IO;
 using System.Net.Mime;
 
-namespace CloudNative.CloudEvents
+namespace CloudNative.CloudEvents.Avro
 {
     /// <summary>
     /// Formatter that implements the Avro Event Format.
diff --git a/src/CloudNative.CloudEvents.Avro/CloudNative.CloudEvents.Avro.csproj b/src/CloudNative.CloudEvents.Avro/CloudNative.CloudEvents.Avro.csproj
index 51c23ff..018f8e2 100644
--- a/src/CloudNative.CloudEvents.Avro/CloudNative.CloudEvents.Avro.csproj
+++ b/src/CloudNative.CloudEvents.Avro/CloudNative.CloudEvents.Avro.csproj
@@ -4,7 +4,7 @@
     <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
     <Description>Avro extensions for CloudNative.CloudEvents</Description>
     <PackageTags>cncf;cloudnative;cloudevents;events;avro</PackageTags>
-    <LangVersion>8.0</LangVersion>
+    <LangVersion>10.0</LangVersion>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
diff --git a/src/CloudNative.CloudEvents.Avro/ObsoleteFormatter.cs b/src/CloudNative.CloudEvents.Avro/ObsoleteFormatter.cs
new file mode 100644
index 0000000..a80eb2e
--- /dev/null
+++ b/src/CloudNative.CloudEvents.Avro/ObsoleteFormatter.cs
@@ -0,0 +1,20 @@
+// Copyright 2021 Cloud Native Foundation. 
+// Licensed under the Apache 2.0 license.
+// See LICENSE file in the project root for full license information.
+
+using System;
+
+namespace CloudNative.CloudEvents;
+
+/// <summary>
+/// Formatter that implements the Avro Event Format.
+/// </summary>
+/// <remarks>
+/// This class is the wrong namespace, and is only present for backward compatibility reasons.
+/// Please use CloudNative.CloudEvents.Avro.AvroEventFormatter instead
+/// (which this class derives from for convenience).
+/// </remarks>
+[Obsolete("This class is the wrong namespace, and is only present for backward compatibility reasons. Please use CloudNative.CloudEvents.Avro.AvroEventFormatter.")]
+public class AvroEventFormatter : Avro.AvroEventFormatter
+{
+}