diff --git a/src/libsysprof-analyze/meson.build b/src/libsysprof-analyze/meson.build
index f35a7ade..d803f25a 100644
--- a/src/libsysprof-analyze/meson.build
+++ b/src/libsysprof-analyze/meson.build
@@ -1,12 +1,12 @@
 libsysprof_analyze_public_sources = [
   'sysprof-document.c',
-  'sysprof-capture-frame-object.c',
+  'sysprof-document-frame.c',
 ]
 
 libsysprof_analyze_public_headers = [
   'sysprof-analyze.h',
   'sysprof-document.h',
-  'sysprof-capture-frame-object.h',
+  'sysprof-document-frame.h',
 ]
 
 libsysprof_analyze_deps = [
diff --git a/src/libsysprof-analyze/sysprof-analyze.h b/src/libsysprof-analyze/sysprof-analyze.h
index 8b1dbc3e..9f6a9860 100644
--- a/src/libsysprof-analyze/sysprof-analyze.h
+++ b/src/libsysprof-analyze/sysprof-analyze.h
@@ -25,8 +25,8 @@
 G_BEGIN_DECLS
 
 #define SYSPROF_ANALYZE_INSIDE
-# include "sysprof-capture-frame-object.h"
 # include "sysprof-document.h"
+# include "sysprof-document-frame.h"
 #undef SYSPROF_ANALYZE_INSIDE
 
 G_END_DECLS
diff --git a/src/libsysprof-analyze/sysprof-capture-frame-object-private.h b/src/libsysprof-analyze/sysprof-document-frame-private.h
similarity index 70%
rename from src/libsysprof-analyze/sysprof-capture-frame-object-private.h
rename to src/libsysprof-analyze/sysprof-document-frame-private.h
index 34d6ce2e..74f493b5 100644
--- a/src/libsysprof-analyze/sysprof-capture-frame-object-private.h
+++ b/src/libsysprof-analyze/sysprof-document-frame-private.h
@@ -1,4 +1,4 @@
-/* sysprof-capture-frame-object-private.h
+/* sysprof-document-frame-private.h
  *
  * Copyright 2023 Christian Hergert <chergert@redhat.com>
  *
@@ -18,12 +18,16 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
-#include "sysprof-capture-frame-object.h"
+#pragma once
+
+#include <sysprof-capture.h>
+
+#include "sysprof-document-frame.h"
 
 G_BEGIN_DECLS
 
-SysprofCaptureFrameObject *sysprof_capture_frame_object_new (GMappedFile   *mapped,
-                                                             gconstpointer  data,
-                                                             gboolean       is_native);
+SysprofDocumentFrame *sysprof_document_frame_new (GMappedFile   *mapped,
+                                                  gconstpointer  data,
+                                                  gboolean       is_native);
 
 G_END_DECLS
diff --git a/src/libsysprof-analyze/sysprof-capture-frame-object.c b/src/libsysprof-analyze/sysprof-document-frame.c
similarity index 56%
rename from src/libsysprof-analyze/sysprof-capture-frame-object.c
rename to src/libsysprof-analyze/sysprof-document-frame.c
index 1cf6e983..1dc6ff89 100644
--- a/src/libsysprof-analyze/sysprof-capture-frame-object.c
+++ b/src/libsysprof-analyze/sysprof-document-frame.c
@@ -1,4 +1,4 @@
-/* sysprof-capture-frame-object.c
+/* sysprof-document-frame.c
  *
  * Copyright 2023 Christian Hergert <chergert@redhat.com>
  *
@@ -20,9 +20,9 @@
 
 #include "config.h"
 
-#include "sysprof-capture-frame-object-private.h"
+#include "sysprof-document-frame-private.h"
 
-struct _SysprofCaptureFrameObject
+struct _SysprofDocumentFrame
 {
   GObject parent_instance;
   GMappedFile *mapped_file;
@@ -30,40 +30,40 @@ struct _SysprofCaptureFrameObject
   guint is_native : 1;
 };
 
-G_DEFINE_FINAL_TYPE (SysprofCaptureFrameObject, sysprof_capture_frame_object, G_TYPE_OBJECT)
+G_DEFINE_FINAL_TYPE (SysprofDocumentFrame, sysprof_document_frame, G_TYPE_OBJECT)
 
 static void
-sysprof_capture_frame_object_finalize (GObject *object)
+sysprof_document_frame_finalize (GObject *object)
 {
-  SysprofCaptureFrameObject *self = (SysprofCaptureFrameObject *)object;
+  SysprofDocumentFrame *self = (SysprofDocumentFrame *)object;
 
   g_clear_pointer (&self->mapped_file, g_mapped_file_unref);
   self->frame = NULL;
 
-  G_OBJECT_CLASS (sysprof_capture_frame_object_parent_class)->finalize (object);
+  G_OBJECT_CLASS (sysprof_document_frame_parent_class)->finalize (object);
 }
 
 static void
-sysprof_capture_frame_object_class_init (SysprofCaptureFrameObjectClass *klass)
+sysprof_document_frame_class_init (SysprofDocumentFrameClass *klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-  object_class->finalize = sysprof_capture_frame_object_finalize;
+  object_class->finalize = sysprof_document_frame_finalize;
 }
 
 static void
-sysprof_capture_frame_object_init (SysprofCaptureFrameObject *self)
+sysprof_document_frame_init (SysprofDocumentFrame *self)
 {
 }
 
-SysprofCaptureFrameObject *
-sysprof_capture_frame_object_new (GMappedFile   *mapped_file,
-                                  gconstpointer  data,
-                                  gboolean       is_native)
+SysprofDocumentFrame *
+sysprof_document_frame_new (GMappedFile   *mapped_file,
+                            gconstpointer  data,
+                            gboolean       is_native)
 {
-  SysprofCaptureFrameObject *self;
+  SysprofDocumentFrame *self;
 
-  self = g_object_new (SYSPROF_TYPE_CAPTURE_FRAME_OBJECT, NULL);
+  self = g_object_new (SYSPROF_TYPE_DOCUMENT_FRAME, NULL);
   self->mapped_file = g_mapped_file_ref (mapped_file);
   self->frame = data;
   self->is_native = !!is_native;
diff --git a/src/libsysprof-analyze/sysprof-capture-frame-object.h b/src/libsysprof-analyze/sysprof-document-frame.h
similarity index 67%
rename from src/libsysprof-analyze/sysprof-capture-frame-object.h
rename to src/libsysprof-analyze/sysprof-document-frame.h
index ee64063e..eaca9d51 100644
--- a/src/libsysprof-analyze/sysprof-capture-frame-object.h
+++ b/src/libsysprof-analyze/sysprof-document-frame.h
@@ -1,4 +1,4 @@
-/* sysprof-capture-frame-object.h
+/* sysprof-document-frame.h
  *
  * Copyright 2023 Christian Hergert <chergert@redhat.com>
  *
@@ -20,18 +20,14 @@
 
 #pragma once
 
-#include <gio/gio.h>
-
-#include <sysprof-capture.h>
+#include <glib-object.h>
 
 G_BEGIN_DECLS
 
-#define SYSPROF_TYPE_CAPTURE_FRAME_OBJECT (sysprof_capture_frame_object_get_type())
+#define SYSPROF_TYPE_DOCUMENT_FRAME (sysprof_document_frame_get_type())
 
 SYSPROF_AVAILABLE_IN_ALL
-G_DECLARE_FINAL_TYPE (SysprofCaptureFrameObject, sysprof_capture_frame_object, SYSPROF, CAPTURE_FRAME_OBJECT, GObject)
-
-SYSPROF_AVAILABLE_IN_ALL
-SysprofCaptureFrame *sysprof_capture_frame_object_get_frame (SysprofCaptureFrameObject *self);
+G_DECLARE_FINAL_TYPE (SysprofDocumentFrame, sysprof_document_frame, SYSPROF, CAPTURE_FRAME_OBJECT, GObject)
 
 G_END_DECLS
+
diff --git a/src/libsysprof-analyze/sysprof-document.c b/src/libsysprof-analyze/sysprof-document.c
index d3842526..588d9b75 100644
--- a/src/libsysprof-analyze/sysprof-document.c
+++ b/src/libsysprof-analyze/sysprof-document.c
@@ -24,8 +24,8 @@
 
 #include <glib/gstdio.h>
 
-#include "sysprof-capture-frame-object-private.h"
 #include "sysprof-document.h"
+#include "sysprof-document-frame-private.h"
 
 struct _SysprofDocument
 {
@@ -39,7 +39,7 @@ struct _SysprofDocument
 static GType
 sysprof_document_get_item_type (GListModel *model)
 {
-  return SYSPROF_TYPE_CAPTURE_FRAME_OBJECT;
+  return SYSPROF_TYPE_DOCUMENT_FRAME;
 }
 
 static guint
@@ -57,9 +57,9 @@ sysprof_document_get_item (GListModel *model,
   if (position >= self->frames->len)
     return NULL;
 
-  return sysprof_capture_frame_object_new (self->mapped_file,
-                                           g_ptr_array_index (self->frames, position),
-                                           self->is_native);
+  return sysprof_document_frame_new (self->mapped_file,
+                                     g_ptr_array_index (self->frames, position),
+                                     self->is_native);
 }
 
 static void
diff --git a/src/libsysprof-analyze/tests/test-capture-model.c b/src/libsysprof-analyze/tests/test-capture-model.c
index f240434b..ef144d96 100644
--- a/src/libsysprof-analyze/tests/test-capture-model.c
+++ b/src/libsysprof-analyze/tests/test-capture-model.c
@@ -1,6 +1,8 @@
 #include <errno.h>
 #include <fcntl.h>
+
 #include <sysprof-analyze.h>
+#include <sysprof-capture.h>
 
 int
 main (int argc,
@@ -34,9 +36,9 @@ main (int argc,
 
   for (guint i = 0; i < n_items; i++)
     {
-      SysprofCaptureFrameObject *obj = g_list_model_get_item (G_LIST_MODEL (document), i);
+      SysprofDocumentFrame *frame = g_list_model_get_item (G_LIST_MODEL (document), i);
 
-      g_clear_object (&obj);
+      g_clear_object (&frame);
     }
 
   g_clear_object (&document);