diff --git a/liblwgeom/cunit/cu_out_geojson.c b/liblwgeom/cunit/cu_out_geojson.c
index 8e954a358..3f5106032 100644
--- a/liblwgeom/cunit/cu_out_geojson.c
+++ b/liblwgeom/cunit/cu_out_geojson.c
@@ -250,10 +250,10 @@ static void out_geojson_test_geoms(void)
 	    "CIRCULARSTRING(-2 0,0 2,2 0,0 2,2 4)",
 	    "lwgeom_to_geojson: 'CircularString' geometry type not supported");
 
-	/* CompoundString */
+	/* CompoundCurve */
 	do_geojson_unsupported(
 	    "COMPOUNDCURVE(CIRCULARSTRING(0 0,1 1,1 0),(1 0,0 1))",
-	    "lwgeom_to_geojson: 'CompoundString' geometry type not supported");
+	    "lwgeom_to_geojson: 'CompoundCurve' geometry type not supported");
 
 	/* CurvePolygon */
 	do_geojson_unsupported(
diff --git a/liblwgeom/cunit/cu_out_gml.c b/liblwgeom/cunit/cu_out_gml.c
index 5f7aab424..7b08d0267 100644
--- a/liblwgeom/cunit/cu_out_gml.c
+++ b/liblwgeom/cunit/cu_out_gml.c
@@ -547,14 +547,14 @@ static void out_gml_test_geoms(void)
 	    "CIRCULARSTRING(-2 0,0 2,2 0,0 2,2 4)",
 	    "lwgeom_to_gml3: 'CircularString' geometry type not supported");
 
-	/* GML2 - CompoundString */
+	/* GML2 - CompoundCurve */
 	do_gml2_unsupported(
 	    "COMPOUNDCURVE(CIRCULARSTRING(0 0,1 1,1 0),(1 0,0 1))",
-	    "lwgeom_to_gml2: 'CompoundString' geometry type not supported");
-	/* GML3 - CompoundString */
+	    "lwgeom_to_gml2: 'CompoundCurve' geometry type not supported");
+	/* GML3 - CompoundCurve */
 	do_gml3_unsupported(
 	    "COMPOUNDCURVE(CIRCULARSTRING(0 0,1 1,1 0),(1 0,0 1))",
-	    "lwgeom_to_gml3: 'CompoundString' geometry type not supported");
+	    "lwgeom_to_gml3: 'CompoundCurve' geometry type not supported");
 
 	/* GML2 - CurvePolygon */
 	do_gml2_unsupported(
diff --git a/liblwgeom/cunit/cu_out_kml.c b/liblwgeom/cunit/cu_out_kml.c
index 3608e1c79..369e548ee 100644
--- a/liblwgeom/cunit/cu_out_kml.c
+++ b/liblwgeom/cunit/cu_out_kml.c
@@ -173,10 +173,10 @@ static void out_kml_test_geoms(void)
 	    "CIRCULARSTRING(-2 0,0 2,2 0,0 2,2 4)",
 	    "lwgeom_to_kml2: 'CircularString' geometry type not supported");
 
-	/* CompoundString */
+	/* CompoundCurve */
 	do_kml_unsupported(
 	    "COMPOUNDCURVE(CIRCULARSTRING(0 0,1 1,1 0),(1 0,0 1))",
-	    "lwgeom_to_kml2: 'CompoundString' geometry type not supported");
+	    "lwgeom_to_kml2: 'CompoundCurve' geometry type not supported");
 
 	/* CurvePolygon */
 	do_kml_unsupported(
diff --git a/liblwgeom/cunit/cu_out_svg.c b/liblwgeom/cunit/cu_out_svg.c
index f3efb6f7c..192e7869b 100644
--- a/liblwgeom/cunit/cu_out_svg.c
+++ b/liblwgeom/cunit/cu_out_svg.c
@@ -222,10 +222,10 @@ static void out_svg_test_geoms(void)
 	    "CIRCULARSTRING(-2 0,0 2,2 0,0 2,2 4)",
 	    "lwgeom_to_svg: 'CircularString' geometry type not supported");
 
-	/* CompoundString */
+	/* CompoundCurve */
 	do_svg_unsupported(
 	    "COMPOUNDCURVE(CIRCULARSTRING(0 0,1 1,1 0),(1 0,0 1))",
-	    "lwgeom_to_svg: 'CompoundString' geometry type not supported");
+	    "lwgeom_to_svg: 'CompoundCurve' geometry type not supported");
 
 	/* CurvePolygon */
 	do_svg_unsupported(
diff --git a/liblwgeom/cunit/cu_out_x3d.c b/liblwgeom/cunit/cu_out_x3d.c
index 37526e1a8..5a1f43a5f 100644
--- a/liblwgeom/cunit/cu_out_x3d.c
+++ b/liblwgeom/cunit/cu_out_x3d.c
@@ -149,10 +149,10 @@ static void out_x3d3_test_geoms(void)
 	    "CIRCULARSTRING(-2 0 1,0 2 1,2 0 1,0 2 1,2 4 1)",
 	    "lwgeom_to_x3d3: 'CircularString' geometry type not supported");
 
-	/* CompoundString */
+	/* CompoundCurve */
 	do_x3d3_unsupported(
 	    "COMPOUNDCURVE(CIRCULARSTRING(0 0 1,1 1 1,1 0 1),(1 0 1,0 1 1))",
-	    "lwgeom_to_x3d3: 'CompoundString' geometry type not supported");
+	    "lwgeom_to_x3d3: 'CompoundCurve' geometry type not supported");
 
 }
 
diff --git a/postgis/SERIALIZED_FORM b/postgis/SERIALIZED_FORM
index dde877d50..eb7ff1072 100644
--- a/postgis/SERIALIZED_FORM
+++ b/postgis/SERIALIZED_FORM
@@ -133,9 +133,9 @@ A CircularString geometry is as follows:
         <UINT32> -- number of elements in following ORDINATE_ARRAY
         <ORDINATE_ARRAY>
 
-=CompoundString=
+=CompoundCurve=
 
-A CompoundString geometry is as follows:
+A CompoundCurve geometry is as follows:
 
         <COMMON_HEADER>
         <UINT32> -- number of segments
@@ -165,7 +165,7 @@ A CurvePolygon geometry is as follows:
         One or more geometries as specified by previous uint32:
                 <SERIALIZED_GEOMETRY> -- Must be some combination of 
                                          LineStrings and CircularStrings.
-                                         CompoundString are not yet supported.
+                                         CompoundCurve are not yet supported.
 
 =Collections=