diff --git a/src/hb-blob.cc b/src/hb-blob.cc
index 4b741cae6..521e8b693 100644
--- a/src/hb-blob.cc
+++ b/src/hb-blob.cc
@@ -42,7 +42,7 @@
 
 /**
  * SECTION: hb-blob
- * @title: Blobs
+ * @title: hb_blob_t
  * @short_description: Binary data containers
  * @include: hb.h
  *
diff --git a/src/hb-buffer.cc b/src/hb-buffer.cc
index 7286202a3..d773dd84a 100644
--- a/src/hb-buffer.cc
+++ b/src/hb-buffer.cc
@@ -33,7 +33,7 @@
 
 /**
  * SECTION: hb-buffer
- * @title: Buffers
+ * @title: hb_buffer_t
  * @short_description: Input and output buffers
  * @include: hb.h
  *
diff --git a/src/hb-face.cc b/src/hb-face.cc
index 4695267a3..2f6ccea31 100644
--- a/src/hb-face.cc
+++ b/src/hb-face.cc
@@ -37,8 +37,8 @@
 
 /**
  * SECTION:hb-face
- * @title: Face
- * @short_description: Font face object
+ * @title: hb_face_t
+ * @short_description: Font face objects
  * @include: hb.h
  *
  * Font face is objects represent a single face in a font family.
diff --git a/src/hb-font.cc b/src/hb-font.cc
index 3c7b4a5b0..2ef0ff854 100644
--- a/src/hb-font.cc
+++ b/src/hb-font.cc
@@ -36,8 +36,8 @@
 
 /**
  * SECTION:hb-font
- * @title: Font
- * @short_description: Font object
+ * @title: hb_font_t
+ * @short_description: Font objects
  * @include: hb.h
  *
  * Font objects represent a font face at a certain size and other
diff --git a/src/hb-map.cc b/src/hb-map.cc
index 57d17ba1e..e83396492 100644
--- a/src/hb-map.cc
+++ b/src/hb-map.cc
@@ -29,7 +29,7 @@
 
 /**
  * SECTION:hb-map
- * @title: Map
+ * @title: hb_map_t
  * @short_description: Object representing integer to integer mapping
  * @include: hb.h
  *
diff --git a/src/hb-set.cc b/src/hb-set.cc
index 8b1a359c5..2a4b356c7 100644
--- a/src/hb-set.cc
+++ b/src/hb-set.cc
@@ -29,7 +29,7 @@
 
 /**
  * SECTION:hb-set
- * @title: Set
+ * @title: hb_set_t
  * @short_description: Object representing a set of integers
  * @include: hb.h
  *
diff --git a/src/hb-shape-plan.cc b/src/hb-shape-plan.cc
index 3eacd587b..abffd40d7 100644
--- a/src/hb-shape-plan.cc
+++ b/src/hb-shape-plan.cc
@@ -33,7 +33,7 @@
 
 /**
  * SECTION:hb-shape-plan
- * @title: Shape plan
+ * @title: hb_shape_plan_t
  * @short_description: Object representing a shaping plan
  * @include: hb.h
  *
diff --git a/src/hb-unicode.cc b/src/hb-unicode.cc
index bfa4ca2bc..ca555a8df 100644
--- a/src/hb-unicode.cc
+++ b/src/hb-unicode.cc
@@ -35,7 +35,7 @@
 
 /**
  * SECTION: hb-unicode
- * @title: Unicode functions
+ * @title: hb_unicode_funcs_t
  * @short_description: Unicode character property access
  * @include: hb.h
  *