diff --git a/src/Generation/Generator/Renderer/Internal/ReturnType/Converter/UntypedRecord.cs b/src/Generation/Generator/Renderer/Internal/ReturnType/Converter/UntypedRecord.cs
index 6e1cdb80c..68ecba441 100644
--- a/src/Generation/Generator/Renderer/Internal/ReturnType/Converter/UntypedRecord.cs
+++ b/src/Generation/Generator/Renderer/Internal/ReturnType/Converter/UntypedRecord.cs
@@ -16,8 +16,8 @@ public RenderableReturnType Convert(GirModel.ReturnType returnType)
 
         var typeName = returnType switch
         {
-            { Transfer: Transfer.Full } => Model.TypedRecord.GetFullyQuallifiedOwnedHandle(type),
-            { Transfer: Transfer.None } => Model.TypedRecord.GetFullyQuallifiedUnownedHandle(type),
+            { Transfer: Transfer.Full } => Model.UntypedRecord.GetFullyQuallifiedOwnedHandle(type),
+            { Transfer: Transfer.None } => Model.UntypedRecord.GetFullyQuallifiedUnownedHandle(type),
             _ => throw new Exception($"Unsupported transfer type {returnType.Transfer} for untyped record {type.Name}")
         };
 
diff --git a/src/Generation/Generator/Renderer/Internal/UntypedRecordData.cs b/src/Generation/Generator/Renderer/Internal/UntypedRecordData.cs
index 63f993c86..a8f9757d7 100644
--- a/src/Generation/Generator/Renderer/Internal/UntypedRecordData.cs
+++ b/src/Generation/Generator/Renderer/Internal/UntypedRecordData.cs
@@ -21,7 +21,7 @@ namespace {Namespace.GetInternalName(record.Namespace)};
 
 {PlatformSupportAttribute.Render(record as GirModel.PlatformDependent)}
 [StructLayout(LayoutKind.Sequential)]
-public partial struct {Model.TypedRecord.GetDataName(record)}
+public partial struct {Model.UntypedRecord.GetDataName(record)}
 {{
     {record.Fields
         .Select(x => x.AnyTypeOrCallback)
diff --git a/src/Generation/Generator/Renderer/Internal/UntypedRecordHandle.cs b/src/Generation/Generator/Renderer/Internal/UntypedRecordHandle.cs
index 1251a184e..132dd6b77 100644
--- a/src/Generation/Generator/Renderer/Internal/UntypedRecordHandle.cs
+++ b/src/Generation/Generator/Renderer/Internal/UntypedRecordHandle.cs
@@ -17,7 +17,7 @@ public static string Render(GirModel.Record record)
         var arrayHandleType = Model.UntypedRecord.GetInternalArrayHandle(record);
         var arrayUnownedHandleTypeName = Model.UntypedRecord.GetInternalArrayUnownedHandle(record);
         var arrayOwnedHandleTypeName = Model.UntypedRecord.GetInternalArrayOwnedHandle(record);
-        var fullyQualifiedType = Model.TypedRecord.GetFullyQualifiedPublicClassName(record);
+        var fullyQualifiedType = Model.UntypedRecord.GetFullyQualifiedPublicClassName(record);
         var fullyQuallifiedDataName = Model.UntypedRecord.GetFullyQuallifiedDataName(record);
 
         return $@"using System;
@@ -186,7 +186,7 @@ public class {arrayUnownedHandleTypeName} : {arrayHandleType}
         {{
             var ownedHandle = new {Model.UntypedRecord.GetFullyQuallifiedUnownedHandle(record)}(currentHandle).Copy();
             data[i] = new {fullyQualifiedType}(ownedHandle);
-            currentHandle += Marshal.SizeOf<{Model.TypedRecord.GetFullyQuallifiedDataName(record)}>();
+            currentHandle += Marshal.SizeOf<{Model.UntypedRecord.GetFullyQuallifiedDataName(record)}>();
         }}
 
         return data;
diff --git a/src/Generation/Generator/Renderer/Public/ParameterToNativeExpression/Converter/UntypedRecordArray.cs b/src/Generation/Generator/Renderer/Public/ParameterToNativeExpression/Converter/UntypedRecordArray.cs
index 7eca7bf21..a390775d3 100644
--- a/src/Generation/Generator/Renderer/Public/ParameterToNativeExpression/Converter/UntypedRecordArray.cs
+++ b/src/Generation/Generator/Renderer/Public/ParameterToNativeExpression/Converter/UntypedRecordArray.cs
@@ -89,10 +89,10 @@ private static void StructArray(ParameterToNativeData parameter, IEnumerable<Par
         parameter.SetCallName(() => nativeVariableName);
 
         var nullable = parameter.Parameter.Nullable
-            ? $"{parameterName} is null ? ({Model.TypedRecord.GetFullyQuallifiedArrayHandle(record)}){Model.TypedRecord.GetFullyQuallifiedArrayNullHandle(record)} : "
+            ? $"{parameterName} is null ? ({Model.UntypedRecord.GetFullyQuallifiedArrayHandle(record)}){Model.UntypedRecord.GetFullyQuallifiedArrayNullHandle(record)} : "
             : string.Empty;
 
-        parameter.SetExpression(() => $"var {nativeVariableName} = {nullable} {Model.TypedRecord.GetFullyQuallifiedArrayOwnedHandle(record)}.Create({parameterName});");
+        parameter.SetExpression(() => $"var {nativeVariableName} = {nullable} {Model.UntypedRecord.GetFullyQuallifiedArrayOwnedHandle(record)}.Create({parameterName});");
 
         var lengthIndex = parameter.Parameter.AnyTypeOrVarArgs.AsT0.AsT1.Length ?? throw new Exception("Length missing");
         var lengthParameter = allParameters.ElementAt(lengthIndex);