diff --git a/src/ntcore/ProtobufTopic.cs b/src/ntcore/ProtobufTopic.cs
index 0c7ee8bc..148b4ce5 100644
--- a/src/ntcore/ProtobufTopic.cs
+++ b/src/ntcore/ProtobufTopic.cs
@@ -7,7 +7,7 @@ namespace NetworkTables;
 
 public sealed class ProtobufTopic<T> : Topic, IEquatable<ProtobufTopic<T>?>, IEqualityOperators<ProtobufTopic<T>?, ProtobufTopic<T>?, bool> where T : IProtobufSerializable<T>
 {
-    public IGenericProtobuf<T> Proto { get; } = T.ProtoGeneric;
+    public IGenericProtobuf<T> Proto { get; } = T.Proto;
 
     private ProtobufTopic(Topic topic) : base(topic.Instance, topic.Handle)
     {
diff --git a/src/wpimath/Geometry/Pose2d.cs b/src/wpimath/Geometry/Pose2d.cs
index 3cbe9b5c..15d555c2 100644
--- a/src/wpimath/Geometry/Pose2d.cs
+++ b/src/wpimath/Geometry/Pose2d.cs
@@ -58,7 +58,7 @@ public partial class Pose2dJsonContext : JsonSerializerContext
 {
 }
 
-public readonly struct Pose2d : IStructSerializable<Pose2d>, IProtobufSerializable<Pose2d>,
+public readonly struct Pose2d : IStructSerializable<Pose2d>, IProtobufSerializable<Pose2d, ProtobufPose2d>,
                                     IMultiplyOperators<Pose2d, double, Pose2d>,
                                     IAdditionOperators<Pose2d, Transform2d, Pose2d>,
                                     ISubtractionOperators<Pose2d, Pose2d, Transform2d>,
@@ -69,7 +69,6 @@ public partial class Pose2dJsonContext : JsonSerializerContext
 {
     public static IStruct<Pose2d> Struct { get; } = new Pose2dStruct();
     public static IProtobuf<Pose2d, ProtobufPose2d> Proto { get; } = new Pose2dProto();
-    static IGenericProtobuf<Pose2d> IProtobufSerializable<Pose2d>.ProtoGeneric => Proto;
 
     [JsonInclude]
     [JsonPropertyName("translation")]
diff --git a/src/wpimath/Geometry/Quaternion.cs b/src/wpimath/Geometry/Quaternion.cs
index 6adef4ca..795331a6 100644
--- a/src/wpimath/Geometry/Quaternion.cs
+++ b/src/wpimath/Geometry/Quaternion.cs
@@ -77,7 +77,6 @@ public partial class QuaternionJsonContext : JsonSerializerContext
 {
     public static IStruct<Quaternion> Struct { get; } = new QuaternionStruct();
     public static IProtobuf<Quaternion, ProtobufQuaternion> Proto { get; } = new QuaternionProto();
-    static IGenericProtobuf<Quaternion> IProtobufSerializable<Quaternion>.ProtoGeneric => Proto;
 
     [JsonInclude]
     public double W { get; init; }
diff --git a/src/wpimath/Geometry/Rotation2d.cs b/src/wpimath/Geometry/Rotation2d.cs
index a6fe0a95..847fc587 100644
--- a/src/wpimath/Geometry/Rotation2d.cs
+++ b/src/wpimath/Geometry/Rotation2d.cs
@@ -68,7 +68,6 @@ public partial class Rotation2dJsonContext : JsonSerializerContext
 {
     public static IStruct<Rotation2d> Struct { get; } = new Rotation2dStruct();
     public static IProtobuf<Rotation2d, ProtobufRotation2d> Proto { get; } = new Rotation2dProto();
-    static IGenericProtobuf<Rotation2d> IProtobufSerializable<Rotation2d>.ProtoGeneric => Proto;
 
     public Rotation2d(Angle angle)
     {
diff --git a/src/wpimath/Geometry/Rotation3d.cs b/src/wpimath/Geometry/Rotation3d.cs
index 70300401..b73e3df4 100644
--- a/src/wpimath/Geometry/Rotation3d.cs
+++ b/src/wpimath/Geometry/Rotation3d.cs
@@ -72,7 +72,6 @@ public partial class Rotation3dJsonContext : JsonSerializerContext
 {
     public static IStruct<Rotation3d> Struct { get; } = new Rotation3dStruct();
     public static IProtobuf<Rotation3d, ProtobufRotation3d> Proto { get; } = new Rotation3dProto();
-    static IGenericProtobuf<Rotation3d> IProtobufSerializable<Rotation3d>.ProtoGeneric => Proto;
 
     [JsonInclude]
     [JsonPropertyName("quaternion")]
diff --git a/src/wpimath/Geometry/Transform2d.cs b/src/wpimath/Geometry/Transform2d.cs
index 45d3b9f9..e34e6dbe 100644
--- a/src/wpimath/Geometry/Transform2d.cs
+++ b/src/wpimath/Geometry/Transform2d.cs
@@ -71,7 +71,6 @@ public partial class Transform2dJsonContext : JsonSerializerContext
 {
     public static IStruct<Transform2d> Struct { get; } = new Transform2dStruct();
     public static IProtobuf<Transform2d, ProtobufTransform2d> Proto { get; } = new Transform2dProto();
-    static IGenericProtobuf<Transform2d> IProtobufSerializable<Transform2d>.ProtoGeneric => Proto;
 
     [JsonInclude]
     [JsonPropertyName("translation")]
diff --git a/src/wpimath/Geometry/Translation2d.cs b/src/wpimath/Geometry/Translation2d.cs
index 6a434e80..aa707757 100644
--- a/src/wpimath/Geometry/Translation2d.cs
+++ b/src/wpimath/Geometry/Translation2d.cs
@@ -58,7 +58,7 @@ public partial class Translation2dJsonContext : JsonSerializerContext
 {
 }
 
-public readonly struct Translation2d : IStructSerializable<Translation2d>, IProtobufSerializable<Translation2d>,
+public readonly struct Translation2d : IStructSerializable<Translation2d>, IProtobufSerializable<Translation2d, ProtobufTranslation2d>,
                                         IAdditionOperators<Translation2d, Translation2d, Translation2d>,
                                     ISubtractionOperators<Translation2d, Translation2d, Translation2d>,
                                     IUnaryNegationOperators<Translation2d, Translation2d>,
@@ -71,7 +71,6 @@ public partial class Translation2dJsonContext : JsonSerializerContext
 {
     public static IStruct<Translation2d> Struct { get; } = new Translation2dStruct();
     public static IProtobuf<Translation2d, ProtobufTranslation2d> Proto { get; } = new Translation2dProto();
-    static IGenericProtobuf<Translation2d> IProtobufSerializable<Translation2d>.ProtoGeneric => Proto;
 
     [JsonIgnore]
     public Length X { get; }
diff --git a/src/wpimath/Geometry/Twist2d.cs b/src/wpimath/Geometry/Twist2d.cs
index c191dcdc..6c474c9d 100644
--- a/src/wpimath/Geometry/Twist2d.cs
+++ b/src/wpimath/Geometry/Twist2d.cs
@@ -71,7 +71,6 @@ public partial class Twist2dJsonContext : JsonSerializerContext
 {
     public static IStruct<Twist2d> Struct { get; } = new Twist2dStruct();
     public static IProtobuf<Twist2d, ProtobufTwist2d> Proto { get; } = new Twist2dProto();
-    static IGenericProtobuf<Twist2d> IProtobufSerializable<Twist2d>.ProtoGeneric => Proto;
 
     [JsonIgnore]
     public Length Dx { get; init; }
diff --git a/src/wpimath/Geometry/Twist3d.cs b/src/wpimath/Geometry/Twist3d.cs
index b095c1e1..3823a7b3 100644
--- a/src/wpimath/Geometry/Twist3d.cs
+++ b/src/wpimath/Geometry/Twist3d.cs
@@ -83,7 +83,6 @@ public partial class Twist3dJsonContext : JsonSerializerContext
 {
     public static IStruct<Twist3d> Struct { get; } = new Twist3dStruct();
     public static IProtobuf<Twist3d, ProtobufTwist3d> Proto { get; } = new Twist3dProto();
-    static IGenericProtobuf<Twist3d> IProtobufSerializable<Twist3d>.ProtoGeneric => Proto;
 
     [JsonIgnore]
     public Length Dx { get; init; }
diff --git a/src/wpiutil/IWPISerializable.cs b/src/wpiutil/IWPISerializable.cs
index cf2892b1..102e1e5b 100644
--- a/src/wpiutil/IWPISerializable.cs
+++ b/src/wpiutil/IWPISerializable.cs
@@ -3,4 +3,4 @@ namespace WPIUtil;
 /// <summary>
 /// Marker interface to indicate a class is serializable using WPI serialization methods.
 /// </summary>
-public interface IWPISerializable<T> { }
+public interface IWPISerializable<T> where T : IWPISerializable<T> { }
diff --git a/src/wpiutil/Logging/ProtobufLogEntry.cs b/src/wpiutil/Logging/ProtobufLogEntry.cs
index 0409b597..a242bc60 100644
--- a/src/wpiutil/Logging/ProtobufLogEntry.cs
+++ b/src/wpiutil/Logging/ProtobufLogEntry.cs
@@ -7,9 +7,9 @@ public sealed class ProtobufLogEntry<T> : DataLogEntry where T : IProtobufSerial
     private readonly ProtobufBuffer<T> m_storage = new();
     private readonly object m_lockObject = new();
 
-    public ProtobufLogEntry(DataLog log, string name, string metadata = "", long timestamp = 0) : base(log, name, T.ProtoGeneric.TypeString, metadata, timestamp)
+    public ProtobufLogEntry(DataLog log, string name, string metadata = "", long timestamp = 0) : base(log, name, T.Proto.TypeString, metadata, timestamp)
     {
-        log.AddSchema(T.ProtoGeneric, timestamp);
+        log.AddSchema(T.Proto, timestamp);
     }
 
     public void Append(T value, long timestamp = 0)
diff --git a/src/wpiutil/Serialization/Protobuf/IProtobufSerializable.cs b/src/wpiutil/Serialization/Protobuf/IProtobufSerializable.cs
index 71167d08..c0321d9e 100644
--- a/src/wpiutil/Serialization/Protobuf/IProtobufSerializable.cs
+++ b/src/wpiutil/Serialization/Protobuf/IProtobufSerializable.cs
@@ -3,11 +3,16 @@
 namespace WPIUtil.Serialization.Protobuf;
 
 public interface IProtobufSerializable<T> : IWPISerializable<T>
+    where T : IProtobufSerializable<T>
 {
-    public static abstract IGenericProtobuf<T> ProtoGeneric { get; }
+    public static abstract IGenericProtobuf<T> Proto { get; }
 }
 
-public interface IProtobufSerializable<T, TProto> : IProtobufSerializable<T> where TProto : IMessage<TProto>
+public interface IProtobufSerializable<T, TProto> : IProtobufSerializable<T>
+    where T : IProtobufSerializable<T, TProto>
+    where TProto : IMessage<TProto>
 {
-    public static abstract IProtobuf<T, TProto> Proto { get; }
+    public static new abstract IProtobuf<T, TProto> Proto { get; }
+
+    static IGenericProtobuf<T> IProtobufSerializable<T>.Proto => T.Proto;
 }
diff --git a/src/wpiutil/Serialization/Protobuf/ProtobufBuffer.cs b/src/wpiutil/Serialization/Protobuf/ProtobufBuffer.cs
index 3fed477a..09b32804 100644
--- a/src/wpiutil/Serialization/Protobuf/ProtobufBuffer.cs
+++ b/src/wpiutil/Serialization/Protobuf/ProtobufBuffer.cs
@@ -6,7 +6,7 @@ public struct ProtobufBuffer<T> where T : IProtobufSerializable<T>
 {
     public ProtobufBuffer()
     {
-        Proto = T.ProtoGeneric;
+        Proto = T.Proto;
         m_msg = Proto.GenericCreateMessage();
     }
 
diff --git a/src/wpiutil/Serialization/Struct/StructSerializable.cs b/src/wpiutil/Serialization/Struct/StructSerializable.cs
index 4e7eeee2..dc8511a8 100644
--- a/src/wpiutil/Serialization/Struct/StructSerializable.cs
+++ b/src/wpiutil/Serialization/Struct/StructSerializable.cs
@@ -1,6 +1,7 @@
 namespace WPIUtil.Serialization.Struct;
 
 public interface IStructSerializable<T> : IWPISerializable<T>
+    where T : IStructSerializable<T>
 {
     public static abstract IStruct<T> Struct { get; }
 }
diff --git a/test/wpimath.test/GenericHelpers.cs b/test/wpimath.test/GenericHelpers.cs
index 6ee0d389..f1581575 100644
--- a/test/wpimath.test/GenericHelpers.cs
+++ b/test/wpimath.test/GenericHelpers.cs
@@ -16,9 +16,9 @@ public static T StructRoundTrip<T>(T start) where T : IStructSerializable<T>
 
     public static T ProtoRoundTrip<T>(T start) where T : IProtobufSerializable<T>
     {
-        var proto = T.ProtoGeneric.GenericCreateMessage();
-        T.ProtoGeneric.GenericPack(proto, start);
-        return T.ProtoGeneric.GenericUnpack(proto);
+        var proto = T.Proto.GenericCreateMessage();
+        T.Proto.GenericPack(proto, start);
+        return T.Proto.GenericUnpack(proto);
     }
 
     public static T ProtoTypedRoundTrip<T, U>(T start) where T : IProtobufSerializable<T, U> where U : IMessage<U>