diff --git a/gtk/gtksizegroup.c b/gtk/gtksizegroup.c
index b74edf5109..84dbe46e77 100644
--- a/gtk/gtksizegroup.c
+++ b/gtk/gtksizegroup.c
@@ -93,7 +93,7 @@
  * An example of a UI definition fragment with GtkSizeGroup:
  * |[
  * <object class="GtkSizeGroup">
- *   <property name="mode">GTK_SIZE_GROUP_HORIZONTAL</property>
+ *   <property name="mode">horizontal</property>
  *   <widgets>
  *     <widget name="radio1"/>
  *     <widget name="radio2"/>
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 42ba750375..db3b4c3e94 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -365,7 +365,7 @@
  * |[
  * <interface>
  *   <template class="FooWidget" parent="GtkBox">
- *     <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
+ *     <property name="orientation">horizontal</property>
  *     <property name="spacing">4</property>
  *     <child>
  *       <object class="GtkButton" id="hello_button">
diff --git a/testsuite/gtk/builder.c b/testsuite/gtk/builder.c
index 0b9d928b47..9c3b16f17e 100644
--- a/testsuite/gtk/builder.c
+++ b/testsuite/gtk/builder.c
@@ -360,7 +360,7 @@ test_sizegroup (void)
   const gchar buffer1[] =
     "<interface domain=\"test\">"
     "  <object class=\"GtkSizeGroup\" id=\"sizegroup1\">"
-    "    <property name=\"mode\">GTK_SIZE_GROUP_HORIZONTAL</property>"
+    "    <property name=\"mode\">horizontal</property>"
     "    <widgets>"
     "      <widget name=\"radio1\"/>"
     "      <widget name=\"radio2\"/>"
@@ -383,7 +383,7 @@ test_sizegroup (void)
   const gchar buffer2[] =
     "<interface domain=\"test\">"
     "  <object class=\"GtkSizeGroup\" id=\"sizegroup1\">"
-    "    <property name=\"mode\">GTK_SIZE_GROUP_HORIZONTAL</property>"
+    "    <property name=\"mode\">horizontal</property>"
     "    <widgets>"
     "    </widgets>"
     "   </object>"
@@ -391,14 +391,14 @@ test_sizegroup (void)
   const gchar buffer3[] =
     "<interface domain=\"test\">"
     "  <object class=\"GtkSizeGroup\" id=\"sizegroup1\">"
-    "    <property name=\"mode\">GTK_SIZE_GROUP_HORIZONTAL</property>"
+    "    <property name=\"mode\">horizontal</property>"
     "    <widgets>"
     "      <widget name=\"radio1\"/>"
     "      <widget name=\"radio2\"/>"
     "    </widgets>"
     "  </object>"
     "  <object class=\"GtkSizeGroup\" id=\"sizegroup2\">"
-    "    <property name=\"mode\">GTK_SIZE_GROUP_HORIZONTAL</property>"
+    "    <property name=\"mode\">horizontal</property>"
     "    <widgets>"
     "      <widget name=\"radio1\"/>"
     "      <widget name=\"radio2\"/>"
@@ -833,7 +833,7 @@ test_construct_only_property (void)
   const gchar buffer[] =
     "<interface>"
     "  <object class=\"GtkWindow\" id=\"window1\">"
-    "    <property name=\"type\">GTK_WINDOW_POPUP</property>"
+    "    <property name=\"type\">popup</property>"
     "  </object>"
     "</interface>";
   const gchar buffer2[] =