diff --git a/docs/reference/matrix-glib/matrix-glib-docs.xml b/docs/reference/matrix-glib/matrix-glib-docs.xml
index df707be..658e1c1 100644
--- a/docs/reference/matrix-glib/matrix-glib-docs.xml
+++ b/docs/reference/matrix-glib/matrix-glib-docs.xml
@@ -18,8 +18,8 @@
 
   <chapter>
     <title>Matrix Client</title>
+    <xi:include href="xml/matrix-types.xml"/>
     <xi:include href="xml/matrix-client.xml"/>
-    <xi:include href="xml/matrix-api-types.xml"/>
     <xi:include href="xml/matrix-api.xml"/>
     <xi:include href="xml/matrix-http-api.xml"/>
     <xi:include href="xml/matrix-version.xml"/>
diff --git a/docs/reference/matrix-glib/matrix-glib-sections.txt b/docs/reference/matrix-glib/matrix-glib-sections.txt
index 390e436..9a30cc2 100644
--- a/docs/reference/matrix-glib/matrix-glib-sections.txt
+++ b/docs/reference/matrix-glib/matrix-glib-sections.txt
@@ -18,8 +18,8 @@ matrix_client_get_type
 </SECTION>
 
 <SECTION>
-<FILE>matrix-api-types</FILE>
-<TITLE>Fundamental types for MatrixAPI</TITLE>
+<FILE>matrix-types</FILE>
+<TITLE>Fundamental types for the Matrix GLib SDK</TITLE>
 
 <SUBSECTION>
 MatrixAPIError
diff --git a/src/Makefile.am b/src/Makefile.am
index 77a84b8..387b8b6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,8 +4,8 @@ lib_LTLIBRARIES = libmatrix-glib-0.0.la
 bin_PROGRAMS = test-api-client
 
 INST_H_SRC_FILES = \
+	matrix-types.h \
 	matrix-api.h \
-	matrix-api-types.h \
 	matrix-http-api.h \
 	matrix-client.h \
 	$(NULL)
@@ -16,14 +16,14 @@ INST_H_BUILT_FILES = \
 	$(NULL)
 
 matrix_enum_headers = \
+	matrix-types.h \
 	matrix-api.h \
-	matrix-api-types.h \
 	$(NULL)
 
 libmatrix_glib_0_0_la_SOURCES = \
 	matrix-version.c \
+	matrix-types.c \
 	matrix-api.c \
-	matrix-api-types.c \
 	matrix-http-api.c \
 	matrix-enumtypes.c \
 	utils.c \
diff --git a/src/matrix-api.h b/src/matrix-api.h
index 0560596..2a2ad29 100644
--- a/src/matrix-api.h
+++ b/src/matrix-api.h
@@ -22,7 +22,7 @@
 #include <glib-object.h>
 #include <json-glib/json-glib.h>
 
-#include "matrix-api-types.h"
+#include "matrix-types.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/matrix-api-types.c b/src/matrix-types.c
similarity index 99%
rename from src/matrix-api-types.c
rename to src/matrix-types.c
index b447275..6863b89 100644
--- a/src/matrix-api-types.c
+++ b/src/matrix-types.c
@@ -16,17 +16,16 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#include "matrix-api-types.h"
+#include "matrix-types.h"
 #include "matrix-enumtypes.h"
 #include "utils.h"
 
 /**
- * SECTION:matrix-api-types
+ * SECTION:matrix-types
  * @title: Generic types
- * @short_description: Generic types for all #MatrixAPI
- *                     implementations
+ * @short_description: Generic types for Matrix GLib SDK calls
  *
- * These are the types used by all #MatrixAPI implementations for
+ * These are the generic types used by many SDK calls for
  * communication with the homeserver.
  */
 
diff --git a/src/matrix-api-types.h b/src/matrix-types.h
similarity index 99%
rename from src/matrix-api-types.h
rename to src/matrix-types.h
index 183f1f1..8dfdaf6 100644
--- a/src/matrix-api-types.h
+++ b/src/matrix-types.h
@@ -16,8 +16,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __MATRIX_API_TYPES_H__
-#define __MATRIX_API_TYPES_H__
+#ifndef __MATRIX_TYPES_H__
+#define __MATRIX_TYPES_H__
 
 #include <glib-object.h>
 #include <json-glib/json-glib.h>
@@ -309,4 +309,4 @@ gchar *matrix_api_state_event_get_json_data(MatrixAPIStateEvent *event,
 
 G_END_DECLS
 
-#endif /* __MATRIX_API_TYPES_H__ */
+#endif /* __MATRIX_TYPES_H__ */