diff --git a/gtk/gtkbox.c b/gtk/gtkbox.c
index cb68b423b1..b3b4db9518 100644
--- a/gtk/gtkbox.c
+++ b/gtk/gtkbox.c
@@ -28,7 +28,7 @@
  * SECTION:gtkbox
  * @Short_description: A container box
  * @Title: GtkBox
- * @See_also: #GtkFrame, #GtkTable, #GtkLayout
+ * @See_also: #GtkFrame, #GtkGrid, #GtkLayout
  *
  * The GtkBox widget organizes child widgets into a rectangular area.
  *
diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c
index f53e8a5d3c..7ada895fc4 100644
--- a/gtk/gtkcontainer.c
+++ b/gtk/gtkcontainer.c
@@ -73,7 +73,7 @@
  * The second type of container can have more than one child; its purpose is to
  * manage <emphasis>layout</emphasis>. This means that these containers assign
  * sizes and positions to their children. For example, a #GtkHBox arranges its
- * children in a horizontal row, and a #GtkTable arranges the widgets it contains
+ * children in a horizontal row, and a #GtkGrid arranges the widgets it contains
  * in a two-dimensional grid.
  *
  * <refsect2 id="container-geometry-management">
@@ -1481,10 +1481,10 @@ gtk_container_get_border_width (GtkContainer *container)
  *
  * Adds @widget to @container. Typically used for simple containers
  * such as #GtkWindow, #GtkFrame, or #GtkButton; for more complicated
- * layout containers such as #GtkBox or #GtkTable, this function will
+ * layout containers such as #GtkBox or #GtkGrid, this function will
  * pick default packing parameters that may not be correct.  So
  * consider functions such as gtk_box_pack_start() and
- * gtk_table_attach() as an alternative to gtk_container_add() in
+ * gtk_grid_attach() as an alternative to gtk_container_add() in
  * those cases. A widget may be added to only one container at a time;
  * you can't place the same widget inside two different containers.
  **/
diff --git a/gtk/gtkfilechooser.c b/gtk/gtkfilechooser.c
index edad536877..e9487cb841 100644
--- a/gtk/gtkfilechooser.c
+++ b/gtk/gtkfilechooser.c
@@ -178,7 +178,7 @@
  * </example>
  * <note>
  *    If you want to set more than one extra widget in the file
- *    chooser, you can a container such as a #GtkVBox or a #GtkTable
+ *    chooser, you can a container such as a #GtkBox or a #GtkGrid
  *    and include your widgets in it.  Then, set the container as
  *    the whole extra widget.
  * </note>
diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c
index 1f2d33b3c0..3bd5f3b295 100644
--- a/gtk/gtkscrolledwindow.c
+++ b/gtk/gtkscrolledwindow.c
@@ -58,7 +58,7 @@
  * For widgets that lack native scrolling support, the #GtkViewport
  * widget acts as an adaptor class, implementing scrollability for child
  * widgets that lack their own scrolling capabilities. Use #GtkViewport
- * to scroll child widgets such as #GtkTable, #GtkBox, and so on.
+ * to scroll child widgets such as #GtkGrid, #GtkBox, and so on.
  *
  * If a widget has native scrolling abilities, it can be added to the
  * #GtkScrolledWindow with gtk_container_add(). If a widget does not, you
@@ -79,7 +79,7 @@
  *
  * If a #GtkScrolledWindow doesn't behave quite as you would like, or
  * doesn't have exactly the right layout, it's very possible to set up
- * your own scrolling with #GtkScrollbar and for example a #GtkTable.
+ * your own scrolling with #GtkScrollbar and for example a #GtkGrid.
  */
 
 
diff --git a/gtk/gtksizegroup.c b/gtk/gtksizegroup.c
index ba9a803c04..4a5737f606 100644
--- a/gtk/gtksizegroup.c
+++ b/gtk/gtksizegroup.c
@@ -39,7 +39,7 @@
  * #GtkSizeGroup provides a mechanism for grouping a number of widgets
  * together so they all request the same amount of space.  This is
  * typically useful when you want a column of widgets to have the same
- * size, but you can't use a #GtkTable widget.
+ * size, but you can't use a #GtkGrid widget.
  *
  * In detail, the size requested for each widget in a #GtkSizeGroup is
  * the maximum of the sizes that would have been requested for each
diff --git a/gtk/gtkviewport.c b/gtk/gtkviewport.c
index 7aa3a81b36..2d3e6dd092 100644
--- a/gtk/gtkviewport.c
+++ b/gtk/gtkviewport.c
@@ -44,7 +44,7 @@
  * The #GtkViewport widget acts as an adaptor class, implementing
  * scrollability for child widgets that lack their own scrolling
  * capabilities. Use #GtkViewport to scroll child widgets such as
- * #GtkTable, #GtkBox, and so on.
+ * #GtkGrid, #GtkBox, and so on.
  *
  * If a widget has native scrolling abilities, such as #GtkTextView,
  * #GtkTreeView or #GtkIconview, it can be added to a #GtkScrolledWindow