Use GtkFooPrivate instead GtkFooPriv

author: Javier Jardón <jjardon@gnome.org> 2010-08-26 19:15:37 +0200
committer: Javier Jardón <jjardon@gnome.org> 2010-08-27 04:48:23 +0200
commit: 1e5d7c022596b7146638ef8bd74f544725f9bf2b (patch)
tree: 61505bd6664441c672463e0d3c085aa199a8dbd8
parent: c6a44d849424ac77c478d56ff727ebc742d054b0 (diff)
download: gtk+-1e5d7c022596b7146638ef8bd74f544725f9bf2b.tar.gz
98 files changed, 1316 insertions, 1316 deletions
diff --git a/gtk/gtkaccessible.c b/gtk/gtkaccessible.c
index 228f88f1df..532f476e7f 100644
--- a/gtk/gtkaccessible.c
+++ b/gtk/gtkaccessible.c
@@ -35,7 +35,7 @@
  * @widget: The GtkWidget whose properties and features are exported via this
  *   accessible instance
  */
-struct _GtkAccessiblePriv
+struct _GtkAccessiblePrivate
 {
   GtkWidget *widget;
 };
@@ -49,7 +49,7 @@ gtk_accessible_init (GtkAccessible *accesible)
 {
   accesible->priv = G_TYPE_INSTANCE_GET_PRIVATE (accesible,
                                                  GTK_TYPE_ACCESSIBLE,
-                                                 GtkAccessiblePriv);
+                                                 GtkAccessiblePrivate);
 }
 
 static void
@@ -57,7 +57,7 @@ gtk_accessible_class_init (GtkAccessibleClass *klass)
 {
   klass->connect_widget_destroyed = gtk_accessible_real_connect_widget_destroyed;
 
-  g_type_class_add_private (klass, sizeof (GtkAccessiblePriv));
+  g_type_class_add_private (klass, sizeof (GtkAccessiblePrivate));
 }
 
 /**
@@ -121,7 +121,7 @@ gtk_accessible_connect_widget_destroyed (GtkAccessible *accessible)
 static void
 gtk_accessible_real_connect_widget_destroyed (GtkAccessible *accessible)
 {
-  GtkAccessiblePriv *priv = accessible->priv;
+  GtkAccessiblePrivate *priv = accessible->priv;
 
   if (priv->widget)
   {
diff --git a/gtk/gtkaccessible.h b/gtk/gtkaccessible.h
index 584bcc5c41..d3a154e7ed 100644
--- a/gtk/gtkaccessible.h
+++ b/gtk/gtkaccessible.h
@@ -37,7 +37,7 @@ G_BEGIN_DECLS
 #define GTK_ACCESSIBLE_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_ACCESSIBLE, GtkAccessibleClass))
 
 typedef struct _GtkAccessible                GtkAccessible;
-typedef struct _GtkAccessiblePriv            GtkAccessiblePriv;
+typedef struct _GtkAccessiblePrivate         GtkAccessiblePrivate;
 typedef struct _GtkAccessibleClass           GtkAccessibleClass;
 
   /*
@@ -48,7 +48,7 @@ struct _GtkAccessible
   AtkObject parent;
 
   /*< private >*/
-  GtkAccessiblePriv *priv;
+  GtkAccessiblePrivate *priv;
 };
 
 struct _GtkAccessibleClass
diff --git a/gtk/gtkalignment.c b/gtk/gtkalignment.c
index 2e3a8bb566..c863553924 100644
--- a/gtk/gtkalignment.c
+++ b/gtk/gtkalignment.c
@@ -50,7 +50,7 @@
 #include "gtkintl.h"
 
 
-struct _GtkAlignmentPriv
+struct _GtkAlignmentPrivate
 {
   gfloat        xalign;
   gfloat        yalign;
@@ -221,17 +221,17 @@ gtk_alignment_class_init (GtkAlignmentClass *class)
                                                       0,
                                                       GTK_PARAM_READWRITE));
 
-  g_type_class_add_private (gobject_class, sizeof (GtkAlignmentPriv));
+  g_type_class_add_private (gobject_class, sizeof (GtkAlignmentPrivate));
 }
 
 static void
 gtk_alignment_init (GtkAlignment *alignment)
 {
-  GtkAlignmentPriv *priv;
+  GtkAlignmentPrivate *priv;
 
   alignment->priv = G_TYPE_INSTANCE_GET_PRIVATE (alignment,
                                                  GTK_TYPE_ALIGNMENT,
-                                                 GtkAlignmentPriv);
+                                                 GtkAlignmentPrivate);
   priv = alignment->priv;
 
   gtk_widget_set_has_window (GTK_WIDGET (alignment), FALSE);
@@ -274,7 +274,7 @@ gtk_alignment_new (gfloat xalign,
 		   gfloat yscale)
 {
   GtkAlignment *alignment;
-  GtkAlignmentPriv *priv;
+  GtkAlignmentPrivate *priv;
 
   alignment = g_object_new (GTK_TYPE_ALIGNMENT, NULL);
 
@@ -295,7 +295,7 @@ gtk_alignment_set_property (GObject         *object,
 			    GParamSpec      *pspec)
 {
   GtkAlignment *alignment = GTK_ALIGNMENT (object);
-  GtkAlignmentPriv *priv = alignment->priv;
+  GtkAlignmentPrivate *priv = alignment->priv;
 
   switch (prop_id)
     {
@@ -371,7 +371,7 @@ gtk_alignment_get_property (GObject         *object,
 			    GParamSpec      *pspec)
 {
   GtkAlignment *alignment = GTK_ALIGNMENT (object);
-  GtkAlignmentPriv *priv = alignment->priv;
+  GtkAlignmentPrivate *priv = alignment->priv;
 
   switch (prop_id)
     {
@@ -432,7 +432,7 @@ gtk_alignment_set (GtkAlignment *alignment,
 		   gfloat        xscale,
 		   gfloat        yscale)
 {
-  GtkAlignmentPriv *priv;
+  GtkAlignmentPrivate *priv;
   GtkWidget *child;
 
   g_return_if_fail (GTK_IS_ALIGNMENT (alignment));
@@ -485,7 +485,7 @@ gtk_alignment_size_allocate (GtkWidget     *widget,
 			     GtkAllocation *allocation)
 {
   GtkAlignment *alignment = GTK_ALIGNMENT (widget);
-  GtkAlignmentPriv *priv = alignment->priv;
+  GtkAlignmentPrivate *priv = alignment->priv;
   GtkBin *bin;
   GtkAllocation child_allocation;
   GtkWidget *bin_child;
@@ -576,7 +576,7 @@ gtk_alignment_get_size (GtkSizeRequest *widget,
 			gint           *natural_size)
 {
   GtkAlignment *alignment = GTK_ALIGNMENT (widget);
-  GtkAlignmentPriv *priv = alignment->priv;
+  GtkAlignmentPrivate *priv = alignment->priv;
   GtkWidget *child;
   guint minimum, natural;
 
@@ -651,7 +651,7 @@ gtk_alignment_set_padding (GtkAlignment    *alignment,
 			   guint            padding_left,
 			   guint            padding_right)
 {
-  GtkAlignmentPriv *priv;
+  GtkAlignmentPrivate *priv;
   GtkWidget *child;
   
   g_return_if_fail (GTK_IS_ALIGNMENT (alignment));
@@ -711,7 +711,7 @@ gtk_alignment_get_padding (GtkAlignment    *alignment,
 			   guint           *padding_left,
 			   guint           *padding_right)
 {
-  GtkAlignmentPriv *priv;
+  GtkAlignmentPrivate *priv;
 
   g_return_if_fail (GTK_IS_ALIGNMENT (alignment));
 
diff --git a/gtk/gtkalignment.h b/gtk/gtkalignment.h
index 9b391efda4..498ad93c45 100644
--- a/gtk/gtkalignment.h
+++ b/gtk/gtkalignment.h
@@ -45,16 +45,16 @@ G_BEGIN_DECLS
 #define GTK_ALIGNMENT_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_ALIGNMENT, GtkAlignmentClass))
 
 
-typedef struct _GtkAlignment       GtkAlignment;
-typedef struct _GtkAlignmentPriv   GtkAlignmentPriv;
-typedef struct _GtkAlignmentClass  GtkAlignmentClass;
+typedef struct _GtkAlignment              GtkAlignment;
+typedef struct _GtkAlignmentPrivate       GtkAlignmentPrivate;
+typedef struct _GtkAlignmentClass         GtkAlignmentClass;
 
 struct _GtkAlignment
 {
   GtkBin bin;
 
   /* <private> */
-  GtkAlignmentPriv *priv;
+  GtkAlignmentPrivate *priv;
 };
 
 struct _GtkAlignmentClass
diff --git a/gtk/gtkarrow.c b/gtk/gtkarrow.c
index 7da60bf82c..ed1d69c9a1 100644
--- a/gtk/gtkarrow.c
+++ b/gtk/gtkarrow.c
@@ -52,7 +52,7 @@
 
 #define MIN_ARROW_SIZE  15
 
-struct _GtkArrowPriv
+struct _GtkArrowPrivate
 {
   gint16 arrow_type;
   gint16 shadow_type;
@@ -119,7 +119,7 @@ gtk_arrow_class_init (GtkArrowClass *class)
                                                                0.0, 1.0, 0.7,
                                                                GTK_PARAM_READABLE));
 
-  g_type_class_add_private (class, sizeof (GtkArrowPriv));
+  g_type_class_add_private (class, sizeof (GtkArrowPrivate));
 }
 
 static void
@@ -129,7 +129,7 @@ gtk_arrow_set_property (GObject         *object,
 			GParamSpec      *pspec)
 {
   GtkArrow *arrow = GTK_ARROW (object);
-  GtkArrowPriv *priv = arrow->priv;
+  GtkArrowPrivate *priv = arrow->priv;
 
   switch (prop_id)
     {
@@ -156,7 +156,7 @@ gtk_arrow_get_property (GObject         *object,
 			GParamSpec      *pspec)
 {
   GtkArrow *arrow = GTK_ARROW (object);
-  GtkArrowPriv *priv = arrow->priv;
+  GtkArrowPrivate *priv = arrow->priv;
 
   switch (prop_id)
     {
@@ -175,12 +175,12 @@ gtk_arrow_get_property (GObject         *object,
 static void
 gtk_arrow_init (GtkArrow *arrow)
 {
-  GtkArrowPriv *priv;
+  GtkArrowPrivate *priv;
   gint xpad, ypad;
 
   arrow->priv = G_TYPE_INSTANCE_GET_PRIVATE (arrow,
                                              GTK_TYPE_ARROW,
-                                             GtkArrowPriv);
+                                             GtkArrowPrivate);
   priv = arrow->priv;
 
   gtk_widget_set_has_window (GTK_WIDGET (arrow), FALSE);
@@ -206,7 +206,7 @@ GtkWidget*
 gtk_arrow_new (GtkArrowType  arrow_type,
 	       GtkShadowType shadow_type)
 {
-  GtkArrowPriv *priv;
+  GtkArrowPrivate *priv;
   GtkArrow *arrow;
 
   arrow = g_object_new (GTK_TYPE_ARROW, NULL);
@@ -232,7 +232,7 @@ gtk_arrow_set (GtkArrow      *arrow,
 	       GtkArrowType   arrow_type,
 	       GtkShadowType  shadow_type)
 {
-  GtkArrowPriv *priv;
+  GtkArrowPrivate *priv;
   GtkWidget *widget;
 
   g_return_if_fail (GTK_IS_ARROW (arrow));
@@ -272,7 +272,7 @@ gtk_arrow_expose (GtkWidget      *widget,
   if (gtk_widget_is_drawable (widget))
     {
       GtkArrow *arrow = GTK_ARROW (widget);
-      GtkArrowPriv *priv = arrow->priv;
+      GtkArrowPrivate *priv = arrow->priv;
       GtkMisc *misc = GTK_MISC (widget);
       GtkShadowType shadow_type;
       gint width, height;
diff --git a/gtk/gtkarrow.h b/gtk/gtkarrow.h
index 9188448dfe..dc7f5bd134 100644
--- a/gtk/gtkarrow.h
+++ b/gtk/gtkarrow.h
@@ -45,16 +45,16 @@ G_BEGIN_DECLS
 #define GTK_IS_ARROW_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ARROW))
 #define GTK_ARROW_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_ARROW, GtkArrowClass))
 
-typedef struct _GtkArrow        GtkArrow;
-typedef struct _GtkArrowPriv    GtkArrowPriv;
-typedef struct _GtkArrowClass   GtkArrowClass;
+typedef struct _GtkArrow              GtkArrow;
+typedef struct _GtkArrowPrivate       GtkArrowPrivate;
+typedef struct _GtkArrowClass         GtkArrowClass;
 
 struct _GtkArrow
 {
   GtkMisc misc;
 
   /*< private >*/
-  GtkArrowPriv *priv;
+  GtkArrowPrivate *priv;
 };
 
 struct _GtkArrowClass
diff --git a/gtk/gtkaspectframe.c b/gtk/gtkaspectframe.c
index f2eb19fa81..42b709a50f 100644
--- a/gtk/gtkaspectframe.c
+++ b/gtk/gtkaspectframe.c
@@ -50,7 +50,7 @@
 
 
 
-struct _GtkAspectFramePriv
+struct _GtkAspectFramePrivate
 {
   GtkAllocation center_allocation;
 
@@ -128,17 +128,17 @@ gtk_aspect_frame_class_init (GtkAspectFrameClass *class)
                                                          TRUE,
                                                          GTK_PARAM_READWRITE));
 
-  g_type_class_add_private (class, sizeof (GtkAspectFramePriv));
+  g_type_class_add_private (class, sizeof (GtkAspectFramePrivate));
 }
 
 static void
 gtk_aspect_frame_init (GtkAspectFrame *aspect_frame)
 {
-  GtkAspectFramePriv *priv;
+  GtkAspectFramePrivate *priv;
 
   aspect_frame->priv = G_TYPE_INSTANCE_GET_PRIVATE (aspect_frame,
                                                     GTK_TYPE_ASPECT_FRAME,
-                                                    GtkAspectFramePriv);
+                                                    GtkAspectFramePrivate);
   priv = aspect_frame->priv;
 
   priv->xalign = 0.5;
@@ -154,7 +154,7 @@ gtk_aspect_frame_set_property (GObject         *object,
 			       GParamSpec      *pspec)
 {
   GtkAspectFrame *aspect_frame = GTK_ASPECT_FRAME (object);
-  GtkAspectFramePriv *priv = aspect_frame->priv;
+  GtkAspectFramePrivate *priv = aspect_frame->priv;
   
   switch (prop_id)
     {
@@ -200,7 +200,7 @@ gtk_aspect_frame_get_property (GObject         *object,
 			       GParamSpec      *pspec)
 {
   GtkAspectFrame *aspect_frame = GTK_ASPECT_FRAME (object);
-  GtkAspectFramePriv *priv = aspect_frame->priv;
+  GtkAspectFramePrivate *priv = aspect_frame->priv;
   
   switch (prop_id)
     {
@@ -247,7 +247,7 @@ gtk_aspect_frame_new (const gchar *label,
 		      gboolean     obey_child)
 {
   GtkAspectFrame *aspect_frame;
-  GtkAspectFramePriv *priv;
+  GtkAspectFramePrivate *priv;
 
   aspect_frame = g_object_new (GTK_TYPE_ASPECT_FRAME, NULL);
 
@@ -285,7 +285,7 @@ gtk_aspect_frame_set (GtkAspectFrame *aspect_frame,
 		      gfloat          ratio,
 		      gboolean        obey_child)
 {
-  GtkAspectFramePriv *priv;
+  GtkAspectFramePrivate *priv;
 
   g_return_if_fail (GTK_IS_ASPECT_FRAME (aspect_frame));
 
@@ -334,7 +334,7 @@ gtk_aspect_frame_compute_child_allocation (GtkFrame      *frame,
 					   GtkAllocation *child_allocation)
 {
   GtkAspectFrame *aspect_frame = GTK_ASPECT_FRAME (frame);
-  GtkAspectFramePriv *priv = aspect_frame->priv;
+  GtkAspectFramePrivate *priv = aspect_frame->priv;
   GtkBin *bin = GTK_BIN (frame);
   GtkWidget *child;
   gdouble ratio;
diff --git a/gtk/gtkaspectframe.h b/gtk/gtkaspectframe.h
index 475b0e592a..e1e194e1a5 100644
--- a/gtk/gtkaspectframe.h
+++ b/gtk/gtkaspectframe.h
@@ -44,16 +44,16 @@ G_BEGIN_DECLS
 #define GTK_IS_ASPECT_FRAME_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ASPECT_FRAME))
 #define GTK_ASPECT_FRAME_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_ASPECT_FRAME, GtkAspectFrameClass))
 
-typedef struct _GtkAspectFrame       GtkAspectFrame;
-typedef struct _GtkAspectFramePriv   GtkAspectFramePriv;
-typedef struct _GtkAspectFrameClass  GtkAspectFrameClass;
+typedef struct _GtkAspectFrame              GtkAspectFrame;
+typedef struct _GtkAspectFramePrivate       GtkAspectFramePrivate;
+typedef struct _GtkAspectFrameClass         GtkAspectFrameClass;
 
 struct _GtkAspectFrame
 {
   GtkFrame frame;
 
   /*< private >*/
-  GtkAspectFramePriv *priv;
+  GtkAspectFramePrivate *priv;
 };
 
 struct _GtkAspectFrameClass
diff --git a/gtk/gtkbbox.c b/gtk/gtkbbox.c
index e5c128fa56..f0c893c62c 100644
--- a/gtk/gtkbbox.c
+++ b/gtk/gtkbbox.c
@@ -59,7 +59,7 @@
 #include "gtkintl.h"
 
 
-struct _GtkButtonBoxPriv
+struct _GtkButtonBoxPrivate
 {
   GtkButtonBoxStyle layout_style;
 };
@@ -185,17 +185,17 @@ gtk_button_box_class_init (GtkButtonBoxClass *class)
                                                                     FALSE,
                                                                     GTK_PARAM_READWRITE));
 
-  g_type_class_add_private (class, sizeof (GtkButtonBoxPriv));
+  g_type_class_add_private (class, sizeof (GtkButtonBoxPrivate));
 }
 
 static void
 gtk_button_box_init (GtkButtonBox *button_box)
 {
-  GtkButtonBoxPriv *priv;
+  GtkButtonBoxPrivate *priv;
 
   button_box->priv = G_TYPE_INSTANCE_GET_PRIVATE (button_box,
                                                   GTK_TYPE_BUTTON_BOX,
-                                                  GtkButtonBoxPriv);
+                                                  GtkButtonBoxPrivate);
   priv = button_box->priv;
 
   gtk_box_set_spacing (GTK_BOX (button_box), 0);
@@ -226,7 +226,7 @@ gtk_button_box_get_property (GObject    *object,
                              GValue     *value,
                              GParamSpec *pspec)
 {
-  GtkButtonBoxPriv *priv = GTK_BUTTON_BOX (object)->priv;
+  GtkButtonBoxPrivate *priv = GTK_BUTTON_BOX (object)->priv;
 
   switch (prop_id)
     {
@@ -303,7 +303,7 @@ void
 gtk_button_box_set_layout (GtkButtonBox      *widget,
                            GtkButtonBoxStyle  layout_style)
 {
-  GtkButtonBoxPriv *priv;
+  GtkButtonBoxPrivate *priv;
 
   g_return_if_fail (GTK_IS_BUTTON_BOX (widget));
 
@@ -404,7 +404,7 @@ gtk_button_box_child_requisition (GtkWidget  *widget,
                                   gint      **widths,
                                   gint      **heights)
 {
-  GtkButtonBoxPriv *priv;
+  GtkButtonBoxPrivate *priv;
   GtkButtonBox *bbox;
   GList *children, *list;
   gint nchildren;
@@ -531,7 +531,7 @@ static void
 gtk_button_box_size_request (GtkWidget      *widget,
                              GtkRequisition *requisition)
 {
-  GtkButtonBoxPriv *priv;
+  GtkButtonBoxPrivate *priv;
   GtkButtonBox *bbox;
   gint nvis_children;
   gint max_size;
@@ -618,7 +618,7 @@ static void
 gtk_button_box_size_allocate (GtkWidget     *widget,
                               GtkAllocation *allocation)
 {
-  GtkButtonBoxPriv *priv;
+  GtkButtonBoxPrivate *priv;
   GtkButtonBox *bbox;
   GList *children, *list;
   GtkAllocation child_allocation;
diff --git a/gtk/gtkbbox.h b/gtk/gtkbbox.h
index 878ba0a162..df842f7fe6 100644
--- a/gtk/gtkbbox.h
+++ b/gtk/gtkbbox.h
@@ -44,16 +44,16 @@ G_BEGIN_DECLS
 #define GTK_BUTTON_BOX_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_BUTTON_BOX, GtkButtonBoxClass))
 
 
-typedef struct _GtkButtonBox       GtkButtonBox;
-typedef struct _GtkButtonBoxPriv   GtkButtonBoxPriv;
-typedef struct _GtkButtonBoxClass  GtkButtonBoxClass;
+typedef struct _GtkButtonBox              GtkButtonBox;
+typedef struct _GtkButtonBoxPrivate       GtkButtonBoxPrivate;
+typedef struct _GtkButtonBoxClass         GtkButtonBoxClass;
 
 struct _GtkButtonBox
 {
   GtkBox box;
 
   /*< private >*/
-  GtkButtonBoxPriv *priv;
+  GtkButtonBoxPrivate *priv;
 };
 
 struct _GtkButtonBoxClass
diff --git a/gtk/gtkbin.c b/gtk/gtkbin.c
index 388ad7a68e..ecc2b99954 100644
--- a/gtk/gtkbin.c
+++ b/gtk/gtkbin.c
@@ -43,7 +43,7 @@
 #include "gtkintl.h"
 
 
-struct _GtkBinPriv
+struct _GtkBinPrivate
 {
   GtkWidget *child;
 };
@@ -88,17 +88,17 @@ gtk_bin_class_init (GtkBinClass *class)
   container_class->forall = gtk_bin_forall;
   container_class->child_type = gtk_bin_child_type;
 
-  g_type_class_add_private (class, sizeof (GtkBinPriv));
+  g_type_class_add_private (class, sizeof (GtkBinPrivate));
 }
 
 static void
 gtk_bin_init (GtkBin *bin)
 {
-  GtkBinPriv *priv;
+  GtkBinPrivate *priv;
 
   bin->priv = G_TYPE_INSTANCE_GET_PRIVATE (bin,
                                            GTK_TYPE_BIN,
-                                           GtkBinPriv);
+                                           GtkBinPrivate);
   priv = bin->priv;
 
   gtk_widget_set_has_window (GTK_WIDGET (bin), FALSE);
@@ -110,7 +110,7 @@ gtk_bin_init (GtkBin *bin)
 static GType
 gtk_bin_child_type (GtkContainer *container)
 {
-  GtkBinPriv *priv = GTK_BIN (container)->priv;
+  GtkBinPrivate *priv = GTK_BIN (container)->priv;
 
   if (!priv->child)
     return GTK_TYPE_WIDGET;
@@ -123,7 +123,7 @@ gtk_bin_add (GtkContainer *container,
 	     GtkWidget    *child)
 {
   GtkBin *bin = GTK_BIN (container);
-  GtkBinPriv *priv = bin->priv;
+  GtkBinPrivate *priv = bin->priv;
 
   if (priv->child != NULL)
     {
@@ -146,7 +146,7 @@ gtk_bin_remove (GtkContainer *container,
 		GtkWidget    *child)
 {
   GtkBin *bin = GTK_BIN (container);
-  GtkBinPriv *priv = bin->priv;
+  GtkBinPrivate *priv = bin->priv;
   gboolean widget_was_visible;
 
   g_return_if_fail (priv->child == child);
@@ -170,7 +170,7 @@ gtk_bin_forall (GtkContainer *container,
 		gpointer      callback_data)
 {
   GtkBin *bin = GTK_BIN (container);
-  GtkBinPriv *priv = bin->priv;
+  GtkBinPrivate *priv = bin->priv;
 
   if (priv->child)
     (* callback) (priv->child, callback_data);
@@ -200,7 +200,7 @@ static GtkSizeRequestMode
 gtk_bin_get_request_mode (GtkSizeRequest      *widget)
 {
   GtkBin *bin = GTK_BIN (widget);
-  GtkBinPriv *priv = bin->priv;
+  GtkBinPrivate *priv = bin->priv;
 
   if (priv->child)
     return gtk_size_request_get_request_mode (GTK_SIZE_REQUEST (priv->child));
@@ -213,7 +213,7 @@ get_child_padding_delta (GtkBin         *bin,
 			 gint           *delta_h,
 			 gint           *delta_v)
 {
-  GtkBinPriv *priv = bin->priv;
+  GtkBinPrivate *priv = bin->priv;
   gint hmin, vmin, child_hmin, child_vmin;
 
   gtk_size_request_get_width (GTK_SIZE_REQUEST (bin), &hmin, NULL);
@@ -233,7 +233,7 @@ gtk_bin_get_width_for_height (GtkSizeRequest      *widget,
 			      gint                *natural_width)
 {
   GtkBin *bin = GTK_BIN (widget);
-  GtkBinPriv *priv = bin->priv;
+  GtkBinPrivate *priv = bin->priv;
   gint    hdelta, vdelta, child_min, child_nat;
 
   if (priv->child)
@@ -261,7 +261,7 @@ gtk_bin_get_height_for_width  (GtkSizeRequest      *widget,
 			       gint                *natural_height)
 {
   GtkBin *bin = GTK_BIN (widget);
-  GtkBinPriv *priv = bin->priv;
+  GtkBinPrivate *priv = bin->priv;
   gint    hdelta, vdelta, child_min, child_nat;
 
   if (priv->child)
diff --git a/gtk/gtkbin.h b/gtk/gtkbin.h
index 80b6846f2d..c264134d18 100644
--- a/gtk/gtkbin.h
+++ b/gtk/gtkbin.h
@@ -45,16 +45,16 @@ G_BEGIN_DECLS
 #define GTK_BIN_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_BIN, GtkBinClass))
 
 
-typedef struct _GtkBin       GtkBin;
-typedef struct _GtkBinPriv   GtkBinPriv;
-typedef struct _GtkBinClass  GtkBinClass;
+typedef struct _GtkBin              GtkBin;
+typedef struct _GtkBinPrivate       GtkBinPrivate;
+typedef struct _GtkBinClass         GtkBinClass;
 
 struct _GtkBin
 {
   GtkContainer container;
 
   /*< private >*/
-  GtkBinPriv *priv;
+  GtkBinPrivate *priv;
 };
 
 struct _GtkBinClass
diff --git a/gtk/gtkbox.c b/gtk/gtkbox.c
index 3abf717690..0e8aa0a76b 100644
--- a/gtk/gtkbox.c
+++ b/gtk/gtkbox.c
@@ -98,7 +98,7 @@ enum {
   CHILD_PROP_POSITION
 };
 
-struct _GtkBoxPriv
+struct _GtkBoxPrivate
 {
   GtkOrientation  orientation;
 
@@ -293,17 +293,17 @@ gtk_box_class_init (GtkBoxClass *class)
 								-1, G_MAXINT, 0,
 								GTK_PARAM_READWRITE));
 
-  g_type_class_add_private (object_class, sizeof (GtkBoxPriv));
+  g_type_class_add_private (object_class, sizeof (GtkBoxPrivate));
 }
 
 static void
 gtk_box_init (GtkBox *box)
 {
-  GtkBoxPriv *private;
+  GtkBoxPrivate *private;
 
   box->priv = G_TYPE_INSTANCE_GET_PRIVATE (box,
                                            GTK_TYPE_BOX,
-                                           GtkBoxPriv);
+                                           GtkBoxPrivate);
   private = box->priv;
 
   gtk_widget_set_has_window (GTK_WIDGET (box), FALSE);
@@ -325,7 +325,7 @@ gtk_box_set_property (GObject      *object,
                       GParamSpec   *pspec)
 {
   GtkBox *box = GTK_BOX (object);
-  GtkBoxPriv *private = box->priv;
+  GtkBoxPrivate *private = box->priv;
 
   switch (prop_id)
     {
@@ -352,7 +352,7 @@ gtk_box_get_property (GObject    *object,
                       GParamSpec *pspec)
 {
   GtkBox *box = GTK_BOX (object);
-  GtkBoxPriv *private = box->priv;
+  GtkBoxPrivate *private = box->priv;
 
   switch (prop_id)
     {
@@ -377,7 +377,7 @@ count_expand_children (GtkBox *box,
                        gint *visible_children,
                        gint *expand_children)
 {
-  GtkBoxPriv  *private = box->priv;
+  GtkBoxPrivate  *private = box->priv;
   GList       *children;
   GtkBoxChild *child;
 
@@ -401,7 +401,7 @@ gtk_box_size_allocate (GtkWidget     *widget,
                        GtkAllocation *allocation)
 {
   GtkBox *box = GTK_BOX (widget);
-  GtkBoxPriv *private = box->priv;
+  GtkBoxPrivate *private = box->priv;
   GtkBoxChild *child;
   GList *children;
   gint nvis_children;
@@ -774,7 +774,7 @@ gtk_box_pack (GtkBox      *box,
               guint        padding,
               GtkPackType  pack_type)
 {
-  GtkBoxPriv *private = box->priv;
+  GtkBoxPrivate *private = box->priv;
   GtkBoxChild *child_info;
 
   g_return_if_fail (GTK_IS_BOX (box));
@@ -818,7 +818,7 @@ gtk_box_size_request_init (GtkSizeRequestIface *iface)
 static GtkSizeRequestMode
 gtk_box_get_request_mode  (GtkSizeRequest  *widget)
 {
-  GtkBoxPriv *private = GTK_BOX (widget)->priv;
+  GtkBoxPrivate *private = GTK_BOX (widget)->priv;
 
   return (private->orientation == GTK_ORIENTATION_VERTICAL) ?
     GTK_SIZE_REQUEST_HEIGHT_FOR_WIDTH : GTK_SIZE_REQUEST_WIDTH_FOR_HEIGHT;
@@ -831,7 +831,7 @@ gtk_box_get_size (GtkSizeRequest      *widget,
 		  gint                *natural_size)
 {
   GtkBox *box;
-  GtkBoxPriv *private;
+  GtkBoxPrivate *private;
   GList *children;
   gint nvis_children;
   gint border_width;
@@ -932,7 +932,7 @@ gtk_box_compute_size_for_opposing_orientation (GtkBox *box,
 					       gint   *minimum_size,
 					       gint   *natural_size)
 {
-  GtkBoxPriv       *private = box->priv;
+  GtkBoxPrivate       *private = box->priv;
   GtkBoxChild      *child;
   GList            *children;
   gint              nvis_children;
@@ -1110,7 +1110,7 @@ gtk_box_compute_size_for_orientation (GtkBox *box,
 				      gint   *minimum_size,
 				      gint   *natural_size)
 {
-  GtkBoxPriv    *private = box->priv;
+  GtkBoxPrivate    *private = box->priv;
   GList         *children;
   gint           nvis_children = 0;
   gint           required_size = 0, required_natural = 0, child_size, child_natural;
@@ -1179,7 +1179,7 @@ gtk_box_get_width_for_height (GtkSizeRequest *widget,
 			      gint           *natural_width)
 {
   GtkBox        *box     = GTK_BOX (widget);
-  GtkBoxPriv    *private = box->priv;
+  GtkBoxPrivate    *private = box->priv;
 
   if (private->orientation == GTK_ORIENTATION_VERTICAL)
     gtk_box_compute_size_for_opposing_orientation (box, height, minimum_width, natural_width); 
@@ -1194,7 +1194,7 @@ gtk_box_get_height_for_width (GtkSizeRequest *widget,
 			      gint           *natural_height)
 {
   GtkBox        *box     = GTK_BOX (widget);
-  GtkBoxPriv    *private = box->priv;
+  GtkBoxPrivate    *private = box->priv;
 
   if (private->orientation == GTK_ORIENTATION_HORIZONTAL)
     gtk_box_compute_size_for_opposing_orientation (box, width, minimum_height, natural_height);
@@ -1304,7 +1304,7 @@ void
 gtk_box_set_homogeneous (GtkBox  *box,
 			 gboolean homogeneous)
 {
-  GtkBoxPriv *private;
+  GtkBoxPrivate *private;
 
   g_return_if_fail (GTK_IS_BOX (box));
 
@@ -1347,7 +1347,7 @@ void
 gtk_box_set_spacing (GtkBox *box,
 		     gint    spacing)
 {
-  GtkBoxPriv *private;
+  GtkBoxPrivate *private;
 
   g_return_if_fail (GTK_IS_BOX (box));
 
@@ -1384,7 +1384,7 @@ void
 _gtk_box_set_spacing_set (GtkBox  *box,
                           gboolean spacing_set)
 {
-  GtkBoxPriv *private;
+  GtkBoxPrivate *private;
 
   g_return_if_fail (GTK_IS_BOX (box));
 
@@ -1396,7 +1396,7 @@ _gtk_box_set_spacing_set (GtkBox  *box,
 gboolean
 _gtk_box_get_spacing_set (GtkBox *box)
 {
-  GtkBoxPriv *private;
+  GtkBoxPrivate *private;
 
   g_return_val_if_fail (GTK_IS_BOX (box), FALSE);
 
@@ -1429,7 +1429,7 @@ gtk_box_reorder_child (GtkBox    *box,
 		       GtkWidget *child,
 		       gint       position)
 {
-  GtkBoxPriv *priv;
+  GtkBoxPrivate *priv;
   GList *old_link;
   GList *new_link;
   GtkBoxChild *child_info = NULL;
@@ -1491,7 +1491,7 @@ gtk_box_query_child_packing (GtkBox      *box,
 			     guint       *padding,
 			     GtkPackType *pack_type)
 {
-  GtkBoxPriv *private;
+  GtkBoxPrivate *private;
   GList *list;
   GtkBoxChild *child_info = NULL;
 
@@ -1542,7 +1542,7 @@ gtk_box_set_child_packing (GtkBox      *box,
 			   guint        padding,
 			   GtkPackType  pack_type)
 {
-  GtkBoxPriv *private;
+  GtkBoxPrivate *private;
   GList *list;
   GtkBoxChild *child_info = NULL;
 
@@ -1586,7 +1586,7 @@ gtk_box_set_child_packing (GtkBox      *box,
 void
 _gtk_box_set_old_defaults (GtkBox *box)
 {
-  GtkBoxPriv *private;
+  GtkBoxPrivate *private;
 
   g_return_if_fail (GTK_IS_BOX (box));
 
@@ -1599,7 +1599,7 @@ static void
 gtk_box_add (GtkContainer *container,
 	     GtkWidget    *widget)
 {
-  GtkBoxPriv *priv = GTK_BOX (container)->priv;
+  GtkBoxPrivate *priv = GTK_BOX (container)->priv;
 
   gtk_box_pack_start (GTK_BOX (container), widget,
                       priv->default_expand,
@@ -1612,7 +1612,7 @@ gtk_box_remove (GtkContainer *container,
 		GtkWidget    *widget)
 {
   GtkBox *box = GTK_BOX (container);
-  GtkBoxPriv *priv = box->priv;
+  GtkBoxPrivate *priv = box->priv;
   GtkBoxChild *child;
   GList *children;
 
@@ -1652,7 +1652,7 @@ gtk_box_forall (GtkContainer *container,
 		gpointer      callback_data)
 {
   GtkBox *box = GTK_BOX (container);
-  GtkBoxPriv *priv = box->priv;
+  GtkBoxPrivate *priv = box->priv;
   GtkBoxChild *child;
   GList *children;
 
@@ -1680,7 +1680,7 @@ gtk_box_forall (GtkContainer *container,
 GList *
 _gtk_box_get_children (GtkBox *box)
 {
-  GtkBoxPriv *priv;
+  GtkBoxPrivate *priv;
   GtkBoxChild *child;
   GList *children;
   GList *retval = NULL;
diff --git a/gtk/gtkbox.h b/gtk/gtkbox.h
index 85a2f4a4cb..725debdc97 100644
--- a/gtk/gtkbox.h
+++ b/gtk/gtkbox.h
@@ -46,16 +46,16 @@ G_BEGIN_DECLS
 #define GTK_BOX_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_BOX, GtkBoxClass))
 
 
-typedef struct _GtkBox	      GtkBox;
-typedef struct _GtkBoxPriv    GtkBoxPriv;
-typedef struct _GtkBoxClass   GtkBoxClass;
+typedef struct _GtkBox              GtkBox;
+typedef struct _GtkBoxPrivate       GtkBoxPrivate;
+typedef struct _GtkBoxClass         GtkBoxClass;
 
 struct _GtkBox
 {
   GtkContainer container;
 
   /*< private >*/
-  GtkBoxPriv *priv;
+  GtkBoxPrivate *priv;
 };
 
 struct _GtkBoxClass
diff --git a/gtk/gtkcellrenderer.c b/gtk/gtkcellrenderer.c
index 8c940f24d7..865dd96274 100644
--- a/gtk/gtkcellrenderer.c
+++ b/gtk/gtkcellrenderer.c
@@ -62,7 +62,7 @@ static void gtk_cell_renderer_get_width_for_height     (GtkCellSizeRequest
 
 
 
-struct _GtkCellRendererPriv
+struct _GtkCellRendererPrivate
 {
   gfloat xalign;
   gfloat yalign;
@@ -159,11 +159,11 @@ gtk_cell_renderer_get_type (void)
 static void
 gtk_cell_renderer_init (GtkCellRenderer *cell)
 {
-  GtkCellRendererPriv *priv;
+  GtkCellRendererPrivate *priv;
 
   cell->priv = G_TYPE_INSTANCE_GET_PRIVATE (cell,
                                             GTK_TYPE_CELL_RENDERER,
-                                            GtkCellRendererPriv);
+                                            GtkCellRendererPrivate);
   priv = cell->priv;
 
   priv->mode = GTK_CELL_RENDERER_MODE_INERT;
@@ -390,7 +390,7 @@ gtk_cell_renderer_class_init (GtkCellRendererClass *class)
                 P_("Cell background set"),
                 P_("Whether this tag affects the cell background color"));
 
-  g_type_class_add_private (class, sizeof (GtkCellRendererPriv));
+  g_type_class_add_private (class, sizeof (GtkCellRendererPrivate));
 }
 
 static void
@@ -400,7 +400,7 @@ gtk_cell_renderer_get_property (GObject     *object,
 				GParamSpec  *pspec)
 {
   GtkCellRenderer *cell = GTK_CELL_RENDERER (object);
-  GtkCellRendererPriv *priv = cell->priv;
+  GtkCellRendererPrivate *priv = cell->priv;
 
   switch (param_id)
     {
@@ -469,7 +469,7 @@ gtk_cell_renderer_set_property (GObject      *object,
 				GParamSpec   *pspec)
 {
   GtkCellRenderer *cell = GTK_CELL_RENDERER (object);
-  GtkCellRendererPriv *priv = cell->priv;
+  GtkCellRendererPrivate *priv = cell->priv;
 
   switch (param_id)
     {
@@ -539,7 +539,7 @@ static void
 set_cell_bg_color (GtkCellRenderer *cell,
 		   GdkColor        *color)
 {
-  GtkCellRendererPriv *priv = cell->priv;
+  GtkCellRendererPrivate *priv = cell->priv;
 
   if (color)
     {
@@ -640,7 +640,7 @@ gtk_cell_renderer_render (GtkCellRenderer      *cell,
 			  GtkCellRendererState  flags)
 {
   gboolean selected = FALSE;
-  GtkCellRendererPriv *priv = cell->priv;
+  GtkCellRendererPrivate *priv = cell->priv;
 
   g_return_if_fail (GTK_IS_CELL_RENDERER (cell));
   g_return_if_fail (GTK_CELL_RENDERER_GET_CLASS (cell)->render != NULL);
@@ -693,7 +693,7 @@ gtk_cell_renderer_activate (GtkCellRenderer      *cell,
 			    const GdkRectangle   *cell_area,
 			    GtkCellRendererState  flags)
 {
-  GtkCellRendererPriv *priv;
+  GtkCellRendererPrivate *priv;
 
   g_return_val_if_fail (GTK_IS_CELL_RENDERER (cell), FALSE);
 
@@ -739,7 +739,7 @@ gtk_cell_renderer_start_editing (GtkCellRenderer      *cell,
 				 GtkCellRendererState  flags)
 
 {
-  GtkCellRendererPriv *priv;
+  GtkCellRendererPrivate *priv;
   GtkCellEditable *editable;
 
   g_return_val_if_fail (GTK_IS_CELL_RENDERER (cell), NULL);
@@ -782,7 +782,7 @@ gtk_cell_renderer_set_fixed_size (GtkCellRenderer *cell,
 				  gint             width,
 				  gint             height)
 {
-  GtkCellRendererPriv *priv;
+  GtkCellRendererPrivate *priv;
 
   g_return_if_fail (GTK_IS_CELL_RENDERER (cell));
   g_return_if_fail (width >= -1 && height >= -1);
@@ -822,7 +822,7 @@ gtk_cell_renderer_get_fixed_size (GtkCellRenderer *cell,
 				  gint            *width,
 				  gint            *height)
 {
-  GtkCellRendererPriv *priv;
+  GtkCellRendererPrivate *priv;
 
   g_return_if_fail (GTK_IS_CELL_RENDERER (cell));
 
@@ -849,7 +849,7 @@ gtk_cell_renderer_set_alignment (GtkCellRenderer *cell,
                                  gfloat           xalign,
                                  gfloat           yalign)
 {
-  GtkCellRendererPriv *priv;
+  GtkCellRendererPrivate *priv;
 
   g_return_if_fail (GTK_IS_CELL_RENDERER (cell));
   g_return_if_fail (xalign >= 0.0 && xalign <= 1.0);
@@ -892,7 +892,7 @@ gtk_cell_renderer_get_alignment (GtkCellRenderer *cell,
                                  gfloat          *xalign,
                                  gfloat          *yalign)
 {
-  GtkCellRendererPriv *priv;
+  GtkCellRendererPrivate *priv;
 
   g_return_if_fail (GTK_IS_CELL_RENDERER (cell));
 
@@ -919,7 +919,7 @@ gtk_cell_renderer_set_padding (GtkCellRenderer *cell,
                                gint             xpad,
                                gint             ypad)
 {
-  GtkCellRendererPriv *priv;
+  GtkCellRendererPrivate *priv;
 
   g_return_if_fail (GTK_IS_CELL_RENDERER (cell));
   g_return_if_fail (xpad >= 0 && xpad >= 0);
@@ -961,7 +961,7 @@ gtk_cell_renderer_get_padding (GtkCellRenderer *cell,
                                gint            *xpad,
                                gint            *ypad)
 {
-  GtkCellRendererPriv *priv;
+  GtkCellRendererPrivate *priv;
 
   g_return_if_fail (GTK_IS_CELL_RENDERER (cell));
 
@@ -986,7 +986,7 @@ void
 gtk_cell_renderer_set_visible (GtkCellRenderer *cell,
                                gboolean         visible)
 {
-  GtkCellRendererPriv *priv;
+  GtkCellRendererPrivate *priv;
 
   g_return_if_fail (GTK_IS_CELL_RENDERER (cell));
 
@@ -1030,7 +1030,7 @@ void
 gtk_cell_renderer_set_sensitive (GtkCellRenderer *cell,
                                  gboolean         sensitive)
 {
-  GtkCellRendererPriv *priv;
+  GtkCellRendererPrivate *priv;
 
   g_return_if_fail (GTK_IS_CELL_RENDERER (cell));
 
@@ -1080,7 +1080,7 @@ void
 gtk_cell_renderer_stop_editing (GtkCellRenderer *cell,
 				gboolean         canceled)
 {
-  GtkCellRendererPriv *priv;
+  GtkCellRendererPrivate *priv;
 
   g_return_if_fail (GTK_IS_CELL_RENDERER (cell));
 
@@ -1199,7 +1199,7 @@ _gtk_cell_renderer_calc_offset    (GtkCellRenderer      *cell,
 				   gint                 *x_offset,
 				   gint                 *y_offset)
 { 
-  GtkCellRendererPriv *priv;
+  GtkCellRendererPrivate *priv;
 
   g_return_if_fail (GTK_IS_CELL_RENDERER (cell));
   g_return_if_fail (cell_area != NULL);
diff --git a/gtk/gtkcellrenderer.h b/gtk/gtkcellrenderer.h
index fac5b8daf9..837b7ae13f 100644
--- a/gtk/gtkcellrenderer.h
+++ b/gtk/gtkcellrenderer.h
@@ -52,16 +52,16 @@ typedef enum
 #define GTK_IS_CELL_RENDERER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CELL_RENDERER))
 #define GTK_CELL_RENDERER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_CELL_RENDERER, GtkCellRendererClass))
 
-typedef struct _GtkCellRenderer      GtkCellRenderer;
-typedef struct _GtkCellRendererPriv  GtkCellRendererPriv;
-typedef struct _GtkCellRendererClass GtkCellRendererClass;
+typedef struct _GtkCellRenderer              GtkCellRenderer;
+typedef struct _GtkCellRendererPrivate       GtkCellRendererPrivate;
+typedef struct _GtkCellRendererClass         GtkCellRendererClass;
 
 struct _GtkCellRenderer
 {
   GtkObject parent;
 
   /* <private> */
-  GtkCellRendererPriv *priv;
+  GtkCellRendererPrivate *priv;
 };
 
 struct _GtkCellRendererClass
diff --git a/gtk/gtkcellrendereraccel.c b/gtk/gtkcellrendereraccel.c
index 2b8f7dbb03..b5f58574f1 100644
--- a/gtk/gtkcellrendereraccel.c
+++ b/gtk/gtkcellrendereraccel.c
@@ -71,7 +71,7 @@ enum {
   PROP_ACCEL_MODE
 };
 
-struct _GtkCellRendererAccelPriv
+struct _GtkCellRendererAccelPrivate
 {
   GtkCellRendererAccelMode accel_mode;
 
@@ -99,7 +99,7 @@ gtk_cell_renderer_accel_init (GtkCellRendererAccel *cell_accel)
 
   cell_accel->priv = G_TYPE_INSTANCE_GET_PRIVATE (cell_accel,
                                                   GTK_TYPE_CELL_RENDERER_ACCEL,
-                                                  GtkCellRendererAccelPriv);
+                                                  GtkCellRendererAccelPrivate);
 
   text = convert_keysym_state_to_string (cell_accel, 0, 0, 0);
   g_object_set (cell_accel, "text", text, NULL);
@@ -234,7 +234,7 @@ gtk_cell_renderer_accel_class_init (GtkCellRendererAccelClass *cell_accel_class)
 					 G_TYPE_NONE, 1,
 					 G_TYPE_STRING);
 
-  g_type_class_add_private (cell_accel_class, sizeof (GtkCellRendererAccelPriv));
+  g_type_class_add_private (cell_accel_class, sizeof (GtkCellRendererAccelPrivate));
 }
 
 
@@ -259,7 +259,7 @@ convert_keysym_state_to_string (GtkCellRendererAccel *accel,
                                 GdkModifierType       mask,
 				guint                 keycode)
 {
-  GtkCellRendererAccelPriv *priv = accel->priv;
+  GtkCellRendererAccelPrivate *priv = accel->priv;
 
   if (keysym == 0 && keycode == 0)
     /* This label is displayed in a treeview cell displaying
@@ -307,7 +307,7 @@ gtk_cell_renderer_accel_get_property  (GObject    *object,
                                        GValue     *value,
                                        GParamSpec *pspec)
 {
-  GtkCellRendererAccelPriv *priv = GTK_CELL_RENDERER_ACCEL (object)->priv;
+  GtkCellRendererAccelPrivate *priv = GTK_CELL_RENDERER_ACCEL (object)->priv;
 
   switch (param_id)
     {
@@ -339,7 +339,7 @@ gtk_cell_renderer_accel_set_property  (GObject      *object,
                                        GParamSpec   *pspec)
 {
   GtkCellRendererAccel *accel = GTK_CELL_RENDERER_ACCEL (object);
-  GtkCellRendererAccelPriv *priv = accel->priv;
+  GtkCellRendererAccelPrivate *priv = accel->priv;
   gboolean changed = FALSE;
 
   switch (param_id)
@@ -407,7 +407,7 @@ gtk_cell_renderer_accel_get_size (GtkCellRenderer *cell,
                                   gint            *height)
 
 {
-  GtkCellRendererAccelPriv *priv = GTK_CELL_RENDERER_ACCEL (cell)->priv;
+  GtkCellRendererAccelPrivate *priv = GTK_CELL_RENDERER_ACCEL (cell)->priv;
   GtkRequisition requisition;
 
   if (priv->sizing_label == NULL)
@@ -430,7 +430,7 @@ grab_key_callback (GtkWidget            *widget,
                    GdkEventKey          *event,
                    GtkCellRendererAccel *accel)
 {
-  GtkCellRendererAccelPriv *priv = accel->priv;
+  GtkCellRendererAccelPrivate *priv = accel->priv;
   GdkModifierType accel_mods = 0;
   guint accel_key;
   gchar *path;
@@ -525,7 +525,7 @@ static void
 ungrab_stuff (GtkWidget            *widget,
               GtkCellRendererAccel *accel)
 {
-  GtkCellRendererAccelPriv *priv = accel->priv;
+  GtkCellRendererAccelPrivate *priv = accel->priv;
 
   gtk_device_grab_remove (priv->grab_widget, priv->grab_pointer);
   gdk_device_ungrab (priv->grab_keyboard, GDK_CURRENT_TIME);
@@ -579,7 +579,7 @@ gtk_cell_renderer_accel_start_editing (GtkCellRenderer      *cell,
                                        GdkRectangle         *cell_area,
                                        GtkCellRendererState  flags)
 {
-  GtkCellRendererAccelPriv *priv;
+  GtkCellRendererAccelPrivate *priv;
   GtkCellRendererText *celltext;
   GtkCellRendererAccel *accel;
   GtkStyle *style;
diff --git a/gtk/gtkcellrendereraccel.h b/gtk/gtkcellrendereraccel.h
index 1efe0c1162..73bb90da9c 100644
--- a/gtk/gtkcellrendereraccel.h
+++ b/gtk/gtkcellrendereraccel.h
@@ -35,9 +35,9 @@ G_BEGIN_DECLS
 #define GTK_IS_CELL_RENDERER_ACCEL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CELL_RENDERER_ACCEL))
 #define GTK_CELL_RENDERER_ACCEL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_CELL_RENDERER_ACCEL, GtkCellRendererAccelClass))
 
-typedef struct _GtkCellRendererAccel      GtkCellRendererAccel;
-typedef struct _GtkCellRendererAccelPriv  GtkCellRendererAccelPriv;
-typedef struct _GtkCellRendererAccelClass GtkCellRendererAccelClass;
+typedef struct _GtkCellRendererAccel              GtkCellRendererAccel;
+typedef struct _GtkCellRendererAccelPrivate       GtkCellRendererAccelPrivate;
+typedef struct _GtkCellRendererAccelClass         GtkCellRendererAccelClass;
 
 
 typedef enum
@@ -52,7 +52,7 @@ struct _GtkCellRendererAccel
   GtkCellRendererText parent;
 
   /*< private >*/
-  GtkCellRendererAccelPriv *priv;
+  GtkCellRendererAccelPrivate *priv;
 };
 
 struct _GtkCellRendererAccelClass
diff --git a/gtk/gtkcellrenderercombo.c b/gtk/gtkcellrenderercombo.c
index 340a1819d6..effbc89db6 100644
--- a/gtk/gtkcellrenderercombo.c
+++ b/gtk/gtkcellrenderercombo.c
@@ -31,7 +31,7 @@
 #include "gtkmarshalers.h"
 #include "gtkprivate.h"
 
-struct _GtkCellRendererComboPriv
+struct _GtkCellRendererComboPrivate
 {
   GtkTreeModel *model;
 
@@ -187,17 +187,17 @@ gtk_cell_renderer_combo_class_init (GtkCellRendererComboClass *klass)
 		  G_TYPE_STRING,
 		  GTK_TYPE_TREE_ITER);
 
-  g_type_class_add_private (klass, sizeof (GtkCellRendererComboPriv));
+  g_type_class_add_private (klass, sizeof (GtkCellRendererComboPrivate));
 }
 
 static void
 gtk_cell_renderer_combo_init (GtkCellRendererCombo *self)
 {
-  GtkCellRendererComboPriv *priv;
+  GtkCellRendererComboPrivate *priv;
 
   self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
                                             GTK_TYPE_CELL_RENDERER_COMBO,
-                                            GtkCellRendererComboPriv);
+                                            GtkCellRendererComboPrivate);
   priv = self->priv;
 
   priv->model = NULL;
@@ -231,7 +231,7 @@ static void
 gtk_cell_renderer_combo_finalize (GObject *object)
 {
   GtkCellRendererCombo *cell = GTK_CELL_RENDERER_COMBO (object);
-  GtkCellRendererComboPriv *priv = cell->priv;
+  GtkCellRendererComboPrivate *priv = cell->priv;
   
   if (priv->model)
     {
@@ -249,7 +249,7 @@ gtk_cell_renderer_combo_get_property (GObject    *object,
 				      GParamSpec *pspec)
 {
   GtkCellRendererCombo *cell = GTK_CELL_RENDERER_COMBO (object);
-  GtkCellRendererComboPriv *priv = cell->priv;
+  GtkCellRendererComboPrivate *priv = cell->priv;
 
   switch (prop_id)
     {
@@ -275,7 +275,7 @@ gtk_cell_renderer_combo_set_property (GObject      *object,
 				      GParamSpec   *pspec)
 {
   GtkCellRendererCombo *cell = GTK_CELL_RENDERER_COMBO (object);
-  GtkCellRendererComboPriv *priv = cell->priv;
+  GtkCellRendererComboPrivate *priv = cell->priv;
 
   switch (prop_id)
     {
@@ -330,7 +330,7 @@ gtk_cell_renderer_combo_editing_done (GtkCellEditable *combo,
   GtkCellRendererCombo *cell;
   GtkEntry *entry;
   gboolean canceled;
-  GtkCellRendererComboPriv *priv;
+  GtkCellRendererComboPrivate *priv;
 
   cell = GTK_CELL_RENDERER_COMBO (data);
   priv = cell->priv;
@@ -397,7 +397,7 @@ find_text (GtkTreeModel *model,
 	   GtkTreeIter  *iter, 
 	   gpointer      data)
 {
-  GtkCellRendererComboPriv *priv;
+  GtkCellRendererComboPrivate *priv;
   SearchData *search_data = (SearchData *)data;
   gchar *text, *cell_text;
 
@@ -432,7 +432,7 @@ gtk_cell_renderer_combo_start_editing (GtkCellRenderer     *cell,
   GtkCellRendererText *cell_text;
   GtkWidget *combo;
   SearchData search_data;
-  GtkCellRendererComboPriv *priv;
+  GtkCellRendererComboPrivate *priv;
   gboolean editable;
   gchar *text;
 
diff --git a/gtk/gtkcellrenderercombo.h b/gtk/gtkcellrenderercombo.h
index 9bd1b8b398..dc72cc2183 100644
--- a/gtk/gtkcellrenderercombo.h
+++ b/gtk/gtkcellrenderercombo.h
@@ -36,16 +36,16 @@ G_BEGIN_DECLS
 #define GTK_IS_CELL_RENDERER_COMBO_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CELL_RENDERER_COMBO))
 #define GTK_CELL_RENDERER_COMBO_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_CELL_RENDERER_COMBO, GtkCellRendererTextClass))
 
-typedef struct _GtkCellRendererCombo      GtkCellRendererCombo;
-typedef struct _GtkCellRendererComboPriv  GtkCellRendererComboPriv;
-typedef struct _GtkCellRendererComboClass GtkCellRendererComboClass;
+typedef struct _GtkCellRendererCombo              GtkCellRendererCombo;
+typedef struct _GtkCellRendererComboPrivate       GtkCellRendererComboPrivate;
+typedef struct _GtkCellRendererComboClass         GtkCellRendererComboClass;
 
 struct _GtkCellRendererCombo
 {
   GtkCellRendererText parent;
 
   /* <private> */
-  GtkCellRendererComboPriv *priv;
+  GtkCellRendererComboPrivate *priv;
 };
 
 struct _GtkCellRendererComboClass
diff --git a/gtk/gtkcellrendererpixbuf.c b/gtk/gtkcellrendererpixbuf.c
index eeacac29a8..ce88b817a6 100644
--- a/gtk/gtkcellrendererpixbuf.c
+++ b/gtk/gtkcellrendererpixbuf.c
@@ -67,7 +67,7 @@ enum {
 };
 
 
-struct _GtkCellRendererPixbufPriv
+struct _GtkCellRendererPixbufPrivate
 {
   GtkIconSize stock_size;
 
@@ -91,11 +91,11 @@ G_DEFINE_TYPE (GtkCellRendererPixbuf, gtk_cell_renderer_pixbuf, GTK_TYPE_CELL_RE
 static void
 gtk_cell_renderer_pixbuf_init (GtkCellRendererPixbuf *cellpixbuf)
 {
-  GtkCellRendererPixbufPriv *priv;
+  GtkCellRendererPixbufPrivate *priv;
 
   cellpixbuf->priv = G_TYPE_INSTANCE_GET_PRIVATE (cellpixbuf,
                                                   GTK_TYPE_CELL_RENDERER_PIXBUF,
-                                                  GtkCellRendererPixbufPriv);
+                                                  GtkCellRendererPixbufPrivate);
   priv = cellpixbuf->priv;
 
   priv->stock_size = GTK_ICON_SIZE_MENU;
@@ -219,14 +219,14 @@ gtk_cell_renderer_pixbuf_class_init (GtkCellRendererPixbufClass *class)
 
 
 
-  g_type_class_add_private (object_class, sizeof (GtkCellRendererPixbufPriv));
+  g_type_class_add_private (object_class, sizeof (GtkCellRendererPixbufPrivate));
 }
 
 static void
 gtk_cell_renderer_pixbuf_finalize (GObject *object)
 {
   GtkCellRendererPixbuf *cellpixbuf = GTK_CELL_RENDERER_PIXBUF (object);
-  GtkCellRendererPixbufPriv *priv = cellpixbuf->priv;
+  GtkCellRendererPixbufPrivate *priv = cellpixbuf->priv;
 
   if (priv->pixbuf)
     g_object_unref (priv->pixbuf);
@@ -252,7 +252,7 @@ gtk_cell_renderer_pixbuf_get_property (GObject        *object,
 				       GParamSpec     *pspec)
 {
   GtkCellRendererPixbuf *cellpixbuf = GTK_CELL_RENDERER_PIXBUF (object);
-  GtkCellRendererPixbufPriv *priv = cellpixbuf->priv;
+  GtkCellRendererPixbufPrivate *priv = cellpixbuf->priv;
 
   switch (param_id)
     {
@@ -296,7 +296,7 @@ gtk_cell_renderer_pixbuf_set_property (GObject      *object,
 				       GParamSpec   *pspec)
 {
   GtkCellRendererPixbuf *cellpixbuf = GTK_CELL_RENDERER_PIXBUF (object);
-  GtkCellRendererPixbufPriv *priv = cellpixbuf->priv;
+  GtkCellRendererPixbufPrivate *priv = cellpixbuf->priv;
 
   switch (param_id)
     {
@@ -477,7 +477,7 @@ static void
 gtk_cell_renderer_pixbuf_create_stock_pixbuf (GtkCellRendererPixbuf *cellpixbuf,
                                               GtkWidget             *widget)
 {
-  GtkCellRendererPixbufPriv *priv = cellpixbuf->priv;
+  GtkCellRendererPixbufPrivate *priv = cellpixbuf->priv;
 
   if (priv->pixbuf)
     g_object_unref (priv->pixbuf);
@@ -494,7 +494,7 @@ static void
 gtk_cell_renderer_pixbuf_create_themed_pixbuf (GtkCellRendererPixbuf *cellpixbuf,
 					       GtkWidget             *widget)
 {
-  GtkCellRendererPixbufPriv *priv = cellpixbuf->priv;
+  GtkCellRendererPixbufPrivate *priv = cellpixbuf->priv;
   GdkScreen *screen;
   GtkIconTheme *icon_theme;
   GtkSettings *settings;
@@ -553,7 +553,7 @@ create_symbolic_pixbuf (GtkCellRendererPixbuf *cellpixbuf,
 			GtkWidget             *widget,
 			GtkStateType           state)
 {
-  GtkCellRendererPixbufPriv *priv = cellpixbuf->priv;
+  GtkCellRendererPixbufPrivate *priv = cellpixbuf->priv;
   GdkScreen *screen;
   GtkIconTheme *icon_theme;
   GtkSettings *settings;
@@ -674,7 +674,7 @@ gtk_cell_renderer_pixbuf_get_size (GtkCellRenderer *cell,
 				   gint            *height)
 {
   GtkCellRendererPixbuf *cellpixbuf = (GtkCellRendererPixbuf *) cell;
-  GtkCellRendererPixbufPriv *priv = cellpixbuf->priv;
+  GtkCellRendererPixbufPrivate *priv = cellpixbuf->priv;
   gint pixbuf_width  = 0;
   gint pixbuf_height = 0;
   gint calc_width;
@@ -752,7 +752,7 @@ gtk_cell_renderer_pixbuf_render (GtkCellRenderer      *cell,
 
 {
   GtkCellRendererPixbuf *cellpixbuf = (GtkCellRendererPixbuf *) cell;
-  GtkCellRendererPixbufPriv *priv = cellpixbuf->priv;
+  GtkCellRendererPixbufPrivate *priv = cellpixbuf->priv;
   GdkPixbuf *pixbuf;
   GdkPixbuf *invisible = NULL;
   GdkPixbuf *colorized = NULL;
diff --git a/gtk/gtkcellrendererpixbuf.h b/gtk/gtkcellrendererpixbuf.h
index b4830a0a44..7a8ba49818 100644
--- a/gtk/gtkcellrendererpixbuf.h
+++ b/gtk/gtkcellrendererpixbuf.h
@@ -37,16 +37,16 @@ G_BEGIN_DECLS
 #define GTK_IS_CELL_RENDERER_PIXBUF_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CELL_RENDERER_PIXBUF))
 #define GTK_CELL_RENDERER_PIXBUF_GET_CLASS(obj)         (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_CELL_RENDERER_PIXBUF, GtkCellRendererPixbufClass))
 
-typedef struct _GtkCellRendererPixbuf      GtkCellRendererPixbuf;
-typedef struct _GtkCellRendererPixbufPriv  GtkCellRendererPixbufPriv;
-typedef struct _GtkCellRendererPixbufClass GtkCellRendererPixbufClass;
+typedef struct _GtkCellRendererPixbuf              GtkCellRendererPixbuf;
+typedef struct _GtkCellRendererPixbufPrivate       GtkCellRendererPixbufPrivate;
+typedef struct _GtkCellRendererPixbufClass         GtkCellRendererPixbufClass;
 
 struct _GtkCellRendererPixbuf
 {
   GtkCellRenderer parent;
 
   /*< private >*/
-  GtkCellRendererPixbufPriv *priv;
+  GtkCellRendererPixbufPrivate *priv;
 };
 
 struct _GtkCellRendererPixbufClass
diff --git a/gtk/gtkcellrenderertext.c b/gtk/gtkcellrenderertext.c
index d59c1917db..f0b44453e1 100644
--- a/gtk/gtkcellrenderertext.c
+++ b/gtk/gtkcellrenderertext.c
@@ -133,7 +133,7 @@ static guint text_cell_renderer_signals [LAST_SIGNAL];
 
 #define GTK_CELL_RENDERER_TEXT_PATH "gtk-cell-renderer-text-path"
 
-struct _GtkCellRendererTextPriv
+struct _GtkCellRendererTextPrivate
 {
   GtkWidget *entry;
 
@@ -187,12 +187,12 @@ G_DEFINE_TYPE_WITH_CODE (GtkCellRendererText, gtk_cell_renderer_text, GTK_TYPE_C
 static void
 gtk_cell_renderer_text_init (GtkCellRendererText *celltext)
 {
-  GtkCellRendererTextPriv *priv;
+  GtkCellRendererTextPrivate *priv;
   GtkCellRenderer *cell = GTK_CELL_RENDERER (celltext);
 
   celltext->priv = G_TYPE_INSTANCE_GET_PRIVATE (celltext,
                                                 GTK_TYPE_CELL_RENDERER_TEXT,
-                                                GtkCellRendererTextPriv);
+                                                GtkCellRendererTextPrivate);
   priv = celltext->priv;
 
   gtk_cell_renderer_set_alignment (cell, 0.0, 0.5);
@@ -645,14 +645,14 @@ gtk_cell_renderer_text_class_init (GtkCellRendererTextClass *class)
 		  G_TYPE_STRING,
 		  G_TYPE_STRING);
 
-  g_type_class_add_private (object_class, sizeof (GtkCellRendererTextPriv));
+  g_type_class_add_private (object_class, sizeof (GtkCellRendererTextPrivate));
 }
 
 static void
 gtk_cell_renderer_text_finalize (GObject *object)
 {
   GtkCellRendererText *celltext = GTK_CELL_RENDERER_TEXT (object);
-  GtkCellRendererTextPriv *priv = celltext->priv;
+  GtkCellRendererTextPrivate *priv = celltext->priv;
 
   pango_font_description_free (priv->font);
 
@@ -696,7 +696,7 @@ gtk_cell_renderer_text_get_property (GObject        *object,
 				     GParamSpec     *pspec)
 {
   GtkCellRendererText *celltext = GTK_CELL_RENDERER_TEXT (object);
-  GtkCellRendererTextPriv *priv = celltext->priv;
+  GtkCellRendererTextPrivate *priv = celltext->priv;
 
   switch (param_id)
     {
@@ -887,7 +887,7 @@ static void
 set_bg_color (GtkCellRendererText *celltext,
               GdkColor            *color)
 {
-  GtkCellRendererTextPriv *priv = celltext->priv;
+  GtkCellRendererTextPrivate *priv = celltext->priv;
 
   if (color)
     {
@@ -916,7 +916,7 @@ static void
 set_fg_color (GtkCellRendererText *celltext,
               GdkColor            *color)
 {
-  GtkCellRendererTextPriv *priv = celltext->priv;
+  GtkCellRendererTextPrivate *priv = celltext->priv;
 
   if (color)
     {
@@ -1020,7 +1020,7 @@ static void
 set_font_description (GtkCellRendererText  *celltext,
                       PangoFontDescription *font_desc)
 {
-  GtkCellRendererTextPriv *priv = celltext->priv;
+  GtkCellRendererTextPrivate *priv = celltext->priv;
   GObject *object = G_OBJECT (celltext);
   PangoFontDescription *new_font_desc;
   PangoFontMask old_mask, new_mask, changed_mask, set_changed_mask;
@@ -1072,7 +1072,7 @@ gtk_cell_renderer_text_set_property (GObject      *object,
 				     GParamSpec   *pspec)
 {
   GtkCellRendererText *celltext = GTK_CELL_RENDERER_TEXT (object);
-  GtkCellRendererTextPriv *priv = celltext->priv;
+  GtkCellRendererTextPrivate *priv = celltext->priv;
 
   switch (param_id)
     {
@@ -1433,7 +1433,7 @@ get_layout (GtkCellRendererText *celltext,
             GdkRectangle        *cell_area,
             GtkCellRendererState flags)
 {
-  GtkCellRendererTextPriv *priv = celltext->priv;
+  GtkCellRendererTextPrivate *priv = celltext->priv;
   PangoAttrList *attr_list;
   PangoLayout *layout;
   PangoUnderline uline;
@@ -1574,7 +1574,7 @@ get_size (GtkCellRenderer *cell,
 	  gint            *height)
 {
   GtkCellRendererText *celltext = GTK_CELL_RENDERER_TEXT (cell);
-  GtkCellRendererTextPriv *priv = celltext->priv;
+  GtkCellRendererTextPrivate *priv = celltext->priv;
   PangoRectangle rect;
   gint xpad, ypad;
   gint cell_width, cell_height;
@@ -1699,7 +1699,7 @@ gtk_cell_renderer_text_render (GtkCellRenderer      *cell,
 
 {
   GtkCellRendererText *celltext = GTK_CELL_RENDERER_TEXT (cell);
-  GtkCellRendererTextPriv *priv = celltext->priv;
+  GtkCellRendererTextPrivate *priv = celltext->priv;
   PangoLayout *layout;
   GtkStateType state;
   gint x_offset = 0;
@@ -1780,7 +1780,7 @@ static void
 gtk_cell_renderer_text_editing_done (GtkCellEditable *entry,
 				     gpointer         data)
 {
-  GtkCellRendererTextPriv *priv;
+  GtkCellRendererTextPrivate *priv;
   const gchar *path;
   const gchar *new_text;
   gboolean canceled;
@@ -1824,7 +1824,7 @@ gtk_cell_renderer_text_editing_done (GtkCellEditable *entry,
 static gboolean
 popdown_timeout (gpointer data)
 {
-  GtkCellRendererTextPriv *priv;
+  GtkCellRendererTextPrivate *priv;
 
   priv = GTK_CELL_RENDERER_TEXT (data)->priv;
 
@@ -1840,7 +1840,7 @@ static void
 gtk_cell_renderer_text_popup_unmap (GtkMenu *menu,
                                     gpointer data)
 {
-  GtkCellRendererTextPriv *priv;
+  GtkCellRendererTextPrivate *priv;
 
   priv = GTK_CELL_RENDERER_TEXT (data)->priv;
 
@@ -1858,7 +1858,7 @@ gtk_cell_renderer_text_populate_popup (GtkEntry *entry,
                                        GtkMenu  *menu,
                                        gpointer  data)
 {
-  GtkCellRendererTextPriv *priv;
+  GtkCellRendererTextPrivate *priv;
 
   priv = GTK_CELL_RENDERER_TEXT (data)->priv;
 
@@ -1879,7 +1879,7 @@ gtk_cell_renderer_text_focus_out_event (GtkWidget *entry,
 		                        GdkEvent  *event,
 					gpointer   data)
 {
-  GtkCellRendererTextPriv *priv;
+  GtkCellRendererTextPrivate *priv;
 
   priv = GTK_CELL_RENDERER_TEXT (data)->priv;
 
@@ -1907,7 +1907,7 @@ gtk_cell_renderer_text_start_editing (GtkCellRenderer      *cell,
 {
   GtkRequisition requisition;
   GtkCellRendererText *celltext;
-  GtkCellRendererTextPriv *priv;
+  GtkCellRendererTextPrivate *priv;
   gfloat xalign, yalign;
 
   celltext = GTK_CELL_RENDERER_TEXT (cell);
@@ -1997,7 +1997,7 @@ void
 gtk_cell_renderer_text_set_fixed_height_from_font (GtkCellRendererText *renderer,
 						   gint                 number_of_rows)
 {
-  GtkCellRendererTextPriv *priv;
+  GtkCellRendererTextPrivate *priv;
   GtkCellRenderer *cell;
 
   g_return_if_fail (GTK_IS_CELL_RENDERER_TEXT (renderer));
@@ -2034,7 +2034,7 @@ gtk_cell_renderer_text_get_width (GtkCellSizeRequest *cell,
 				  gint               *minimum_size,
 				  gint               *natural_size)
 {
-  GtkCellRendererTextPriv    *priv;
+  GtkCellRendererTextPrivate    *priv;
   GtkCellRendererText        *celltext;
   GtkStyle                   *style;
   PangoLayout                *layout;
@@ -2129,7 +2129,7 @@ gtk_cell_renderer_text_get_height_for_width (GtkCellSizeRequest *cell,
 					     gint               *minimum_height,
 					     gint               *natural_height)
 {
-  GtkCellRendererTextPriv    *priv;
+  GtkCellRendererTextPrivate    *priv;
   GtkCellRendererText        *celltext;
   PangoLayout                *layout;
   gint                        text_height, xpad, ypad;
diff --git a/gtk/gtkcellrenderertext.h b/gtk/gtkcellrenderertext.h
index c9f8e63492..dcd893641f 100644
--- a/gtk/gtkcellrenderertext.h
+++ b/gtk/gtkcellrenderertext.h
@@ -38,16 +38,16 @@ G_BEGIN_DECLS
 #define GTK_IS_CELL_RENDERER_TEXT_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CELL_RENDERER_TEXT))
 #define GTK_CELL_RENDERER_TEXT_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_CELL_RENDERER_TEXT, GtkCellRendererTextClass))
 
-typedef struct _GtkCellRendererText      GtkCellRendererText;
-typedef struct _GtkCellRendererTextPriv  GtkCellRendererTextPriv;
-typedef struct _GtkCellRendererTextClass GtkCellRendererTextClass;
+typedef struct _GtkCellRendererText              GtkCellRendererText;
+typedef struct _GtkCellRendererTextPrivate       GtkCellRendererTextPrivate;
+typedef struct _GtkCellRendererTextClass         GtkCellRendererTextClass;
 
 struct _GtkCellRendererText
 {
   GtkCellRenderer parent;
 
   /*< private >*/
-  GtkCellRendererTextPriv *priv;
+  GtkCellRendererTextPrivate *priv;
 };
 
 struct _GtkCellRendererTextClass
diff --git a/gtk/gtkcellrenderertoggle.c b/gtk/gtkcellrenderertoggle.c
index 62bbc3d67f..470a061a0a 100644
--- a/gtk/gtkcellrenderertoggle.c
+++ b/gtk/gtkcellrenderertoggle.c
@@ -75,7 +75,7 @@ enum {
 
 static guint toggle_cell_signals[LAST_SIGNAL] = { 0 };
 
-struct _GtkCellRendererTogglePriv
+struct _GtkCellRendererTogglePrivate
 {
   gint indicator_size;
 
@@ -92,11 +92,11 @@ G_DEFINE_TYPE (GtkCellRendererToggle, gtk_cell_renderer_toggle, GTK_TYPE_CELL_RE
 static void
 gtk_cell_renderer_toggle_init (GtkCellRendererToggle *celltoggle)
 {
-  GtkCellRendererTogglePriv *priv;
+  GtkCellRendererTogglePrivate *priv;
 
   celltoggle->priv = G_TYPE_INSTANCE_GET_PRIVATE (celltoggle,
                                                   GTK_TYPE_CELL_RENDERER_TOGGLE,
-                                                  GtkCellRendererTogglePriv);
+                                                  GtkCellRendererTogglePrivate);
   priv = celltoggle->priv;
 
   priv->activatable = TRUE;
@@ -184,7 +184,7 @@ gtk_cell_renderer_toggle_class_init (GtkCellRendererToggleClass *class)
 		  G_TYPE_NONE, 1,
 		  G_TYPE_STRING);
 
-  g_type_class_add_private (object_class, sizeof (GtkCellRendererTogglePriv));
+  g_type_class_add_private (object_class, sizeof (GtkCellRendererTogglePrivate));
 }
 
 static void
@@ -194,7 +194,7 @@ gtk_cell_renderer_toggle_get_property (GObject     *object,
 				       GParamSpec  *pspec)
 {
   GtkCellRendererToggle *celltoggle = GTK_CELL_RENDERER_TOGGLE (object);
-  GtkCellRendererTogglePriv *priv = celltoggle->priv;
+  GtkCellRendererTogglePrivate *priv = celltoggle->priv;
 
   switch (param_id)
     {
@@ -227,7 +227,7 @@ gtk_cell_renderer_toggle_set_property (GObject      *object,
 				       GParamSpec   *pspec)
 {
   GtkCellRendererToggle *celltoggle = GTK_CELL_RENDERER_TOGGLE (object);
-  GtkCellRendererTogglePriv *priv = celltoggle->priv;
+  GtkCellRendererTogglePrivate *priv = celltoggle->priv;
 
   switch (param_id)
     {
@@ -280,7 +280,7 @@ gtk_cell_renderer_toggle_get_size (GtkCellRenderer *cell,
 				   gint            *width,
 				   gint            *height)
 {
-  GtkCellRendererTogglePriv *priv;
+  GtkCellRendererTogglePrivate *priv;
   gint calc_width;
   gint calc_height;
   gint xpad, ypad;
@@ -332,7 +332,7 @@ gtk_cell_renderer_toggle_render (GtkCellRenderer      *cell,
 				 GtkCellRendererState  flags)
 {
   GtkCellRendererToggle *celltoggle = GTK_CELL_RENDERER_TOGGLE (cell);
-  GtkCellRendererTogglePriv *priv = celltoggle->priv;
+  GtkCellRendererTogglePrivate *priv = celltoggle->priv;
   gint width, height;
   gint x_offset, y_offset;
   gint xpad, ypad;
@@ -405,7 +405,7 @@ gtk_cell_renderer_toggle_activate (GtkCellRenderer      *cell,
 				   GdkRectangle         *cell_area,
 				   GtkCellRendererState  flags)
 {
-  GtkCellRendererTogglePriv *priv;
+  GtkCellRendererTogglePrivate *priv;
   GtkCellRendererToggle *celltoggle;
 
   celltoggle = GTK_CELL_RENDERER_TOGGLE (cell);
@@ -437,7 +437,7 @@ void
 gtk_cell_renderer_toggle_set_radio (GtkCellRendererToggle *toggle,
 				    gboolean               radio)
 {
-  GtkCellRendererTogglePriv *priv;
+  GtkCellRendererTogglePrivate *priv;
 
   g_return_if_fail (GTK_IS_CELL_RENDERER_TOGGLE (toggle));
 
@@ -527,7 +527,7 @@ void
 gtk_cell_renderer_toggle_set_activatable (GtkCellRendererToggle *toggle,
                                           gboolean               setting)
 {
-  GtkCellRendererTogglePriv *priv;
+  GtkCellRendererTogglePrivate *priv;
 
   g_return_if_fail (GTK_IS_CELL_RENDERER_TOGGLE (toggle));
 
diff --git a/gtk/gtkcellrenderertoggle.h b/gtk/gtkcellrenderertoggle.h
index 16d2464025..ca53af03f9 100644
--- a/gtk/gtkcellrenderertoggle.h
+++ b/gtk/gtkcellrenderertoggle.h
@@ -37,16 +37,16 @@ G_BEGIN_DECLS
 #define GTK_IS_CELL_RENDERER_TOGGLE_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CELL_RENDERER_TOGGLE))
 #define GTK_CELL_RENDERER_TOGGLE_GET_CLASS(obj)         (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_CELL_RENDERER_TOGGLE, GtkCellRendererToggleClass))
 
-typedef struct _GtkCellRendererToggle      GtkCellRendererToggle;
-typedef struct _GtkCellRendererTogglePriv  GtkCellRendererTogglePriv;
-typedef struct _GtkCellRendererToggleClass GtkCellRendererToggleClass;
+typedef struct _GtkCellRendererToggle              GtkCellRendererToggle;
+typedef struct _GtkCellRendererTogglePrivate       GtkCellRendererTogglePrivate;
+typedef struct _GtkCellRendererToggleClass         GtkCellRendererToggleClass;
 
 struct _GtkCellRendererToggle
 {
   GtkCellRenderer parent;
 
   /*< private >*/
-  GtkCellRendererTogglePriv *priv;
+  GtkCellRendererTogglePrivate *priv;
 };
 
 struct _GtkCellRendererToggleClass
diff --git a/gtk/gtkcheckmenuitem.c b/gtk/gtkcheckmenuitem.c
index e9305569bc..9f00e9c9bd 100644
--- a/gtk/gtkcheckmenuitem.c
+++ b/gtk/gtkcheckmenuitem.c
@@ -35,7 +35,7 @@
 
 
 
-struct _GtkCheckMenuItemPriv
+struct _GtkCheckMenuItemPrivate
 {
   guint active             : 1;
   guint always_show_toggle : 1;
@@ -152,7 +152,7 @@ gtk_check_menu_item_class_init (GtkCheckMenuItemClass *klass)
 		  _gtk_marshal_VOID__VOID,
 		  G_TYPE_NONE, 0);
 
-  g_type_class_add_private (klass, sizeof (GtkCheckMenuItemPriv));
+  g_type_class_add_private (klass, sizeof (GtkCheckMenuItemPrivate));
 }
 
 static void 
@@ -251,7 +251,7 @@ void
 gtk_check_menu_item_set_active (GtkCheckMenuItem *check_menu_item,
 				gboolean          is_active)
 {
-  GtkCheckMenuItemPriv *priv;
+  GtkCheckMenuItemPrivate *priv;
 
   g_return_if_fail (GTK_IS_CHECK_MENU_ITEM (check_menu_item));
 
@@ -322,7 +322,7 @@ void
 gtk_check_menu_item_set_inconsistent (GtkCheckMenuItem *check_menu_item,
                                       gboolean          setting)
 {
-  GtkCheckMenuItemPriv *priv;
+  GtkCheckMenuItemPrivate *priv;
 
   g_return_if_fail (GTK_IS_CHECK_MENU_ITEM (check_menu_item));
 
@@ -367,7 +367,7 @@ void
 gtk_check_menu_item_set_draw_as_radio (GtkCheckMenuItem *check_menu_item,
 				       gboolean          draw_as_radio)
 {
-  GtkCheckMenuItemPriv *priv;
+  GtkCheckMenuItemPrivate *priv;
 
   g_return_if_fail (GTK_IS_CHECK_MENU_ITEM (check_menu_item));
 
@@ -406,11 +406,11 @@ gtk_check_menu_item_get_draw_as_radio (GtkCheckMenuItem *check_menu_item)
 static void
 gtk_check_menu_item_init (GtkCheckMenuItem *check_menu_item)
 {
-  GtkCheckMenuItemPriv *priv;
+  GtkCheckMenuItemPrivate *priv;
 
   check_menu_item->priv = G_TYPE_INSTANCE_GET_PRIVATE (check_menu_item,
                                                        GTK_TYPE_CHECK_MENU_ITEM,
-                                                       GtkCheckMenuItemPriv);
+                                                       GtkCheckMenuItemPrivate);
   priv = check_menu_item->priv; 
 
   priv->active = FALSE;
@@ -432,7 +432,7 @@ gtk_check_menu_item_expose (GtkWidget      *widget,
 static void
 gtk_check_menu_item_activate (GtkMenuItem *menu_item)
 {
-  GtkCheckMenuItemPriv *priv;
+  GtkCheckMenuItemPrivate *priv;
 
   GtkCheckMenuItem *check_menu_item = GTK_CHECK_MENU_ITEM (menu_item);
   priv = check_menu_item->priv;
@@ -459,7 +459,7 @@ static void
 gtk_real_check_menu_item_draw_indicator (GtkCheckMenuItem *check_menu_item,
 					 GdkRectangle     *area)
 {
-  GtkCheckMenuItemPriv *priv = check_menu_item->priv;
+  GtkCheckMenuItemPrivate *priv = check_menu_item->priv;
   GtkWidget *widget;
   GtkStateType state_type;
   GtkShadowType shadow_type;
@@ -550,7 +550,7 @@ gtk_check_menu_item_get_property (GObject     *object,
 				  GParamSpec  *pspec)
 {
   GtkCheckMenuItem *checkitem = GTK_CHECK_MENU_ITEM (object);
-  GtkCheckMenuItemPriv *priv = checkitem->priv;
+  GtkCheckMenuItemPrivate *priv = checkitem->priv;
   
   switch (prop_id)
     {
@@ -610,7 +610,7 @@ void
 _gtk_check_menu_item_set_active (GtkCheckMenuItem *check_menu_item,
                                  gboolean          is_active)
 {
-  GtkCheckMenuItemPriv *priv = check_menu_item->priv;
+  GtkCheckMenuItemPrivate *priv = check_menu_item->priv;
 
   priv->active = is_active;
 }
diff --git a/gtk/gtkcheckmenuitem.h b/gtk/gtkcheckmenuitem.h
index e76ba5e081..773d1ad7ab 100644
--- a/gtk/gtkcheckmenuitem.h
+++ b/gtk/gtkcheckmenuitem.h
@@ -45,16 +45,16 @@ G_BEGIN_DECLS
 #define GTK_CHECK_MENU_ITEM_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_CHECK_MENU_ITEM, GtkCheckMenuItemClass))
 
 
-typedef struct _GtkCheckMenuItem       GtkCheckMenuItem;
-typedef struct _GtkCheckMenuItemPriv   GtkCheckMenuItemPriv;
-typedef struct _GtkCheckMenuItemClass  GtkCheckMenuItemClass;
+typedef struct _GtkCheckMenuItem              GtkCheckMenuItem;
+typedef struct _GtkCheckMenuItemPrivate       GtkCheckMenuItemPrivate;
+typedef struct _GtkCheckMenuItemClass         GtkCheckMenuItemClass;
 
 struct _GtkCheckMenuItem
 {
   GtkMenuItem menu_item;
 
   /* <private> */
-  GtkCheckMenuItemPriv *priv;
+  GtkCheckMenuItemPrivate *priv;
 };
 
 struct _GtkCheckMenuItemClass
diff --git a/gtk/gtkcolorseldialog.c b/gtk/gtkcolorseldialog.c
index a203de4df1..d225ef1517 100644
--- a/gtk/gtkcolorseldialog.c
+++ b/gtk/gtkcolorseldialog.c
@@ -36,7 +36,7 @@
 
 
 
-struct _GtkColorSelectionDialogPriv
+struct _GtkColorSelectionDialogPrivate
 {
   GtkWidget *colorsel;
   GtkWidget *ok_button;
@@ -76,7 +76,7 @@ gtk_color_selection_dialog_get_property (GObject         *object,
 					 GParamSpec      *pspec)
 {
   GtkColorSelectionDialog *colorsel = GTK_COLOR_SELECTION_DIALOG (object);
-  GtkColorSelectionDialogPriv *priv = colorsel->priv;
+  GtkColorSelectionDialogPrivate *priv = colorsel->priv;
 
   switch (prop_id)
     {
@@ -133,19 +133,19 @@ gtk_color_selection_dialog_class_init (GtkColorSelectionDialogClass *klass)
 						     GTK_TYPE_WIDGET,
 						     G_PARAM_READABLE));
 
-  g_type_class_add_private (klass, sizeof (GtkColorSelectionDialogPriv));
+  g_type_class_add_private (klass, sizeof (GtkColorSelectionDialogPrivate));
 }
 
 static void
 gtk_color_selection_dialog_init (GtkColorSelectionDialog *colorseldiag)
 {
-  GtkColorSelectionDialogPriv *priv;
+  GtkColorSelectionDialogPrivate *priv;
   GtkDialog *dialog = GTK_DIALOG (colorseldiag);
   GtkWidget *action_area, *content_area;
 
   colorseldiag->priv = G_TYPE_INSTANCE_GET_PRIVATE (colorseldiag,
                                                     GTK_TYPE_COLOR_SELECTION_DIALOG,
-                                                    GtkColorSelectionDialogPriv);
+                                                    GtkColorSelectionDialogPrivate);
   priv = colorseldiag->priv;
 
   content_area = gtk_dialog_get_content_area (dialog);
@@ -238,7 +238,7 @@ gtk_color_selection_dialog_buildable_get_internal_child (GtkBuildable *buildable
 							 const gchar  *childname)
 {
   GtkColorSelectionDialog *selection_dialog = GTK_COLOR_SELECTION_DIALOG (buildable);
-  GtkColorSelectionDialogPriv *priv = selection_dialog->priv;
+  GtkColorSelectionDialogPrivate *priv = selection_dialog->priv;
 
   if (g_strcmp0 (childname, "ok_button") == 0)
     return G_OBJECT (priv->ok_button);
diff --git a/gtk/gtkcolorseldialog.h b/gtk/gtkcolorseldialog.h
index 574aaf06ef..0b4f0aaaa7 100644
--- a/gtk/gtkcolorseldialog.h
+++ b/gtk/gtkcolorseldialog.h
@@ -45,9 +45,9 @@ G_BEGIN_DECLS
 #define GTK_COLOR_SELECTION_DIALOG_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_COLOR_SELECTION_DIALOG, GtkColorSelectionDialogClass))
 
 
-typedef struct _GtkColorSelectionDialog       GtkColorSelectionDialog;
-typedef struct _GtkColorSelectionDialogPriv   GtkColorSelectionDialogPriv;
-typedef struct _GtkColorSelectionDialogClass  GtkColorSelectionDialogClass;
+typedef struct _GtkColorSelectionDialog              GtkColorSelectionDialog;
+typedef struct _GtkColorSelectionDialogPrivate       GtkColorSelectionDialogPrivate;
+typedef struct _GtkColorSelectionDialogClass         GtkColorSelectionDialogClass;
 
 
 struct _GtkColorSelectionDialog
@@ -55,7 +55,7 @@ struct _GtkColorSelectionDialog
   GtkDialog parent_instance;
 
   /* <private> */
-  GtkColorSelectionDialogPriv *priv;
+  GtkColorSelectionDialogPrivate *priv;
 };
 
 struct _GtkColorSelectionDialogClass
diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c
index d50b4194d0..275cda1333 100644
--- a/gtk/gtkcontainer.c
+++ b/gtk/gtkcontainer.c
@@ -41,7 +41,7 @@
 #include <gobject/gobjectnotifyqueue.c>
 #include <gobject/gvaluecollector.h>
 
-struct _GtkContainerPriv
+struct _GtkContainerPrivate
 {
   GtkWidget *focus_child;
 
@@ -302,7 +302,7 @@ gtk_container_class_init (GtkContainerClass *class)
 		  G_TYPE_NONE, 1,
 		  GTK_TYPE_WIDGET);
 
-  g_type_class_add_private (class, sizeof (GtkContainerPriv));
+  g_type_class_add_private (class, sizeof (GtkContainerPrivate));
 }
 
 static void
@@ -1055,11 +1055,11 @@ gtk_container_remove_unimplemented (GtkContainer     *container,
 static void
 gtk_container_init (GtkContainer *container)
 {
-  GtkContainerPriv *priv;
+  GtkContainerPrivate *priv;
 
   container->priv = G_TYPE_INSTANCE_GET_PRIVATE (container,
                                                  GTK_TYPE_CONTAINER,
-                                                 GtkContainerPriv);
+                                                 GtkContainerPrivate);
   priv = container->priv;
 
   priv->focus_child = NULL;
@@ -1073,7 +1073,7 @@ static void
 gtk_container_destroy (GtkObject *object)
 {
   GtkContainer *container = GTK_CONTAINER (object);
-  GtkContainerPriv *priv = container->priv;
+  GtkContainerPrivate *priv = container->priv;
 
   if (GTK_CONTAINER_RESIZE_PENDING (container))
     _gtk_container_dequeue_resize_handler (container);
@@ -1121,7 +1121,7 @@ gtk_container_get_property (GObject         *object,
 			    GParamSpec      *pspec)
 {
   GtkContainer *container = GTK_CONTAINER (object);
-  GtkContainerPriv *priv = container->priv;
+  GtkContainerPrivate *priv = container->priv;
   
   switch (prop_id)
     {
@@ -1158,7 +1158,7 @@ void
 gtk_container_set_border_width (GtkContainer *container,
 				guint         border_width)
 {
-  GtkContainerPriv *priv;
+  GtkContainerPrivate *priv;
 
   g_return_if_fail (GTK_IS_CONTAINER (container));
 
@@ -1288,7 +1288,7 @@ void
 gtk_container_set_resize_mode (GtkContainer  *container,
 			       GtkResizeMode  resize_mode)
 {
-  GtkContainerPriv *priv;
+  GtkContainerPrivate *priv;
 
   g_return_if_fail (GTK_IS_CONTAINER (container));
   g_return_if_fail (resize_mode <= GTK_RESIZE_IMMEDIATE);
@@ -1393,7 +1393,7 @@ gtk_container_idle_sizer (gpointer data)
 void
 _gtk_container_queue_resize (GtkContainer *container)
 {
-  GtkContainerPriv *priv;
+  GtkContainerPrivate *priv;
   GtkContainer *resize_container;
   GtkWidget *parent;
   GtkWidget *widget;
@@ -1721,7 +1721,7 @@ static void
 gtk_container_real_set_focus_child (GtkContainer     *container,
 				    GtkWidget        *child)
 {
-  GtkContainerPriv *priv;
+  GtkContainerPrivate *priv;
 
   g_return_if_fail (GTK_IS_CONTAINER (container));
   g_return_if_fail (child == NULL || GTK_IS_WIDGET (child));
@@ -1805,7 +1805,7 @@ gtk_container_focus (GtkWidget        *widget,
   GList *sorted_children;
   gint return_val;
   GtkContainer *container;
-  GtkContainerPriv *priv;
+  GtkContainerPrivate *priv;
 
   g_return_val_if_fail (GTK_IS_CONTAINER (widget), FALSE);
 
@@ -2295,7 +2295,7 @@ gtk_container_focus_move (GtkContainer     *container,
 			  GList            *children,
 			  GtkDirectionType  direction)
 {
-  GtkContainerPriv *priv = container->priv;
+  GtkContainerPrivate *priv = container->priv;
   GtkWidget *focus_child;
   GtkWidget *child;
 
@@ -2383,7 +2383,7 @@ gtk_container_set_focus_chain (GtkContainer *container,
 {
   GList *chain;
   GList *tmp_list;
-  GtkContainerPriv *priv;
+  GtkContainerPrivate *priv;
   
   g_return_if_fail (GTK_IS_CONTAINER (container));
 
@@ -2447,7 +2447,7 @@ gboolean
 gtk_container_get_focus_chain (GtkContainer *container,
 			       GList       **focus_chain)
 {
-  GtkContainerPriv *priv;
+  GtkContainerPrivate *priv;
 
   g_return_val_if_fail (GTK_IS_CONTAINER (container), FALSE);
 
@@ -2473,7 +2473,7 @@ gtk_container_get_focus_chain (GtkContainer *container,
 void
 gtk_container_unset_focus_chain (GtkContainer  *container)
 {
-  GtkContainerPriv *priv;
+  GtkContainerPrivate *priv;
 
   g_return_if_fail (GTK_IS_CONTAINER (container));
 
diff --git a/gtk/gtkcontainer.h b/gtk/gtkcontainer.h
index e37de1ee38..ff84ac8ff0 100644
--- a/gtk/gtkcontainer.h
+++ b/gtk/gtkcontainer.h
@@ -46,16 +46,16 @@ G_BEGIN_DECLS
 #define GTK_CONTAINER_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_CONTAINER, GtkContainerClass))
 
 
-typedef struct _GtkContainer	   GtkContainer;
-typedef struct _GtkContainerPriv   GtkContainerPriv;
-typedef struct _GtkContainerClass  GtkContainerClass;
+typedef struct _GtkContainer              GtkContainer;
+typedef struct _GtkContainerPrivate       GtkContainerPrivate;
+typedef struct _GtkContainerClass         GtkContainerClass;
 
 struct _GtkContainer
 {
   GtkWidget widget;
 
   /*< private >*/
-  GtkContainerPriv *priv;
+  GtkContainerPrivate *priv;
 };
 
 struct _GtkContainerClass
diff --git a/gtk/gtkdialog.c b/gtk/gtkdialog.c
index 1c070c2de3..fd8180bdfe 100644
--- a/gtk/gtkdialog.c
+++ b/gtk/gtkdialog.c
@@ -42,7 +42,7 @@
 #include "gtkbuildable.h"
 
 
-struct _GtkDialogPriv
+struct _GtkDialogPrivate
 {
   GtkWidget *vbox;
   GtkWidget *action_area;
@@ -136,7 +136,7 @@ gtk_dialog_class_init (GtkDialogClass *class)
 
   class->close = gtk_dialog_close;
   
-  g_type_class_add_private (gobject_class, sizeof (GtkDialogPriv));
+  g_type_class_add_private (gobject_class, sizeof (GtkDialogPrivate));
 
   /**
    * GtkDialog:has-separator:
@@ -242,7 +242,7 @@ gtk_dialog_class_init (GtkDialogClass *class)
 static void
 update_spacings (GtkDialog *dialog)
 {
-  GtkDialogPriv *priv = dialog->priv;
+  GtkDialogPrivate *priv = dialog->priv;
   gint content_area_border;
   gint content_area_spacing;
   gint button_spacing;
@@ -271,11 +271,11 @@ update_spacings (GtkDialog *dialog)
 static void
 gtk_dialog_init (GtkDialog *dialog)
 {
-  GtkDialogPriv *priv;
+  GtkDialogPrivate *priv;
 
   dialog->priv = G_TYPE_INSTANCE_GET_PRIVATE (dialog,
                                               GTK_TYPE_DIALOG,
-                                              GtkDialogPriv);
+                                              GtkDialogPrivate);
   priv = dialog->priv;
 
   priv->ignore_separator = FALSE;
@@ -328,7 +328,7 @@ gtk_dialog_buildable_get_internal_child (GtkBuildable *buildable,
 					 GtkBuilder   *builder,
 					 const gchar  *childname)
 {
-  GtkDialogPriv *priv = GTK_DIALOG (buildable)->priv;
+  GtkDialogPrivate *priv = GTK_DIALOG (buildable)->priv;
 
   if (strcmp (childname, "vbox") == 0)
     return G_OBJECT (priv->vbox);
@@ -369,7 +369,7 @@ gtk_dialog_get_property (GObject     *object,
                          GParamSpec  *pspec)
 {
   GtkDialog *dialog = GTK_DIALOG (object);
-  GtkDialogPriv *priv = dialog->priv;
+  GtkDialogPrivate *priv = dialog->priv;
   
   switch (prop_id)
     {
@@ -410,7 +410,7 @@ gtk_dialog_map (GtkWidget *widget)
   GtkWidget *default_widget, *focus;
   GtkWindow *window = GTK_WINDOW (widget);
   GtkDialog *dialog = GTK_DIALOG (widget);
-  GtkDialogPriv *priv = dialog->priv;
+  GtkDialogPrivate *priv = dialog->priv;
   
   GTK_WIDGET_CLASS (gtk_dialog_parent_class)->map (widget);
 
@@ -472,7 +472,7 @@ static GtkWidget *
 dialog_find_button (GtkDialog *dialog,
 		    gint       response_id)
 {
-  GtkDialogPriv *priv = dialog->priv;
+  GtkDialogPrivate *priv = dialog->priv;
   GtkWidget *child = NULL;
   GList *children, *tmp_list;
       
@@ -662,7 +662,7 @@ gtk_dialog_add_action_widget (GtkDialog *dialog,
                               GtkWidget *child,
                               gint       response_id)
 {
-  GtkDialogPriv *priv;
+  GtkDialogPrivate *priv;
   ResponseData *ad;
   guint signal_id;
   
@@ -809,7 +809,7 @@ gtk_dialog_set_response_sensitive (GtkDialog *dialog,
                                    gint       response_id,
                                    gboolean   setting)
 {
-  GtkDialogPriv *priv;
+  GtkDialogPrivate *priv;
   GList *children;
   GList *tmp_list;
 
@@ -847,7 +847,7 @@ void
 gtk_dialog_set_default_response (GtkDialog *dialog,
                                  gint       response_id)
 {
-  GtkDialogPriv *priv;
+  GtkDialogPrivate *priv;
   GList *children;
   GList *tmp_list;
 
@@ -884,7 +884,7 @@ void
 gtk_dialog_set_has_separator (GtkDialog *dialog,
                               gboolean   setting)
 {
-  GtkDialogPriv *priv;
+  GtkDialogPrivate *priv;
 
   g_return_if_fail (GTK_IS_DIALOG (dialog));
 
@@ -1140,7 +1140,7 @@ void
 _gtk_dialog_set_ignore_separator (GtkDialog *dialog,
 				  gboolean   ignore_separator)
 {
-  GtkDialogPriv *priv = dialog->priv;
+  GtkDialogPrivate *priv = dialog->priv;
 
   priv->ignore_separator = ignore_separator;
 }
@@ -1161,7 +1161,7 @@ GtkWidget*
 gtk_dialog_get_widget_for_response (GtkDialog *dialog,
 				    gint       response_id)
 {
-  GtkDialogPriv *priv;
+  GtkDialogPrivate *priv;
   GList *children;
   GList *tmp_list;
 
@@ -1257,7 +1257,7 @@ gtk_dialog_set_alternative_button_order_valist (GtkDialog *dialog,
 						gint       first_response_id,
 						va_list    args)
 {
-  GtkDialogPriv *priv = dialog->priv;
+  GtkDialogPrivate *priv = dialog->priv;
   GtkWidget *child;
   gint response_id;
   gint position;
@@ -1362,7 +1362,7 @@ gtk_dialog_set_alternative_button_order_from_array (GtkDialog *dialog,
                                                     gint       n_params,
                                                     gint      *new_order)
 {
-  GtkDialogPriv *priv = dialog->priv;
+  GtkDialogPrivate *priv = dialog->priv;
   GdkScreen *screen;
   GtkWidget *child;
   gint position;
@@ -1480,7 +1480,7 @@ gtk_dialog_buildable_custom_finished (GtkBuildable *buildable,
 				      gpointer      user_data)
 {
   GtkDialog *dialog = GTK_DIALOG (buildable);
-  GtkDialogPriv *priv = dialog->priv;
+  GtkDialogPrivate *priv = dialog->priv;
   GSList *l;
   ActionWidgetsSubParserData *parser_data;
   GObject *object;
diff --git a/gtk/gtkdialog.h b/gtk/gtkdialog.h
index 428786e81c..5394209aa0 100644
--- a/gtk/gtkdialog.h
+++ b/gtk/gtkdialog.h
@@ -91,16 +91,16 @@ typedef enum
 #define GTK_DIALOG_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_DIALOG, GtkDialogClass))
 
 
-typedef struct _GtkDialog        GtkDialog;
-typedef struct _GtkDialogPriv    GtkDialogPriv;
-typedef struct _GtkDialogClass   GtkDialogClass;
+typedef struct _GtkDialog              GtkDialog;
+typedef struct _GtkDialogPrivate       GtkDialogPrivate;
+typedef struct _GtkDialogClass         GtkDialogClass;
 
 struct _GtkDialog
 {
   GtkWindow window;
 
   /*< private >*/
-  GtkDialogPriv *priv;
+  GtkDialogPrivate *priv;
 };
 
 struct _GtkDialogClass
diff --git a/gtk/gtkfilesystem.c b/gtk/gtkfilesystem.c
index 2442f17d6c..a4a289653b 100644
--- a/gtk/gtkfilesystem.c
+++ b/gtk/gtkfilesystem.c
@@ -75,7 +75,7 @@ static guint folder_signals [FOLDER_LAST_SIGNAL] = { 0, };
 
 typedef struct AsyncFuncData AsyncFuncData;
 
-struct GtkFileSystemPriv
+struct GtkFileSystemPrivate
 {
   GVolumeMonitor *volume_monitor;
 
@@ -90,7 +90,7 @@ struct GtkFileSystemPriv
   GFileMonitor *bookmarks_monitor;
 };
 
-struct GtkFolderPriv
+struct GtkFolderPrivate
 {
   GFile *folder_file;
   GHashTable *children;
@@ -160,7 +160,7 @@ static void
 gtk_file_system_dispose (GObject *object)
 {
   GtkFileSystem *file_system = GTK_FILE_SYSTEM (object);
-  GtkFileSystemPriv *priv = file_system->priv;
+  GtkFileSystemPrivate *priv = file_system->priv;
 
   DEBUG ("dispose");
 
@@ -185,7 +185,7 @@ static void
 gtk_file_system_finalize (GObject *object)
 {
   GtkFileSystem *file_system = GTK_FILE_SYSTEM (object);
-  GtkFileSystemPriv *priv = file_system->priv;
+  GtkFileSystemPrivate *priv = file_system->priv;
 
   DEBUG ("finalize");
 
@@ -227,7 +227,7 @@ _gtk_file_system_class_init (GtkFileSystemClass *class)
 		  g_cclosure_marshal_VOID__VOID,
 		  G_TYPE_NONE, 0);
 
-  g_type_class_add_private (object_class, sizeof (GtkFileSystemPriv));
+  g_type_class_add_private (object_class, sizeof (GtkFileSystemPrivate));
 }
 
 static GFile *
@@ -330,7 +330,7 @@ bookmarks_file_changed (GFileMonitor      *monitor,
 			gpointer           data)
 {
   GtkFileSystem *file_system = GTK_FILE_SYSTEM (data);
-  GtkFileSystemPriv *priv = file_system->priv;
+  GtkFileSystemPrivate *priv = file_system->priv;
 
   switch (event)
     {
@@ -389,7 +389,7 @@ mount_referenced_by_volume_activation_root (GList *volumes, GMount *mount)
 static void
 get_volumes_list (GtkFileSystem *file_system)
 {
-  GtkFileSystemPriv *priv = file_system->priv;
+  GtkFileSystemPrivate *priv = file_system->priv;
   GList *l, *ll;
   GList *drives;
   GList *volumes;
@@ -530,7 +530,7 @@ get_volumes_list (GtkFileSystem *file_system)
 static void
 _gtk_file_system_init (GtkFileSystem *file_system)
 {
-  GtkFileSystemPriv *priv;
+  GtkFileSystemPrivate *priv;
   GFile *bookmarks_file;
   GError *error = NULL;
 
@@ -538,7 +538,7 @@ _gtk_file_system_init (GtkFileSystem *file_system)
 
   file_system->priv = G_TYPE_INSTANCE_GET_PRIVATE (file_system,
                                                    GTK_TYPE_FILE_SYSTEM,
-                                                   GtkFileSystemPriv);
+                                                   GtkFileSystemPrivate);
   priv = file_system->priv;
 
   /* Volumes */
@@ -591,7 +591,7 @@ _gtk_file_system_new (void)
 GSList *
 _gtk_file_system_list_volumes (GtkFileSystem *file_system)
 {
-  GtkFileSystemPriv *priv = file_system->priv;
+  GtkFileSystemPrivate *priv = file_system->priv;
   GSList *list;
 
   DEBUG ("list_volumes");
@@ -611,7 +611,7 @@ _gtk_file_system_list_volumes (GtkFileSystem *file_system)
 GSList *
 _gtk_file_system_list_bookmarks (GtkFileSystem *file_system)
 {
-  GtkFileSystemPriv *priv = file_system->priv;
+  GtkFileSystemPrivate *priv = file_system->priv;
   GSList *bookmarks, *files = NULL;
 
   DEBUG ("list_bookmarks");
@@ -1063,7 +1063,7 @@ _gtk_file_system_insert_bookmark (GtkFileSystem  *file_system,
 				  gint            position,
 				  GError        **error)
 {
-  GtkFileSystemPriv *priv = file_system->priv;
+  GtkFileSystemPrivate *priv = file_system->priv;
   GSList *bookmarks;
   GtkFileSystemBookmark *bookmark;
   gboolean result = TRUE;
@@ -1118,7 +1118,7 @@ _gtk_file_system_remove_bookmark (GtkFileSystem  *file_system,
 				  GFile          *file,
 				  GError        **error)
 {
-  GtkFileSystemPriv *priv = file_system->priv;
+  GtkFileSystemPrivate *priv = file_system->priv;
   GtkFileSystemBookmark *bookmark;
   GSList *bookmarks;
   gboolean result = FALSE;
@@ -1173,7 +1173,7 @@ gchar *
 _gtk_file_system_get_bookmark_label (GtkFileSystem *file_system,
 				     GFile         *file)
 {
-  GtkFileSystemPriv *priv = file_system->priv;
+  GtkFileSystemPrivate *priv = file_system->priv;
   GSList *bookmarks;
   gchar *label = NULL;
 
@@ -1203,7 +1203,7 @@ _gtk_file_system_set_bookmark_label (GtkFileSystem *file_system,
 				     GFile         *file,
 				     const gchar   *label)
 {
-  GtkFileSystemPriv *priv = file_system->priv;
+  GtkFileSystemPrivate *priv = file_system->priv;
   gboolean changed = FALSE;
   GFile *bookmarks_file;
   GSList *bookmarks;
@@ -1260,7 +1260,7 @@ gtk_folder_set_property (GObject      *object,
 			 GParamSpec   *pspec)
 {
   GtkFolder *folder = GTK_FOLDER (object);
-  GtkFolderPriv *priv = folder->priv;
+  GtkFolderPrivate *priv = folder->priv;
 
   switch (prop_id)
     {
@@ -1286,7 +1286,7 @@ gtk_folder_get_property (GObject    *object,
 			 GParamSpec *pspec)
 {
   GtkFolder *folder = GTK_FOLDER (object);
-  GtkFolderPriv *priv = folder->priv;
+  GtkFolderPrivate *priv = folder->priv;
 
   switch (prop_id)
     {
@@ -1342,7 +1342,7 @@ directory_monitor_changed (GFileMonitor      *monitor,
 			   gpointer           data)
 {
   GtkFolder *folder = GTK_FOLDER (data);
-  GtkFolderPriv *priv = folder->priv;
+  GtkFolderPrivate *priv = folder->priv;
   GSList *files;
 
   files = g_slist_prepend (NULL, file);
@@ -1381,7 +1381,7 @@ enumerator_files_callback (GObject      *source_object,
 			   gpointer      user_data)
 {
   GtkFolder *folder = GTK_FOLDER (user_data);
-  GtkFolderPriv *priv = folder->priv;
+  GtkFolderPrivate *priv = folder->priv;
   GFileEnumerator *enumerator;
   GError *error = NULL;
   GSList *files = NULL;
@@ -1441,7 +1441,7 @@ static void
 gtk_folder_constructed (GObject *object)
 {
   GtkFolder *folder = GTK_FOLDER (object);
-  GtkFolderPriv *priv = folder->priv;
+  GtkFolderPrivate *priv = folder->priv;
   GError *error = NULL;
 
   priv->directory_monitor = g_file_monitor_directory (priv->folder_file, G_FILE_MONITOR_NONE, NULL, &error);
@@ -1470,7 +1470,7 @@ static void
 gtk_folder_finalize (GObject *object)
 {
   GtkFolder *folder = GTK_FOLDER (object);
-  GtkFolderPriv *priv = folder->priv;
+  GtkFolderPrivate *priv = folder->priv;
 
   g_hash_table_unref (priv->children);
 
@@ -1559,13 +1559,13 @@ _gtk_folder_class_init (GtkFolderClass *class)
 		  g_cclosure_marshal_VOID__VOID,
 		  G_TYPE_NONE, 0);
 
-  g_type_class_add_private (object_class, sizeof (GtkFolderPriv));
+  g_type_class_add_private (object_class, sizeof (GtkFolderPrivate));
 }
 
 static void
 _gtk_folder_init (GtkFolder *folder)
 {
-  GtkFolderPriv *priv = folder->priv;
+  GtkFolderPrivate *priv = folder->priv;
 
   priv->children = g_hash_table_new_full (g_file_hash,
 					  (GEqualFunc) g_file_equal,
@@ -1578,7 +1578,7 @@ static void
 gtk_folder_set_finished_loading (GtkFolder *folder,
 				 gboolean   finished_loading)
 {
-  GtkFolderPriv *priv = folder->priv;
+  GtkFolderPrivate *priv = folder->priv;
 
   priv->finished_loading = (finished_loading == TRUE);
 
@@ -1592,7 +1592,7 @@ gtk_folder_add_file (GtkFolder *folder,
 		     GFile     *file,
 		     GFileInfo *info)
 {
-  GtkFolderPriv *priv = folder->priv;
+  GtkFolderPrivate *priv = folder->priv;
 
   g_hash_table_insert (priv->children,
 		       g_object_ref (file),
@@ -1602,7 +1602,7 @@ gtk_folder_add_file (GtkFolder *folder,
 GSList *
 _gtk_folder_list_children (GtkFolder *folder)
 {
-  GtkFolderPriv *priv = folder->priv;
+  GtkFolderPrivate *priv = folder->priv;
   GList *files, *elem;
   GSList *children = NULL;
 
@@ -1621,7 +1621,7 @@ GFileInfo *
 _gtk_folder_get_info (GtkFolder  *folder,
 		      GFile      *file)
 {
-  GtkFolderPriv *priv = folder->priv;
+  GtkFolderPrivate *priv = folder->priv;
   GFileInfo *info;
 
   info = g_hash_table_lookup (priv->children, file);
diff --git a/gtk/gtkfilesystem.h b/gtk/gtkfilesystem.h
index 1e5acb3c24..ec8266f466 100644
--- a/gtk/gtkfilesystem.h
+++ b/gtk/gtkfilesystem.h
@@ -34,7 +34,7 @@ G_BEGIN_DECLS
 #define GTK_FILE_SYSTEM_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS  ((o), GTK_TYPE_FILE_SYSTEM, GtkFileSystemClass))
 
 typedef struct GtkFileSystem          GtkFileSystem;
-typedef struct GtkFileSystemPriv      GtkFileSystemPriv;
+typedef struct GtkFileSystemPrivate      GtkFileSystemPrivate;
 typedef struct GtkFileSystemClass     GtkFileSystemClass;
 
 
@@ -46,7 +46,7 @@ typedef struct GtkFileSystemClass     GtkFileSystemClass;
 #define GTK_FOLDER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS  ((o), GTK_TYPE_FOLDER, GtkFolderClass))
 
 typedef struct GtkFolder          GtkFolder;
-typedef struct GtkFolderPriv      GtkFolderPriv;
+typedef struct GtkFolderPrivate      GtkFolderPrivate;
 typedef struct GtkFolderClass     GtkFolderClass;
 
 typedef struct GtkFileSystemVolume GtkFileSystemVolume; /* opaque struct */
@@ -57,7 +57,7 @@ struct GtkFileSystem
 {
   GObject parent_object;
 
-  GtkFileSystemPriv *priv;
+  GtkFileSystemPrivate *priv;
 };
 
 struct GtkFileSystemClass
@@ -73,7 +73,7 @@ struct GtkFolder
 {
   GObject parent_object;
 
-  GtkFolderPriv *priv;
+  GtkFolderPrivate *priv;
 };
 
 struct GtkFolderClass
diff --git a/gtk/gtkfixed.c b/gtk/gtkfixed.c
index 1c26c74272..0a461423f5 100644
--- a/gtk/gtkfixed.c
+++ b/gtk/gtkfixed.c
@@ -30,7 +30,7 @@
 #include "gtkintl.h"
 
 
-struct _GtkFixedPriv
+struct _GtkFixedPrivate
 {
   GList *children;
 };
@@ -110,7 +110,7 @@ gtk_fixed_class_init (GtkFixedClass *class)
                                                                 0,
                                                                 GTK_PARAM_READWRITE));
 
-  g_type_class_add_private (class, sizeof (GtkFixedPriv));
+  g_type_class_add_private (class, sizeof (GtkFixedPrivate));
 }
 
 static GType
@@ -122,11 +122,11 @@ gtk_fixed_child_type (GtkContainer     *container)
 static void
 gtk_fixed_init (GtkFixed *fixed)
 {
-  GtkFixedPriv *priv;
+  GtkFixedPrivate *priv;
 
   fixed->priv = G_TYPE_INSTANCE_GET_PRIVATE (fixed,
                                              GTK_TYPE_FIXED,
-                                             GtkFixedPriv);
+                                             GtkFixedPrivate);
   priv = fixed->priv;
 
   gtk_widget_set_has_window (GTK_WIDGET (fixed), FALSE);
@@ -144,7 +144,7 @@ static GtkFixedChild*
 get_child (GtkFixed  *fixed,
            GtkWidget *widget)
 {
-  GtkFixedPriv *priv = fixed->priv;
+  GtkFixedPrivate *priv = fixed->priv;
   GList *children;
 
   children = priv->children;
@@ -168,7 +168,7 @@ gtk_fixed_put (GtkFixed       *fixed,
                gint            x,
                gint            y)
 {
-  GtkFixedPriv *priv = fixed->priv;
+  GtkFixedPrivate *priv = fixed->priv;
   GtkFixedChild *child_info;
 
   g_return_if_fail (GTK_IS_FIXED (fixed));
@@ -327,7 +327,7 @@ static void
 gtk_fixed_size_request (GtkWidget      *widget,
 			GtkRequisition *requisition)
 {
-  GtkFixedPriv *priv;
+  GtkFixedPrivate *priv;
   GtkFixed *fixed;
   GtkFixedChild *child;
   GList *children;
@@ -369,7 +369,7 @@ gtk_fixed_size_allocate (GtkWidget     *widget,
 			 GtkAllocation *allocation)
 {
   GtkFixed *fixed = GTK_FIXED (widget);
-  GtkFixedPriv *priv = fixed->priv;
+  GtkFixedPrivate *priv = fixed->priv;
   GtkFixedChild *child;
   GtkAllocation child_allocation;
   GtkRequisition child_requisition;
@@ -427,7 +427,7 @@ gtk_fixed_remove (GtkContainer *container,
 		  GtkWidget    *widget)
 {
   GtkFixed *fixed = GTK_FIXED (container);
-  GtkFixedPriv *priv = fixed->priv;
+  GtkFixedPrivate *priv = fixed->priv;
   GtkFixedChild *child;
   GtkWidget *widget_container = GTK_WIDGET (container);
   GList *children;
@@ -464,7 +464,7 @@ gtk_fixed_forall (GtkContainer *container,
 		  gpointer      callback_data)
 {
   GtkFixed *fixed = GTK_FIXED (container);
-  GtkFixedPriv *priv = fixed->priv;
+  GtkFixedPrivate *priv = fixed->priv;
   GtkFixedChild *child;
   GList *children;
 
diff --git a/gtk/gtkfixed.h b/gtk/gtkfixed.h
index fc65f6cae5..2703c6b1c3 100644
--- a/gtk/gtkfixed.h
+++ b/gtk/gtkfixed.h
@@ -44,17 +44,17 @@ G_BEGIN_DECLS
 #define GTK_IS_FIXED_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_FIXED))
 #define GTK_FIXED_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_FIXED, GtkFixedClass))
 
-typedef struct _GtkFixed        GtkFixed;
-typedef struct _GtkFixedPriv    GtkFixedPriv;
-typedef struct _GtkFixedClass   GtkFixedClass;
-typedef struct _GtkFixedChild   GtkFixedChild;
+typedef struct _GtkFixed              GtkFixed;
+typedef struct _GtkFixedPrivate       GtkFixedPrivate;
+typedef struct _GtkFixedClass         GtkFixedClass;
+typedef struct _GtkFixedChild         GtkFixedChild;
 
 struct _GtkFixed
 {
   GtkContainer container;
 
   /* <private> */
-  GtkFixedPriv *priv;
+  GtkFixedPrivate *priv;
 };
 
 struct _GtkFixedClass
diff --git a/gtk/gtkfontsel.c b/gtk/gtkfontsel.c
index ffe67b88fc..f1a509cab1 100644
--- a/gtk/gtkfontsel.c
+++ b/gtk/gtkfontsel.c
@@ -61,7 +61,7 @@
 #include "gtkprivate.h"
 #include "gtkbuildable.h"
 
-struct _GtkFontSelectionPriv
+struct _GtkFontSelectionPrivate
 {
   GtkWidget *font_entry;        /* Used _get_family_entry() for consistency, -mr */
   GtkWidget *font_style_entry;  /* Used _get_face_entry() for consistency, -mr */
@@ -80,7 +80,7 @@ struct _GtkFontSelectionPriv
 };
 
 
-struct _GtkFontSelectionDialogPriv
+struct _GtkFontSelectionDialogPrivate
 {
   GtkWidget *fontsel;
 
@@ -232,7 +232,7 @@ gtk_font_selection_class_init (GtkFontSelectionClass *klass)
                                                         _(PREVIEW_TEXT),
                                                         GTK_PARAM_READWRITE));
 
-  g_type_class_add_private (klass, sizeof (GtkFontSelectionPriv));
+  g_type_class_add_private (klass, sizeof (GtkFontSelectionPrivate));
 }
 
 static void 
@@ -311,7 +311,7 @@ list_row_activated (GtkWidget *widget)
 static void
 gtk_font_selection_init (GtkFontSelection *fontsel)
 {
-  GtkFontSelectionPriv *priv;
+  GtkFontSelectionPrivate *priv;
   GtkWidget *scrolled_win;
   GtkWidget *text_box;
   GtkWidget *table, *label;
@@ -324,7 +324,7 @@ gtk_font_selection_init (GtkFontSelection *fontsel)
 
   fontsel->priv = G_TYPE_INSTANCE_GET_PRIVATE (fontsel,
                                                GTK_TYPE_FONT_SELECTION,
-                                               GtkFontSelectionPriv);
+                                               GtkFontSelectionPrivate);
   priv = fontsel->priv;
 
   gtk_widget_push_composite_child ();
@@ -611,7 +611,7 @@ static void
 gtk_font_selection_ref_family (GtkFontSelection *fontsel,
 			       PangoFontFamily  *family)
 {
-  GtkFontSelectionPriv *priv = fontsel->priv;
+  GtkFontSelectionPrivate *priv = fontsel->priv;
 
   if (family)
     family = g_object_ref (family);
@@ -623,7 +623,7 @@ gtk_font_selection_ref_family (GtkFontSelection *fontsel,
 static void gtk_font_selection_ref_face (GtkFontSelection *fontsel,
 					 PangoFontFace    *face)
 {
-  GtkFontSelectionPriv *priv = fontsel->priv;
+  GtkFontSelectionPrivate *priv = fontsel->priv;
 
   if (face)
     face = g_object_ref (face);
@@ -703,7 +703,7 @@ set_cursor_to_iter (GtkTreeView *view,
 static void
 gtk_font_selection_scroll_to_selection (GtkFontSelection *fontsel)
 {
-  GtkFontSelectionPriv *priv = fontsel->priv;
+  GtkFontSelectionPrivate *priv = fontsel->priv;
 
   /* Try to scroll the font family list to the selected item */
   scroll_to_selection (GTK_TREE_VIEW (priv->family_list));
@@ -730,7 +730,7 @@ gtk_font_selection_select_font (GtkTreeSelection *selection,
 				gpointer          data)
 {
   GtkFontSelection *fontsel;
-  GtkFontSelectionPriv *priv;
+  GtkFontSelectionPrivate *priv;
   GtkTreeModel *model;
   GtkTreeIter iter;
 #ifdef INCLUDE_FONT_ENTRIES
@@ -774,7 +774,7 @@ cmp_families (const void *a, const void *b)
 static void
 gtk_font_selection_show_available_fonts (GtkFontSelection *fontsel)
 {
-  GtkFontSelectionPriv *priv = fontsel->priv;
+  GtkFontSelectionPrivate *priv = fontsel->priv;
   GtkListStore *model;
   PangoFontFamily **families;
   PangoFontFamily *match_family = NULL;
@@ -871,7 +871,7 @@ font_description_style_equal (const PangoFontDescription *a,
 static void
 gtk_font_selection_show_available_styles (GtkFontSelection *fontsel)
 {
-  GtkFontSelectionPriv *priv = fontsel->priv;
+  GtkFontSelectionPrivate *priv = fontsel->priv;
   gint n_faces, i;
   PangoFontFace **faces;
   PangoFontDescription *old_desc;
@@ -947,7 +947,7 @@ static void
 gtk_font_selection_select_best_style (GtkFontSelection *fontsel,
 				      gboolean	        use_first)
 {
-  GtkFontSelectionPriv *priv = fontsel->priv;
+  GtkFontSelectionPrivate *priv = fontsel->priv;
   GtkTreeIter iter;
   GtkTreeModel *model;
 
@@ -990,7 +990,7 @@ static void
 gtk_font_selection_show_available_sizes (GtkFontSelection *fontsel,
 					 gboolean          first_time)
 {
-  GtkFontSelectionPriv *priv = fontsel->priv;
+  GtkFontSelectionPrivate *priv = fontsel->priv;
   gint i;
   GtkListStore *model;
   gchar buffer[128];
@@ -1067,7 +1067,7 @@ static void
 gtk_font_selection_set_size (GtkFontSelection *fontsel,
 			     gint              new_size)
 {
-  GtkFontSelectionPriv *priv = fontsel->priv;
+  GtkFontSelectionPrivate *priv = fontsel->priv;
 
   if (priv->size != new_size)
     {
@@ -1085,7 +1085,7 @@ gtk_font_selection_size_activate (GtkWidget   *w,
                                   gpointer     data)
 {
   GtkFontSelection *fontsel = GTK_FONT_SELECTION (data);
-  GtkFontSelectionPriv *priv = fontsel->priv;
+  GtkFontSelectionPrivate *priv = fontsel->priv;
   gint new_size;
   const gchar *text;
 
@@ -1104,7 +1104,7 @@ gtk_font_selection_size_focus_out (GtkWidget     *w,
 				   gpointer       data)
 {
   GtkFontSelection *fontsel = GTK_FONT_SELECTION (data);
-  GtkFontSelectionPriv *priv = fontsel->priv;
+  GtkFontSelectionPrivate *priv = fontsel->priv;
   gint new_size;
   const gchar *text;
 
@@ -1142,7 +1142,7 @@ gtk_font_selection_load_font (GtkFontSelection *fontsel)
 static PangoFontDescription *
 gtk_font_selection_get_font_description (GtkFontSelection *fontsel)
 {
-  GtkFontSelectionPriv *priv = fontsel->priv;
+  GtkFontSelectionPrivate *priv = fontsel->priv;
   PangoFontDescription *font_desc;
 
   if (priv->face)
@@ -1165,7 +1165,7 @@ gtk_font_selection_get_font_description (GtkFontSelection *fontsel)
 static void
 gtk_font_selection_update_preview (GtkFontSelection *fontsel)
 {
-  GtkFontSelectionPriv *priv = fontsel->priv;
+  GtkFontSelectionPrivate *priv = fontsel->priv;
   GtkRcStyle *rc_style;
   gint new_height;
   GtkRequisition old_requisition;
@@ -1393,7 +1393,7 @@ gtk_font_selection_select_font_desc (GtkFontSelection      *fontsel,
 				     PangoFontFamily      **pfamily,
 				     PangoFontFace        **pface)
 {
-  GtkFontSelectionPriv *priv = fontsel->priv;
+  GtkFontSelectionPrivate *priv = fontsel->priv;
   PangoFontFamily *new_family = NULL;
   PangoFontFace *new_face = NULL;
   PangoFontFace *fallback_face = NULL;
@@ -1549,7 +1549,7 @@ gtk_font_selection_set_font_name (GtkFontSelection *fontsel,
 G_CONST_RETURN gchar*
 gtk_font_selection_get_preview_text (GtkFontSelection *fontsel)
 {
-  GtkFontSelectionPriv *priv;
+  GtkFontSelectionPrivate *priv;
 
   g_return_val_if_fail (GTK_IS_FONT_SELECTION (fontsel), NULL);
 
@@ -1571,7 +1571,7 @@ void
 gtk_font_selection_set_preview_text  (GtkFontSelection *fontsel,
 				      const gchar      *text)
 {
-  GtkFontSelectionPriv *priv;
+  GtkFontSelectionPrivate *priv;
 
   g_return_if_fail (GTK_IS_FONT_SELECTION (fontsel));
   g_return_if_fail (text != NULL);
@@ -1600,19 +1600,19 @@ static GtkBuildableIface *parent_buildable_iface;
 static void
 gtk_font_selection_dialog_class_init (GtkFontSelectionDialogClass *klass)
 {
-  g_type_class_add_private (klass, sizeof (GtkFontSelectionDialogPriv));
+  g_type_class_add_private (klass, sizeof (GtkFontSelectionDialogPrivate));
 }
 
 static void
 gtk_font_selection_dialog_init (GtkFontSelectionDialog *fontseldiag)
 {
-  GtkFontSelectionDialogPriv *priv;
+  GtkFontSelectionDialogPrivate *priv;
   GtkDialog *dialog = GTK_DIALOG (fontseldiag);
   GtkWidget *action_area, *content_area;
 
   fontseldiag->priv = G_TYPE_INSTANCE_GET_PRIVATE (fontseldiag,
                                                    GTK_TYPE_FONT_SELECTION_DIALOG,
-                                                   GtkFontSelectionDialogPriv);
+                                                   GtkFontSelectionDialogPrivate);
   priv = fontseldiag->priv;
 
   content_area = gtk_dialog_get_content_area (dialog);
@@ -1752,7 +1752,7 @@ gtk_font_selection_dialog_buildable_get_internal_child (GtkBuildable *buildable,
 							GtkBuilder   *builder,
 							const gchar  *childname)
 {
-  GtkFontSelectionDialogPriv *priv;
+  GtkFontSelectionDialogPrivate *priv;
 
   priv = GTK_FONT_SELECTION_DIALOG (buildable)->priv;
 
@@ -1787,7 +1787,7 @@ gtk_font_selection_dialog_buildable_get_internal_child (GtkBuildable *buildable,
 gchar*
 gtk_font_selection_dialog_get_font_name (GtkFontSelectionDialog *fsd)
 {
-  GtkFontSelectionDialogPriv *priv;
+  GtkFontSelectionDialogPrivate *priv;
 
   g_return_val_if_fail (GTK_IS_FONT_SELECTION_DIALOG (fsd), NULL);
 
@@ -1810,7 +1810,7 @@ gboolean
 gtk_font_selection_dialog_set_font_name (GtkFontSelectionDialog *fsd,
 					 const gchar	        *fontname)
 {
-  GtkFontSelectionDialogPriv *priv;
+  GtkFontSelectionDialogPrivate *priv;
 
   g_return_val_if_fail (GTK_IS_FONT_SELECTION_DIALOG (fsd), FALSE);
   g_return_val_if_fail (fontname, FALSE);
@@ -1833,7 +1833,7 @@ gtk_font_selection_dialog_set_font_name (GtkFontSelectionDialog *fsd,
 G_CONST_RETURN gchar*
 gtk_font_selection_dialog_get_preview_text (GtkFontSelectionDialog *fsd)
 {
-  GtkFontSelectionDialogPriv *priv;
+  GtkFontSelectionDialogPrivate *priv;
 
   g_return_val_if_fail (GTK_IS_FONT_SELECTION_DIALOG (fsd), NULL);
 
@@ -1853,7 +1853,7 @@ void
 gtk_font_selection_dialog_set_preview_text (GtkFontSelectionDialog *fsd,
 					    const gchar	           *text)
 {
-  GtkFontSelectionDialogPriv *priv;
+  GtkFontSelectionDialogPrivate *priv;
 
   g_return_if_fail (GTK_IS_FONT_SELECTION_DIALOG (fsd));
   g_return_if_fail (text != NULL);
diff --git a/gtk/gtkfontsel.h b/gtk/gtkfontsel.h
index b829464ea5..7ec2b354c6 100644
--- a/gtk/gtkfontsel.h
+++ b/gtk/gtkfontsel.h
@@ -58,20 +58,20 @@ G_BEGIN_DECLS
 #define GTK_FONT_SELECTION_DIALOG_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_FONT_SELECTION_DIALOG, GtkFontSelectionDialogClass))
 
 
-typedef struct _GtkFontSelection	     GtkFontSelection;
-typedef struct _GtkFontSelectionPriv         GtkFontSelectionPriv;
-typedef struct _GtkFontSelectionClass	     GtkFontSelectionClass;
+typedef struct _GtkFontSelection              GtkFontSelection;
+typedef struct _GtkFontSelectionPrivate       GtkFontSelectionPrivate;
+typedef struct _GtkFontSelectionClass         GtkFontSelectionClass;
 
-typedef struct _GtkFontSelectionDialog	     GtkFontSelectionDialog;
-typedef struct _GtkFontSelectionDialogPriv   GtkFontSelectionDialogPriv;
-typedef struct _GtkFontSelectionDialogClass  GtkFontSelectionDialogClass;
+typedef struct _GtkFontSelectionDialog              GtkFontSelectionDialog;
+typedef struct _GtkFontSelectionDialogPrivate       GtkFontSelectionDialogPrivate;
+typedef struct _GtkFontSelectionDialogClass         GtkFontSelectionDialogClass;
 
 struct _GtkFontSelection
 {
   GtkVBox parent_instance;
 
   /* <private> */
-  GtkFontSelectionPriv *priv;
+  GtkFontSelectionPrivate *priv;
 };
 
 struct _GtkFontSelectionClass
@@ -91,7 +91,7 @@ struct _GtkFontSelectionDialog
   GtkDialog parent_instance;
 
   /*< private >*/
-  GtkFontSelectionDialogPriv *priv;
+  GtkFontSelectionDialogPrivate *priv;
 };
 
 struct _GtkFontSelectionDialogClass
diff --git a/gtk/gtkframe.c b/gtk/gtkframe.c
index 7c4ddfa72b..8817111c97 100644
--- a/gtk/gtkframe.c
+++ b/gtk/gtkframe.c
@@ -36,7 +36,7 @@
 #define LABEL_PAD 1
 #define LABEL_SIDE_PAD 2
 
-struct _GtkFramePriv
+struct _GtkFramePrivate
 {
   /* Properties */
   GtkWidget *label_widget;
@@ -188,7 +188,7 @@ gtk_frame_class_init (GtkFrameClass *class)
 
   class->compute_child_allocation = gtk_frame_real_compute_child_allocation;
 
-  g_type_class_add_private (class, sizeof (GtkFramePriv));
+  g_type_class_add_private (class, sizeof (GtkFramePrivate));
 }
 
 static void
@@ -214,11 +214,11 @@ gtk_frame_buildable_add_child (GtkBuildable *buildable,
 static void
 gtk_frame_init (GtkFrame *frame)
 {
-  GtkFramePriv *priv;
+  GtkFramePrivate *priv;
 
   frame->priv = G_TYPE_INSTANCE_GET_PRIVATE (frame,
                                              GTK_TYPE_FRAME,
-                                             GtkFramePriv);
+                                             GtkFramePrivate);
   priv = frame->priv;
 
   priv->label_widget = NULL;
@@ -234,7 +234,7 @@ gtk_frame_set_property (GObject         *object,
 			GParamSpec      *pspec)
 {
   GtkFrame *frame = GTK_FRAME (object);
-  GtkFramePriv *priv = frame->priv;
+  GtkFramePrivate *priv = frame->priv;
 
   switch (prop_id)
     {
@@ -269,7 +269,7 @@ gtk_frame_get_property (GObject         *object,
 			GParamSpec      *pspec)
 {
   GtkFrame *frame = GTK_FRAME (object);
-  GtkFramePriv *priv = frame->priv;
+  GtkFramePrivate *priv = frame->priv;
 
   switch (prop_id)
     {
@@ -317,7 +317,7 @@ gtk_frame_remove (GtkContainer *container,
 		  GtkWidget    *child)
 {
   GtkFrame *frame = GTK_FRAME (container);
-  GtkFramePriv *priv = frame->priv;
+  GtkFramePrivate *priv = frame->priv;
 
   if (priv->label_widget == child)
     gtk_frame_set_label_widget (frame, NULL);
@@ -333,7 +333,7 @@ gtk_frame_forall (GtkContainer *container,
 {
   GtkBin *bin = GTK_BIN (container);
   GtkFrame *frame = GTK_FRAME (container);
-  GtkFramePriv *priv = frame->priv;
+  GtkFramePrivate *priv = frame->priv;
   GtkWidget *child;
 
   child = gtk_bin_get_child (bin);
@@ -388,7 +388,7 @@ gtk_frame_set_label (GtkFrame *frame,
 G_CONST_RETURN gchar *
 gtk_frame_get_label (GtkFrame *frame)
 {
-  GtkFramePriv *priv;
+  GtkFramePrivate *priv;
 
   g_return_val_if_fail (GTK_IS_FRAME (frame), NULL);
 
@@ -413,7 +413,7 @@ void
 gtk_frame_set_label_widget (GtkFrame  *frame,
 			    GtkWidget *label_widget)
 {
-  GtkFramePriv *priv;
+  GtkFramePrivate *priv;
   gboolean need_resize = FALSE;
 
   g_return_if_fail (GTK_IS_FRAME (frame));
@@ -485,7 +485,7 @@ gtk_frame_set_label_align (GtkFrame *frame,
 			   gfloat    xalign,
 			   gfloat    yalign)
 {
-  GtkFramePriv *priv;
+  GtkFramePrivate *priv;
 
   g_return_if_fail (GTK_IS_FRAME (frame));
 
@@ -525,7 +525,7 @@ gtk_frame_get_label_align (GtkFrame *frame,
 		           gfloat   *xalign,
 			   gfloat   *yalign)
 {
-  GtkFramePriv *priv;
+  GtkFramePrivate *priv;
 
   g_return_if_fail (GTK_IS_FRAME (frame));
 
@@ -548,7 +548,7 @@ void
 gtk_frame_set_shadow_type (GtkFrame      *frame,
 			   GtkShadowType  type)
 {
-  GtkFramePriv *priv;
+  GtkFramePrivate *priv;
   GtkWidget *widget;
 
   g_return_if_fail (GTK_IS_FRAME (frame));
@@ -592,7 +592,7 @@ gtk_frame_paint (GtkWidget    *widget,
 		 GdkRectangle *area)
 {
   GtkFrame *frame;
-  GtkFramePriv *priv;
+  GtkFramePrivate *priv;
   GtkStateType state;
   GtkStyle *style;
   GdkWindow *window;
@@ -670,7 +670,7 @@ gtk_frame_size_allocate (GtkWidget     *widget,
 			 GtkAllocation *allocation)
 {
   GtkFrame *frame = GTK_FRAME (widget);
-  GtkFramePriv *priv = frame->priv;
+  GtkFramePrivate *priv = frame->priv;
   GtkBin *bin = GTK_BIN (widget);
   GtkAllocation new_allocation;
   GtkWidget *child;
@@ -740,7 +740,7 @@ static void
 gtk_frame_real_compute_child_allocation (GtkFrame      *frame,
 					 GtkAllocation *child_allocation)
 {
-  GtkFramePriv *priv = frame->priv;
+  GtkFramePrivate *priv = frame->priv;
   GtkWidget *widget = GTK_WIDGET (frame);
   GtkAllocation allocation;
   GtkStyle *style;
@@ -790,7 +790,7 @@ gtk_frame_get_size (GtkSizeRequest *request,
 		    gint           *natural_size)
 {
   GtkFrame *frame = GTK_FRAME (request);
-  GtkFramePriv *priv = frame->priv;
+  GtkFramePrivate *priv = frame->priv;
   GtkStyle *style;
   GtkWidget *widget = GTK_WIDGET (request);
   GtkWidget *child;
@@ -889,7 +889,7 @@ gtk_frame_get_height_for_width (GtkSizeRequest *request,
   GtkWidget *widget = GTK_WIDGET (request);
   GtkWidget *child;
   GtkFrame *frame = GTK_FRAME (widget);
-  GtkFramePriv *priv = frame->priv;
+  GtkFramePrivate *priv = frame->priv;
   GtkBin *bin = GTK_BIN (widget);
   GtkStyle *style;
   gint child_min, child_nat, label_width;
diff --git a/gtk/gtkframe.h b/gtk/gtkframe.h
index 8c3aa855f1..91ef2f716e 100644
--- a/gtk/gtkframe.h
+++ b/gtk/gtkframe.h
@@ -45,16 +45,16 @@ G_BEGIN_DECLS
 #define GTK_IS_FRAME_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_FRAME))
 #define GTK_FRAME_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_FRAME, GtkFrameClass))
 
-typedef struct _GtkFrame       GtkFrame;
-typedef struct _GtkFramePriv   GtkFramePriv;
-typedef struct _GtkFrameClass  GtkFrameClass;
+typedef struct _GtkFrame              GtkFrame;
+typedef struct _GtkFramePrivate       GtkFramePrivate;
+typedef struct _GtkFrameClass         GtkFrameClass;
 
 struct _GtkFrame
 {
   GtkBin bin;
 
   /* <private> */
-  GtkFramePriv *priv;
+  GtkFramePrivate *priv;
 };
 
 struct _GtkFrameClass
diff --git a/gtk/gtkhandlebox.c b/gtk/gtkhandlebox.c
index ead564c313..7153beb92a 100644
--- a/gtk/gtkhandlebox.c
+++ b/gtk/gtkhandlebox.c
@@ -37,7 +37,7 @@
 
 
 
-struct _GtkHandleBoxPriv
+struct _GtkHandleBoxPrivate
 {
   /* Properties */
   GtkPositionType handle_position;
@@ -270,17 +270,17 @@ gtk_handle_box_class_init (GtkHandleBoxClass *class)
 		  G_TYPE_NONE, 1,
 		  GTK_TYPE_WIDGET);
 
-  g_type_class_add_private (gobject_class, sizeof (GtkHandleBoxPriv));
+  g_type_class_add_private (gobject_class, sizeof (GtkHandleBoxPrivate));
 }
 
 static void
 gtk_handle_box_init (GtkHandleBox *handle_box)
 {
-  GtkHandleBoxPriv *priv;
+  GtkHandleBoxPrivate *priv;
 
   handle_box->priv = G_TYPE_INSTANCE_GET_PRIVATE (handle_box,
                                                   GTK_TYPE_HANDLE_BOX,
-                                                  GtkHandleBoxPriv);
+                                                  GtkHandleBoxPrivate);
   priv = handle_box->priv;
 
   gtk_widget_set_has_window (GTK_WIDGET (handle_box), TRUE);
@@ -333,7 +333,7 @@ gtk_handle_box_get_property (GObject         *object,
 			     GParamSpec      *pspec)
 {
   GtkHandleBox *handle_box = GTK_HANDLE_BOX (object);
-  GtkHandleBoxPriv *priv = handle_box->priv;
+  GtkHandleBoxPrivate *priv = handle_box->priv;
 
   switch (prop_id)
     {
@@ -371,7 +371,7 @@ static void
 gtk_handle_box_map (GtkWidget *widget)
 {
   GtkHandleBox *hb = GTK_HANDLE_BOX (widget);
-  GtkHandleBoxPriv *priv = hb->priv;
+  GtkHandleBoxPrivate *priv = hb->priv;
   GtkBin *bin = GTK_BIN (widget);
   GtkWidget *child;
 
@@ -397,7 +397,7 @@ static void
 gtk_handle_box_unmap (GtkWidget *widget)
 {
   GtkHandleBox *hb = GTK_HANDLE_BOX (widget);
-  GtkHandleBoxPriv *priv = hb->priv;
+  GtkHandleBoxPrivate *priv = hb->priv;
 
   gtk_widget_set_mapped (widget, FALSE);
 
@@ -413,7 +413,7 @@ static void
 gtk_handle_box_realize (GtkWidget *widget)
 {
   GtkHandleBox *hb = GTK_HANDLE_BOX (widget);
-  GtkHandleBoxPriv *priv = hb->priv;
+  GtkHandleBoxPrivate *priv = hb->priv;
   GtkWidget *child;
   GdkWindowAttr attributes;
   gint attributes_mask;
@@ -486,7 +486,7 @@ static void
 gtk_handle_box_unrealize (GtkWidget *widget)
 {
   GtkHandleBox *hb = GTK_HANDLE_BOX (widget);
-  GtkHandleBoxPriv *priv = hb->priv;
+  GtkHandleBoxPrivate *priv = hb->priv;
 
   gdk_window_set_user_data (priv->bin_window, NULL);
   gdk_window_destroy (priv->bin_window);
@@ -503,7 +503,7 @@ gtk_handle_box_style_set (GtkWidget *widget,
 			  GtkStyle  *previous_style)
 {
   GtkHandleBox *hb = GTK_HANDLE_BOX (widget);
-  GtkHandleBoxPriv *priv = hb->priv;
+  GtkHandleBoxPrivate *priv = hb->priv;
 
   if (gtk_widget_get_realized (widget) &&
       gtk_widget_get_has_window (widget))
@@ -518,7 +518,7 @@ gtk_handle_box_style_set (GtkWidget *widget,
 static int
 effective_handle_position (GtkHandleBox *hb)
 {
-  GtkHandleBoxPriv *priv = hb->priv;
+  GtkHandleBoxPrivate *priv = hb->priv;
   int handle_position;
 
   if (gtk_widget_get_direction (GTK_WIDGET (hb)) == GTK_TEXT_DIR_LTR)
@@ -548,7 +548,7 @@ gtk_handle_box_size_request (GtkWidget      *widget,
 {
   GtkBin *bin = GTK_BIN (widget);
   GtkHandleBox *hb = GTK_HANDLE_BOX (widget);
-  GtkHandleBoxPriv *priv = hb->priv;
+  GtkHandleBoxPrivate *priv = hb->priv;
   GtkRequisition child_requisition;
   GtkWidget *child;
   gint handle_position;
@@ -626,7 +626,7 @@ gtk_handle_box_size_allocate (GtkWidget     *widget,
 {
   GtkBin *bin = GTK_BIN (widget);
   GtkHandleBox *hb = GTK_HANDLE_BOX (widget);
-  GtkHandleBoxPriv *priv = hb->priv;
+  GtkHandleBoxPrivate *priv = hb->priv;
   GtkRequisition child_requisition;
   GtkWidget *child;
   gint handle_position;
@@ -789,7 +789,7 @@ void
 gtk_handle_box_set_shadow_type (GtkHandleBox  *handle_box,
 				GtkShadowType  type)
 {
-  GtkHandleBoxPriv *priv;
+  GtkHandleBoxPrivate *priv;
 
   g_return_if_fail (GTK_IS_HANDLE_BOX (handle_box));
 
@@ -824,7 +824,7 @@ void
 gtk_handle_box_set_handle_position  (GtkHandleBox    *handle_box,
 				     GtkPositionType  position)
 {
-  GtkHandleBoxPriv *priv;
+  GtkHandleBoxPrivate *priv;
 
   g_return_if_fail (GTK_IS_HANDLE_BOX (handle_box));
 
@@ -859,7 +859,7 @@ void
 gtk_handle_box_set_snap_edge        (GtkHandleBox    *handle_box,
 				     GtkPositionType  edge)
 {
-  GtkHandleBoxPriv *priv;
+  GtkHandleBoxPrivate *priv;
 
   g_return_if_fail (GTK_IS_HANDLE_BOX (handle_box));
 
@@ -918,7 +918,7 @@ gtk_handle_box_paint (GtkWidget      *widget,
 		      GdkRectangle   *area)
 {
   GtkHandleBox *hb = GTK_HANDLE_BOX (widget);
-  GtkHandleBoxPriv *priv = hb->priv;
+  GtkHandleBoxPrivate *priv = hb->priv;
   GtkBin *bin = GTK_BIN (widget);
   GtkWidget *child;
   gint width, height;
@@ -1005,7 +1005,7 @@ gtk_handle_box_expose (GtkWidget      *widget,
 		       GdkEventExpose *event)
 {
   GtkHandleBox *hb;
-  GtkHandleBoxPriv *priv;
+  GtkHandleBoxPrivate *priv;
 
   if (gtk_widget_is_drawable (widget))
     {
@@ -1043,7 +1043,7 @@ gtk_handle_box_grab_event (GtkWidget    *widget,
 			   GdkEvent     *event,
 			   GtkHandleBox *hb)
 {
-  GtkHandleBoxPriv *priv = hb->priv;
+  GtkHandleBoxPrivate *priv = hb->priv;
 
   switch (event->type)
     {
@@ -1071,7 +1071,7 @@ gtk_handle_box_button_press (GtkWidget      *widget,
                              GdkEventButton *event)
 {
   GtkHandleBox *hb = GTK_HANDLE_BOX (widget);
-  GtkHandleBoxPriv *priv = hb->priv;
+  GtkHandleBoxPrivate *priv = hb->priv;
   gboolean event_handled;
   GdkCursor *fleur;
   gint handle_position;
@@ -1206,7 +1206,7 @@ gtk_handle_box_motion (GtkWidget      *widget,
 		       GdkEventMotion *event)
 {
   GtkHandleBox *hb = GTK_HANDLE_BOX (widget);
-  GtkHandleBoxPriv *priv = hb->priv;
+  GtkHandleBoxPrivate *priv = hb->priv;
   GtkWidget *child;
   gint new_x, new_y;
   gint snap_edge;
@@ -1416,7 +1416,7 @@ static void
 gtk_handle_box_add (GtkContainer *container,
 		    GtkWidget    *widget)
 {
-  GtkHandleBoxPriv *priv = GTK_HANDLE_BOX (container)->priv;
+  GtkHandleBoxPrivate *priv = GTK_HANDLE_BOX (container)->priv;
 
   gtk_widget_set_parent_window (widget, priv->bin_window);
   GTK_CONTAINER_CLASS (gtk_handle_box_parent_class)->add (container, widget);
@@ -1436,7 +1436,7 @@ gtk_handle_box_delete_event (GtkWidget *widget,
 			     GdkEventAny  *event)
 {
   GtkHandleBox *hb = GTK_HANDLE_BOX (widget);
-  GtkHandleBoxPriv *priv = hb->priv;
+  GtkHandleBoxPrivate *priv = hb->priv;
 
   if (event->window == priv->float_window)
     {
@@ -1451,7 +1451,7 @@ gtk_handle_box_delete_event (GtkWidget *widget,
 static void
 gtk_handle_box_reattach (GtkHandleBox *hb)
 {
-  GtkHandleBoxPriv *priv = hb->priv;
+  GtkHandleBoxPrivate *priv = hb->priv;
   GtkWidget *child;
   GtkWidget *widget = GTK_WIDGET (hb);
   
@@ -1483,7 +1483,7 @@ static void
 gtk_handle_box_end_drag (GtkHandleBox *hb,
 			 guint32       time)
 {
-  GtkHandleBoxPriv *priv = hb->priv;
+  GtkHandleBoxPrivate *priv = hb->priv;
   GtkWidget *invisible = gtk_handle_box_get_invisible ();
 
   priv->in_drag = FALSE;
diff --git a/gtk/gtkhandlebox.h b/gtk/gtkhandlebox.h
index 0240e362b1..174ce393a9 100644
--- a/gtk/gtkhandlebox.h
+++ b/gtk/gtkhandlebox.h
@@ -49,16 +49,16 @@ G_BEGIN_DECLS
 #define GTK_IS_HANDLE_BOX_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_HANDLE_BOX))
 #define GTK_HANDLE_BOX_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_HANDLE_BOX, GtkHandleBoxClass))
 
-typedef struct _GtkHandleBox       GtkHandleBox;
-typedef struct _GtkHandleBoxPriv   GtkHandleBoxPriv;
-typedef struct _GtkHandleBoxClass  GtkHandleBoxClass;
+typedef struct _GtkHandleBox              GtkHandleBox;
+typedef struct _GtkHandleBoxPrivate       GtkHandleBoxPrivate;
+typedef struct _GtkHandleBoxClass         GtkHandleBoxClass;
 
 struct _GtkHandleBox
 {
   GtkBin bin;
 
   /* <private> */
-  GtkHandleBoxPriv *priv;
+  GtkHandleBoxPrivate *priv;
 };
 
 struct _GtkHandleBoxClass
diff --git a/gtk/gtkhsv.c b/gtk/gtkhsv.c
index 5d1fdcc64f..9d936a0062 100644
--- a/gtk/gtkhsv.c
+++ b/gtk/gtkhsv.c
@@ -56,7 +56,7 @@ typedef enum {
 } DragMode;
 
 /* Private part of the GtkHSV structure */
-struct _GtkHSVPriv
+struct _GtkHSVPrivate
 {
   /* Color value */
   double h;
@@ -195,16 +195,16 @@ gtk_hsv_class_init (GtkHSVClass *class)
                                 "move", 1,
                                 G_TYPE_ENUM, GTK_DIR_LEFT);
 
-  g_type_class_add_private (gobject_class, sizeof (GtkHSVPriv));
+  g_type_class_add_private (gobject_class, sizeof (GtkHSVPrivate));
 }
 
 /* Object initialization function for the HSV color selector */
 static void
 gtk_hsv_init (GtkHSV *hsv)
 {
-  GtkHSVPriv *priv;
+  GtkHSVPrivate *priv;
 
-  priv = G_TYPE_INSTANCE_GET_PRIVATE (hsv, GTK_TYPE_HSV, GtkHSVPriv);
+  priv = G_TYPE_INSTANCE_GET_PRIVATE (hsv, GTK_TYPE_HSV, GtkHSVPrivate);
   
   hsv->priv = priv;
 
@@ -235,7 +235,7 @@ static void
 gtk_hsv_map (GtkWidget *widget)
 {
   GtkHSV *hsv = GTK_HSV (widget);
-  GtkHSVPriv *priv = hsv->priv;
+  GtkHSVPrivate *priv = hsv->priv;
 
   GTK_WIDGET_CLASS (gtk_hsv_parent_class)->map (widget);
 
@@ -248,7 +248,7 @@ static void
 gtk_hsv_unmap (GtkWidget *widget)
 {
   GtkHSV *hsv = GTK_HSV (widget);
-  GtkHSVPriv *priv = hsv->priv;
+  GtkHSVPrivate *priv = hsv->priv;
 
   gdk_window_hide (priv->window);
 
@@ -260,7 +260,7 @@ static void
 gtk_hsv_realize (GtkWidget *widget)
 {
   GtkHSV *hsv = GTK_HSV (widget);
-  GtkHSVPriv *priv = hsv->priv;
+  GtkHSVPrivate *priv = hsv->priv;
   GtkAllocation allocation;
   GdkWindow *parent_window;
   GdkWindowAttr attr;
@@ -302,7 +302,7 @@ static void
 gtk_hsv_unrealize (GtkWidget *widget)
 {
   GtkHSV *hsv = GTK_HSV (widget);
-  GtkHSVPriv *priv = hsv->priv;
+  GtkHSVPrivate *priv = hsv->priv;
 
   gdk_window_set_user_data (priv->window, NULL);
   gdk_window_destroy (priv->window);
@@ -317,7 +317,7 @@ gtk_hsv_size_request (GtkWidget      *widget,
 		      GtkRequisition *requisition)
 {
   GtkHSV *hsv = GTK_HSV (widget);
-  GtkHSVPriv *priv = hsv->priv;
+  GtkHSVPrivate *priv = hsv->priv;
   gint focus_width;
   gint focus_pad;
 
@@ -336,7 +336,7 @@ gtk_hsv_size_allocate (GtkWidget     *widget,
 		       GtkAllocation *allocation)
 {
   GtkHSV *hsv = GTK_HSV (widget);
-  GtkHSVPriv *priv = hsv->priv;
+  GtkHSVPrivate *priv = hsv->priv;
 
   gtk_widget_set_allocation (widget, allocation);
 
@@ -511,7 +511,7 @@ compute_triangle (GtkHSV *hsv,
 		  gint   *vx,
 		  gint   *vy)
 {
-  GtkHSVPriv *priv = hsv->priv;
+  GtkHSVPrivate *priv = hsv->priv;
   GtkAllocation allocation;
   GtkWidget *widget = GTK_WIDGET (hsv);
   gdouble center_x;
@@ -541,7 +541,7 @@ is_in_ring (GtkHSV *hsv,
 	    gdouble x,
 	    gdouble y)
 {
-  GtkHSVPriv *priv = hsv->priv;
+  GtkHSVPrivate *priv = hsv->priv;
   GtkAllocation allocation;
   GtkWidget *widget = GTK_WIDGET (hsv);
   gdouble dx, dy, dist;
@@ -705,7 +705,7 @@ static void
 set_cross_grab (GtkHSV *hsv,
 		guint32 time)
 {
-  GtkHSVPriv *priv = hsv->priv;
+  GtkHSVPrivate *priv = hsv->priv;
   GdkCursor *cursor;
 
   cursor = gdk_cursor_new_for_display (gtk_widget_get_display (GTK_WIDGET (hsv)),
@@ -725,7 +725,7 @@ gtk_hsv_grab_broken (GtkWidget          *widget,
 		     GdkEventGrabBroken *event)
 {
   GtkHSV *hsv = GTK_HSV (widget);
-  GtkHSVPriv *priv = hsv->priv;
+  GtkHSVPrivate *priv = hsv->priv;
 
   priv->mode = DRAG_NONE;
   
@@ -738,7 +738,7 @@ gtk_hsv_button_press (GtkWidget      *widget,
 		      GdkEventButton *event)
 {
   GtkHSV *hsv = GTK_HSV (widget);
-  GtkHSVPriv *priv = hsv->priv;
+  GtkHSVPrivate *priv = hsv->priv;
   double x, y;
 
   if (priv->mode != DRAG_NONE || event->button != 1)
@@ -788,7 +788,7 @@ gtk_hsv_button_release (GtkWidget      *widget,
 			GdkEventButton *event)
 {
   GtkHSV *hsv = GTK_HSV (widget);
-  GtkHSVPriv *priv = hsv->priv;
+  GtkHSVPrivate *priv = hsv->priv;
   DragMode mode;
   gdouble x, y;
 
@@ -826,7 +826,7 @@ gtk_hsv_motion (GtkWidget      *widget,
 		GdkEventMotion *event)
 {
   GtkHSV *hsv = GTK_HSV (widget);
-  GtkHSVPriv *priv = hsv->priv;
+  GtkHSVPrivate *priv = hsv->priv;
   GdkModifierType mods;
   double x, y;
 
@@ -868,7 +868,7 @@ paint_ring (GtkHSV      *hsv,
 	    gint         width,
 	    gint         height)
 {
-  GtkHSVPriv *priv = hsv->priv;
+  GtkHSVPrivate *priv = hsv->priv;
   GtkAllocation allocation;
   GtkWidget *widget = GTK_WIDGET (hsv);
   int xx, yy;
@@ -1020,7 +1020,7 @@ paint_triangle (GtkHSV      *hsv,
 		gint         width,
 		gint         height)
 {
-  GtkHSVPriv *priv = hsv->priv;
+  GtkHSVPrivate *priv = hsv->priv;
   GtkWidget *widget = GTK_WIDGET (hsv);
   gint hx, hy, sx, sy, vx, vy; /* HSV vertices */
   gint x1, y1, r1, g1, b1; /* First vertex in scanline order */
@@ -1241,7 +1241,7 @@ gtk_hsv_expose (GtkWidget      *widget,
 		GdkEventExpose *event)
 {
   GtkHSV *hsv = GTK_HSV (widget);
-  GtkHSVPriv *priv = hsv->priv;
+  GtkHSVPrivate *priv = hsv->priv;
   GtkAllocation allocation;
   GdkRectangle rect, dest;
   GdkWindow *window;
@@ -1287,7 +1287,7 @@ gtk_hsv_focus (GtkWidget       *widget,
                GtkDirectionType dir)
 {
   GtkHSV *hsv = GTK_HSV (widget);
-  GtkHSVPriv *priv = hsv->priv;
+  GtkHSVPrivate *priv = hsv->priv;
 
   if (!gtk_widget_has_focus (widget))
     {
@@ -1371,7 +1371,7 @@ gtk_hsv_set_color (GtkHSV *hsv,
 		   gdouble s,
 		   gdouble v)
 {
-  GtkHSVPriv *priv;
+  GtkHSVPrivate *priv;
 
   g_return_if_fail (GTK_IS_HSV (hsv));
   g_return_if_fail (h >= 0.0 && h <= 1.0);
@@ -1407,7 +1407,7 @@ gtk_hsv_get_color (GtkHSV *hsv,
                    double *s,
                    double *v)
 {
-  GtkHSVPriv *priv = hsv->priv;
+  GtkHSVPrivate *priv = hsv->priv;
 
   g_return_if_fail (GTK_IS_HSV (hsv));
 
@@ -1438,7 +1438,7 @@ gtk_hsv_set_metrics (GtkHSV *hsv,
 		     gint    size,
 		     gint    ring_width)
 {
-  GtkHSVPriv *priv = hsv->priv;
+  GtkHSVPrivate *priv = hsv->priv;
   int same_size;
 
   g_return_if_fail (GTK_IS_HSV (hsv));
@@ -1474,7 +1474,7 @@ gtk_hsv_get_metrics (GtkHSV *hsv,
 		     gint   *size,
 		     gint   *ring_width)
 {
-  GtkHSVPriv *priv = hsv->priv;
+  GtkHSVPrivate *priv = hsv->priv;
 
   g_return_if_fail (GTK_IS_HSV (hsv));
 
@@ -1505,7 +1505,7 @@ gtk_hsv_get_metrics (GtkHSV *hsv,
 gboolean
 gtk_hsv_is_adjusting (GtkHSV *hsv)
 {
-  GtkHSVPriv *priv = hsv->priv;
+  GtkHSVPrivate *priv = hsv->priv;
 
   g_return_val_if_fail (GTK_IS_HSV (hsv), FALSE);
 
@@ -1596,7 +1596,7 @@ static void
 gtk_hsv_move (GtkHSV          *hsv,
               GtkDirectionType dir)
 {
-  GtkHSVPriv *priv = hsv->priv;
+  GtkHSVPrivate *priv = hsv->priv;
   gdouble hue, sat, val;
   gint hx, hy, sx, sy, vx, vy; /* HSV vertices */
   gint x, y; /* position in triangle */
diff --git a/gtk/gtkhsv.h b/gtk/gtkhsv.h
index d9ba2db651..fda2861f11 100644
--- a/gtk/gtkhsv.h
+++ b/gtk/gtkhsv.h
@@ -48,16 +48,16 @@ G_BEGIN_DECLS
 #define GTK_HSV_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_HSV, GtkHSVClass))
 
 
-typedef struct _GtkHSV       GtkHSV;
-typedef struct _GtkHSVPriv   GtkHSVPriv;
-typedef struct _GtkHSVClass  GtkHSVClass;
+typedef struct _GtkHSV              GtkHSV;
+typedef struct _GtkHSVPrivate       GtkHSVPrivate;
+typedef struct _GtkHSVClass         GtkHSVClass;
 
 struct _GtkHSV
 {
   GtkWidget parent_instance;
 
   /* <private> */
-  GtkHSVPriv *priv;
+  GtkHSVPrivate *priv;
 };
 
 struct _GtkHSVClass
diff --git a/gtk/gtkiconfactory.c b/gtk/gtkiconfactory.c
index 5cd0f38cbb..8155ac8953 100644
--- a/gtk/gtkiconfactory.c
+++ b/gtk/gtkiconfactory.c
@@ -42,7 +42,7 @@
 
 static GSList *all_icon_factories = NULL;
 
-struct _GtkIconFactoryPriv
+struct _GtkIconFactoryPrivate
 {
   GHashTable *icons;
 };
@@ -122,11 +122,11 @@ G_DEFINE_TYPE_WITH_CODE (GtkIconFactory, gtk_icon_factory, G_TYPE_OBJECT,
 static void
 gtk_icon_factory_init (GtkIconFactory *factory)
 {
-  GtkIconFactoryPriv *priv;
+  GtkIconFactoryPrivate *priv;
 
   factory->priv = G_TYPE_INSTANCE_GET_PRIVATE (factory,
                                                GTK_TYPE_ICON_FACTORY,
-                                               GtkIconFactoryPriv);
+                                               GtkIconFactoryPrivate);
   priv = factory->priv;
 
   priv->icons = g_hash_table_new (g_str_hash, g_str_equal);
@@ -140,7 +140,7 @@ gtk_icon_factory_class_init (GtkIconFactoryClass *klass)
 
   object_class->finalize = gtk_icon_factory_finalize;
 
-  g_type_class_add_private (klass, sizeof (GtkIconFactoryPriv));
+  g_type_class_add_private (klass, sizeof (GtkIconFactoryPrivate));
 }
 
 static void
@@ -161,7 +161,7 @@ static void
 gtk_icon_factory_finalize (GObject *object)
 {
   GtkIconFactory *factory = GTK_ICON_FACTORY (object);
-  GtkIconFactoryPriv *priv = factory->priv;
+  GtkIconFactoryPrivate *priv = factory->priv;
 
   all_icon_factories = g_slist_remove (all_icon_factories, factory);
 
@@ -219,7 +219,7 @@ gtk_icon_factory_add (GtkIconFactory *factory,
                       const gchar    *stock_id,
                       GtkIconSet     *icon_set)
 {
-  GtkIconFactoryPriv *priv = factory->priv;
+  GtkIconFactoryPrivate *priv = factory->priv;
   gpointer old_key = NULL;
   gpointer old_value = NULL;
 
@@ -262,7 +262,7 @@ GtkIconSet *
 gtk_icon_factory_lookup (GtkIconFactory *factory,
                          const gchar    *stock_id)
 {
-  GtkIconFactoryPriv *priv;
+  GtkIconFactoryPrivate *priv;
 
   g_return_val_if_fail (GTK_IS_ICON_FACTORY (factory), NULL);
   g_return_val_if_fail (stock_id != NULL, NULL);
@@ -2686,7 +2686,7 @@ _gtk_icon_factory_list_ids (void)
     {
       GList *these_ids;
       GtkIconFactory *factory = GTK_ICON_FACTORY (tmp_list->data);
-      GtkIconFactoryPriv *priv = factory->priv;
+      GtkIconFactoryPrivate *priv = factory->priv;
 
       these_ids = g_hash_table_get_keys (priv->icons);
 
diff --git a/gtk/gtkiconfactory.h b/gtk/gtkiconfactory.h
index d51708a6dd..990b12a458 100644
--- a/gtk/gtkiconfactory.h
+++ b/gtk/gtkiconfactory.h
@@ -46,15 +46,15 @@ G_BEGIN_DECLS
 #define GTK_TYPE_ICON_SET                  (gtk_icon_set_get_type ())
 #define GTK_TYPE_ICON_SOURCE               (gtk_icon_source_get_type ())
 
-typedef struct _GtkIconFactoryPriv  GtkIconFactoryPriv;
-typedef struct _GtkIconFactoryClass GtkIconFactoryClass;
+typedef struct _GtkIconFactoryPrivate       GtkIconFactoryPrivate;
+typedef struct _GtkIconFactoryClass         GtkIconFactoryClass;
 
 struct _GtkIconFactory
 {
   GObject parent_instance;
 
   /* <private> */
-  GtkIconFactoryPriv *priv;
+  GtkIconFactoryPrivate *priv;
 };
 
 struct _GtkIconFactoryClass
diff --git a/gtk/gtkimage.c b/gtk/gtkimage.c
index 2a41329683..e7aadcf6aa 100644
--- a/gtk/gtkimage.c
+++ b/gtk/gtkimage.c
@@ -127,7 +127,7 @@
  */
 
 
-struct _GtkImagePriv
+struct _GtkImagePrivate
 {
   GtkIconSize           icon_size;      /* Only used with GTK_IMAGE_STOCK, GTK_IMAGE_ICON_SET, GTK_IMAGE_ICON_NAME */
   GtkImageType          storage_type;
@@ -352,17 +352,17 @@ gtk_image_class_init (GtkImageClass *class)
                                                       GTK_IMAGE_EMPTY,
                                                       GTK_PARAM_READABLE));
 
-  g_type_class_add_private (object_class, sizeof (GtkImagePriv));
+  g_type_class_add_private (object_class, sizeof (GtkImagePrivate));
 }
 
 static void
 gtk_image_init (GtkImage *image)
 {
-  GtkImagePriv *priv;
+  GtkImagePrivate *priv;
 
   image->priv = G_TYPE_INSTANCE_GET_PRIVATE (image,
                                              GTK_TYPE_IMAGE,
-                                             GtkImagePriv);
+                                             GtkImagePrivate);
   priv = image->priv;
 
   gtk_widget_set_has_window (GTK_WIDGET (image), FALSE);
@@ -393,7 +393,7 @@ gtk_image_set_property (GObject      *object,
 			GParamSpec   *pspec)
 {
   GtkImage *image = GTK_IMAGE (object);
-  GtkImagePriv *priv = image->priv;
+  GtkImagePrivate *priv = image->priv;
 
   switch (prop_id)
     {
@@ -486,7 +486,7 @@ gtk_image_get_property (GObject     *object,
 			GParamSpec  *pspec)
 {
   GtkImage *image = GTK_IMAGE (object);
-  GtkImagePriv *priv = image->priv;
+  GtkImagePrivate *priv = image->priv;
 
   /* The "getter" functions whine if you try to get the wrong
    * storage type. This function is instead robust against that,
@@ -812,7 +812,7 @@ gtk_image_set_from_pixmap (GtkImage  *image,
                            GdkPixmap *pixmap,
                            GdkBitmap *mask)
 {
-  GtkImagePriv *priv;
+  GtkImagePrivate *priv;
 
   g_return_if_fail (GTK_IS_IMAGE (image));
   g_return_if_fail (pixmap == NULL ||
@@ -865,7 +865,7 @@ void
 gtk_image_set_from_file   (GtkImage    *image,
                            const gchar *filename)
 {
-  GtkImagePriv *priv;
+  GtkImagePrivate *priv;
   GdkPixbufAnimation *anim;
   
   g_return_if_fail (GTK_IS_IMAGE (image));
@@ -923,7 +923,7 @@ void
 gtk_image_set_from_pixbuf (GtkImage  *image,
                            GdkPixbuf *pixbuf)
 {
-  GtkImagePriv *priv;
+  GtkImagePrivate *priv;
 
   g_return_if_fail (GTK_IS_IMAGE (image));
   g_return_if_fail (pixbuf == NULL ||
@@ -967,7 +967,7 @@ gtk_image_set_from_stock  (GtkImage       *image,
                            const gchar    *stock_id,
                            GtkIconSize     size)
 {
-  GtkImagePriv *priv;
+  GtkImagePrivate *priv;
   gchar *new_id;
 
   g_return_if_fail (GTK_IS_IMAGE (image));
@@ -1013,7 +1013,7 @@ gtk_image_set_from_icon_set  (GtkImage       *image,
                               GtkIconSet     *icon_set,
                               GtkIconSize     size)
 {
-  GtkImagePriv *priv;
+  GtkImagePrivate *priv;
 
   g_return_if_fail (GTK_IS_IMAGE (image));
 
@@ -1056,7 +1056,7 @@ void
 gtk_image_set_from_animation (GtkImage           *image,
                               GdkPixbufAnimation *animation)
 {
-  GtkImagePriv *priv;
+  GtkImagePrivate *priv;
 
   g_return_if_fail (GTK_IS_IMAGE (image));
   g_return_if_fail (animation == NULL ||
@@ -1105,7 +1105,7 @@ gtk_image_set_from_icon_name  (GtkImage       *image,
 			       GtkIconSize     size)
 {
   gchar *new_name;
-  GtkImagePriv *priv;
+  GtkImagePrivate *priv;
 
   g_return_if_fail (GTK_IS_IMAGE (image));
 
@@ -1152,7 +1152,7 @@ gtk_image_set_from_gicon  (GtkImage       *image,
 			   GIcon          *icon,
 			   GtkIconSize     size)
 {
-  GtkImagePriv *priv;
+  GtkImagePrivate *priv;
 
   g_return_if_fail (GTK_IS_IMAGE (image));
 
@@ -1222,7 +1222,7 @@ gtk_image_get_pixmap (GtkImage   *image,
                       GdkPixmap **pixmap,
                       GdkBitmap **mask)
 {
-  GtkImagePriv *priv;
+  GtkImagePrivate *priv;
 
   g_return_if_fail (GTK_IS_IMAGE (image));
 
@@ -1254,7 +1254,7 @@ gtk_image_get_pixmap (GtkImage   *image,
 GdkPixbuf*
 gtk_image_get_pixbuf (GtkImage *image)
 {
-  GtkImagePriv *priv;
+  GtkImagePrivate *priv;
 
   g_return_val_if_fail (GTK_IS_IMAGE (image), NULL);
 
@@ -1288,7 +1288,7 @@ gtk_image_get_stock  (GtkImage        *image,
                       gchar          **stock_id,
                       GtkIconSize     *size)
 {
-  GtkImagePriv *priv;
+  GtkImagePrivate *priv;
 
   g_return_if_fail (GTK_IS_IMAGE (image));
 
@@ -1324,7 +1324,7 @@ gtk_image_get_icon_set  (GtkImage        *image,
                          GtkIconSet     **icon_set,
                          GtkIconSize     *size)
 {
-  GtkImagePriv *priv;
+  GtkImagePrivate *priv;
 
   g_return_if_fail (GTK_IS_IMAGE (image));
 
@@ -1356,7 +1356,7 @@ gtk_image_get_icon_set  (GtkImage        *image,
 GdkPixbufAnimation*
 gtk_image_get_animation (GtkImage *image)
 {
-  GtkImagePriv *priv;
+  GtkImagePrivate *priv;
 
   g_return_val_if_fail (GTK_IS_IMAGE (image), NULL);
 
@@ -1393,7 +1393,7 @@ gtk_image_get_icon_name  (GtkImage              *image,
 			  G_CONST_RETURN gchar **icon_name,
 			  GtkIconSize           *size)
 {
-  GtkImagePriv *priv;
+  GtkImagePrivate *priv;
 
   g_return_if_fail (GTK_IS_IMAGE (image));
 
@@ -1433,7 +1433,7 @@ gtk_image_get_gicon (GtkImage     *image,
 		     GIcon       **gicon,
 		     GtkIconSize  *size)
 {
-  GtkImagePriv *priv;
+  GtkImagePrivate *priv;
 
   g_return_if_fail (GTK_IS_IMAGE (image));
 
@@ -1468,7 +1468,7 @@ gtk_image_new (void)
 static void
 gtk_image_reset_anim_iter (GtkImage *image)
 {
-  GtkImagePriv *priv = image->priv;
+  GtkImagePrivate *priv = image->priv;
 
   if (priv->storage_type == GTK_IMAGE_ANIMATION)
     {
@@ -1508,7 +1508,7 @@ static gint
 animation_timeout (gpointer data)
 {
   GtkImage *image = GTK_IMAGE (data);
-  GtkImagePriv *priv = image->priv;
+  GtkImagePrivate *priv = image->priv;
   int delay;
 
   priv->data.anim.frame_timeout = 0;
@@ -1533,7 +1533,7 @@ animation_timeout (gpointer data)
 static void
 icon_theme_changed (GtkImage *image)
 {
-  GtkImagePriv *priv = image->priv;
+  GtkImagePrivate *priv = image->priv;
 
   if (priv->storage_type == GTK_IMAGE_ICON_NAME)
     {
@@ -1557,7 +1557,7 @@ static void
 ensure_pixbuf_for_icon_name (GtkImage     *image,
 			     GtkStateType  state)
 {
-  GtkImagePriv *priv = image->priv;
+  GtkImagePrivate *priv = image->priv;
   GdkScreen *screen;
   GtkIconTheme *icon_theme;
   GtkSettings *settings;
@@ -1663,7 +1663,7 @@ static void
 ensure_pixbuf_for_gicon (GtkImage     *image,
 			 GtkStateType  state)
 {
-  GtkImagePriv *priv = image->priv;
+  GtkImagePrivate *priv = image->priv;
   GdkScreen *screen;
   GtkIconTheme *icon_theme;
   GtkSettings *settings;
@@ -1778,7 +1778,7 @@ gtk_image_expose (GtkWidget      *widget,
 		  GdkEventExpose *event)
 {
   GtkImage *image;
-  GtkImagePriv *priv;
+  GtkImagePrivate *priv;
 
   g_return_val_if_fail (GTK_IS_IMAGE (widget), FALSE);
   g_return_val_if_fail (event != NULL, FALSE);
@@ -2088,7 +2088,7 @@ gtk_image_expose (GtkWidget      *widget,
 static void
 gtk_image_reset (GtkImage *image)
 {
-  GtkImagePriv *priv = image->priv;
+  GtkImagePrivate *priv = image->priv;
 
   g_object_freeze_notify (G_OBJECT (image));
   
@@ -2211,7 +2211,7 @@ gtk_image_reset (GtkImage *image)
 void
 gtk_image_clear (GtkImage *image)
 {
-  GtkImagePriv *priv = image->priv;
+  GtkImagePrivate *priv = image->priv;
 
   priv->need_calc_size = 1;
 
@@ -2223,7 +2223,7 @@ static void
 gtk_image_calc_size (GtkImage *image)
 {
   GtkWidget *widget = GTK_WIDGET (image);
-  GtkImagePriv *priv = image->priv;
+  GtkImagePrivate *priv = image->priv;
   GdkPixbuf *pixbuf = NULL;
 
   priv->need_calc_size = 0;
@@ -2354,7 +2354,7 @@ void
 gtk_image_set_pixel_size (GtkImage *image,
 			  gint      pixel_size)
 {
-  GtkImagePriv *priv;
+  GtkImagePrivate *priv;
 
   g_return_if_fail (GTK_IS_IMAGE (image));
 
diff --git a/gtk/gtkimage.h b/gtk/gtkimage.h
index 0a02219cc0..9085fcb25e 100644
--- a/gtk/gtkimage.h
+++ b/gtk/gtkimage.h
@@ -46,9 +46,9 @@ G_BEGIN_DECLS
 #define GTK_IMAGE_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_IMAGE, GtkImageClass))
 
 
-typedef struct _GtkImage       GtkImage;
-typedef struct _GtkImagePriv   GtkImagePriv;
-typedef struct _GtkImageClass  GtkImageClass;
+typedef struct _GtkImage              GtkImage;
+typedef struct _GtkImagePrivate       GtkImagePrivate;
+typedef struct _GtkImageClass         GtkImageClass;
 
 typedef struct _GtkImagePixmapData  GtkImagePixmapData;
 typedef struct _GtkImageImageData   GtkImageImageData;
@@ -145,7 +145,7 @@ struct _GtkImage
   GtkMisc misc;
 
   /* <private> */
-  GtkImagePriv *priv;
+  GtkImagePrivate *priv;
 };
 
 struct _GtkImageClass
diff --git a/gtk/gtkimagemenuitem.c b/gtk/gtkimagemenuitem.c
index 6965d4dabd..8c5a63afa3 100644
--- a/gtk/gtkimagemenuitem.c
+++ b/gtk/gtkimagemenuitem.c
@@ -39,7 +39,7 @@
 
 
 
-struct _GtkImageMenuItemPriv
+struct _GtkImageMenuItemPrivate
 {
   GtkWidget     *image;
 
@@ -194,17 +194,17 @@ gtk_image_menu_item_class_init (GtkImageMenuItemClass *klass)
 						       TRUE,
 						       GTK_PARAM_READWRITE));
 
-  g_type_class_add_private (object_class, sizeof (GtkImageMenuItemPriv));
+  g_type_class_add_private (object_class, sizeof (GtkImageMenuItemPrivate));
 }
 
 static void
 gtk_image_menu_item_init (GtkImageMenuItem *image_menu_item)
 {
-  GtkImageMenuItemPriv *priv;
+  GtkImageMenuItemPrivate *priv;
 
   image_menu_item->priv = G_TYPE_INSTANCE_GET_PRIVATE (image_menu_item,
                                                        GTK_TYPE_IMAGE_MENU_ITEM,
-                                                       GtkImageMenuItemPriv);
+                                                       GtkImageMenuItemPrivate);
   priv = image_menu_item->priv;
 
   priv->image = NULL;
@@ -215,7 +215,7 @@ gtk_image_menu_item_init (GtkImageMenuItem *image_menu_item)
 static void 
 gtk_image_menu_item_finalize (GObject *object)
 {
-  GtkImageMenuItemPriv *priv = GTK_IMAGE_MENU_ITEM (object)->priv;
+  GtkImageMenuItemPrivate *priv = GTK_IMAGE_MENU_ITEM (object)->priv;
 
   g_free (priv->label);
   priv->label  = NULL;
@@ -279,7 +279,7 @@ gtk_image_menu_item_get_property (GObject         *object,
 static gboolean
 show_image (GtkImageMenuItem *image_menu_item)
 {
-  GtkImageMenuItemPriv *priv = image_menu_item->priv;
+  GtkImageMenuItemPrivate *priv = image_menu_item->priv;
   GtkSettings *settings = gtk_widget_get_settings (GTK_WIDGET (image_menu_item));
   gboolean show;
 
@@ -295,7 +295,7 @@ static void
 gtk_image_menu_item_map (GtkWidget *widget)
 {
   GtkImageMenuItem *image_menu_item = GTK_IMAGE_MENU_ITEM (widget);
-  GtkImageMenuItemPriv *priv = image_menu_item->priv;
+  GtkImageMenuItemPrivate *priv = image_menu_item->priv;
 
   GTK_WIDGET_CLASS (gtk_image_menu_item_parent_class)->map (widget);
 
@@ -309,7 +309,7 @@ static void
 gtk_image_menu_item_destroy (GtkObject *object)
 {
   GtkImageMenuItem *image_menu_item = GTK_IMAGE_MENU_ITEM (object);
-  GtkImageMenuItemPriv *priv = image_menu_item->priv;
+  GtkImageMenuItemPrivate *priv = image_menu_item->priv;
 
   if (priv->image)
     gtk_container_remove (GTK_CONTAINER (image_menu_item),
@@ -323,7 +323,7 @@ gtk_image_menu_item_toggle_size_request (GtkMenuItem *menu_item,
 					 gint        *requisition)
 {
   GtkImageMenuItem *image_menu_item = GTK_IMAGE_MENU_ITEM (menu_item);
-  GtkImageMenuItemPriv *priv = image_menu_item->priv;
+  GtkImageMenuItemPrivate *priv = image_menu_item->priv;
   GtkPackDirection pack_dir;
   GtkWidget *parent;
   GtkWidget *widget = GTK_WIDGET (menu_item);
@@ -364,7 +364,7 @@ gtk_image_menu_item_toggle_size_request (GtkMenuItem *menu_item,
 static void
 gtk_image_menu_item_recalculate (GtkImageMenuItem *image_menu_item)
 {
-  GtkImageMenuItemPriv    *priv = image_menu_item->priv;
+  GtkImageMenuItemPrivate    *priv = image_menu_item->priv;
   GtkStockItem             stock_item;
   GtkWidget               *image;
   const gchar             *resolved_label = priv->label;
@@ -393,7 +393,7 @@ static void
 gtk_image_menu_item_set_label (GtkMenuItem      *menu_item,
 			       const gchar      *label)
 {
-  GtkImageMenuItemPriv *priv = GTK_IMAGE_MENU_ITEM (menu_item)->priv;
+  GtkImageMenuItemPrivate *priv = GTK_IMAGE_MENU_ITEM (menu_item)->priv;
 
   if (priv->label != label)
     {
@@ -410,7 +410,7 @@ gtk_image_menu_item_set_label (GtkMenuItem      *menu_item,
 static G_CONST_RETURN gchar *
 gtk_image_menu_item_get_label (GtkMenuItem *menu_item)
 {
-  GtkImageMenuItemPriv *priv = GTK_IMAGE_MENU_ITEM (menu_item)->priv;
+  GtkImageMenuItemPrivate *priv = GTK_IMAGE_MENU_ITEM (menu_item)->priv;
 
   return priv->label;
 }
@@ -420,7 +420,7 @@ gtk_image_menu_item_size_request (GtkWidget      *widget,
                                   GtkRequisition *requisition)
 {
   GtkImageMenuItem *image_menu_item = GTK_IMAGE_MENU_ITEM (widget);
-  GtkImageMenuItemPriv *priv = image_menu_item->priv;
+  GtkImageMenuItemPrivate *priv = image_menu_item->priv;
   gint child_width = 0;
   gint child_height = 0;
   GtkPackDirection pack_dir;
@@ -466,7 +466,7 @@ gtk_image_menu_item_size_allocate (GtkWidget     *widget,
                                    GtkAllocation *allocation)
 {
   GtkImageMenuItem *image_menu_item = GTK_IMAGE_MENU_ITEM (widget);
-  GtkImageMenuItemPriv *priv = image_menu_item->priv;
+  GtkImageMenuItemPrivate *priv = image_menu_item->priv;
   GtkAllocation widget_allocation;
   GtkPackDirection pack_dir;
   GtkWidget *parent;
@@ -555,7 +555,7 @@ gtk_image_menu_item_forall (GtkContainer   *container,
                             gpointer        callback_data)
 {
   GtkImageMenuItem *image_menu_item = GTK_IMAGE_MENU_ITEM (container);
-  GtkImageMenuItemPriv *priv = image_menu_item->priv;
+  GtkImageMenuItemPrivate *priv = image_menu_item->priv;
 
   GTK_CONTAINER_CLASS (gtk_image_menu_item_parent_class)->forall (container,
                                                                   include_internals,
@@ -784,7 +784,7 @@ void
 gtk_image_menu_item_set_use_stock (GtkImageMenuItem *image_menu_item,
 				   gboolean          use_stock)
 {
-  GtkImageMenuItemPriv *priv;
+  GtkImageMenuItemPrivate *priv;
 
   g_return_if_fail (GTK_IS_IMAGE_MENU_ITEM (image_menu_item));
 
@@ -837,7 +837,7 @@ void
 gtk_image_menu_item_set_always_show_image (GtkImageMenuItem *image_menu_item,
                                            gboolean          always_show)
 {
-  GtkImageMenuItemPriv *priv;
+  GtkImageMenuItemPrivate *priv;
 
   g_return_if_fail (GTK_IS_IMAGE_MENU_ITEM (image_menu_item));
 
@@ -898,7 +898,7 @@ void
 gtk_image_menu_item_set_accel_group (GtkImageMenuItem *image_menu_item, 
 				     GtkAccelGroup    *accel_group)
 {
-  GtkImageMenuItemPriv    *priv;
+  GtkImageMenuItemPrivate    *priv;
   GtkStockItem             stock_item;
 
   /* Silent return for the constructor */
@@ -937,7 +937,7 @@ void
 gtk_image_menu_item_set_image (GtkImageMenuItem *image_menu_item,
                                GtkWidget        *image)
 {
-  GtkImageMenuItemPriv *priv;
+  GtkImageMenuItemPrivate *priv;
 
   g_return_if_fail (GTK_IS_IMAGE_MENU_ITEM (image_menu_item));
 
@@ -985,7 +985,7 @@ gtk_image_menu_item_remove (GtkContainer *container,
                             GtkWidget    *child)
 {
   GtkImageMenuItem *image_menu_item = GTK_IMAGE_MENU_ITEM (container);
-  GtkImageMenuItemPriv *priv = image_menu_item->priv;
+  GtkImageMenuItemPrivate *priv = image_menu_item->priv;
 
   if (child == priv->image)
     {
@@ -1011,7 +1011,7 @@ gtk_image_menu_item_remove (GtkContainer *container,
 static void 
 show_image_change_notify (GtkImageMenuItem *image_menu_item)
 {
-  GtkImageMenuItemPriv *priv = image_menu_item->priv;
+  GtkImageMenuItemPrivate *priv = image_menu_item->priv;
 
   if (priv->image)
     {
diff --git a/gtk/gtkimagemenuitem.h b/gtk/gtkimagemenuitem.h
index 1a27d1b33d..1904a7b626 100644
--- a/gtk/gtkimagemenuitem.h
+++ b/gtk/gtkimagemenuitem.h
@@ -45,16 +45,16 @@ G_BEGIN_DECLS
 #define GTK_IMAGE_MENU_ITEM_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_IMAGE_MENU_ITEM, GtkImageMenuItemClass))
 
 
-typedef struct _GtkImageMenuItem       GtkImageMenuItem;
-typedef struct _GtkImageMenuItemPriv   GtkImageMenuItemPriv;
-typedef struct _GtkImageMenuItemClass  GtkImageMenuItemClass;
+typedef struct _GtkImageMenuItem              GtkImageMenuItem;
+typedef struct _GtkImageMenuItemPrivate       GtkImageMenuItemPrivate;
+typedef struct _GtkImageMenuItemClass         GtkImageMenuItemClass;
 
 struct _GtkImageMenuItem
 {
   GtkMenuItem menu_item;
 
   /*< private >*/
-  GtkImageMenuItemPriv *priv;
+  GtkImageMenuItemPrivate *priv;
 };
 
 struct _GtkImageMenuItemClass
diff --git a/gtk/gtkimcontextsimple.c b/gtk/gtkimcontextsimple.c
index 7a17340883..9b73f8445e 100644
--- a/gtk/gtkimcontextsimple.c
+++ b/gtk/gtkimcontextsimple.c
@@ -33,7 +33,7 @@
 typedef struct _GtkComposeTable GtkComposeTable;
 typedef struct _GtkComposeTableCompact GtkComposeTableCompact;
 
-struct _GtkIMContextSimplePriv
+struct _GtkIMContextSimplePrivate
 {
   GSList        *tables;
 
@@ -119,7 +119,7 @@ gtk_im_context_simple_class_init (GtkIMContextSimpleClass *class)
   im_context_class->get_preedit_string = gtk_im_context_simple_get_preedit_string;
   gobject_class->finalize = gtk_im_context_simple_finalize;
 
-  g_type_class_add_private (class, sizeof (GtkIMContextSimplePriv));
+  g_type_class_add_private (class, sizeof (GtkIMContextSimplePrivate));
 }
 
 static void
@@ -127,14 +127,14 @@ gtk_im_context_simple_init (GtkIMContextSimple *im_context_simple)
 {
   im_context_simple->priv = G_TYPE_INSTANCE_GET_PRIVATE (im_context_simple,
                                                          GTK_TYPE_IM_CONTEXT_SIMPLE,
-                                                         GtkIMContextSimplePriv);
+                                                         GtkIMContextSimplePrivate);
 }
 
 static void
 gtk_im_context_simple_finalize (GObject *obj)
 {
   GtkIMContextSimple *context_simple = GTK_IM_CONTEXT_SIMPLE (obj);
-  GtkIMContextSimplePriv *priv = context_simple->priv;
+  GtkIMContextSimplePrivate *priv = context_simple->priv;
 
   if (priv->tables)
     {
@@ -165,7 +165,7 @@ gtk_im_context_simple_commit_char (GtkIMContext *context,
 				   gunichar ch)
 {
   GtkIMContextSimple *context_simple = GTK_IM_CONTEXT_SIMPLE (context);
-  GtkIMContextSimplePriv *priv = context_simple->priv;
+  GtkIMContextSimplePrivate *priv = context_simple->priv;
   gchar buf[10];
   gint len;
 
@@ -225,7 +225,7 @@ check_table (GtkIMContextSimple    *context_simple,
 	     const GtkComposeTable *table,
 	     gint                   n_compose)
 {
-  GtkIMContextSimplePriv *priv = context_simple->priv;
+  GtkIMContextSimplePrivate *priv = context_simple->priv;
   gint row_stride = table->max_seq_len + 2; 
   guint16 *seq; 
   
@@ -313,7 +313,7 @@ static gboolean
 check_win32_special_cases (GtkIMContextSimple    *context_simple,
 			   gint                   n_compose)
 {
-  GtkIMContextSimplePriv *priv = context_simple->priv;
+  GtkIMContextSimplePrivate *priv = context_simple->priv;
   if (n_compose == 2 &&
       priv->compose_buffer[1] == GDK_space)
     {
@@ -343,7 +343,7 @@ check_win32_special_case_after_compact_match (GtkIMContextSimple    *context_sim
 					      gint                   n_compose,
 					      guint                  value)
 {
-  GtkIMContextSimplePriv *priv = context_simple->priv;
+  GtkIMContextSimplePrivate *priv = context_simple->priv;
 
   /* On Windows user expectation is that typing two dead accents will input
    * two corresponding spacing accents.
@@ -364,7 +364,7 @@ check_compact_table (GtkIMContextSimple    *context_simple,
 	     const GtkComposeTableCompact *table,
 	     gint                   n_compose)
 {
-  GtkIMContextSimplePriv *priv = context_simple->priv;
+  GtkIMContextSimplePrivate *priv = context_simple->priv;
   gint row_stride;
   guint16 *seq_index;
   guint16 *seq; 
@@ -519,7 +519,7 @@ check_algorithmically (GtkIMContextSimple    *context_simple,
 		       gint                   n_compose)
 
 {
-  GtkIMContextSimplePriv *priv = context_simple->priv;
+  GtkIMContextSimplePrivate *priv = context_simple->priv;
   gint i;
   gunichar combination_buffer[GTK_MAX_COMPOSE_LEN];
   gchar *combination_utf8, *nfc;
@@ -626,7 +626,7 @@ static gboolean
 check_hex (GtkIMContextSimple *context_simple,
            gint                n_compose)
 {
-  GtkIMContextSimplePriv *priv = context_simple->priv;
+  GtkIMContextSimplePrivate *priv = context_simple->priv;
   /* See if this is a hex sequence, return TRUE if so */
   gint i;
   GString *str;
@@ -711,7 +711,7 @@ no_sequence_matches (GtkIMContextSimple *context_simple,
                      gint                n_compose,
                      GdkEventKey        *event)
 {
-  GtkIMContextSimplePriv *priv = context_simple->priv;
+  GtkIMContextSimplePrivate *priv = context_simple->priv;
   GtkIMContext *context;
   gunichar ch;
   
@@ -816,7 +816,7 @@ gtk_im_context_simple_filter_keypress (GtkIMContext *context,
 				       GdkEventKey  *event)
 {
   GtkIMContextSimple *context_simple = GTK_IM_CONTEXT_SIMPLE (context);
-  GtkIMContextSimplePriv *priv = context_simple->priv;
+  GtkIMContextSimplePrivate *priv = context_simple->priv;
   GSList *tmp_list;  
   int n_compose = 0;
   gboolean have_hex_mods;
@@ -1068,7 +1068,7 @@ static void
 gtk_im_context_simple_reset (GtkIMContext *context)
 {
   GtkIMContextSimple *context_simple = GTK_IM_CONTEXT_SIMPLE (context);
-  GtkIMContextSimplePriv *priv = context_simple->priv;
+  GtkIMContextSimplePrivate *priv = context_simple->priv;
 
   priv->compose_buffer[0] = 0;
 
@@ -1089,7 +1089,7 @@ gtk_im_context_simple_get_preedit_string (GtkIMContext   *context,
 					  gint           *cursor_pos)
 {
   GtkIMContextSimple *context_simple = GTK_IM_CONTEXT_SIMPLE (context);
-  GtkIMContextSimplePriv *priv = context_simple->priv;
+  GtkIMContextSimplePrivate *priv = context_simple->priv;
   char outbuf[37]; /* up to 6 hex digits */
   int len = 0;
 
@@ -1158,7 +1158,7 @@ gtk_im_context_simple_add_table (GtkIMContextSimple *context_simple,
 				 gint                max_seq_len,
 				 gint                n_seqs)
 {
-  GtkIMContextSimplePriv *priv = context_simple->priv;
+  GtkIMContextSimplePrivate *priv = context_simple->priv;
   GtkComposeTable *table;
 
   g_return_if_fail (GTK_IS_IM_CONTEXT_SIMPLE (context_simple));
diff --git a/gtk/gtkimcontextsimple.h b/gtk/gtkimcontextsimple.h
index ee02e1b53f..a215110c51 100644
--- a/gtk/gtkimcontextsimple.h
+++ b/gtk/gtkimcontextsimple.h
@@ -38,9 +38,9 @@ G_BEGIN_DECLS
 #define GTK_IM_CONTEXT_SIMPLE_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_IM_CONTEXT_SIMPLE, GtkIMContextSimpleClass))
 
 
-typedef struct _GtkIMContextSimple       GtkIMContextSimple;
-typedef struct _GtkIMContextSimplePriv   GtkIMContextSimplePriv;
-typedef struct _GtkIMContextSimpleClass  GtkIMContextSimpleClass;
+typedef struct _GtkIMContextSimple              GtkIMContextSimple;
+typedef struct _GtkIMContextSimplePrivate       GtkIMContextSimplePrivate;
+typedef struct _GtkIMContextSimpleClass         GtkIMContextSimpleClass;
 
 #define GTK_MAX_COMPOSE_LEN 7
 
@@ -49,7 +49,7 @@ struct _GtkIMContextSimple
   GtkIMContext object;
 
   /* <private> */
-  GtkIMContextSimplePriv *priv;
+  GtkIMContextSimplePrivate *priv;
 };
 
 struct _GtkIMContextSimpleClass
diff --git a/gtk/gtkinvisible.c b/gtk/gtkinvisible.c
index 64031547a1..dc349e990b 100644
--- a/gtk/gtkinvisible.c
+++ b/gtk/gtkinvisible.c
@@ -30,7 +30,7 @@
 #include "gtkprivate.h"
 #include "gtkintl.h"
 
-struct _GtkInvisiblePriv
+struct _GtkInvisiblePrivate
 {
   GdkScreen    *screen;
   gboolean      has_user_ref_count;
@@ -93,18 +93,18 @@ gtk_invisible_class_init (GtkInvisibleClass *class)
 							GDK_TYPE_SCREEN,
  							GTK_PARAM_READWRITE));
 
-  g_type_class_add_private (class, sizeof (GtkInvisiblePriv));
+  g_type_class_add_private (class, sizeof (GtkInvisiblePrivate));
 }
 
 static void
 gtk_invisible_init (GtkInvisible *invisible)
 {
-  GtkInvisiblePriv *priv;
+  GtkInvisiblePrivate *priv;
   GdkColormap *colormap;
 
   invisible->priv = G_TYPE_INSTANCE_GET_PRIVATE (invisible,
                                                  GTK_TYPE_INVISIBLE,
-                                                 GtkInvisiblePriv);
+                                                 GtkInvisiblePrivate);
   priv = invisible->priv;
 
   gtk_widget_set_has_window (GTK_WIDGET (invisible), TRUE);
@@ -124,7 +124,7 @@ static void
 gtk_invisible_destroy (GtkObject *object)
 {
   GtkInvisible *invisible = GTK_INVISIBLE (object);
-  GtkInvisiblePriv *priv = invisible->priv;
+  GtkInvisiblePrivate *priv = invisible->priv;
 
   if (priv->has_user_ref_count)
     {
@@ -180,7 +180,7 @@ void
 gtk_invisible_set_screen (GtkInvisible *invisible,
 			  GdkScreen    *screen)
 {
-  GtkInvisiblePriv *priv;
+  GtkInvisiblePrivate *priv;
   GtkWidget *widget;
   GdkScreen *previous_screen;
   gboolean was_realized;
@@ -308,7 +308,7 @@ gtk_invisible_get_property  (GObject      *object,
 			     GParamSpec   *pspec)
 {
   GtkInvisible *invisible = GTK_INVISIBLE (object);
-  GtkInvisiblePriv *priv = invisible->priv;
+  GtkInvisiblePrivate *priv = invisible->priv;
 
   switch (prop_id)
     {
diff --git a/gtk/gtkinvisible.h b/gtk/gtkinvisible.h
index 9cda19d289..830974d888 100644
--- a/gtk/gtkinvisible.h
+++ b/gtk/gtkinvisible.h
@@ -43,16 +43,16 @@ G_BEGIN_DECLS
 #define GTK_INVISIBLE_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_INVISIBLE, GtkInvisibleClass))
 
 
-typedef struct _GtkInvisible	   GtkInvisible;
-typedef struct _GtkInvisiblePriv   GtkInvisiblePriv;
-typedef struct _GtkInvisibleClass  GtkInvisibleClass;
+typedef struct _GtkInvisible              GtkInvisible;
+typedef struct _GtkInvisiblePrivate       GtkInvisiblePrivate;
+typedef struct _GtkInvisibleClass         GtkInvisibleClass;
 
 struct _GtkInvisible
 {
   GtkWidget widget;
 
   /* <private> */
-  GtkInvisiblePriv *priv;
+  GtkInvisiblePrivate *priv;
 };
 
 struct _GtkInvisibleClass
diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index 94ac98a036..6e6a0d2484 100644
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -53,7 +53,7 @@
 #include "gtkprivate.h"
 
 
-struct _GtkLabelPriv
+struct _GtkLabelPrivate
 {
   GtkLabelSelectionInfo *select_info;
   GtkWidget *mnemonic_widget;
@@ -906,7 +906,7 @@ gtk_label_class_init (GtkLabelClass *class)
 						       TRUE,
 						       GTK_PARAM_READWRITE));
 
-  g_type_class_add_private (class, sizeof (GtkLabelPriv));
+  g_type_class_add_private (class, sizeof (GtkLabelPrivate));
 }
 
 static void 
@@ -980,7 +980,7 @@ gtk_label_get_property (GObject     *object,
 			GParamSpec  *pspec)
 {
   GtkLabel *label = GTK_LABEL (object);
-  GtkLabelPriv *priv = label->priv;
+  GtkLabelPrivate *priv = label->priv;
 
   switch (prop_id)
     {
@@ -1061,11 +1061,11 @@ gtk_label_get_property (GObject     *object,
 static void
 gtk_label_init (GtkLabel *label)
 {
-  GtkLabelPriv *priv;
+  GtkLabelPrivate *priv;
 
   label->priv = G_TYPE_INSTANCE_GET_PRIVATE (label,
                                              GTK_TYPE_LABEL,
-                                             GtkLabelPriv);
+                                             GtkLabelPrivate);
   priv = label->priv;
 
   gtk_widget_set_has_window (GTK_WIDGET (label), FALSE);
@@ -1485,7 +1485,7 @@ gtk_label_mnemonic_activate (GtkWidget *widget,
 			     gboolean   group_cycling)
 {
   GtkLabel *label = GTK_LABEL (widget);
-  GtkLabelPriv *priv = label->priv;
+  GtkLabelPrivate *priv = label->priv;
   GtkWidget *parent;
 
   if (priv->mnemonic_widget)
@@ -1520,7 +1520,7 @@ static void
 gtk_label_setup_mnemonic (GtkLabel *label,
 			  guint     last_key)
 {
-  GtkLabelPriv *priv = label->priv;
+  GtkLabelPrivate *priv = label->priv;
   GtkWidget *widget = GTK_WIDGET (label);
   GtkWidget *toplevel;
   GtkWidget *mnemonic_menu;
@@ -1584,7 +1584,7 @@ gtk_label_hierarchy_changed (GtkWidget *widget,
 			     GtkWidget *old_toplevel)
 {
   GtkLabel *label = GTK_LABEL (widget);
-  GtkLabelPriv *priv = label->priv;
+  GtkLabelPrivate *priv = label->priv;
 
   gtk_label_setup_mnemonic (label, priv->mnemonic_keyval);
 }
@@ -1632,7 +1632,7 @@ mnemonics_visible_apply (GtkWidget *widget,
                          gboolean   mnemonics_visible)
 {
   GtkLabel *label = GTK_LABEL (widget);
-  GtkLabelPriv *priv = label->priv;
+  GtkLabelPrivate *priv = label->priv;
 
   mnemonics_visible = mnemonics_visible != FALSE;
 
@@ -1717,7 +1717,7 @@ label_mnemonic_widget_weak_notify (gpointer      data,
 				   GObject      *where_the_object_was)
 {
   GtkLabel *label = data;
-  GtkLabelPriv *priv = label->priv;
+  GtkLabelPrivate *priv = label->priv;
 
   priv->mnemonic_widget = NULL;
   g_object_notify (G_OBJECT (label), "mnemonic-widget");
@@ -1747,7 +1747,7 @@ void
 gtk_label_set_mnemonic_widget (GtkLabel  *label,
 			       GtkWidget *widget)
 {
-  GtkLabelPriv *priv;
+  GtkLabelPrivate *priv;
 
   g_return_if_fail (GTK_IS_LABEL (label));
 
@@ -1815,7 +1815,7 @@ static void
 gtk_label_set_text_internal (GtkLabel *label,
 			     gchar    *str)
 {
-  GtkLabelPriv *priv = label->priv;
+  GtkLabelPrivate *priv = label->priv;
 
   g_free (priv->text);
 
@@ -1828,7 +1828,7 @@ static void
 gtk_label_set_label_internal (GtkLabel *label,
 			      gchar    *str)
 {
-  GtkLabelPriv *priv = label->priv;
+  GtkLabelPrivate *priv = label->priv;
 
   g_free (priv->label);
 
@@ -1841,7 +1841,7 @@ static void
 gtk_label_set_use_markup_internal (GtkLabel *label,
 				   gboolean  val)
 {
-  GtkLabelPriv *priv = label->priv;
+  GtkLabelPrivate *priv = label->priv;
 
   val = val != FALSE;
   if (priv->use_markup != val)
@@ -1856,7 +1856,7 @@ static void
 gtk_label_set_use_underline_internal (GtkLabel *label,
 				      gboolean val)
 {
-  GtkLabelPriv *priv = label->priv;
+  GtkLabelPrivate *priv = label->priv;
 
   val = val != FALSE;
   if (priv->use_underline != val)
@@ -1870,7 +1870,7 @@ gtk_label_set_use_underline_internal (GtkLabel *label,
 static void
 gtk_label_compose_effective_attrs (GtkLabel *label)
 {
-  GtkLabelPriv      *priv = label->priv;
+  GtkLabelPrivate      *priv = label->priv;
   PangoAttrIterator *iter;
   PangoAttribute    *attr;
   GSList            *iter_attrs, *l;
@@ -1905,7 +1905,7 @@ static void
 gtk_label_set_attributes_internal (GtkLabel      *label,
 				   PangoAttrList *attrs)
 {
-  GtkLabelPriv *priv = label->priv;
+  GtkLabelPrivate *priv = label->priv;
 
   if (attrs)
     pango_attr_list_ref (attrs);
@@ -1924,7 +1924,7 @@ gtk_label_set_attributes_internal (GtkLabel      *label,
 static void
 gtk_label_recalculate (GtkLabel *label)
 {
-  GtkLabelPriv *priv = label->priv;
+  GtkLabelPrivate *priv = label->priv;
   guint keyval = priv->mnemonic_keyval;
 
   if (priv->use_markup)
@@ -2095,7 +2095,7 @@ start_element_handler (GMarkupParseContext  *context,
                        gpointer              user_data,
                        GError              **error)
 {
-  GtkLabelPriv *priv;
+  GtkLabelPrivate *priv;
   UriParserData *pdata = user_data;
 
   if (strcmp (element_name, "a") == 0)
@@ -2347,7 +2347,7 @@ failed:
 static void
 gtk_label_ensure_has_tooltip (GtkLabel *label)
 {
-  GtkLabelPriv *priv = label->priv;
+  GtkLabelPrivate *priv = label->priv;
   GList *l;
   gboolean has_tooltip = FALSE;
 
@@ -2369,7 +2369,7 @@ gtk_label_set_markup_internal (GtkLabel    *label,
                                const gchar *str,
                                gboolean     with_uline)
 {
-  GtkLabelPriv *priv = label->priv;
+  GtkLabelPrivate *priv = label->priv;
   gchar *text = NULL;
   GError *error = NULL;
   PangoAttrList *attrs = NULL;
@@ -2477,7 +2477,7 @@ void
 gtk_label_set_markup (GtkLabel    *label,
                       const gchar *str)
 {
-  GtkLabelPriv *priv;
+  GtkLabelPrivate *priv;
 
   g_return_if_fail (GTK_IS_LABEL (label));
 
@@ -2511,7 +2511,7 @@ void
 gtk_label_set_markup_with_mnemonic (GtkLabel    *label,
 				    const gchar *str)
 {
-  GtkLabelPriv *priv;
+  GtkLabelPrivate *priv;
 
   g_return_if_fail (GTK_IS_LABEL (label));
 
@@ -2551,7 +2551,7 @@ static PangoAttrList *
 gtk_label_pattern_to_attrs (GtkLabel      *label,
 			    const gchar   *pattern)
 {
-  GtkLabelPriv *priv = label->priv;
+  GtkLabelPrivate *priv = label->priv;
   const char *start;
   const char *p = priv->text;
   const char *q = pattern;
@@ -2593,7 +2593,7 @@ gtk_label_set_pattern_internal (GtkLabel    *label,
 				const gchar *pattern,
                                 gboolean     is_mnemonic)
 {
-  GtkLabelPriv *priv = label->priv;
+  GtkLabelPrivate *priv = label->priv;
   PangoAttrList *attrs;
   gboolean enable_mnemonics;
   gboolean auto_mnemonics;
@@ -2629,7 +2629,7 @@ void
 gtk_label_set_pattern (GtkLabel	   *label,
 		       const gchar *pattern)
 {
-  GtkLabelPriv *priv = label->priv;
+  GtkLabelPrivate *priv = label->priv;
 
   g_return_if_fail (GTK_IS_LABEL (label));
 
@@ -2666,7 +2666,7 @@ void
 gtk_label_set_justify (GtkLabel        *label,
 		       GtkJustification jtype)
 {
-  GtkLabelPriv *priv;
+  GtkLabelPrivate *priv;
 
   g_return_if_fail (GTK_IS_LABEL (label));
   g_return_if_fail (jtype >= GTK_JUSTIFY_LEFT && jtype <= GTK_JUSTIFY_FILL);
@@ -2715,7 +2715,7 @@ void
 gtk_label_set_ellipsize (GtkLabel          *label,
 			 PangoEllipsizeMode mode)
 {
-  GtkLabelPriv *priv;
+  GtkLabelPrivate *priv;
 
   g_return_if_fail (GTK_IS_LABEL (label));
   g_return_if_fail (mode >= PANGO_ELLIPSIZE_NONE && mode <= PANGO_ELLIPSIZE_END);
@@ -2765,7 +2765,7 @@ void
 gtk_label_set_width_chars (GtkLabel *label,
 			   gint      n_chars)
 {
-  GtkLabelPriv *priv;
+  GtkLabelPrivate *priv;
 
   g_return_if_fail (GTK_IS_LABEL (label));
 
@@ -2812,7 +2812,7 @@ void
 gtk_label_set_max_width_chars (GtkLabel *label,
 			       gint      n_chars)
 {
-  GtkLabelPriv *priv;
+  GtkLabelPrivate *priv;
 
   g_return_if_fail (GTK_IS_LABEL (label));
 
@@ -2866,7 +2866,7 @@ void
 gtk_label_set_line_wrap (GtkLabel *label,
 			 gboolean  wrap)
 {
-  GtkLabelPriv *priv;
+  GtkLabelPrivate *priv;
 
   g_return_if_fail (GTK_IS_LABEL (label));
 
@@ -2916,7 +2916,7 @@ void
 gtk_label_set_line_wrap_mode (GtkLabel *label,
 			      PangoWrapMode wrap_mode)
 {
-  GtkLabelPriv *priv;
+  GtkLabelPrivate *priv;
 
   g_return_if_fail (GTK_IS_LABEL (label));
 
@@ -2963,7 +2963,7 @@ static void
 gtk_label_finalize (GObject *object)
 {
   GtkLabel *label = GTK_LABEL (object);
-  GtkLabelPriv *priv = label->priv;
+  GtkLabelPrivate *priv = label->priv;
 
   g_free (priv->label);
   g_free (priv->text);
@@ -2986,7 +2986,7 @@ gtk_label_finalize (GObject *object)
 static void
 gtk_label_clear_layout (GtkLabel *label)
 {
-  GtkLabelPriv *priv = label->priv;
+  GtkLabelPrivate *priv = label->priv;
 
   if (priv->layout)
     {
@@ -3004,7 +3004,7 @@ get_label_width (GtkLabel *label,
 		 gint     *natural)
 {
   GtkWidgetAuxInfo *aux_info;
-  GtkLabelPriv     *priv;
+  GtkLabelPrivate     *priv;
   PangoLayout      *layout;
   PangoContext     *context;
   PangoFontMetrics *metrics;
@@ -3111,7 +3111,7 @@ get_label_width (GtkLabel *label,
 static void
 gtk_label_invalidate_wrap_width (GtkLabel *label)
 {
-  GtkLabelPriv *priv = label->priv;
+  GtkLabelPrivate *priv = label->priv;
 
   priv->wrap_width = -1;
 }
@@ -3119,7 +3119,7 @@ gtk_label_invalidate_wrap_width (GtkLabel *label)
 static gint
 get_label_wrap_width (GtkLabel *label)
 {
-  GtkLabelPriv *priv = label->priv;
+  GtkLabelPrivate *priv = label->priv;
 
   if (priv->wrap_width < 0)
     {
@@ -3167,7 +3167,7 @@ get_label_wrap_width (GtkLabel *label)
 static void
 gtk_label_ensure_layout (GtkLabel *label, gboolean guess_wrap_width)
 {
-  GtkLabelPriv *priv = label->priv;
+  GtkLabelPrivate *priv = label->priv;
   GtkWidget *widget;
   PangoRectangle logical_rect;
   gboolean rtl;
@@ -3382,7 +3382,7 @@ get_size_for_allocation (GtkLabel        *label,
                          gint            *minimum_size,
                          gint            *natural_size)
 {
-  GtkLabelPriv *priv = label->priv;
+  GtkLabelPrivate *priv = label->priv;
   PangoLayout *layout;
   GtkWidgetAuxInfo *aux_info =
     _gtk_widget_get_aux_info (GTK_WIDGET (label), FALSE);
@@ -3425,7 +3425,7 @@ gtk_label_get_size (GtkSizeRequest *widget,
 		    gint           *natural_size)
 {
   GtkLabel      *label = GTK_LABEL (widget);
-  GtkLabelPriv  *priv = label->priv;
+  GtkLabelPrivate  *priv = label->priv;
   PangoRectangle required_rect;
   PangoRectangle natural_rect;
   gint           xpad, ypad;
@@ -3589,7 +3589,7 @@ gtk_label_get_width_for_height (GtkSizeRequest *widget,
                                 gint           *natural_width)
 {
   GtkLabel *label = GTK_LABEL (widget);
-  GtkLabelPriv *priv = label->priv;
+  GtkLabelPrivate *priv = label->priv;
 
   if (priv->wrap && (priv->angle == 90 || priv->angle == 270))
     {
@@ -3621,7 +3621,7 @@ gtk_label_get_height_for_width (GtkSizeRequest *widget,
                                 gint           *natural_height)
 {
   GtkLabel *label = GTK_LABEL (widget);
-  GtkLabelPriv *priv = label->priv;
+  GtkLabelPrivate *priv = label->priv;
 
   if (priv->wrap && (priv->angle == 0 || priv->angle == 180 || priv->angle == 360))
     {
@@ -3651,7 +3651,7 @@ gtk_label_size_allocate (GtkWidget     *widget,
                          GtkAllocation *allocation)
 {
   GtkLabel *label = GTK_LABEL (widget);
-  GtkLabelPriv *priv = label->priv;
+  GtkLabelPrivate *priv = label->priv;
 
   GTK_WIDGET_CLASS (gtk_label_parent_class)->size_allocate (widget, allocation);
 
@@ -3753,7 +3753,7 @@ gtk_label_size_allocate (GtkWidget     *widget,
 static void
 gtk_label_update_cursor (GtkLabel *label)
 {
-  GtkLabelPriv *priv = label->priv;
+  GtkLabelPrivate *priv = label->priv;
   GtkWidget *widget;
 
   if (!priv->select_info)
@@ -3792,7 +3792,7 @@ gtk_label_state_changed (GtkWidget   *widget,
                          GtkStateType prev_state)
 {
   GtkLabel *label = GTK_LABEL (widget);
-  GtkLabelPriv *priv = label->priv;
+  GtkLabelPrivate *priv = label->priv;
 
   if (priv->select_info)
     {
@@ -3820,7 +3820,7 @@ gtk_label_direction_changed (GtkWidget        *widget,
 			     GtkTextDirection previous_dir)
 {
   GtkLabel *label = GTK_LABEL (widget);
-  GtkLabelPriv *priv = label->priv;
+  GtkLabelPrivate *priv = label->priv;
 
   if (priv->layout)
     pango_layout_context_changed (priv->layout);
@@ -3836,7 +3836,7 @@ get_layout_location (GtkLabel  *label,
   GtkAllocation allocation;
   GtkMisc *misc;
   GtkWidget *widget;
-  GtkLabelPriv *priv;
+  GtkLabelPrivate *priv;
   gint req_width, x, y;
   gint req_height;
   gint xpad, ypad;
@@ -3930,7 +3930,7 @@ draw_insertion_cursor (GtkLabel      *label,
 static PangoDirection
 get_cursor_direction (GtkLabel *label)
 {
-  GtkLabelPriv *priv = label->priv;
+  GtkLabelPrivate *priv = label->priv;
   GSList *l;
 
   g_assert (priv->select_info);
@@ -3958,7 +3958,7 @@ get_cursor_direction (GtkLabel *label)
 static void
 gtk_label_draw_cursor (GtkLabel  *label, gint xoffset, gint yoffset)
 {
-  GtkLabelPriv *priv = label->priv;
+  GtkLabelPrivate *priv = label->priv;
   GtkWidget *widget;
 
   if (priv->select_info == NULL)
@@ -4037,7 +4037,7 @@ gtk_label_draw_cursor (GtkLabel  *label, gint xoffset, gint yoffset)
 static GtkLabelLink *
 gtk_label_get_focus_link (GtkLabel *label)
 {
-  GtkLabelPriv *priv = label->priv;
+  GtkLabelPrivate *priv = label->priv;
   GtkLabelSelectionInfo *info = priv->select_info;
   GList *l;
 
@@ -4063,7 +4063,7 @@ gtk_label_expose (GtkWidget      *widget,
 		  GdkEventExpose *event)
 {
   GtkLabel *label = GTK_LABEL (widget);
-  GtkLabelPriv *priv = label->priv;
+  GtkLabelPrivate *priv = label->priv;
   GtkLabelSelectionInfo *info = priv->select_info;
   GtkStyle *style;
   GdkWindow *window;
@@ -4301,7 +4301,7 @@ static void
 gtk_label_set_uline_text_internal (GtkLabel    *label,
 				   const gchar *str)
 {
-  GtkLabelPriv *priv = label->priv;
+  GtkLabelPrivate *priv = label->priv;
   guint accel_key = GDK_VoidSymbol;
   gchar *new_str;
   gchar *pattern;
@@ -4355,7 +4355,7 @@ static void
 gtk_label_realize (GtkWidget *widget)
 {
   GtkLabel *label = GTK_LABEL (widget);
-  GtkLabelPriv *priv = label->priv;
+  GtkLabelPrivate *priv = label->priv;
 
   GTK_WIDGET_CLASS (gtk_label_parent_class)->realize (widget);
 
@@ -4367,7 +4367,7 @@ static void
 gtk_label_unrealize (GtkWidget *widget)
 {
   GtkLabel *label = GTK_LABEL (widget);
-  GtkLabelPriv *priv = label->priv;
+  GtkLabelPrivate *priv = label->priv;
 
   if (priv->select_info)
     gtk_label_destroy_window (label);
@@ -4379,7 +4379,7 @@ static void
 gtk_label_map (GtkWidget *widget)
 {
   GtkLabel *label = GTK_LABEL (widget);
-  GtkLabelPriv *priv = label->priv;
+  GtkLabelPrivate *priv = label->priv;
 
   GTK_WIDGET_CLASS (gtk_label_parent_class)->map (widget);
 
@@ -4391,7 +4391,7 @@ static void
 gtk_label_unmap (GtkWidget *widget)
 {
   GtkLabel *label = GTK_LABEL (widget);
-  GtkLabelPriv *priv = label->priv;
+  GtkLabelPrivate *priv = label->priv;
 
   if (priv->select_info)
     gdk_window_hide (priv->select_info->window);
@@ -4462,7 +4462,7 @@ get_layout_index (GtkLabel *label,
                   gint      y,
                   gint     *index)
 {
-  GtkLabelPriv *priv = label->priv;
+  GtkLabelPrivate *priv = label->priv;
   gint trailing = 0;
   const gchar *cluster;
   const gchar *cluster_end;
@@ -4497,7 +4497,7 @@ get_layout_index (GtkLabel *label,
 static void
 gtk_label_select_word (GtkLabel *label)
 {
-  GtkLabelPriv *priv = label->priv;
+  GtkLabelPrivate *priv = label->priv;
   gint min, max;
 
   gint start_index = gtk_label_move_backward_word (label, priv->select_info->selection_end);
@@ -4518,7 +4518,7 @@ static void
 gtk_label_grab_focus (GtkWidget *widget)
 {
   GtkLabel *label = GTK_LABEL (widget);
-  GtkLabelPriv *priv = label->priv;
+  GtkLabelPrivate *priv = label->priv;
   gboolean select_on_focus;
   GtkLabelLink *link;
 
@@ -4553,7 +4553,7 @@ gtk_label_focus (GtkWidget        *widget,
                  GtkDirectionType  direction)
 {
   GtkLabel *label = GTK_LABEL (widget);
-  GtkLabelPriv *priv = label->priv;
+  GtkLabelPrivate *priv = label->priv;
   GtkLabelSelectionInfo *info = priv->select_info;
   GtkLabelLink *focus_link;
   GList *l;
@@ -4663,7 +4663,7 @@ gtk_label_button_press (GtkWidget      *widget,
                         GdkEventButton *event)
 {
   GtkLabel *label = GTK_LABEL (widget);
-  GtkLabelPriv *priv = label->priv;
+  GtkLabelPrivate *priv = label->priv;
   GtkLabelSelectionInfo *info = priv->select_info;
   gint index = 0;
   gint min, max;
@@ -4770,7 +4770,7 @@ gtk_label_button_release (GtkWidget      *widget,
 
 {
   GtkLabel *label = GTK_LABEL (widget);
-  GtkLabelPriv *priv = label->priv;
+  GtkLabelPrivate *priv = label->priv;
   GtkLabelSelectionInfo *info = priv->select_info;
   gint index;
 
@@ -4809,7 +4809,7 @@ gtk_label_button_release (GtkWidget      *widget,
 static void
 connect_mnemonics_visible_notify (GtkLabel *label)
 {
-  GtkLabelPriv *priv = label->priv;
+  GtkLabelPrivate *priv = label->priv;
   GtkWidget *toplevel;
   gboolean connected;
 
@@ -4844,7 +4844,7 @@ drag_begin_cb (GtkWidget      *widget,
                gpointer        data)
 {
   GtkLabel *label = GTK_LABEL (widget);
-  GtkLabelPriv *priv = label->priv;
+  GtkLabelPrivate *priv = label->priv;
   GdkPixmap *pixmap = NULL;
 
   g_signal_handlers_disconnect_by_func (widget, drag_begin_cb, NULL);
@@ -4892,7 +4892,7 @@ gtk_label_motion (GtkWidget      *widget,
                   GdkEventMotion *event)
 {
   GtkLabel *label = GTK_LABEL (widget);
-  GtkLabelPriv *priv = label->priv;
+  GtkLabelPrivate *priv = label->priv;
   GtkLabelSelectionInfo *info = priv->select_info;
   gint index;
 
@@ -5028,7 +5028,7 @@ gtk_label_leave_notify (GtkWidget        *widget,
                         GdkEventCrossing *event)
 {
   GtkLabel *label = GTK_LABEL (widget);
-  GtkLabelPriv *priv = label->priv;
+  GtkLabelPrivate *priv = label->priv;
 
   if (priv->select_info)
     {
@@ -5046,7 +5046,7 @@ gtk_label_leave_notify (GtkWidget        *widget,
 static void
 gtk_label_create_window (GtkLabel *label)
 {
-  GtkLabelPriv *priv = label->priv;
+  GtkLabelPrivate *priv = label->priv;
   GtkAllocation allocation;
   GtkWidget *widget;
   GdkWindowAttr attributes;
@@ -5095,7 +5095,7 @@ gtk_label_create_window (GtkLabel *label)
 static void
 gtk_label_destroy_window (GtkLabel *label)
 {
-  GtkLabelPriv *priv = label->priv;
+  GtkLabelPrivate *priv = label->priv;
 
   g_assert (priv->select_info);
 
@@ -5110,7 +5110,7 @@ gtk_label_destroy_window (GtkLabel *label)
 static void
 gtk_label_ensure_select_info (GtkLabel *label)
 {
-  GtkLabelPriv *priv = label->priv;
+  GtkLabelPrivate *priv = label->priv;
 
   if (priv->select_info == NULL)
     {
@@ -5129,7 +5129,7 @@ gtk_label_ensure_select_info (GtkLabel *label)
 static void
 gtk_label_clear_select_info (GtkLabel *label)
 {
-  GtkLabelPriv *priv = label->priv;
+  GtkLabelPrivate *priv = label->priv;
 
   if (priv->select_info == NULL)
     return;
@@ -5157,7 +5157,7 @@ void
 gtk_label_set_selectable (GtkLabel *label,
                           gboolean  setting)
 {
-  GtkLabelPriv *priv;
+  GtkLabelPrivate *priv;
   gboolean old_setting;
 
   g_return_if_fail (GTK_IS_LABEL (label));
@@ -5207,7 +5207,7 @@ gtk_label_set_selectable (GtkLabel *label,
 gboolean
 gtk_label_get_selectable (GtkLabel *label)
 {
-  GtkLabelPriv *priv;
+  GtkLabelPrivate *priv;
 
   g_return_val_if_fail (GTK_IS_LABEL (label), FALSE);
 
@@ -5233,7 +5233,7 @@ void
 gtk_label_set_angle (GtkLabel *label,
 		     gdouble   angle)
 {
-  GtkLabelPriv *priv;
+  GtkLabelPrivate *priv;
 
   g_return_if_fail (GTK_IS_LABEL (label));
 
@@ -5280,7 +5280,7 @@ static void
 gtk_label_set_selection_text (GtkLabel         *label,
 			      GtkSelectionData *selection_data)
 {
-  GtkLabelPriv *priv = label->priv;
+  GtkLabelPrivate *priv = label->priv;
 
   if ((priv->select_info->selection_anchor !=
        priv->select_info->selection_end) &&
@@ -5332,7 +5332,7 @@ clear_text_callback (GtkClipboard     *clipboard,
                      gpointer          user_data_or_owner)
 {
   GtkLabel *label;
-  GtkLabelPriv *priv;
+  GtkLabelPrivate *priv;
 
   label = GTK_LABEL (user_data_or_owner);
   priv = label->priv;
@@ -5350,7 +5350,7 @@ gtk_label_select_region_index (GtkLabel *label,
                                gint      anchor_index,
                                gint      end_index)
 {
-  GtkLabelPriv *priv;
+  GtkLabelPrivate *priv;
 
   g_return_if_fail (GTK_IS_LABEL (label));
 
@@ -5420,7 +5420,7 @@ gtk_label_select_region  (GtkLabel *label,
                           gint      start_offset,
                           gint      end_offset)
 {
-  GtkLabelPriv *priv;
+  GtkLabelPrivate *priv;
 
   g_return_if_fail (GTK_IS_LABEL (label));
 
@@ -5456,7 +5456,7 @@ gtk_label_get_selection_bounds (GtkLabel  *label,
                                 gint      *start,
                                 gint      *end)
 {
-  GtkLabelPriv *priv;
+  GtkLabelPrivate *priv;
 
   g_return_val_if_fail (GTK_IS_LABEL (label), FALSE);
 
@@ -5527,7 +5527,7 @@ gtk_label_get_selection_bounds (GtkLabel  *label,
 PangoLayout*
 gtk_label_get_layout (GtkLabel *label)
 {
-  GtkLabelPriv *priv;
+  GtkLabelPrivate *priv;
 
   g_return_val_if_fail (GTK_IS_LABEL (label), NULL);
 
@@ -5651,7 +5651,7 @@ void
 gtk_label_set_single_line_mode (GtkLabel *label,
                                 gboolean single_line_mode)
 {
-  GtkLabelPriv *priv;
+  GtkLabelPrivate *priv;
 
   g_return_if_fail (GTK_IS_LABEL (label));
 
@@ -5699,7 +5699,7 @@ get_better_cursor (GtkLabel *label,
 		   gint      *x,
 		   gint      *y)
 {
-  GtkLabelPriv *priv = label->priv;
+  GtkLabelPrivate *priv = label->priv;
   GdkKeymap *keymap = gdk_keymap_get_for_display (gtk_widget_get_display (GTK_WIDGET (label)));
   PangoDirection keymap_direction = gdk_keymap_get_direction (keymap);
   PangoDirection cursor_direction = get_cursor_direction (label);
@@ -5741,7 +5741,7 @@ gtk_label_move_logically (GtkLabel *label,
 			  gint      start,
 			  gint      count)
 {
-  GtkLabelPriv *priv = label->priv;
+  GtkLabelPrivate *priv = label->priv;
   gint offset = g_utf8_pointer_to_offset (priv->text,
 					  priv->text + start);
 
@@ -5785,7 +5785,7 @@ gtk_label_move_visually (GtkLabel *label,
 			 gint      start,
 			 gint      count)
 {
-  GtkLabelPriv *priv = label->priv;
+  GtkLabelPrivate *priv = label->priv;
   gint index;
 
   index = start;
@@ -5839,7 +5839,7 @@ static gint
 gtk_label_move_forward_word (GtkLabel *label,
 			     gint      start)
 {
-  GtkLabelPriv *priv = label->priv;
+  GtkLabelPrivate *priv = label->priv;
   gint new_pos = g_utf8_pointer_to_offset (priv->text,
 					   priv->text + start);
   gint length;
@@ -5870,7 +5870,7 @@ static gint
 gtk_label_move_backward_word (GtkLabel *label,
 			      gint      start)
 {
-  GtkLabelPriv *priv = label->priv;
+  GtkLabelPrivate *priv = label->priv;
   gint new_pos = g_utf8_pointer_to_offset (priv->text,
 					   priv->text + start);
 
@@ -5901,7 +5901,7 @@ gtk_label_move_cursor (GtkLabel       *label,
 		       gint            count,
 		       gboolean        extend_selection)
 {
-  GtkLabelPriv *priv = label->priv;
+  GtkLabelPrivate *priv = label->priv;
   gint old_pos;
   gint new_pos;
 
@@ -6027,7 +6027,7 @@ gtk_label_move_cursor (GtkLabel       *label,
 static void
 gtk_label_copy_clipboard (GtkLabel *label)
 {
-  GtkLabelPriv *priv = label->priv;
+  GtkLabelPrivate *priv = label->priv;
 
   if (priv->text && priv->select_info)
     {
@@ -6066,7 +6066,7 @@ gtk_label_copy_clipboard (GtkLabel *label)
 static void
 gtk_label_select_all (GtkLabel *label)
 {
-  GtkLabelPriv *priv = label->priv;
+  GtkLabelPrivate *priv = label->priv;
 
   gtk_label_select_region_index (label, 0, strlen (priv->text));
 }
@@ -6105,7 +6105,7 @@ popup_menu_detach (GtkWidget *attach_widget,
 		   GtkMenu   *menu)
 {
   GtkLabel *label = GTK_LABEL (attach_widget);
-  GtkLabelPriv *priv = label->priv;
+  GtkLabelPrivate *priv = label->priv;
 
   if (priv->select_info)
     priv->select_info->popup_menu = NULL;
@@ -6187,7 +6187,7 @@ static void
 gtk_label_do_popup (GtkLabel       *label,
                     GdkEventButton *event)
 {
-  GtkLabelPriv *priv = label->priv;
+  GtkLabelPrivate *priv = label->priv;
   GtkWidget *menuitem;
   GtkWidget *menu;
   GtkWidget *image;
@@ -6283,7 +6283,7 @@ gtk_label_do_popup (GtkLabel       *label,
 static void
 gtk_label_clear_links (GtkLabel *label)
 {
-  GtkLabelPriv *priv = label->priv;
+  GtkLabelPrivate *priv = label->priv;
 
   if (!priv->select_info)
     return;
@@ -6297,7 +6297,7 @@ gtk_label_clear_links (GtkLabel *label)
 static void
 gtk_label_rescan_links (GtkLabel *label)
 {
-  GtkLabelPriv *priv = label->priv;
+  GtkLabelPrivate *priv = label->priv;
   PangoLayout *layout = priv->layout;
   PangoAttrList *attlist;
   PangoAttrIterator *iter;
@@ -6370,7 +6370,7 @@ static void
 emit_activate_link (GtkLabel     *label,
                     GtkLabelLink *link)
 {
-  GtkLabelPriv *priv = label->priv;
+  GtkLabelPrivate *priv = label->priv;
   gboolean handled;
 
   g_signal_emit (label, signals[ACTIVATE_LINK], 0, link->uri, &handled);
@@ -6421,7 +6421,7 @@ gtk_label_activate_current_link (GtkLabel *label)
 static GtkLabelLink *
 gtk_label_get_current_link (GtkLabel *label)
 {
-  GtkLabelPriv *priv = label->priv;
+  GtkLabelPrivate *priv = label->priv;
   GtkLabelLink *link;
 
   if (!priv->select_info)
@@ -6481,7 +6481,7 @@ void
 gtk_label_set_track_visited_links (GtkLabel *label,
                                    gboolean  track_links)
 {
-  GtkLabelPriv *priv;
+  GtkLabelPrivate *priv;
 
   g_return_if_fail (GTK_IS_LABEL (label));
 
@@ -6527,7 +6527,7 @@ gtk_label_query_tooltip (GtkWidget  *widget,
                          GtkTooltip *tooltip)
 {
   GtkLabel *label = GTK_LABEL (widget);
-  GtkLabelPriv *priv = label->priv;
+  GtkLabelPrivate *priv = label->priv;
   GtkLabelSelectionInfo *info = priv->select_info;
   gint index = -1;
   GList *l;
diff --git a/gtk/gtklabel.h b/gtk/gtklabel.h
index 3fa3b651bf..9e76ebd1ea 100644
--- a/gtk/gtklabel.h
+++ b/gtk/gtklabel.h
@@ -46,9 +46,9 @@ G_BEGIN_DECLS
 #define GTK_LABEL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_LABEL, GtkLabelClass))
 
 
-typedef struct _GtkLabel       GtkLabel;
-typedef struct _GtkLabelPriv   GtkLabelPriv;
-typedef struct _GtkLabelClass  GtkLabelClass;
+typedef struct _GtkLabel              GtkLabel;
+typedef struct _GtkLabelPrivate       GtkLabelPrivate;
+typedef struct _GtkLabelClass         GtkLabelClass;
 
 typedef struct _GtkLabelSelectionInfo GtkLabelSelectionInfo;
 
@@ -57,7 +57,7 @@ struct _GtkLabel
   GtkMisc misc;
 
   /*< private >*/
-  GtkLabelPriv *priv;
+  GtkLabelPrivate *priv;
 };
 
 struct _GtkLabelClass
diff --git a/gtk/gtklayout.c b/gtk/gtklayout.c
index 5d75670cd8..fab1875673 100644
--- a/gtk/gtklayout.c
+++ b/gtk/gtklayout.c
@@ -39,7 +39,7 @@
 
 typedef struct _GtkLayoutChild   GtkLayoutChild;
 
-struct _GtkLayoutPriv
+struct _GtkLayoutPrivate
 {
   /* Properties */
   guint width;
@@ -233,7 +233,7 @@ gtk_layout_set_adjustments (GtkLayout     *layout,
 			    GtkAdjustment *hadj,
 			    GtkAdjustment *vadj)
 {
-  GtkLayoutPriv *priv = layout->priv;
+  GtkLayoutPrivate *priv = layout->priv;
   gboolean need_adjust = FALSE;
 
   if (hadj)
@@ -295,7 +295,7 @@ static void
 gtk_layout_finalize (GObject *object)
 {
   GtkLayout *layout = GTK_LAYOUT (object);
-  GtkLayoutPriv *priv = layout->priv;
+  GtkLayoutPrivate *priv = layout->priv;
 
   g_object_unref (priv->hadjustment);
   g_object_unref (priv->vadjustment);
@@ -317,7 +317,7 @@ void
 gtk_layout_set_hadjustment (GtkLayout     *layout,
 			    GtkAdjustment *adjustment)
 {
-  GtkLayoutPriv *priv;
+  GtkLayoutPrivate *priv;
 
   g_return_if_fail (GTK_IS_LAYOUT (layout));
 
@@ -341,7 +341,7 @@ void
 gtk_layout_set_vadjustment (GtkLayout     *layout,
 			    GtkAdjustment *adjustment)
 {
-  GtkLayoutPriv *priv;
+  GtkLayoutPrivate *priv;
 
   g_return_if_fail (GTK_IS_LAYOUT (layout));
 
@@ -355,7 +355,7 @@ static GtkLayoutChild*
 get_child (GtkLayout  *layout,
            GtkWidget  *widget)
 {
-  GtkLayoutPriv *priv = layout->priv;
+  GtkLayoutPrivate *priv = layout->priv;
   GList *children;
 
   children = priv->children;
@@ -390,7 +390,7 @@ gtk_layout_put (GtkLayout     *layout,
 		gint           x, 
 		gint           y)
 {
-  GtkLayoutPriv *priv;
+  GtkLayoutPrivate *priv;
   GtkLayoutChild *child;
 
   g_return_if_fail (GTK_IS_LAYOUT (layout));
@@ -512,7 +512,7 @@ gtk_layout_set_size (GtkLayout     *layout,
 		     guint          width,
 		     guint          height)
 {
-  GtkLayoutPriv *priv;
+  GtkLayoutPrivate *priv;
   GtkWidget *widget;
 
   g_return_if_fail (GTK_IS_LAYOUT (layout));
@@ -564,7 +564,7 @@ gtk_layout_get_size (GtkLayout *layout,
 		     guint     *width,
 		     guint     *height)
 {
-  GtkLayoutPriv *priv;
+  GtkLayoutPrivate *priv;
 
   g_return_if_fail (GTK_IS_LAYOUT (layout));
 
@@ -685,7 +685,7 @@ gtk_layout_class_init (GtkLayoutClass *class)
 		  GTK_TYPE_ADJUSTMENT,
 		  GTK_TYPE_ADJUSTMENT);
 
-  g_type_class_add_private (class, sizeof (GtkLayoutPriv));
+  g_type_class_add_private (class, sizeof (GtkLayoutPrivate));
 }
 
 static void
@@ -695,7 +695,7 @@ gtk_layout_get_property (GObject     *object,
 			 GParamSpec  *pspec)
 {
   GtkLayout *layout = GTK_LAYOUT (object);
-  GtkLayoutPriv *priv = layout->priv;
+  GtkLayoutPrivate *priv = layout->priv;
 
   switch (prop_id)
     {
@@ -724,7 +724,7 @@ gtk_layout_set_property (GObject      *object,
 			 GParamSpec   *pspec)
 {
   GtkLayout *layout = GTK_LAYOUT (object);
-  GtkLayoutPriv *priv = layout->priv;
+  GtkLayoutPrivate *priv = layout->priv;
 
   switch (prop_id)
     {
@@ -805,11 +805,11 @@ gtk_layout_get_child_property (GtkContainer *container,
 static void
 gtk_layout_init (GtkLayout *layout)
 {
-  GtkLayoutPriv *priv;
+  GtkLayoutPrivate *priv;
 
   layout->priv = G_TYPE_INSTANCE_GET_PRIVATE (layout,
                                               GTK_TYPE_LAYOUT,
-                                              GtkLayoutPriv);
+                                              GtkLayoutPrivate);
   priv = layout->priv;
 
   priv->children = NULL;
@@ -834,7 +834,7 @@ gtk_layout_constructor (GType                  type,
 			guint                  n_properties,
 			GObjectConstructParam *properties)
 {
-  GtkLayoutPriv *priv;
+  GtkLayoutPrivate *priv;
   GtkLayout *layout;
   GObject *object;
   GtkAdjustment *hadj, *vadj;
@@ -862,7 +862,7 @@ static void
 gtk_layout_realize (GtkWidget *widget)
 {
   GtkLayout *layout = GTK_LAYOUT (widget);
-  GtkLayoutPriv *priv = layout->priv;
+  GtkLayoutPrivate *priv = layout->priv;
   GtkAllocation allocation;
   GdkWindow *window;
   GdkWindowAttr attributes;
@@ -921,7 +921,7 @@ static void
 gtk_layout_style_set (GtkWidget *widget,
                       GtkStyle  *old_style)
 {
-  GtkLayoutPriv *priv;
+  GtkLayoutPrivate *priv;
 
   GTK_WIDGET_CLASS (gtk_layout_parent_class)->style_set (widget, old_style);
 
@@ -936,7 +936,7 @@ static void
 gtk_layout_map (GtkWidget *widget)
 {
   GtkLayout *layout = GTK_LAYOUT (widget);
-  GtkLayoutPriv *priv = layout->priv;
+  GtkLayoutPrivate *priv = layout->priv;
   GList *tmp_list;
 
   gtk_widget_set_mapped (widget, TRUE);
@@ -962,7 +962,7 @@ static void
 gtk_layout_unrealize (GtkWidget *widget)
 {
   GtkLayout *layout = GTK_LAYOUT (widget);
-  GtkLayoutPriv *priv = layout->priv;
+  GtkLayoutPrivate *priv = layout->priv;
 
   gdk_window_set_user_data (priv->bin_window, NULL);
   gdk_window_destroy (priv->bin_window);
@@ -976,7 +976,7 @@ gtk_layout_size_request (GtkWidget     *widget,
 			 GtkRequisition *requisition)
 {
   GtkLayout *layout = GTK_LAYOUT (widget);
-  GtkLayoutPriv *priv = layout->priv;
+  GtkLayoutPrivate *priv = layout->priv;
   GList *tmp_list;
 
   requisition->width = 0;
@@ -1000,7 +1000,7 @@ gtk_layout_size_allocate (GtkWidget     *widget,
 			  GtkAllocation *allocation)
 {
   GtkLayout *layout = GTK_LAYOUT (widget);
-  GtkLayoutPriv *priv = layout->priv;
+  GtkLayoutPrivate *priv = layout->priv;
   GList *tmp_list;
 
   gtk_widget_set_allocation (widget, allocation);
@@ -1044,7 +1044,7 @@ gtk_layout_expose (GtkWidget      *widget,
                    GdkEventExpose *event)
 {
   GtkLayout *layout = GTK_LAYOUT (widget);
-  GtkLayoutPriv *priv = layout->priv;
+  GtkLayoutPrivate *priv = layout->priv;
 
   if (event->window != priv->bin_window)
     return FALSE;
@@ -1068,7 +1068,7 @@ gtk_layout_remove (GtkContainer *container,
 		   GtkWidget    *widget)
 {
   GtkLayout *layout = GTK_LAYOUT (container);
-  GtkLayoutPriv *priv = layout->priv;
+  GtkLayoutPrivate *priv = layout->priv;
   GList *tmp_list;
   GtkLayoutChild *child = NULL;
 
@@ -1098,7 +1098,7 @@ gtk_layout_forall (GtkContainer *container,
 		   gpointer      callback_data)
 {
   GtkLayout *layout = GTK_LAYOUT (container);
-  GtkLayoutPriv *priv = layout->priv;
+  GtkLayoutPrivate *priv = layout->priv;
   GtkLayoutChild *child;
   GList *tmp_list;
 
@@ -1137,7 +1137,7 @@ static void
 gtk_layout_adjustment_changed (GtkAdjustment *adjustment,
 			       GtkLayout     *layout)
 {
-  GtkLayoutPriv *priv = layout->priv;
+  GtkLayoutPrivate *priv = layout->priv;
 
   if (priv->freeze_count)
     return;
diff --git a/gtk/gtklayout.h b/gtk/gtklayout.h
index ae1fb25b5a..d29e7331ab 100644
--- a/gtk/gtklayout.h
+++ b/gtk/gtklayout.h
@@ -50,16 +50,16 @@ G_BEGIN_DECLS
 #define GTK_LAYOUT_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_LAYOUT, GtkLayoutClass))
 
 
-typedef struct _GtkLayout        GtkLayout;
-typedef struct _GtkLayoutPriv    GtkLayoutPriv;
-typedef struct _GtkLayoutClass   GtkLayoutClass;
+typedef struct _GtkLayout              GtkLayout;
+typedef struct _GtkLayoutPrivate       GtkLayoutPrivate;
+typedef struct _GtkLayoutClass         GtkLayoutClass;
 
 struct _GtkLayout
 {
   GtkContainer container;
 
   /* <private> */
-  GtkLayoutPriv *priv;
+  GtkLayoutPrivate *priv;
 };
 
 struct _GtkLayoutClass
diff --git a/gtk/gtkliststore.c b/gtk/gtkliststore.c
index b8b01f6b7b..fc43eba05c 100644
--- a/gtk/gtkliststore.c
+++ b/gtk/gtkliststore.c
@@ -31,7 +31,7 @@
 #include "gtkbuilderprivate.h"
 
 
-struct _GtkListStorePriv
+struct _GtkListStorePrivate
 {
   GtkSortType order;
   GtkTreeIterCompareFunc default_sort_func;
@@ -174,7 +174,7 @@ gtk_list_store_class_init (GtkListStoreClass *class)
 
   object_class->finalize = gtk_list_store_finalize;
 
-  g_type_class_add_private (class, sizeof (GtkListStorePriv));
+  g_type_class_add_private (class, sizeof (GtkListStorePrivate));
 }
 
 static void
@@ -229,11 +229,11 @@ gtk_list_store_buildable_init (GtkBuildableIface *iface)
 static void
 gtk_list_store_init (GtkListStore *list_store)
 {
-  GtkListStorePriv *priv;
+  GtkListStorePrivate *priv;
 
   list_store->priv = G_TYPE_INSTANCE_GET_PRIVATE (list_store,
                                                   GTK_TYPE_LIST_STORE,
-                                                  GtkListStorePriv);
+                                                  GtkListStorePrivate);
   priv = list_store->priv;
 
   priv->seq = g_sequence_new (NULL);
@@ -345,7 +345,7 @@ gtk_list_store_set_column_types (GtkListStore *list_store,
 				 gint          n_columns,
 				 GType        *types)
 {
-  GtkListStorePriv *priv;
+  GtkListStorePrivate *priv;
   gint i;
 
   g_return_if_fail (GTK_IS_LIST_STORE (list_store));
@@ -370,7 +370,7 @@ static void
 gtk_list_store_set_n_columns (GtkListStore *list_store,
 			      gint          n_columns)
 {
-  GtkListStorePriv *priv = list_store->priv;
+  GtkListStorePrivate *priv = list_store->priv;
   int i;
 
   if (priv->n_columns == n_columns)
@@ -391,7 +391,7 @@ gtk_list_store_set_column_type (GtkListStore *list_store,
 				gint          column,
 				GType         type)
 {
-  GtkListStorePriv *priv = list_store->priv;
+  GtkListStorePrivate *priv = list_store->priv;
 
   if (!_gtk_tree_data_list_check_type (type))
     {
@@ -406,7 +406,7 @@ static void
 gtk_list_store_finalize (GObject *object)
 {
   GtkListStore *list_store = GTK_LIST_STORE (object);
-  GtkListStorePriv *priv = list_store->priv;
+  GtkListStorePrivate *priv = list_store->priv;
 
   g_sequence_foreach (priv->seq,
 		      (GFunc) _gtk_tree_data_list_free, priv->column_headers);
@@ -439,7 +439,7 @@ static gint
 gtk_list_store_get_n_columns (GtkTreeModel *tree_model)
 {
   GtkListStore *list_store = GTK_LIST_STORE (tree_model);
-  GtkListStorePriv *priv = list_store->priv;
+  GtkListStorePrivate *priv = list_store->priv;
 
   priv->columns_dirty = TRUE;
 
@@ -451,7 +451,7 @@ gtk_list_store_get_column_type (GtkTreeModel *tree_model,
 				gint          index)
 {
   GtkListStore *list_store = GTK_LIST_STORE (tree_model);
-  GtkListStorePriv *priv = list_store->priv;
+  GtkListStorePrivate *priv = list_store->priv;
 
   g_return_val_if_fail (index < priv->n_columns, G_TYPE_INVALID);
 
@@ -466,7 +466,7 @@ gtk_list_store_get_iter (GtkTreeModel *tree_model,
 			 GtkTreePath  *path)
 {
   GtkListStore *list_store = GTK_LIST_STORE (tree_model);
-  GtkListStorePriv *priv = list_store->priv;
+  GtkListStorePrivate *priv = list_store->priv;
   GSequence *seq;
   gint i;
 
@@ -490,7 +490,7 @@ gtk_list_store_get_path (GtkTreeModel *tree_model,
 			 GtkTreeIter  *iter)
 {
   GtkListStore *list_store = GTK_LIST_STORE (tree_model);
-  GtkListStorePriv *priv = list_store->priv;
+  GtkListStorePrivate *priv = list_store->priv;
   GtkTreePath *path;
 
   g_return_val_if_fail (iter->stamp == priv->stamp, NULL);
@@ -511,7 +511,7 @@ gtk_list_store_get_value (GtkTreeModel *tree_model,
 			  GValue       *value)
 {
   GtkListStore *list_store = GTK_LIST_STORE (tree_model);
-  GtkListStorePriv *priv = list_store->priv;
+  GtkListStorePrivate *priv = list_store->priv;
   GtkTreeDataList *list;
   gint tmp_column = column;
 
@@ -536,7 +536,7 @@ gtk_list_store_iter_next (GtkTreeModel  *tree_model,
 			  GtkTreeIter   *iter)
 {
   GtkListStore *list_store = GTK_LIST_STORE (tree_model);
-  GtkListStorePriv *priv = list_store->priv;
+  GtkListStorePrivate *priv = list_store->priv;
   gboolean retval;
 
   g_return_val_if_fail (priv->stamp == iter->stamp, FALSE);
@@ -555,7 +555,7 @@ gtk_list_store_iter_children (GtkTreeModel *tree_model,
 			      GtkTreeIter  *parent)
 {
   GtkListStore *list_store = (GtkListStore *) tree_model;
-  GtkListStorePriv *priv = list_store->priv;
+  GtkListStorePrivate *priv = list_store->priv;
 
   /* this is a list, nodes have no children */
   if (parent)
@@ -589,7 +589,7 @@ gtk_list_store_iter_n_children (GtkTreeModel *tree_model,
 				GtkTreeIter  *iter)
 {
   GtkListStore *list_store = GTK_LIST_STORE (tree_model);
-  GtkListStorePriv *priv = list_store->priv;
+  GtkListStorePrivate *priv = list_store->priv;
 
   if (iter == NULL)
     return g_sequence_get_length (priv->seq);
@@ -606,7 +606,7 @@ gtk_list_store_iter_nth_child (GtkTreeModel *tree_model,
 			       gint          n)
 {
   GtkListStore *list_store = GTK_LIST_STORE (tree_model);
-  GtkListStorePriv *priv = list_store->priv;
+  GtkListStorePrivate *priv = list_store->priv;
   GSequenceIter *child;
 
   iter->stamp = 0;
@@ -641,7 +641,7 @@ gtk_list_store_real_set_value (GtkListStore *list_store,
 			       GValue       *value,
 			       gboolean      sort)
 {
-  GtkListStorePriv *priv = list_store->priv;
+  GtkListStorePrivate *priv = list_store->priv;
   GtkTreeDataList *list;
   GtkTreeDataList *prev;
   gint old_column = column;
@@ -749,7 +749,7 @@ gtk_list_store_set_value (GtkListStore *list_store,
 			  gint          column,
 			  GValue       *value)
 {
-  GtkListStorePriv *priv = list_store->priv;
+  GtkListStorePrivate *priv = list_store->priv;
 
   g_return_if_fail (GTK_IS_LIST_STORE (list_store));
   g_return_if_fail (VALID_ITER (iter, list_store));
@@ -770,7 +770,7 @@ gtk_list_store_set_value (GtkListStore *list_store,
 static GtkTreeIterCompareFunc
 gtk_list_store_get_compare_func (GtkListStore *list_store)
 {
-  GtkListStorePriv *priv = list_store->priv;
+  GtkListStorePrivate *priv = list_store->priv;
   GtkTreeIterCompareFunc func = NULL;
 
   if (GTK_LIST_STORE_IS_SORTED (list_store))
@@ -802,7 +802,7 @@ gtk_list_store_set_vector_internal (GtkListStore *list_store,
 				    GValue       *values,
 				    gint          n_values)
 {
-  GtkListStorePriv *priv = list_store->priv;
+  GtkListStorePrivate *priv = list_store->priv;
   gint i;
   GtkTreeIterCompareFunc func = NULL;
 
@@ -831,7 +831,7 @@ gtk_list_store_set_valist_internal (GtkListStore *list_store,
 				    gboolean     *maybe_need_sort,
 				    va_list	  var_args)
 {
-  GtkListStorePriv *priv = list_store->priv;
+  GtkListStorePrivate *priv = list_store->priv;
   gint column;
   GtkTreeIterCompareFunc func = NULL;
 
@@ -905,7 +905,7 @@ gtk_list_store_set_valuesv (GtkListStore *list_store,
 			    GValue       *values,
 			    gint          n_values)
 {
-  GtkListStorePriv *priv;
+  GtkListStorePrivate *priv;
   gboolean emit_signal = FALSE;
   gboolean maybe_need_sort = FALSE;
 
@@ -947,7 +947,7 @@ gtk_list_store_set_valist (GtkListStore *list_store,
                            GtkTreeIter  *iter,
                            va_list	 var_args)
 {
-  GtkListStorePriv *priv;
+  GtkListStorePrivate *priv;
   gboolean emit_signal = FALSE;
   gboolean maybe_need_sort = FALSE;
 
@@ -1017,7 +1017,7 @@ gboolean
 gtk_list_store_remove (GtkListStore *list_store,
 		       GtkTreeIter  *iter)
 {
-  GtkListStorePriv *priv;
+  GtkListStorePrivate *priv;
   GtkTreePath *path;
   GSequenceIter *ptr, *next;
 
@@ -1070,7 +1070,7 @@ gtk_list_store_insert (GtkListStore *list_store,
 		       GtkTreeIter  *iter,
 		       gint          position)
 {
-  GtkListStorePriv *priv;
+  GtkListStorePrivate *priv;
   GtkTreePath *path;
   GSequence *seq;
   GSequenceIter *ptr;
@@ -1123,7 +1123,7 @@ gtk_list_store_insert_before (GtkListStore *list_store,
 			      GtkTreeIter  *iter,
 			      GtkTreeIter  *sibling)
 {
-  GtkListStorePriv *priv;
+  GtkListStorePrivate *priv;
   GSequenceIter *after;
   
   g_return_if_fail (GTK_IS_LIST_STORE (list_store));
@@ -1159,7 +1159,7 @@ gtk_list_store_insert_after (GtkListStore *list_store,
 			     GtkTreeIter  *iter,
 			     GtkTreeIter  *sibling)
 {
-  GtkListStorePriv *priv;
+  GtkListStorePrivate *priv;
   GSequenceIter *after;
 
   g_return_if_fail (GTK_IS_LIST_STORE (list_store));
@@ -1212,7 +1212,7 @@ void
 gtk_list_store_append (GtkListStore *list_store,
 		       GtkTreeIter  *iter)
 {
-  GtkListStorePriv *priv;
+  GtkListStorePrivate *priv;
 
   g_return_if_fail (GTK_IS_LIST_STORE (list_store));
   g_return_if_fail (iter != NULL);
@@ -1225,7 +1225,7 @@ gtk_list_store_append (GtkListStore *list_store,
 static void
 gtk_list_store_increment_stamp (GtkListStore *list_store)
 {
-  GtkListStorePriv *priv = list_store->priv;
+  GtkListStorePrivate *priv = list_store->priv;
 
   do
     {
@@ -1244,7 +1244,7 @@ gtk_list_store_increment_stamp (GtkListStore *list_store)
 void
 gtk_list_store_clear (GtkListStore *list_store)
 {
-  GtkListStorePriv *priv;
+  GtkListStorePrivate *priv;
   GtkTreeIter iter;
 
   g_return_if_fail (GTK_IS_LIST_STORE (list_store));
@@ -1279,7 +1279,7 @@ gboolean
 gtk_list_store_iter_is_valid (GtkListStore *list_store,
                               GtkTreeIter  *iter)
 {
-  GtkListStorePriv *priv;
+  GtkListStorePrivate *priv;
 
   g_return_val_if_fail (GTK_IS_LIST_STORE (list_store), FALSE);
   g_return_val_if_fail (iter != NULL, FALSE);
@@ -1349,7 +1349,7 @@ gtk_list_store_drag_data_received (GtkTreeDragDest   *drag_dest,
 {
   GtkTreeModel *tree_model = GTK_TREE_MODEL (drag_dest);
   GtkListStore *list_store = GTK_LIST_STORE (tree_model);
-  GtkListStorePriv *priv = list_store->priv;
+  GtkListStorePrivate *priv = list_store->priv;
   GtkTreeModel *src_model = NULL;
   GtkTreePath *src_path = NULL;
   gboolean retval = FALSE;
@@ -1523,7 +1523,7 @@ void
 gtk_list_store_reorder (GtkListStore *store,
 			gint         *new_order)
 {
-  GtkListStorePriv *priv;
+  GtkListStorePrivate *priv;
   gint i;
   GtkTreePath *path;
   GHashTable *new_positions;
@@ -1618,7 +1618,7 @@ gtk_list_store_swap (GtkListStore *store,
 		     GtkTreeIter  *a,
 		     GtkTreeIter  *b)
 {
-  GtkListStorePriv *priv;
+  GtkListStorePrivate *priv;
   GHashTable *old_positions;
   gint *order;
   GtkTreePath *path;
@@ -1652,7 +1652,7 @@ gtk_list_store_move_to (GtkListStore *store,
 			GtkTreeIter  *iter,
 			gint	      new_pos)
 {
-  GtkListStorePriv *priv = store->priv;
+  GtkListStorePrivate *priv = store->priv;
   GHashTable *old_positions;
   GtkTreePath *path;
   gint *order;
@@ -1743,7 +1743,7 @@ gtk_list_store_compare_func (GSequenceIter *a,
 			     gpointer      user_data)
 {
   GtkListStore *list_store = user_data;
-  GtkListStorePriv *priv = list_store->priv;
+  GtkListStorePrivate *priv = list_store->priv;
   GtkTreeIter iter_a;
   GtkTreeIter iter_b;
   gint retval;
@@ -1793,7 +1793,7 @@ gtk_list_store_compare_func (GSequenceIter *a,
 static void
 gtk_list_store_sort (GtkListStore *list_store)
 {
-  GtkListStorePriv *priv = list_store->priv;
+  GtkListStorePrivate *priv = list_store->priv;
   gint *new_order;
   GtkTreePath *path;
   GHashTable *old_positions;
@@ -1845,7 +1845,7 @@ gtk_list_store_sort_iter_changed (GtkListStore *list_store,
 				  gint          column)
 
 {
-  GtkListStorePriv *priv = list_store->priv;
+  GtkListStorePrivate *priv = list_store->priv;
   GtkTreePath *path;
 
   path = gtk_list_store_get_path (GTK_TREE_MODEL (list_store), iter);
@@ -1876,7 +1876,7 @@ gtk_list_store_get_sort_column_id (GtkTreeSortable  *sortable,
 				   GtkSortType      *order)
 {
   GtkListStore *list_store = GTK_LIST_STORE (sortable);
-  GtkListStorePriv *priv = list_store->priv;
+  GtkListStorePrivate *priv = list_store->priv;
 
   if (sort_column_id)
     * sort_column_id = priv->sort_column_id;
@@ -1896,7 +1896,7 @@ gtk_list_store_set_sort_column_id (GtkTreeSortable  *sortable,
 				   GtkSortType       order)
 {
   GtkListStore *list_store = GTK_LIST_STORE (sortable);
-  GtkListStorePriv *priv = list_store->priv;
+  GtkListStorePrivate *priv = list_store->priv;
 
   if ((priv->sort_column_id == sort_column_id) &&
       (priv->order == order))
@@ -1938,7 +1938,7 @@ gtk_list_store_set_sort_func (GtkTreeSortable        *sortable,
 			      GDestroyNotify          destroy)
 {
   GtkListStore *list_store = GTK_LIST_STORE (sortable);
-  GtkListStorePriv *priv = list_store->priv;
+  GtkListStorePrivate *priv = list_store->priv;
 
   priv->sort_list = _gtk_tree_data_list_set_header (priv->sort_list, 
 							  sort_column_id, 
@@ -1955,7 +1955,7 @@ gtk_list_store_set_default_sort_func (GtkTreeSortable        *sortable,
 				      GDestroyNotify          destroy)
 {
   GtkListStore *list_store = GTK_LIST_STORE (sortable);
-  GtkListStorePriv *priv = list_store->priv;
+  GtkListStorePrivate *priv = list_store->priv;
 
   if (priv->default_sort_destroy)
     {
@@ -1977,7 +1977,7 @@ static gboolean
 gtk_list_store_has_default_sort_func (GtkTreeSortable *sortable)
 {
   GtkListStore *list_store = GTK_LIST_STORE (sortable);
-  GtkListStorePriv *priv = list_store->priv;
+  GtkListStorePrivate *priv = list_store->priv;
 
   return (priv->default_sort_func != NULL);
 }
@@ -2017,7 +2017,7 @@ gtk_list_store_insert_with_values (GtkListStore *list_store,
 				   gint          position,
 				   ...)
 {
-  GtkListStorePriv *priv;
+  GtkListStorePrivate *priv;
   GtkTreePath *path;
   GSequence *seq;
   GSequenceIter *ptr;
@@ -2096,7 +2096,7 @@ gtk_list_store_insert_with_valuesv (GtkListStore *list_store,
 				    GValue       *values,
 				    gint          n_values)
 {
-  GtkListStorePriv *priv;
+  GtkListStorePrivate *priv;
   GtkTreePath *path;
   GSequence *seq;
   GSequenceIter *ptr;
diff --git a/gtk/gtkliststore.h b/gtk/gtkliststore.h
index 8c702f9f74..594fc329c8 100644
--- a/gtk/gtkliststore.h
+++ b/gtk/gtkliststore.h
@@ -39,16 +39,16 @@ G_BEGIN_DECLS
 #define GTK_IS_LIST_STORE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_LIST_STORE))
 #define GTK_LIST_STORE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_LIST_STORE, GtkListStoreClass))
 
-typedef struct _GtkListStore       GtkListStore;
-typedef struct _GtkListStorePriv   GtkListStorePriv;
-typedef struct _GtkListStoreClass  GtkListStoreClass;
+typedef struct _GtkListStore              GtkListStore;
+typedef struct _GtkListStorePrivate       GtkListStorePrivate;
+typedef struct _GtkListStoreClass         GtkListStoreClass;
 
 struct _GtkListStore
 {
   GObject parent;
 
   /*< private >*/
-  GtkListStorePriv *priv;
+  GtkListStorePrivate *priv;
 };
 
 struct _GtkListStoreClass
diff --git a/gtk/gtkmessagedialog.c b/gtk/gtkmessagedialog.c
index e68f89fa26..5458bd54f1 100644
--- a/gtk/gtkmessagedialog.c
+++ b/gtk/gtkmessagedialog.c
@@ -95,7 +95,7 @@
  * </refsect2>
  */
 
-struct _GtkMessageDialogPriv
+struct _GtkMessageDialogPrivate
 {
   GtkWidget     *image;
   GtkWidget     *label;
@@ -320,7 +320,7 @@ gtk_message_dialog_class_init (GtkMessageDialogClass *class)
 							GTK_TYPE_WIDGET,
 							GTK_PARAM_READABLE));
 
-  g_type_class_add_private (gobject_class, sizeof (GtkMessageDialogPriv));
+  g_type_class_add_private (gobject_class, sizeof (GtkMessageDialogPrivate));
 }
 
 static void
@@ -329,11 +329,11 @@ gtk_message_dialog_init (GtkMessageDialog *dialog)
   GtkWidget *hbox;
   GtkDialog *message_dialog = GTK_DIALOG (dialog);
   GtkWidget *action_area, *content_area;
-  GtkMessageDialogPriv *priv;
+  GtkMessageDialogPrivate *priv;
 
   dialog->priv = G_TYPE_INSTANCE_GET_PRIVATE (dialog,
                                               GTK_TYPE_MESSAGE_DIALOG,
-                                              GtkMessageDialogPriv);
+                                              GtkMessageDialogPrivate);
   priv = dialog->priv;
 
   content_area = gtk_dialog_get_content_area (message_dialog);
@@ -393,7 +393,7 @@ gtk_message_dialog_init (GtkMessageDialog *dialog)
 static void
 setup_primary_label_font (GtkMessageDialog *dialog)
 {
-  GtkMessageDialogPriv *priv = dialog->priv;
+  GtkMessageDialogPrivate *priv = dialog->priv;
   gint size;
   PangoFontDescription *font_desc;
 
@@ -415,7 +415,7 @@ static void
 setup_type (GtkMessageDialog *dialog,
 	    GtkMessageType    type)
 {
-  GtkMessageDialogPriv *priv = dialog->priv;
+  GtkMessageDialogPrivate *priv = dialog->priv;
   const gchar *stock_id = NULL;
   AtkObject *atk_obj;
  
@@ -472,7 +472,7 @@ gtk_message_dialog_set_property (GObject      *object,
 				 GParamSpec   *pspec)
 {
   GtkMessageDialog *dialog = GTK_MESSAGE_DIALOG (object);
-  GtkMessageDialogPriv *priv = dialog->priv;
+  GtkMessageDialogPrivate *priv = dialog->priv;
 
   switch (prop_id)
     {
@@ -539,7 +539,7 @@ gtk_message_dialog_get_property (GObject     *object,
 				 GParamSpec  *pspec)
 {
   GtkMessageDialog *dialog = GTK_MESSAGE_DIALOG (object);
-  GtkMessageDialogPriv *priv = dialog->priv;
+  GtkMessageDialogPrivate *priv = dialog->priv;
 
   switch (prop_id)
     {
@@ -729,7 +729,7 @@ void
 gtk_message_dialog_set_image (GtkMessageDialog *dialog,
 			      GtkWidget        *image)
 {
-  GtkMessageDialogPriv *priv;
+  GtkMessageDialogPrivate *priv;
   GtkWidget *parent;
 
   g_return_if_fail (GTK_IS_MESSAGE_DIALOG (dialog));
@@ -788,7 +788,7 @@ void
 gtk_message_dialog_set_markup (GtkMessageDialog *message_dialog,
                                const gchar      *str)
 {
-  GtkMessageDialogPriv *priv;
+  GtkMessageDialogPrivate *priv;
 
   g_return_if_fail (GTK_IS_MESSAGE_DIALOG (message_dialog));
 
@@ -819,7 +819,7 @@ gtk_message_dialog_format_secondary_text (GtkMessageDialog *message_dialog,
 {
   va_list args;
   gchar *msg = NULL;
-  GtkMessageDialogPriv *priv;
+  GtkMessageDialogPrivate *priv;
 
   g_return_if_fail (GTK_IS_MESSAGE_DIALOG (message_dialog));
 
@@ -883,7 +883,7 @@ gtk_message_dialog_format_secondary_markup (GtkMessageDialog *message_dialog,
 {
   va_list args;
   gchar *msg = NULL;
-  GtkMessageDialogPriv *priv;
+  GtkMessageDialogPrivate *priv;
 
   g_return_if_fail (GTK_IS_MESSAGE_DIALOG (message_dialog));
 
diff --git a/gtk/gtkmessagedialog.h b/gtk/gtkmessagedialog.h
index fba60e21ec..1905d6c6bf 100644
--- a/gtk/gtkmessagedialog.h
+++ b/gtk/gtkmessagedialog.h
@@ -44,16 +44,16 @@ G_BEGIN_DECLS
 #define GTK_IS_MESSAGE_DIALOG_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_MESSAGE_DIALOG))
 #define GTK_MESSAGE_DIALOG_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_MESSAGE_DIALOG, GtkMessageDialogClass))
 
-typedef struct _GtkMessageDialog        GtkMessageDialog;
-typedef struct _GtkMessageDialogPriv    GtkMessageDialogPriv;
-typedef struct _GtkMessageDialogClass   GtkMessageDialogClass;
+typedef struct _GtkMessageDialog              GtkMessageDialog;
+typedef struct _GtkMessageDialogPrivate       GtkMessageDialogPrivate;
+typedef struct _GtkMessageDialogClass         GtkMessageDialogClass;
 
 struct _GtkMessageDialog
 {
   GtkDialog parent_instance;
 
   /*< private >*/
-  GtkMessageDialogPriv *priv;
+  GtkMessageDialogPrivate *priv;
 };
 
 struct _GtkMessageDialogClass
diff --git a/gtk/gtkmisc.c b/gtk/gtkmisc.c
index fc711aade0..94d3052b61 100644
--- a/gtk/gtkmisc.c
+++ b/gtk/gtkmisc.c
@@ -31,7 +31,7 @@
 #include "gtkprivate.h"
 
 
-struct _GtkMiscPriv
+struct _GtkMiscPrivate
 {
   gfloat        xalign;
   gfloat        yalign;
@@ -115,17 +115,17 @@ gtk_misc_class_init (GtkMiscClass *class)
 						     0,
 						     GTK_PARAM_READWRITE));
 
-  g_type_class_add_private (class, sizeof (GtkMiscPriv));
+  g_type_class_add_private (class, sizeof (GtkMiscPrivate));
 }
 
 static void
 gtk_misc_init (GtkMisc *misc)
 {
-  GtkMiscPriv *priv;
+  GtkMiscPrivate *priv;
 
   misc->priv = G_TYPE_INSTANCE_GET_PRIVATE (misc,
                                             GTK_TYPE_MISC,
-                                            GtkMiscPriv);
+                                            GtkMiscPrivate);
   priv = misc->priv;
 
   priv->xalign = 0.5;
@@ -141,7 +141,7 @@ gtk_misc_set_property (GObject      *object,
 		       GParamSpec   *pspec)
 {
   GtkMisc *misc = GTK_MISC (object);
-  GtkMiscPriv *priv = misc->priv;
+  GtkMiscPrivate *priv = misc->priv;
 
   switch (prop_id)
     {
@@ -170,7 +170,7 @@ gtk_misc_get_property (GObject      *object,
 		       GParamSpec   *pspec)
 {
   GtkMisc *misc = GTK_MISC (object);
-  GtkMiscPriv *priv = misc->priv;
+  GtkMiscPrivate *priv = misc->priv;
 
   switch (prop_id)
     {
@@ -197,7 +197,7 @@ gtk_misc_set_alignment (GtkMisc *misc,
 			gfloat   xalign,
 			gfloat   yalign)
 {
-  GtkMiscPriv *priv;
+  GtkMiscPrivate *priv;
   GtkWidget *widget;
 
   g_return_if_fail (GTK_IS_MISC (misc));
@@ -250,7 +250,7 @@ gtk_misc_get_alignment (GtkMisc *misc,
 		        gfloat  *xalign,
 			gfloat  *yalign)
 {
-  GtkMiscPriv *priv;
+  GtkMiscPrivate *priv;
 
   g_return_if_fail (GTK_IS_MISC (misc));
 
@@ -267,7 +267,7 @@ gtk_misc_set_padding (GtkMisc *misc,
 		      gint     xpad,
 		      gint     ypad)
 {
-  GtkMiscPriv *priv;
+  GtkMiscPrivate *priv;
   GtkRequisition *requisition;
 
   g_return_if_fail (GTK_IS_MISC (misc));
@@ -319,7 +319,7 @@ gtk_misc_get_padding (GtkMisc *misc,
 		      gint    *xpad,
 		      gint    *ypad)
 {
-  GtkMiscPriv *priv;
+  GtkMiscPrivate *priv;
 
   g_return_if_fail (GTK_IS_MISC (misc));
 
diff --git a/gtk/gtkmisc.h b/gtk/gtkmisc.h
index 697f8a6185..fe6b7c9df8 100644
--- a/gtk/gtkmisc.h
+++ b/gtk/gtkmisc.h
@@ -45,16 +45,16 @@ G_BEGIN_DECLS
 #define GTK_MISC_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_MISC, GtkMiscClass))
 
 
-typedef struct _GtkMisc	      GtkMisc;
-typedef struct _GtkMiscPriv   GtkMiscPriv;
-typedef struct _GtkMiscClass  GtkMiscClass;
+typedef struct _GtkMisc              GtkMisc;
+typedef struct _GtkMiscPrivate       GtkMiscPrivate;
+typedef struct _GtkMiscClass         GtkMiscClass;
 
 struct _GtkMisc
 {
   GtkWidget widget;
 
   /* <private> */
-  GtkMiscPriv *priv;
+  GtkMiscPrivate *priv;
 };
 
 struct _GtkMiscClass
diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index 6aa66ce3e0..5cd2998b73 100644
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -65,7 +65,7 @@ enum {
   N_ACTION_WIDGETS
 };
 
-struct _GtkNotebookPriv
+struct _GtkNotebookPrivate
 {
   GtkNotebookDragOperation   operation;
   GtkNotebookPage           *cur_page;
@@ -1038,20 +1038,20 @@ gtk_notebook_class_init (GtkNotebookClass *class)
   add_tab_bindings (binding_set, GDK_CONTROL_MASK, GTK_DIR_TAB_FORWARD);
   add_tab_bindings (binding_set, GDK_CONTROL_MASK | GDK_SHIFT_MASK, GTK_DIR_TAB_BACKWARD);
 
-  g_type_class_add_private (class, sizeof (GtkNotebookPriv));
+  g_type_class_add_private (class, sizeof (GtkNotebookPrivate));
 }
 
 static void
 gtk_notebook_init (GtkNotebook *notebook)
 {
-  GtkNotebookPriv *priv;
+  GtkNotebookPrivate *priv;
 
   gtk_widget_set_can_focus (GTK_WIDGET (notebook), TRUE);
   gtk_widget_set_has_window (GTK_WIDGET (notebook), FALSE);
 
   notebook->priv = G_TYPE_INSTANCE_GET_PRIVATE (notebook,
                                                 GTK_TYPE_NOTEBOOK,
-                                                GtkNotebookPriv);
+                                                GtkNotebookPrivate);
   priv = notebook->priv;
 
   priv->cur_page = NULL;
@@ -1144,7 +1144,7 @@ static gboolean
 gtk_notebook_select_page (GtkNotebook *notebook,
                           gboolean     move_focus)
 {
-  GtkNotebookPriv *priv = notebook->priv;
+  GtkNotebookPrivate *priv = notebook->priv;
 
   if (gtk_widget_is_focus (GTK_WIDGET (notebook)) && priv->show_tabs)
     {
@@ -1159,7 +1159,7 @@ static gboolean
 gtk_notebook_focus_tab (GtkNotebook       *notebook,
                         GtkNotebookTab     type)
 {
-  GtkNotebookPriv *priv = notebook->priv;
+  GtkNotebookPrivate *priv = notebook->priv;
   GList *list;
 
   if (gtk_widget_is_focus (GTK_WIDGET (notebook)) && priv->show_tabs)
@@ -1188,7 +1188,7 @@ static gboolean
 gtk_notebook_change_current_page (GtkNotebook *notebook,
 				  gint         offset)
 {
-  GtkNotebookPriv *priv = notebook->priv;
+  GtkNotebookPrivate *priv = notebook->priv;
   GList *current = NULL;
 
   if (!priv->show_tabs)
@@ -1234,7 +1234,7 @@ static GtkDirectionType
 get_effective_direction (GtkNotebook      *notebook,
 			 GtkDirectionType  direction)
 {
-  GtkNotebookPriv *priv = notebook->priv;
+  GtkNotebookPrivate *priv = notebook->priv;
 
   /* Remap the directions into the effective direction it would be for a
    * GTK_POS_TOP notebook
@@ -1263,7 +1263,7 @@ get_effective_direction (GtkNotebook      *notebook,
 static gint
 get_effective_tab_pos (GtkNotebook *notebook)
 {
-  GtkNotebookPriv *priv = notebook->priv;
+  GtkNotebookPrivate *priv = notebook->priv;
 
   if (gtk_widget_get_direction (GTK_WIDGET (notebook)) == GTK_TEXT_DIR_RTL)
     {
@@ -1309,7 +1309,7 @@ static void
 gtk_notebook_move_focus_out (GtkNotebook      *notebook,
 			     GtkDirectionType  direction_type)
 {
-  GtkNotebookPriv *priv = notebook->priv;
+  GtkNotebookPrivate *priv = notebook->priv;
   GtkDirectionType effective_direction = get_effective_direction (notebook, direction_type);
   GtkWidget *toplevel;
   
@@ -1339,7 +1339,7 @@ gtk_notebook_move_focus_out (GtkNotebook      *notebook,
 static gint
 reorder_tab (GtkNotebook *notebook, GList *position, GList *tab)
 {
-  GtkNotebookPriv *priv = notebook->priv;
+  GtkNotebookPrivate *priv = notebook->priv;
   GList *elem;
 
   if (position == tab)
@@ -1386,7 +1386,7 @@ gtk_notebook_reorder_tab (GtkNotebook      *notebook,
 			  GtkDirectionType  direction_type,
 			  gboolean          move_to_last)
 {
-  GtkNotebookPriv *priv = notebook->priv;
+  GtkNotebookPrivate *priv = notebook->priv;
   GtkDirectionType effective_direction = get_effective_direction (notebook, direction_type);
   GtkNotebookPage *page;
   GList *last, *child;
@@ -1472,7 +1472,7 @@ static void
 gtk_notebook_destroy (GtkObject *object)
 {
   GtkNotebook *notebook = GTK_NOTEBOOK (object);
-  GtkNotebookPriv *priv = notebook->priv;
+  GtkNotebookPrivate *priv = notebook->priv;
 
   if (priv->menu)
     gtk_notebook_popup_disable (notebook);
@@ -1541,7 +1541,7 @@ gtk_notebook_get_property (GObject         *object,
 			   GParamSpec      *pspec)
 {
   GtkNotebook *notebook = GTK_NOTEBOOK (object);
-  GtkNotebookPriv *priv = notebook->priv;
+  GtkNotebookPrivate *priv = notebook->priv;
 
   switch (prop_id)
     {
@@ -1602,7 +1602,7 @@ static gboolean
 gtk_notebook_get_event_window_position (GtkNotebook  *notebook,
 					GdkRectangle *rectangle)
 {
-  GtkNotebookPriv *priv = notebook->priv;
+  GtkNotebookPrivate *priv = notebook->priv;
   GtkWidget *widget = GTK_WIDGET (notebook);
   guint border_width = gtk_container_get_border_width (GTK_CONTAINER (notebook));
   GtkNotebookPage *visible_page = NULL;
@@ -1690,7 +1690,7 @@ static void
 gtk_notebook_map (GtkWidget *widget)
 {
   GtkNotebook *notebook = GTK_NOTEBOOK (widget);
-  GtkNotebookPriv *priv = notebook->priv;
+  GtkNotebookPrivate *priv = notebook->priv;
   GtkNotebookPage *page;
   GList *children;
   gint i;
@@ -1737,7 +1737,7 @@ static void
 gtk_notebook_unmap (GtkWidget *widget)
 {
   GtkNotebook *notebook = GTK_NOTEBOOK (widget);
-  GtkNotebookPriv *priv = notebook->priv;
+  GtkNotebookPrivate *priv = notebook->priv;
 
   stop_scrolling (notebook);
 
@@ -1752,7 +1752,7 @@ static void
 gtk_notebook_realize (GtkWidget *widget)
 {
   GtkNotebook *notebook = GTK_NOTEBOOK (widget);
-  GtkNotebookPriv *priv = notebook->priv;
+  GtkNotebookPrivate *priv = notebook->priv;
   GdkWindowAttr attributes;
   gint attributes_mask;
   GdkRectangle event_window_pos;
@@ -1788,7 +1788,7 @@ static void
 gtk_notebook_unrealize (GtkWidget *widget)
 {
   GtkNotebook *notebook = GTK_NOTEBOOK (widget);
-  GtkNotebookPriv *priv = notebook->priv;
+  GtkNotebookPrivate *priv = notebook->priv;
 
   gdk_window_set_user_data (priv->event_window, NULL);
   gdk_window_destroy (priv->event_window);
@@ -1809,7 +1809,7 @@ gtk_notebook_size_request (GtkWidget      *widget,
 			   GtkRequisition *requisition)
 {
   GtkNotebook *notebook = GTK_NOTEBOOK (widget);
-  GtkNotebookPriv *priv = notebook->priv;
+  GtkNotebookPrivate *priv = notebook->priv;
   GtkNotebookPage *page;
   GList *children;
   GtkRequisition child_requisition;
@@ -2102,7 +2102,7 @@ gtk_notebook_size_allocate (GtkWidget     *widget,
 			    GtkAllocation *allocation)
 {
   GtkNotebook *notebook = GTK_NOTEBOOK (widget);
-  GtkNotebookPriv *priv = notebook->priv;
+  GtkNotebookPrivate *priv = notebook->priv;
   gint tab_pos = get_effective_tab_pos (notebook);
   gboolean is_rtl;
   gint focus_width;
@@ -2238,7 +2238,7 @@ gtk_notebook_expose (GtkWidget      *widget,
 		     GdkEventExpose *event)
 {
   GtkNotebook *notebook = GTK_NOTEBOOK (widget);
-  GtkNotebookPriv *priv = notebook->priv;
+  GtkNotebookPrivate *priv = notebook->priv;
   gint i;
 
   if (event->window == priv->drag_window)
@@ -2312,7 +2312,7 @@ gtk_notebook_expose (GtkWidget      *widget,
 static gboolean
 gtk_notebook_show_arrows (GtkNotebook *notebook)
 {
-  GtkNotebookPriv *priv = notebook->priv;
+  GtkNotebookPrivate *priv = notebook->priv;
   gboolean show_arrow = FALSE;
   GList *children;
 
@@ -2338,7 +2338,7 @@ gtk_notebook_get_arrow_rect (GtkNotebook     *notebook,
 			     GdkRectangle    *rectangle,
 			     GtkNotebookArrow arrow)
 {
-  GtkNotebookPriv *priv = notebook->priv;
+  GtkNotebookPrivate *priv = notebook->priv;
   GdkRectangle event_window_pos;
   gboolean before = ARROW_IS_BEFORE (arrow);
   gboolean left = ARROW_IS_LEFT (arrow);
@@ -2402,7 +2402,7 @@ gtk_notebook_get_arrow (GtkNotebook *notebook,
 			gint         x,
 			gint         y)
 {
-  GtkNotebookPriv *priv = notebook->priv;
+  GtkNotebookPrivate *priv = notebook->priv;
   GdkRectangle arrow_rect;
   GdkRectangle event_window_pos;
   gint i;
@@ -2440,7 +2440,7 @@ static void
 gtk_notebook_do_arrow (GtkNotebook     *notebook,
 		       GtkNotebookArrow arrow)
 {
-  GtkNotebookPriv *priv = notebook->priv;
+  GtkNotebookPrivate *priv = notebook->priv;
   GtkWidget *widget = GTK_WIDGET (notebook);
   gboolean is_rtl, left;
 
@@ -2463,7 +2463,7 @@ gtk_notebook_arrow_button_press (GtkNotebook      *notebook,
 				 GtkNotebookArrow  arrow,
 				 gint              button)
 {
-  GtkNotebookPriv *priv = notebook->priv;
+  GtkNotebookPrivate *priv = notebook->priv;
   GtkWidget *widget = GTK_WIDGET (notebook);
   gboolean is_rtl = gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL;
   gboolean left = (ARROW_IS_LEFT (arrow) && !is_rtl) || 
@@ -2532,7 +2532,7 @@ gtk_notebook_scroll (GtkWidget      *widget,
                      GdkEventScroll *event)
 {
   GtkNotebook *notebook = GTK_NOTEBOOK (widget);
-  GtkNotebookPriv *priv = notebook->priv;
+  GtkNotebookPrivate *priv = notebook->priv;
   GtkWidget *child, *event_widget;
   gint i;
 
@@ -2573,7 +2573,7 @@ gtk_notebook_scroll (GtkWidget      *widget,
 static GList*
 get_tab_at_pos (GtkNotebook *notebook, gint x, gint y)
 {
-   GtkNotebookPriv *priv = notebook->priv;
+   GtkNotebookPrivate *priv = notebook->priv;
   GtkNotebookPage *page;
   GList *children;
 
@@ -2601,7 +2601,7 @@ gtk_notebook_button_press (GtkWidget      *widget,
 			   GdkEventButton *event)
 {
   GtkNotebook *notebook = GTK_NOTEBOOK (widget);
-  GtkNotebookPriv *priv = notebook->priv;
+  GtkNotebookPrivate *priv = notebook->priv;
   GtkNotebookPage *page;
   GList *tab;
   GtkNotebookArrow arrow;
@@ -2672,7 +2672,7 @@ popup_position_func (GtkMenu  *menu,
                      gpointer  data)
 {
   GtkNotebook *notebook = data;
-  GtkNotebookPriv *priv = notebook->priv;
+  GtkNotebookPrivate *priv = notebook->priv;
   GtkWidget *w;
   GtkRequisition requisition;
 
@@ -2705,7 +2705,7 @@ static gboolean
 gtk_notebook_popup_menu (GtkWidget *widget)
 {
   GtkNotebook *notebook = GTK_NOTEBOOK (widget);
-  GtkNotebookPriv *priv = notebook->priv;
+  GtkNotebookPrivate *priv = notebook->priv;
 
   if (priv->menu)
     {
@@ -2722,7 +2722,7 @@ gtk_notebook_popup_menu (GtkWidget *widget)
 static void 
 stop_scrolling (GtkNotebook *notebook)
 {
-  GtkNotebookPriv *priv = notebook->priv;
+  GtkNotebookPrivate *priv = notebook->priv;
 
   if (priv->timer)
     {
@@ -2739,7 +2739,7 @@ static GList*
 get_drop_position (GtkNotebook *notebook,
 		   guint        pack)
 {
-  GtkNotebookPriv *priv = notebook->priv;
+  GtkNotebookPrivate *priv = notebook->priv;
   GList *children, *last_child;
   GtkNotebookPage *page;
   gboolean is_rtl;
@@ -2800,7 +2800,7 @@ get_drop_position (GtkNotebook *notebook,
 
 static void
 show_drag_window (GtkNotebook        *notebook,
-		  GtkNotebookPriv    *priv,
+		  GtkNotebookPrivate    *priv,
 		  GtkNotebookPage    *page,
                   GdkDevice          *device)
 {
@@ -2848,7 +2848,7 @@ show_drag_window (GtkNotebook        *notebook,
  */
 static void
 hide_drag_window (GtkNotebook        *notebook,
-		  GtkNotebookPriv    *priv,
+		  GtkNotebookPrivate    *priv,
 		  GtkNotebookPage    *page)
 {
   GtkWidget *widget = GTK_WIDGET (notebook);
@@ -2879,7 +2879,7 @@ hide_drag_window (GtkNotebook        *notebook,
 static void
 gtk_notebook_stop_reorder (GtkNotebook *notebook)
 {
-  GtkNotebookPriv *priv = notebook->priv;
+  GtkNotebookPrivate *priv = notebook->priv;
   GtkNotebookPage *page;
 
   if (priv->operation == DRAG_OPERATION_DETACH)
@@ -2931,7 +2931,7 @@ gtk_notebook_button_release (GtkWidget      *widget,
 			     GdkEventButton *event)
 {
   GtkNotebook *notebook;
-  GtkNotebookPriv *priv;
+  GtkNotebookPrivate *priv;
   GtkNotebookPage *page;
 
   if (event->type != GDK_BUTTON_RELEASE)
@@ -2961,7 +2961,7 @@ gtk_notebook_leave_notify (GtkWidget        *widget,
 			   GdkEventCrossing *event)
 {
   GtkNotebook *notebook = GTK_NOTEBOOK (widget);
-  GtkNotebookPriv *priv = notebook->priv;
+  GtkNotebookPrivate *priv = notebook->priv;
   gint x, y;
 
   if (!get_widget_coordinates (widget, (GdkEvent *)event, &x, &y))
@@ -2979,7 +2979,7 @@ gtk_notebook_leave_notify (GtkWidget        *widget,
 static GtkNotebookPointerPosition
 get_pointer_position (GtkNotebook *notebook)
 {
-  GtkNotebookPriv *priv = notebook->priv;
+  GtkNotebookPrivate *priv = notebook->priv;
   GtkWidget *widget = GTK_WIDGET (notebook);
   gint wx, wy, width, height;
   gboolean is_rtl;
@@ -3023,7 +3023,7 @@ static gboolean
 scroll_notebook_timer (gpointer data)
 {
   GtkNotebook *notebook = GTK_NOTEBOOK (data);
-  GtkNotebookPriv *priv = notebook->priv;
+  GtkNotebookPrivate *priv = notebook->priv;
   GtkNotebookPointerPosition pointer_position;
   GList *element, *first_tab;
 
@@ -3055,7 +3055,7 @@ check_threshold (GtkNotebook *notebook,
 		 gint         current_x,
 		 gint         current_y)
 {
-  GtkNotebookPriv *priv = notebook->priv;
+  GtkNotebookPrivate *priv = notebook->priv;
   GtkWidget *widget;
   gint dnd_threshold;
   GdkRectangle rectangle = { 0, }; /* shut up gcc */
@@ -3087,7 +3087,7 @@ gtk_notebook_motion_notify (GtkWidget      *widget,
 			    GdkEventMotion *event)
 {
   GtkNotebook *notebook = GTK_NOTEBOOK (widget);
-  GtkNotebookPriv *priv = notebook->priv;
+  GtkNotebookPrivate *priv = notebook->priv;
   GtkNotebookPage *page;
   GtkNotebookArrow arrow;
   GtkNotebookPointerPosition pointer_position;
@@ -3239,7 +3239,7 @@ gtk_notebook_draw_focus (GtkWidget      *widget,
 			 GdkEventExpose *event)
 {
   GtkNotebook *notebook = GTK_NOTEBOOK (widget);
-  GtkNotebookPriv *priv = notebook->priv;
+  GtkNotebookPrivate *priv = notebook->priv;
 
   if (gtk_widget_has_focus (widget) && gtk_widget_is_drawable (widget) &&
       priv->show_tabs && priv->cur_page &&
@@ -3273,7 +3273,7 @@ gtk_notebook_style_set  (GtkWidget *widget,
 			 GtkStyle  *previous)
 {
   GtkNotebook *notebook = GTK_NOTEBOOK (widget);
-  GtkNotebookPriv *priv = notebook->priv;
+  GtkNotebookPrivate *priv = notebook->priv;
 
   gboolean has_before_previous;
   gboolean has_before_next;
@@ -3328,7 +3328,7 @@ gtk_notebook_drag_begin (GtkWidget        *widget,
 			 GdkDragContext   *context)
 {
   GtkNotebook *notebook = GTK_NOTEBOOK (widget);
-  GtkNotebookPriv *priv = notebook->priv;
+  GtkNotebookPrivate *priv = notebook->priv;
   GtkWidget *tab_label;
 
   if (priv->dnd_timer)
@@ -3366,7 +3366,7 @@ gtk_notebook_drag_end (GtkWidget      *widget,
 		       GdkDragContext *context)
 {
   GtkNotebook *notebook = GTK_NOTEBOOK (widget);
-  GtkNotebookPriv *priv = notebook->priv;
+  GtkNotebookPrivate *priv = notebook->priv;
 
   gtk_notebook_stop_reorder (notebook);
 
@@ -3401,7 +3401,7 @@ gtk_notebook_drag_failed (GtkWidget      *widget,
   if (result == GTK_DRAG_RESULT_NO_TARGET)
     {
       GtkNotebook *notebook = GTK_NOTEBOOK (widget);
-      GtkNotebookPriv *priv = notebook->priv;
+      GtkNotebookPrivate *priv = notebook->priv;
       GtkNotebook *dest_notebook = NULL;
       GdkDisplay *display;
       gint x, y;
@@ -3425,7 +3425,7 @@ static gboolean
 gtk_notebook_switch_tab_timeout (gpointer data)
 {
   GtkNotebook *notebook = GTK_NOTEBOOK (data);
-  GtkNotebookPriv *priv = notebook->priv;
+  GtkNotebookPrivate *priv = notebook->priv;
   GList *tab;
   gint x, y;
 
@@ -3453,7 +3453,7 @@ gtk_notebook_drag_motion (GtkWidget      *widget,
 			  guint           time)
 {
   GtkNotebook *notebook = GTK_NOTEBOOK (widget);
-  GtkNotebookPriv *priv = notebook->priv;
+  GtkNotebookPrivate *priv = notebook->priv;
   GdkRectangle position;
   GtkSettings *settings;
   GtkNotebookArrow arrow;
@@ -3540,7 +3540,7 @@ gtk_notebook_drag_leave (GtkWidget      *widget,
 			 guint           time)
 {
   GtkNotebook *notebook = GTK_NOTEBOOK (widget);
-  GtkNotebookPriv *priv = notebook->priv;
+  GtkNotebookPrivate *priv = notebook->priv;
 
   if (priv->switch_tab_timer)
     {
@@ -3579,7 +3579,7 @@ do_detach_tab (GtkNotebook     *from,
 	       gint             x,
 	       gint             y)
 {
-  GtkNotebookPriv *to_priv = to->priv;
+  GtkNotebookPrivate *to_priv = to->priv;
   GtkWidget *tab_label, *menu_label;
   gboolean tab_expand, tab_fill, reorderable, detachable;
   GList *element;
@@ -3645,7 +3645,7 @@ gtk_notebook_drag_data_get (GtkWidget        *widget,
   if (data->target == gdk_atom_intern_static_string ("GTK_NOTEBOOK_TAB"))
     {
       GtkNotebook *notebook = GTK_NOTEBOOK (widget);
-      GtkNotebookPriv *priv = notebook->priv;
+      GtkNotebookPrivate *priv = notebook->priv;
 
       gtk_selection_data_set (data,
 			      data->target,
@@ -3770,7 +3770,7 @@ gtk_notebook_get_child_property (GtkContainer    *container,
 				 GParamSpec      *pspec)
 {
   GtkNotebook *notebook = GTK_NOTEBOOK (container);
-  GtkNotebookPriv *priv = notebook->priv;
+  GtkNotebookPrivate *priv = notebook->priv;
   GList *list;
   GtkWidget *label;
   gboolean expand;
@@ -3849,7 +3849,7 @@ gtk_notebook_remove (GtkContainer *container,
 		     GtkWidget    *widget)
 {
   GtkNotebook *notebook = GTK_NOTEBOOK (container);
-  GtkNotebookPriv *priv = notebook->priv;
+  GtkNotebookPrivate *priv = notebook->priv;
   GtkNotebookPage *page;
   GList *children;
   gint page_num = 0;
@@ -3885,7 +3885,7 @@ gtk_notebook_remove (GtkContainer *container,
 static gboolean
 focus_tabs_in (GtkNotebook *notebook)
 {
-  GtkNotebookPriv *priv = notebook->priv;
+  GtkNotebookPrivate *priv = notebook->priv;
 
   if (priv->show_tabs && priv->cur_page)
     {
@@ -3906,7 +3906,7 @@ focus_tabs_move (GtkNotebook     *notebook,
 		 GtkDirectionType direction,
 		 gint             search_direction)
 {
-  GtkNotebookPriv *priv = notebook->priv;
+  GtkNotebookPrivate *priv = notebook->priv;
   GList *new_page;
 
   new_page = gtk_notebook_search_page (notebook, priv->focus_tab,
@@ -3936,7 +3936,7 @@ static gboolean
 focus_child_in (GtkNotebook      *notebook,
 		GtkDirectionType  direction)
 {
-  GtkNotebookPriv *priv = notebook->priv;
+  GtkNotebookPrivate *priv = notebook->priv;
 
   if (priv->cur_page)
     return gtk_widget_child_focus (priv->cur_page->child, direction);
@@ -3949,7 +3949,7 @@ focus_action_in (GtkNotebook      *notebook,
                  gint              action,
                  GtkDirectionType  direction)
 {
-  GtkNotebookPriv *priv = notebook->priv;
+  GtkNotebookPrivate *priv = notebook->priv;
 
   if (priv->action_widget[action] &&
       gtk_widget_get_visible (priv->action_widget[action]))
@@ -3966,7 +3966,7 @@ gtk_notebook_focus (GtkWidget        *widget,
 		    GtkDirectionType  direction)
 {
   GtkNotebook *notebook = GTK_NOTEBOOK (widget);
-  GtkNotebookPriv *priv = notebook->priv;
+  GtkNotebookPrivate *priv = notebook->priv;
   GtkWidget *old_focus_child;
   GtkDirectionType effective_direction;
   gint first_action;
@@ -4140,7 +4140,7 @@ gtk_notebook_set_focus_child (GtkContainer *container,
 			      GtkWidget    *child)
 {
   GtkNotebook *notebook = GTK_NOTEBOOK (container);
-  GtkNotebookPriv *priv = notebook->priv;
+  GtkNotebookPrivate *priv = notebook->priv;
   GtkWidget *page_child;
   GtkWidget *toplevel;
 
@@ -4209,7 +4209,7 @@ gtk_notebook_forall (GtkContainer *container,
 		     gpointer      callback_data)
 {
   GtkNotebook *notebook = GTK_NOTEBOOK (container);
-  GtkNotebookPriv *priv = notebook->priv;
+  GtkNotebookPrivate *priv = notebook->priv;
   GList *children;
   gint i;
 
@@ -4254,7 +4254,7 @@ page_visible_cb (GtkWidget  *page,
                  gpointer    data)
 {
   GtkNotebook *notebook = GTK_NOTEBOOK (data);
-  GtkNotebookPriv *priv = notebook->priv;
+  GtkNotebookPrivate *priv = notebook->priv;
   GList *list;
   GList *next = NULL;
 
@@ -4282,7 +4282,7 @@ gtk_notebook_real_insert_page (GtkNotebook *notebook,
 			       GtkWidget   *menu_label,
 			       gint         position)
 {
-  GtkNotebookPriv *priv = notebook->priv;
+  GtkNotebookPrivate *priv = notebook->priv;
   GtkNotebookPage *page;
   gint nchildren;
 
@@ -4392,7 +4392,7 @@ gtk_notebook_real_insert_page (GtkNotebook *notebook,
 static void
 gtk_notebook_redraw_tabs (GtkNotebook *notebook)
 {
-  GtkNotebookPriv *priv = notebook->priv;
+  GtkNotebookPrivate *priv = notebook->priv;
   GtkWidget *widget;
   GtkNotebookPage *page;
   GdkRectangle redraw_rect;
@@ -4451,7 +4451,7 @@ gtk_notebook_redraw_tabs (GtkNotebook *notebook)
 static void
 gtk_notebook_redraw_arrows (GtkNotebook *notebook)
 {
-  GtkNotebookPriv *priv = notebook->priv;
+  GtkNotebookPrivate *priv = notebook->priv;
 
   if (gtk_widget_get_mapped (GTK_WIDGET (notebook)) &&
       gtk_notebook_show_arrows (notebook))
@@ -4480,7 +4480,7 @@ gtk_notebook_redraw_arrows (GtkNotebook *notebook)
 static gboolean
 gtk_notebook_timer (GtkNotebook *notebook)
 {
-  GtkNotebookPriv *priv = notebook->priv;
+  GtkNotebookPrivate *priv = notebook->priv;
   gboolean retval = FALSE;
 
   if (priv->timer)
@@ -4510,7 +4510,7 @@ gtk_notebook_timer (GtkNotebook *notebook)
 static void
 gtk_notebook_set_scroll_timer (GtkNotebook *notebook)
 {
-  GtkNotebookPriv *priv = notebook->priv;
+  GtkNotebookPrivate *priv = notebook->priv;
   GtkWidget *widget = GTK_WIDGET (notebook);
 
   if (!priv->timer)
@@ -4539,7 +4539,7 @@ gtk_notebook_find_child (GtkNotebook *notebook,
 			 GtkWidget   *child,
 			 const gchar *function)
 {
-  GtkNotebookPriv *priv = notebook->priv;
+  GtkNotebookPrivate *priv = notebook->priv;
   GList *list = g_list_find_custom (priv->children, child,
 				    gtk_notebook_page_compare);
 
@@ -4573,7 +4573,7 @@ static void
 gtk_notebook_real_remove (GtkNotebook *notebook,
 			  GList       *list)
 {
-  GtkNotebookPriv *priv = notebook->priv;
+  GtkNotebookPrivate *priv = notebook->priv;
   GtkNotebookPage *page;
   GList * next_list;
   gint need_resize = FALSE;
@@ -4654,7 +4654,7 @@ gtk_notebook_real_remove (GtkNotebook *notebook,
 static void
 gtk_notebook_update_labels (GtkNotebook *notebook)
 {
-  GtkNotebookPriv *priv = notebook->priv;
+  GtkNotebookPrivate *priv = notebook->priv;
   GtkNotebookPage *page;
   GList *list;
   gchar string[32];
@@ -4705,7 +4705,7 @@ static gint
 gtk_notebook_real_page_position (GtkNotebook *notebook,
 				 GList       *list)
 {
-  GtkNotebookPriv *priv = notebook->priv;
+  GtkNotebookPrivate *priv = notebook->priv;
   GList *work;
   gint count_start;
 
@@ -4729,7 +4729,7 @@ gtk_notebook_search_page (GtkNotebook *notebook,
 			  gint         direction,
 			  gboolean     find_visible)
 {
-  GtkNotebookPriv *priv = notebook->priv;
+  GtkNotebookPrivate *priv = notebook->priv;
   GtkNotebookPage *page = NULL;
   GList *old_list = NULL;
   gint flag = 0;
@@ -4801,7 +4801,7 @@ gtk_notebook_paint (GtkWidget    *widget,
 		    GdkRectangle *area)
 {
   GtkNotebook *notebook;
-  GtkNotebookPriv *priv;
+  GtkNotebookPrivate *priv;
   GtkNotebookPage *page;
   GList *children;
   gboolean showarrow;
@@ -4934,7 +4934,7 @@ gtk_notebook_draw_tab (GtkNotebook     *notebook,
 		       GtkNotebookPage *page,
 		       GdkRectangle    *area)
 {
-  GtkNotebookPriv *priv;
+  GtkNotebookPrivate *priv;
   GdkRectangle child_area;
   GdkRectangle page_area;
   GtkStateType state_type;
@@ -4982,7 +4982,7 @@ static void
 gtk_notebook_draw_arrow (GtkNotebook      *notebook,
 			 GtkNotebookArrow  nbarrow)
 {
-  GtkNotebookPriv *priv = notebook->priv;
+  GtkNotebookPrivate *priv = notebook->priv;
   GtkStateType state_type;
   GtkShadowType shadow_type;
   GtkWidget *widget;
@@ -5067,7 +5067,7 @@ gtk_notebook_tab_space (GtkNotebook *notebook,
 			gint        *max,
 			gint        *tab_space)
 {
-  GtkNotebookPriv *priv = notebook->priv;
+  GtkNotebookPrivate *priv = notebook->priv;
   GtkWidget *widget;
   GList *children;
   gint tab_pos = get_effective_tab_pos (notebook);
@@ -5230,7 +5230,7 @@ gtk_notebook_calculate_shown_tabs (GtkNotebook *notebook,
 				   gint        *n,
 				   gint        *remaining_space)
 {
-  GtkNotebookPriv *priv = notebook->priv;
+  GtkNotebookPrivate *priv = notebook->priv;
   GtkWidget *widget;
   GtkContainer *container;
   GList *children;
@@ -5459,7 +5459,7 @@ gtk_notebook_calculate_tabs_allocation (GtkNotebook  *notebook,
 					gint          min,
 					gint          max)
 {
-  GtkNotebookPriv *priv = notebook->priv;
+  GtkNotebookPrivate *priv = notebook->priv;
   GtkWidget *widget;
   GtkContainer *container;
   GtkNotebookPage *page;
@@ -5780,7 +5780,7 @@ gtk_notebook_calculate_tabs_allocation (GtkNotebook  *notebook,
 static void
 gtk_notebook_pages_allocate (GtkNotebook *notebook)
 {
-  GtkNotebookPriv *priv = notebook->priv;
+  GtkNotebookPrivate *priv = notebook->priv;
   GList *children = NULL;
   GList *last_child = NULL;
   gboolean showarrow = FALSE;
@@ -5834,7 +5834,7 @@ gtk_notebook_page_allocate (GtkNotebook     *notebook,
 			    GtkNotebookPage *page)
 {
   GtkWidget *widget = GTK_WIDGET (notebook);
-  GtkNotebookPriv *priv = notebook->priv;
+  GtkNotebookPrivate *priv = notebook->priv;
   GtkAllocation child_allocation;
   GtkRequisition tab_requisition;
   gint xthickness;
@@ -6046,7 +6046,7 @@ gtk_notebook_calc_tabs (GtkNotebook  *notebook,
 static void
 gtk_notebook_update_tab_states (GtkNotebook *notebook)
 {
-  GtkNotebookPriv *priv = notebook->priv;
+  GtkNotebookPrivate *priv = notebook->priv;
   GList *list;
 
   for (list = priv->children; list != NULL; list = list->next)
@@ -6072,7 +6072,7 @@ gtk_notebook_real_switch_page (GtkNotebook     *notebook,
 			       GtkWidget*       child,
 			       guint            page_num)
 {
-  GtkNotebookPriv *priv = notebook->priv;
+  GtkNotebookPrivate *priv = notebook->priv;
   GList *list = gtk_notebook_find_child (notebook, GTK_WIDGET (child), NULL);
   GtkNotebookPage *page = GTK_NOTEBOOK_PAGE (list);
   gboolean child_has_focus;
@@ -6125,7 +6125,7 @@ static void
 gtk_notebook_switch_page (GtkNotebook     *notebook,
 			  GtkNotebookPage *page)
 {
-  GtkNotebookPriv *priv = notebook->priv;
+  GtkNotebookPrivate *priv = notebook->priv;
   guint page_num;
 
   if (priv->cur_page == page)
@@ -6144,7 +6144,7 @@ static gint
 gtk_notebook_page_select (GtkNotebook *notebook,
 			  gboolean     move_focus)
 {
-  GtkNotebookPriv *priv = notebook->priv;
+  GtkNotebookPrivate *priv = notebook->priv;
   GtkNotebookPage *page;
   GtkDirectionType dir = GTK_DIR_DOWN; /* Quiet GCC */
   gint tab_pos = get_effective_tab_pos (notebook);
@@ -6183,7 +6183,7 @@ static void
 gtk_notebook_switch_focus_tab (GtkNotebook *notebook, 
 			       GList       *new_child)
 {
-  GtkNotebookPriv *priv = notebook->priv;
+  GtkNotebookPrivate *priv = notebook->priv;
   GList *old_child;
   GtkNotebookPage *page;
 
@@ -6212,7 +6212,7 @@ static void
 gtk_notebook_menu_switch_page (GtkWidget       *widget,
 			       GtkNotebookPage *page)
 {
-  GtkNotebookPriv *priv;
+  GtkNotebookPrivate *priv;
   GtkNotebook *notebook;
   GList *children;
   guint page_num;
@@ -6249,7 +6249,7 @@ static void
 gtk_notebook_menu_item_create (GtkNotebook *notebook, 
 			       GList       *list)
 {
-  GtkNotebookPriv *priv = notebook->priv;
+  GtkNotebookPrivate *priv = notebook->priv;
   GtkNotebookPage *page;
   GtkWidget *menu_item;
 
@@ -6287,7 +6287,7 @@ gtk_notebook_menu_detacher (GtkWidget *widget,
 			    GtkMenu   *menu)
 {
   GtkNotebook *notebook = GTK_NOTEBOOK (widget);
-  GtkNotebookPriv *priv = notebook->priv;
+  GtkNotebookPrivate *priv = notebook->priv;
 
   g_return_if_fail (priv->menu == (GtkWidget*) menu);
 
@@ -6459,7 +6459,7 @@ gtk_notebook_mnemonic_activate_switch_page (GtkWidget *child,
 					    gpointer data)
 {
   GtkNotebook *notebook = GTK_NOTEBOOK (data);
-  GtkNotebookPriv *priv = notebook->priv;
+  GtkNotebookPrivate *priv = notebook->priv;
   GList *list;
 
   list = g_list_find_custom (priv->children, child,
@@ -6530,7 +6530,7 @@ void
 gtk_notebook_remove_page (GtkNotebook *notebook,
 			  gint         page_num)
 {
-  GtkNotebookPriv *priv;
+  GtkNotebookPrivate *priv;
   GList *list = NULL;
 
   g_return_if_fail (GTK_IS_NOTEBOOK (notebook));
@@ -6567,7 +6567,7 @@ gtk_notebook_remove_page (GtkNotebook *notebook,
 gint
 gtk_notebook_get_current_page (GtkNotebook *notebook)
 {
-  GtkNotebookPriv *priv;
+  GtkNotebookPrivate *priv;
 
   g_return_val_if_fail (GTK_IS_NOTEBOOK (notebook), -1);
 
@@ -6594,7 +6594,7 @@ GtkWidget*
 gtk_notebook_get_nth_page (GtkNotebook *notebook,
 			   gint         page_num)
 {
-  GtkNotebookPriv *priv;
+  GtkNotebookPrivate *priv;
   GtkNotebookPage *page;
   GList *list;
 
@@ -6629,7 +6629,7 @@ gtk_notebook_get_nth_page (GtkNotebook *notebook,
 gint
 gtk_notebook_get_n_pages (GtkNotebook *notebook)
 {
-  GtkNotebookPriv *priv;
+  GtkNotebookPrivate *priv;
 
   g_return_val_if_fail (GTK_IS_NOTEBOOK (notebook), 0);
 
@@ -6653,7 +6653,7 @@ gint
 gtk_notebook_page_num (GtkNotebook      *notebook,
 		       GtkWidget        *child)
 {
-  GtkNotebookPriv *priv;
+  GtkNotebookPrivate *priv;
   GList *children;
   gint num;
 
@@ -6696,7 +6696,7 @@ void
 gtk_notebook_set_current_page (GtkNotebook *notebook,
 			       gint         page_num)
 {
-  GtkNotebookPriv *priv;
+  GtkNotebookPrivate *priv;
   GList *list;
 
   g_return_if_fail (GTK_IS_NOTEBOOK (notebook));
@@ -6721,7 +6721,7 @@ gtk_notebook_set_current_page (GtkNotebook *notebook,
 void
 gtk_notebook_next_page (GtkNotebook *notebook)
 {
-  GtkNotebookPriv *priv;
+  GtkNotebookPrivate *priv;
   GList *list;
 
   g_return_if_fail (GTK_IS_NOTEBOOK (notebook));
@@ -6749,7 +6749,7 @@ gtk_notebook_next_page (GtkNotebook *notebook)
 void
 gtk_notebook_prev_page (GtkNotebook *notebook)
 {
-  GtkNotebookPriv *priv;
+  GtkNotebookPrivate *priv;
   GList *list;
 
   g_return_if_fail (GTK_IS_NOTEBOOK (notebook));
@@ -6793,7 +6793,7 @@ void
 gtk_notebook_set_show_border (GtkNotebook *notebook,
 			      gboolean     show_border)
 {
-  GtkNotebookPriv *priv;
+  GtkNotebookPrivate *priv;
 
   g_return_if_fail (GTK_IS_NOTEBOOK (notebook));
 
@@ -6838,7 +6838,7 @@ void
 gtk_notebook_set_show_tabs (GtkNotebook *notebook,
 			    gboolean     show_tabs)
 {
-  GtkNotebookPriv *priv;
+  GtkNotebookPrivate *priv;
   GtkNotebookPage *page;
   GList *children;
   gint i;
@@ -6918,7 +6918,7 @@ void
 gtk_notebook_set_tab_pos (GtkNotebook     *notebook,
 			  GtkPositionType  pos)
 {
-  GtkNotebookPriv *priv;
+  GtkNotebookPrivate *priv;
 
   g_return_if_fail (GTK_IS_NOTEBOOK (notebook));
 
@@ -6963,7 +6963,7 @@ void
 gtk_notebook_set_scrollable (GtkNotebook *notebook,
 			     gboolean     scrollable)
 {
-  GtkNotebookPriv *priv;
+  GtkNotebookPrivate *priv;
 
   g_return_if_fail (GTK_IS_NOTEBOOK (notebook));
 
@@ -7053,7 +7053,7 @@ gtk_notebook_get_tab_vborder (GtkNotebook *notebook)
 void
 gtk_notebook_popup_enable (GtkNotebook *notebook)
 {
-  GtkNotebookPriv *priv;
+  GtkNotebookPrivate *priv;
   GList *list;
 
   g_return_if_fail (GTK_IS_NOTEBOOK (notebook));
@@ -7086,7 +7086,7 @@ gtk_notebook_popup_enable (GtkNotebook *notebook)
 void       
 gtk_notebook_popup_disable  (GtkNotebook *notebook)
 {
-  GtkNotebookPriv *priv;
+  GtkNotebookPrivate *priv;
 
   g_return_if_fail (GTK_IS_NOTEBOOK (notebook));
 
@@ -7163,7 +7163,7 @@ gtk_notebook_set_tab_label (GtkNotebook *notebook,
 			    GtkWidget   *child,
 			    GtkWidget   *tab_label)
 {
-  GtkNotebookPriv *priv;
+  GtkNotebookPrivate *priv;
   GtkNotebookPage *page;
   GList *list;
 
@@ -7323,7 +7323,7 @@ gtk_notebook_set_menu_label (GtkNotebook *notebook,
 			     GtkWidget   *child,
 			     GtkWidget   *menu_label)
 {
-  GtkNotebookPriv *priv;
+  GtkNotebookPrivate *priv;
   GtkNotebookPage *page;
   GList *list;
 
@@ -7424,7 +7424,7 @@ static void
 gtk_notebook_child_reordered (GtkNotebook     *notebook,
 			      GtkNotebookPage *page)
 {
-  GtkNotebookPriv *priv = notebook->priv;
+  GtkNotebookPrivate *priv = notebook->priv;
 
   if (priv->menu)
     {
@@ -7447,7 +7447,7 @@ gtk_notebook_set_tab_label_packing (GtkNotebook *notebook,
                                     gboolean     fill,
                                     GtkPackType  pack_type)
 {
-  GtkNotebookPriv *priv;
+  GtkNotebookPrivate *priv;
   GtkNotebookPage *page;
   GList *list;
 
@@ -7523,7 +7523,7 @@ gtk_notebook_reorder_child (GtkNotebook *notebook,
 			    GtkWidget   *child,
 			    gint         position)
 {
-  GtkNotebookPriv *priv;
+  GtkNotebookPrivate *priv;
   GList *list, *new_list;
   GtkNotebookPage *page;
   gint old_pos;
@@ -7618,7 +7618,7 @@ void
 gtk_notebook_set_group (GtkNotebook *notebook,
 			gpointer     group)
 {
-  GtkNotebookPriv *priv;
+  GtkNotebookPrivate *priv;
 
   g_return_if_fail (GTK_IS_NOTEBOOK (notebook));
 
@@ -7842,7 +7842,7 @@ gtk_notebook_set_action_widget (GtkNotebook *notebook,
 				GtkWidget   *widget,
                                 GtkPackType  pack_type)
 {
-  GtkNotebookPriv *priv;
+  GtkNotebookPrivate *priv;
 
   g_return_if_fail (GTK_IS_NOTEBOOK (notebook));
   g_return_if_fail (!widget || GTK_IS_WIDGET (widget));
diff --git a/gtk/gtknotebook.h b/gtk/gtknotebook.h
index 9ced43b033..4240338595 100644
--- a/gtk/gtknotebook.h
+++ b/gtk/gtknotebook.h
@@ -52,16 +52,16 @@ typedef enum
   GTK_NOTEBOOK_TAB_LAST
 } GtkNotebookTab;
 
-typedef struct _GtkNotebook       GtkNotebook;
-typedef struct _GtkNotebookPriv   GtkNotebookPriv;
-typedef struct _GtkNotebookClass  GtkNotebookClass;
+typedef struct _GtkNotebook              GtkNotebook;
+typedef struct _GtkNotebookPrivate       GtkNotebookPrivate;
+typedef struct _GtkNotebookClass         GtkNotebookClass;
 
 struct _GtkNotebook
 {
   GtkContainer container;
 
   /* <private> */
-  GtkNotebookPriv *priv;
+  GtkNotebookPrivate *priv;
 };
 
 struct _GtkNotebookClass
diff --git a/gtk/gtkprogressbar.c b/gtk/gtkprogressbar.c
index b655e99894..daba35d6dc 100644
--- a/gtk/gtkprogressbar.c
+++ b/gtk/gtkprogressbar.c
@@ -39,7 +39,7 @@
 #define MIN_VERTICAL_BAR_HEIGHT    80
 
 
-struct _GtkProgressBarPriv
+struct _GtkProgressBarPrivate
 {
   GtkProgressBarOrientation orientation;
 
@@ -242,17 +242,17 @@ gtk_progress_bar_class_init (GtkProgressBarClass *class)
                                                              1, G_MAXINT, MIN_VERTICAL_BAR_HEIGHT,
                                                              G_PARAM_READWRITE));
 
-  g_type_class_add_private (class, sizeof (GtkProgressBarPriv));
+  g_type_class_add_private (class, sizeof (GtkProgressBarPrivate));
 }
 
 static void
 gtk_progress_bar_init (GtkProgressBar *pbar)
 {
-  GtkProgressBarPriv *priv;
+  GtkProgressBarPrivate *priv;
 
   pbar->priv = G_TYPE_INSTANCE_GET_PRIVATE (pbar,
                                             GTK_TYPE_PROGRESS_BAR,
-                                            GtkProgressBarPriv);
+                                            GtkProgressBarPrivate);
   priv = pbar->priv;
 
   priv->blocks = 10;
@@ -347,7 +347,7 @@ gtk_progress_bar_get_property (GObject      *object,
                                GParamSpec   *pspec)
 {
   GtkProgressBar *pbar = GTK_PROGRESS_BAR (object);
-  GtkProgressBarPriv* priv = pbar->priv;
+  GtkProgressBarPrivate* priv = pbar->priv;
 
   switch (prop_id)
     {
@@ -388,7 +388,7 @@ gtk_progress_bar_new (void)
 static void
 gtk_progress_bar_real_update (GtkProgressBar *pbar)
 {
-  GtkProgressBarPriv *priv;
+  GtkProgressBarPrivate *priv;
   GtkWidget *widget;
 
   g_return_if_fail (GTK_IS_PROGRESS_BAR (pbar));
@@ -467,7 +467,7 @@ static void
 gtk_progress_bar_finalize (GObject *object)
 {
   GtkProgressBar *pbar = GTK_PROGRESS_BAR (object);
-  GtkProgressBarPriv *priv = pbar->priv;
+  GtkProgressBarPrivate *priv = pbar->priv;
 
   g_free (priv->text);
 
@@ -489,7 +489,7 @@ gtk_progress_bar_expose (GtkWidget      *widget,
 static gchar *
 get_current_text (GtkProgressBar *pbar)
 {
-  GtkProgressBarPriv *priv = pbar->priv;
+  GtkProgressBarPrivate *priv = pbar->priv;
 
   if (priv->text)
     return g_strdup (priv->text);
@@ -502,7 +502,7 @@ gtk_progress_bar_size_request (GtkWidget      *widget,
                                GtkRequisition *requisition)
 {
   GtkProgressBar *pbar;
-  GtkProgressBarPriv *priv;
+  GtkProgressBarPrivate *priv;
   GtkStyle *style;
   gchar *buf;
   PangoRectangle logical_rect;
@@ -590,7 +590,7 @@ gtk_progress_bar_size_allocate (GtkWidget     *widget,
 static void
 gtk_progress_bar_act_mode_enter (GtkProgressBar *pbar)
 {
-  GtkProgressBarPriv *priv = pbar->priv;
+  GtkProgressBarPrivate *priv = pbar->priv;
   GtkAllocation allocation;
   GtkStyle *style;
   GtkWidget *widget = GTK_WIDGET (pbar);
@@ -648,7 +648,7 @@ gtk_progress_bar_get_activity (GtkProgressBar            *pbar,
                                gint                      *offset,
                                gint                      *amount)
 {
-  GtkProgressBarPriv *priv = pbar->priv;
+  GtkProgressBarPrivate *priv = pbar->priv;
   GtkAllocation allocation;
   GtkWidget *widget = GTK_WIDGET (pbar);
 
@@ -768,7 +768,7 @@ gtk_progress_bar_paint_text (GtkProgressBar            *pbar,
                              gint                       amount,
                              GtkProgressBarOrientation  orientation)
 {
-  GtkProgressBarPriv *priv = pbar->priv;
+  GtkProgressBarPrivate *priv = pbar->priv;
   GtkAllocation allocation;
   GtkStyle *style;
   GtkWidget *widget = GTK_WIDGET (pbar);
@@ -890,7 +890,7 @@ gtk_progress_bar_paint_text (GtkProgressBar            *pbar,
 static void
 gtk_progress_bar_paint (GtkProgressBar *pbar)
 {
-  GtkProgressBarPriv *priv = pbar->priv;
+  GtkProgressBarPrivate *priv = pbar->priv;
   GtkAllocation allocation;
   GtkWidget *widget = GTK_WIDGET (pbar);
   GtkProgressBarOrientation orientation;
@@ -953,7 +953,7 @@ static void
 gtk_progress_bar_set_activity_mode (GtkProgressBar *pbar,
                                     gboolean        activity_mode)
 {
-  GtkProgressBarPriv *priv = pbar->priv;
+  GtkProgressBarPrivate *priv = pbar->priv;
 
   activity_mode = !!activity_mode;
 
@@ -983,7 +983,7 @@ void
 gtk_progress_bar_set_fraction (GtkProgressBar *pbar,
                                gdouble         fraction)
 {
-  GtkProgressBarPriv* priv;
+  GtkProgressBarPrivate* priv;
 
   g_return_if_fail (GTK_IS_PROGRESS_BAR (pbar));
 
@@ -1026,7 +1026,7 @@ void
 gtk_progress_bar_set_text (GtkProgressBar *pbar,
                            const gchar    *text)
 {
-  GtkProgressBarPriv *priv;
+  GtkProgressBarPrivate *priv;
 
   g_return_if_fail (GTK_IS_PROGRESS_BAR (pbar));
 
@@ -1057,7 +1057,7 @@ void
 gtk_progress_bar_set_show_text (GtkProgressBar *pbar,
                                 gboolean        show_text)
 {
-  GtkProgressBarPriv *priv;
+  GtkProgressBarPrivate *priv;
 
   g_return_if_fail (GTK_IS_PROGRESS_BAR (pbar));
 
@@ -1107,7 +1107,7 @@ void
 gtk_progress_bar_set_pulse_step (GtkProgressBar *pbar,
                                  gdouble         fraction)
 {
-  GtkProgressBarPriv *priv;
+  GtkProgressBarPrivate *priv;
 
   g_return_if_fail (GTK_IS_PROGRESS_BAR (pbar));
 
@@ -1130,7 +1130,7 @@ void
 gtk_progress_bar_set_orientation (GtkProgressBar           *pbar,
                                   GtkProgressBarOrientation orientation)
 {
-  GtkProgressBarPriv *priv;
+  GtkProgressBarPrivate *priv;
 
   g_return_if_fail (GTK_IS_PROGRESS_BAR (pbar));
 
@@ -1229,7 +1229,7 @@ void
 gtk_progress_bar_set_ellipsize (GtkProgressBar     *pbar,
                                 PangoEllipsizeMode  mode)
 {
-  GtkProgressBarPriv *priv;
+  GtkProgressBarPrivate *priv;
 
   g_return_if_fail (GTK_IS_PROGRESS_BAR (pbar));
   g_return_if_fail (mode >= PANGO_ELLIPSIZE_NONE &&
diff --git a/gtk/gtkprogressbar.h b/gtk/gtkprogressbar.h
index 9d32e520ec..1c4d51a61f 100644
--- a/gtk/gtkprogressbar.h
+++ b/gtk/gtkprogressbar.h
@@ -43,9 +43,9 @@ G_BEGIN_DECLS
 #define GTK_PROGRESS_BAR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_PROGRESS_BAR, GtkProgressBarClass))
 
 
-typedef struct _GtkProgressBar       GtkProgressBar;
-typedef struct _GtkProgressBarPriv   GtkProgressBarPriv;
-typedef struct _GtkProgressBarClass  GtkProgressBarClass;
+typedef struct _GtkProgressBar              GtkProgressBar;
+typedef struct _GtkProgressBarPrivate       GtkProgressBarPrivate;
+typedef struct _GtkProgressBarClass         GtkProgressBarClass;
 
 typedef enum
 {
@@ -60,7 +60,7 @@ struct _GtkProgressBar
   GtkWidget parent;
 
   /* <private> */
-  GtkProgressBarPriv *priv;
+  GtkProgressBarPrivate *priv;
 };
 
 struct _GtkProgressBarClass
diff --git a/gtk/gtkradiobutton.c b/gtk/gtkradiobutton.c
index ebaa86cfcb..fc78eadb46 100644
--- a/gtk/gtkradiobutton.c
+++ b/gtk/gtkradiobutton.c
@@ -103,7 +103,7 @@
  */
 
 
-struct _GtkRadioButtonPriv
+struct _GtkRadioButtonPrivate
 {
   GSList *group;
 };
@@ -194,17 +194,17 @@ gtk_radio_button_class_init (GtkRadioButtonClass *class)
 				       _gtk_marshal_VOID__VOID,
 				       G_TYPE_NONE, 0);
 
-  g_type_class_add_private (class, sizeof (GtkRadioButtonPriv));
+  g_type_class_add_private (class, sizeof (GtkRadioButtonPrivate));
 }
 
 static void
 gtk_radio_button_init (GtkRadioButton *radio_button)
 {
-  GtkRadioButtonPriv *priv;
+  GtkRadioButtonPrivate *priv;
 
   radio_button->priv = G_TYPE_INSTANCE_GET_PRIVATE (radio_button,
                                                     GTK_TYPE_RADIO_BUTTON,
-                                                    GtkRadioButtonPriv);
+                                                    GtkRadioButtonPrivate);
   priv = radio_button->priv;
 
   gtk_widget_set_has_window (GTK_WIDGET (radio_button), FALSE);
@@ -279,7 +279,7 @@ void
 gtk_radio_button_set_group (GtkRadioButton *radio_button,
 			    GSList         *group)
 {
-  GtkRadioButtonPriv *priv;
+  GtkRadioButtonPrivate *priv;
   GtkWidget *old_group_singleton = NULL;
   GtkWidget *new_group_singleton = NULL;
 
@@ -507,7 +507,7 @@ gtk_radio_button_destroy (GtkObject *object)
 {
   GtkWidget *old_group_singleton = NULL;
   GtkRadioButton *radio_button = GTK_RADIO_BUTTON (object);
-  GtkRadioButtonPriv *priv = radio_button->priv;
+  GtkRadioButtonPrivate *priv = radio_button->priv;
   GtkRadioButton *tmp_button;
   GSList *tmp_list;
   gboolean was_in_group;
@@ -591,7 +591,7 @@ gtk_radio_button_focus (GtkWidget         *widget,
 			GtkDirectionType   direction)
 {
   GtkRadioButton *radio_button = GTK_RADIO_BUTTON (widget);
-  GtkRadioButtonPriv *priv = radio_button->priv;
+  GtkRadioButtonPrivate *priv = radio_button->priv;
   GSList *tmp_slist;
 
   /* Radio buttons with draw_indicator unset focus "normally", since
@@ -728,7 +728,7 @@ static void
 gtk_radio_button_clicked (GtkButton *button)
 {
   GtkRadioButton *radio_button = GTK_RADIO_BUTTON (button);
-  GtkRadioButtonPriv *priv = radio_button->priv;
+  GtkRadioButtonPrivate *priv = radio_button->priv;
   GtkToggleButton *toggle_button = GTK_TOGGLE_BUTTON (button);
   GtkToggleButton *tmp_button;
   GtkStateType new_state;
diff --git a/gtk/gtkradiobutton.h b/gtk/gtkradiobutton.h
index 7c1e5b4cd6..84e7042821 100644
--- a/gtk/gtkradiobutton.h
+++ b/gtk/gtkradiobutton.h
@@ -45,16 +45,16 @@ G_BEGIN_DECLS
 #define GTK_RADIO_BUTTON_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_RADIO_BUTTON, GtkRadioButtonClass))
 
 
-typedef struct _GtkRadioButton	     GtkRadioButton;
-typedef struct _GtkRadioButtonPriv   GtkRadioButtonPriv;
-typedef struct _GtkRadioButtonClass  GtkRadioButtonClass;
+typedef struct _GtkRadioButton              GtkRadioButton;
+typedef struct _GtkRadioButtonPrivate       GtkRadioButtonPrivate;
+typedef struct _GtkRadioButtonClass         GtkRadioButtonClass;
 
 struct _GtkRadioButton
 {
   GtkCheckButton check_button;
 
   /* <private> */
-  GtkRadioButtonPriv *priv;
+  GtkRadioButtonPrivate *priv;
 };
 
 struct _GtkRadioButtonClass
diff --git a/gtk/gtkradiomenuitem.c b/gtk/gtkradiomenuitem.c
index abf7a4c028..8fdd12b300 100644
--- a/gtk/gtkradiomenuitem.c
+++ b/gtk/gtkradiomenuitem.c
@@ -33,7 +33,7 @@
 #include "gtkintl.h"
 
 
-struct _GtkRadioMenuItemPriv
+struct _GtkRadioMenuItemPrivate
 {
   GSList *group;
 };
@@ -116,7 +116,7 @@ void
 gtk_radio_menu_item_set_group (GtkRadioMenuItem *radio_menu_item,
 			       GSList           *group)
 {
-  GtkRadioMenuItemPriv *priv;
+  GtkRadioMenuItemPrivate *priv;
   GtkWidget *old_group_singleton = NULL;
   GtkWidget *new_group_singleton = NULL;
   
@@ -387,17 +387,17 @@ gtk_radio_menu_item_class_init (GtkRadioMenuItemClass *klass)
 				       _gtk_marshal_VOID__VOID,
 				       G_TYPE_NONE, 0);
 
-  g_type_class_add_private (klass, sizeof (GtkRadioMenuItemPriv));
+  g_type_class_add_private (klass, sizeof (GtkRadioMenuItemPrivate));
 }
 
 static void
 gtk_radio_menu_item_init (GtkRadioMenuItem *radio_menu_item)
 {
-  GtkRadioMenuItemPriv *priv;
+  GtkRadioMenuItemPrivate *priv;
 
   radio_menu_item->priv = G_TYPE_INSTANCE_GET_PRIVATE (radio_menu_item,
                                                        GTK_TYPE_RADIO_MENU_ITEM,
-                                                       GtkRadioMenuItemPriv);
+                                                       GtkRadioMenuItemPrivate);
   priv = radio_menu_item->priv;
 
   priv->group = g_slist_prepend (NULL, radio_menu_item);
@@ -408,7 +408,7 @@ static void
 gtk_radio_menu_item_destroy (GtkObject *object)
 {
   GtkRadioMenuItem *radio_menu_item = GTK_RADIO_MENU_ITEM (object);
-  GtkRadioMenuItemPriv *priv = radio_menu_item->priv;
+  GtkRadioMenuItemPrivate *priv = radio_menu_item->priv;
   GtkWidget *old_group_singleton = NULL;
   GtkRadioMenuItem *tmp_menu_item;
   GSList *tmp_list;
@@ -445,7 +445,7 @@ static void
 gtk_radio_menu_item_activate (GtkMenuItem *menu_item)
 {
   GtkRadioMenuItem *radio_menu_item = GTK_RADIO_MENU_ITEM (menu_item);
-  GtkRadioMenuItemPriv *priv = radio_menu_item->priv;
+  GtkRadioMenuItemPrivate *priv = radio_menu_item->priv;
   GtkCheckMenuItem *check_menu_item = GTK_CHECK_MENU_ITEM (menu_item);
   GtkCheckMenuItem *tmp_menu_item;
   GtkAction        *action;
diff --git a/gtk/gtkradiomenuitem.h b/gtk/gtkradiomenuitem.h
index e7fdb796f3..865ce42c92 100644
--- a/gtk/gtkradiomenuitem.h
+++ b/gtk/gtkradiomenuitem.h
@@ -45,16 +45,16 @@ G_BEGIN_DECLS
 #define GTK_RADIO_MENU_ITEM_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_RADIO_MENU_ITEM, GtkRadioMenuItemClass))
 
 
-typedef struct _GtkRadioMenuItem       GtkRadioMenuItem;
-typedef struct _GtkRadioMenuItemPriv   GtkRadioMenuItemPriv;
-typedef struct _GtkRadioMenuItemClass  GtkRadioMenuItemClass;
+typedef struct _GtkRadioMenuItem              GtkRadioMenuItem;
+typedef struct _GtkRadioMenuItemPrivate       GtkRadioMenuItemPrivate;
+typedef struct _GtkRadioMenuItemClass         GtkRadioMenuItemClass;
 
 struct _GtkRadioMenuItem
 {
   GtkCheckMenuItem check_menu_item;
 
   /* <private> */
-  GtkRadioMenuItemPriv *priv;
+  GtkRadioMenuItemPrivate *priv;
 };
 
 struct _GtkRadioMenuItemClass
diff --git a/gtk/gtkrange.c b/gtk/gtkrange.c
index 261374d066..31b62fd3b1 100644
--- a/gtk/gtkrange.c
+++ b/gtk/gtkrange.c
@@ -71,7 +71,7 @@ typedef enum {
   MOUSE_WIDGET /* inside widget but not in any of the above GUI elements */
 } MouseLocation;
 
-struct _GtkRangePriv
+struct _GtkRangePrivate
 {
   MouseLocation      mouse_location;
   /* last mouse coords we got, or -1 if mouse is outside the range */
@@ -627,7 +627,7 @@ gtk_range_class_init (GtkRangeClass *class)
                                                                  FALSE,
                                                                  GTK_PARAM_READABLE));
 
-  g_type_class_add_private (class, sizeof (GtkRangePriv));
+  g_type_class_add_private (class, sizeof (GtkRangePrivate));
 }
 
 static void
@@ -637,7 +637,7 @@ gtk_range_set_property (GObject      *object,
 			GParamSpec   *pspec)
 {
   GtkRange *range = GTK_RANGE (object);
-  GtkRangePriv *priv = range->priv;
+  GtkRangePrivate *priv = range->priv;
 
   switch (prop_id)
     {
@@ -689,7 +689,7 @@ gtk_range_get_property (GObject      *object,
 			GParamSpec   *pspec)
 {
   GtkRange *range = GTK_RANGE (object);
-  GtkRangePriv *priv = range->priv;
+  GtkRangePrivate *priv = range->priv;
 
   switch (prop_id)
     {
@@ -729,11 +729,11 @@ gtk_range_get_property (GObject      *object,
 static void
 gtk_range_init (GtkRange *range)
 {
-  GtkRangePriv *priv;
+  GtkRangePrivate *priv;
 
   range->priv = G_TYPE_INSTANCE_GET_PRIVATE (range,
                                              GTK_TYPE_RANGE,
-                                             GtkRangePriv);
+                                             GtkRangePrivate);
   priv = range->priv;
 
   gtk_widget_set_has_window (GTK_WIDGET (range), FALSE);
@@ -779,7 +779,7 @@ gtk_range_init (GtkRange *range)
 GtkAdjustment*
 gtk_range_get_adjustment (GtkRange *range)
 {
-  GtkRangePriv *priv;
+  GtkRangePrivate *priv;
 
   g_return_val_if_fail (GTK_IS_RANGE (range), NULL);
 
@@ -809,7 +809,7 @@ void
 gtk_range_set_update_policy (GtkRange      *range,
 			     GtkUpdateType  policy)
 {
-  GtkRangePriv *priv;
+  GtkRangePrivate *priv;
 
   g_return_if_fail (GTK_IS_RANGE (range));
 
@@ -855,7 +855,7 @@ void
 gtk_range_set_adjustment (GtkRange      *range,
 			  GtkAdjustment *adjustment)
 {
-  GtkRangePriv *priv;
+  GtkRangePrivate *priv;
 
   g_return_if_fail (GTK_IS_RANGE (range));
 
@@ -908,7 +908,7 @@ void
 gtk_range_set_inverted (GtkRange *range,
                         gboolean  setting)
 {
-  GtkRangePriv *priv;
+  GtkRangePrivate *priv;
 
   g_return_if_fail (GTK_IS_RANGE (range));
 
@@ -956,7 +956,7 @@ void
 gtk_range_set_flippable (GtkRange *range,
                          gboolean  flippable)
 {
-  GtkRangePriv *priv;
+  GtkRangePrivate *priv;
 
   g_return_if_fail (GTK_IS_RANGE (range));
 
@@ -1006,7 +1006,7 @@ void
 gtk_range_set_slider_size_fixed (GtkRange *range,
                                  gboolean  size_fixed)
 {
-  GtkRangePriv *priv;
+  GtkRangePrivate *priv;
 
   g_return_if_fail (GTK_IS_RANGE (range));
 
@@ -1060,7 +1060,7 @@ void
 gtk_range_set_min_slider_size (GtkRange *range,
                                gint      min_size)
 {
-  GtkRangePriv *priv;
+  GtkRangePrivate *priv;
 
   g_return_if_fail (GTK_IS_RANGE (range));
   g_return_if_fail (min_size > 0);
@@ -1113,7 +1113,7 @@ void
 gtk_range_get_range_rect (GtkRange     *range,
                           GdkRectangle *range_rect)
 {
-  GtkRangePriv *priv;
+  GtkRangePrivate *priv;
 
   g_return_if_fail (GTK_IS_RANGE (range));
   g_return_if_fail (range_rect != NULL);
@@ -1143,7 +1143,7 @@ gtk_range_get_slider_range (GtkRange *range,
                             gint     *slider_start,
                             gint     *slider_end)
 {
-  GtkRangePriv *priv;
+  GtkRangePrivate *priv;
 
   g_return_if_fail (GTK_IS_RANGE (range));
 
@@ -1172,7 +1172,7 @@ void
 gtk_range_set_lower_stepper_sensitivity (GtkRange           *range,
                                          GtkSensitivityType  sensitivity)
 {
-  GtkRangePriv *priv;
+  GtkRangePrivate *priv;
 
   g_return_if_fail (GTK_IS_RANGE (range));
 
@@ -1223,7 +1223,7 @@ void
 gtk_range_set_upper_stepper_sensitivity (GtkRange           *range,
                                          GtkSensitivityType  sensitivity)
 {
-  GtkRangePriv *priv;
+  GtkRangePrivate *priv;
 
   g_return_if_fail (GTK_IS_RANGE (range));
 
@@ -1276,7 +1276,7 @@ gtk_range_set_increments (GtkRange *range,
                           gdouble   step,
                           gdouble   page)
 {
-  GtkRangePriv *priv;
+  GtkRangePrivate *priv;
 
   g_return_if_fail (GTK_IS_RANGE (range));
 
@@ -1303,7 +1303,7 @@ gtk_range_set_range (GtkRange *range,
                      gdouble   min,
                      gdouble   max)
 {
-  GtkRangePriv *priv;
+  GtkRangePrivate *priv;
   gdouble value;
   
   g_return_if_fail (GTK_IS_RANGE (range));
@@ -1338,7 +1338,7 @@ void
 gtk_range_set_value (GtkRange *range,
                      gdouble   value)
 {
-  GtkRangePriv *priv;
+  GtkRangePrivate *priv;
 
   g_return_if_fail (GTK_IS_RANGE (range));
 
@@ -1382,7 +1382,7 @@ void
 gtk_range_set_show_fill_level (GtkRange *range,
                                gboolean  show_fill_level)
 {
-  GtkRangePriv *priv;
+  GtkRangePrivate *priv;
 
   g_return_if_fail (GTK_IS_RANGE (range));
 
@@ -1431,7 +1431,7 @@ void
 gtk_range_set_restrict_to_fill_level (GtkRange *range,
                                       gboolean  restrict_to_fill_level)
 {
-  GtkRangePriv *priv;
+  GtkRangePrivate *priv;
 
   g_return_if_fail (GTK_IS_RANGE (range));
 
@@ -1495,7 +1495,7 @@ void
 gtk_range_set_fill_level (GtkRange *range,
                           gdouble   fill_level)
 {
-  GtkRangePriv *priv;
+  GtkRangePrivate *priv;
 
   g_return_if_fail (GTK_IS_RANGE (range));
 
@@ -1535,7 +1535,7 @@ gtk_range_get_fill_level (GtkRange *range)
 static gboolean
 should_invert (GtkRange *range)
 {
-  GtkRangePriv *priv = range->priv;
+  GtkRangePrivate *priv = range->priv;
 
   if (priv->orientation == GTK_ORIENTATION_HORIZONTAL)
     return
@@ -1550,7 +1550,7 @@ static void
 gtk_range_destroy (GtkObject *object)
 {
   GtkRange *range = GTK_RANGE (object);
-  GtkRangePriv *priv = range->priv;
+  GtkRangePrivate *priv = range->priv;
 
   gtk_range_remove_step_timer (range);
   gtk_range_remove_update_timer (range);
@@ -1614,7 +1614,7 @@ gtk_range_size_allocate (GtkWidget     *widget,
                          GtkAllocation *allocation)
 {
   GtkRange *range = GTK_RANGE (widget);
-  GtkRangePriv *priv = range->priv;
+  GtkRangePrivate *priv = range->priv;
 
   gtk_widget_set_allocation (widget, allocation);
 
@@ -1634,7 +1634,7 @@ gtk_range_realize (GtkWidget *widget)
 {
   GtkAllocation allocation;
   GtkRange *range = GTK_RANGE (widget);
-  GtkRangePriv *priv = range->priv;
+  GtkRangePrivate *priv = range->priv;
   GdkWindow *window;
   GdkWindowAttr attributes;
   gint attributes_mask;  
@@ -1676,7 +1676,7 @@ static void
 gtk_range_unrealize (GtkWidget *widget)
 {
   GtkRange *range = GTK_RANGE (widget);
-  GtkRangePriv *priv = range->priv;
+  GtkRangePrivate *priv = range->priv;
 
   gtk_range_remove_step_timer (range);
   gtk_range_remove_update_timer (range);
@@ -1692,7 +1692,7 @@ static void
 gtk_range_map (GtkWidget *widget)
 {
   GtkRange *range = GTK_RANGE (widget);
-  GtkRangePriv *priv = range->priv;
+  GtkRangePrivate *priv = range->priv;
 
   gdk_window_show (priv->event_window);
 
@@ -1703,7 +1703,7 @@ static void
 gtk_range_unmap (GtkWidget *widget)
 {
   GtkRange *range = GTK_RANGE (widget);
-  GtkRangePriv *priv = range->priv;
+  GtkRangePrivate *priv = range->priv;
 
   stop_scrolling (range);
 
@@ -1715,7 +1715,7 @@ gtk_range_unmap (GtkWidget *widget)
 static const gchar *
 gtk_range_get_slider_detail (GtkRange *range)
 {
-  GtkRangePriv *priv = range->priv;
+  GtkRangePrivate *priv = range->priv;
   const gchar *slider_detail;
 
   if (priv->slider_detail_quark)
@@ -1743,7 +1743,7 @@ static const gchar *
 gtk_range_get_stepper_detail (GtkRange *range,
                               Stepper   stepper)
 {
-  GtkRangePriv *priv = range->priv;
+  GtkRangePrivate *priv = range->priv;
   const gchar *stepper_detail;
   gboolean need_orientation;
   gboolean need_position;
@@ -1814,7 +1814,7 @@ draw_stepper (GtkRange     *range,
               gboolean      prelighted,
               GdkRectangle *area)
 {
-  GtkRangePriv *priv = range->priv;
+  GtkRangePrivate *priv = range->priv;
   GtkAllocation allocation;
   GtkStateType state_type;
   GtkShadowType shadow_type;
@@ -1931,7 +1931,7 @@ gtk_range_expose (GtkWidget      *widget,
 {
   GtkAllocation allocation;
   GtkRange *range = GTK_RANGE (widget);
-  GtkRangePriv *priv = range->priv;
+  GtkRangePrivate *priv = range->priv;
   gboolean sensitive;
   GtkStateType state;
   GtkShadowType shadow_type;
@@ -2243,7 +2243,7 @@ range_grab_add (GtkRange      *range,
                 MouseLocation  location,
                 gint           button)
 {
-  GtkRangePriv *priv = range->priv;
+  GtkRangePrivate *priv = range->priv;
 
   if (device == priv->grab_device)
     return;
@@ -2268,7 +2268,7 @@ range_grab_add (GtkRange      *range,
 static void
 range_grab_remove (GtkRange *range)
 {
-  GtkRangePriv *priv = range->priv;
+  GtkRangePrivate *priv = range->priv;
   MouseLocation location;
 
   if (priv->grab_device)
@@ -2290,7 +2290,7 @@ range_grab_remove (GtkRange *range)
 static GtkScrollType
 range_get_scroll_for_grab (GtkRange      *range)
 {
-  GtkRangePriv *priv = range->priv;
+  GtkRangePrivate *priv = range->priv;
   gboolean invert;
 
   invert = should_invert (range);
@@ -2353,7 +2353,7 @@ static gdouble
 coord_to_value (GtkRange *range,
                 gint      coord)
 {
-  GtkRangePriv *priv = range->priv;
+  GtkRangePrivate *priv = range->priv;
   gdouble frac;
   gdouble value;
   gint    trough_length;
@@ -2406,7 +2406,7 @@ gtk_range_key_press (GtkWidget   *widget,
 {
   GdkDevice *device;
   GtkRange *range = GTK_RANGE (widget);
-  GtkRangePriv *priv = range->priv;
+  GtkRangePrivate *priv = range->priv;
 
   device = gdk_event_get_device ((GdkEvent *) event);
   device = gdk_device_get_associated_device (device);
@@ -2432,7 +2432,7 @@ gtk_range_button_press (GtkWidget      *widget,
 			GdkEventButton *event)
 {
   GtkRange *range = GTK_RANGE (widget);
-  GtkRangePriv *priv = range->priv;
+  GtkRangePrivate *priv = range->priv;
   GdkDevice *device;
 
   if (!gtk_widget_has_focus (widget))
@@ -2574,7 +2574,7 @@ update_slider_position (GtkRange *range,
                         gint      mouse_x,
                         gint      mouse_y)
 {
-  GtkRangePriv *priv = range->priv;
+  GtkRangePrivate *priv = range->priv;
   gint delta;
   gint c;
   gdouble new_value;
@@ -2627,7 +2627,7 @@ gtk_range_grab_broken (GtkWidget          *widget,
 		       GdkEventGrabBroken *event)
 {
   GtkRange *range = GTK_RANGE (widget);
-  GtkRangePriv *priv = range->priv;
+  GtkRangePrivate *priv = range->priv;
   GdkDevice *device;
 
   device = gdk_event_get_device ((GdkEvent *) event);
@@ -2651,7 +2651,7 @@ gtk_range_button_release (GtkWidget      *widget,
 			  GdkEventButton *event)
 {
   GtkRange *range = GTK_RANGE (widget);
-  GtkRangePriv *priv = range->priv;
+  GtkRangePrivate *priv = range->priv;
   GdkDevice *device;
 
   if (event->window == priv->event_window)
@@ -2699,7 +2699,7 @@ gdouble
 _gtk_range_get_wheel_delta (GtkRange           *range,
 			    GdkScrollDirection  direction)
 {
-  GtkRangePriv *priv = range->priv;
+  GtkRangePrivate *priv = range->priv;
   GtkAdjustment *adj = priv->adjustment;
   gdouble delta;
 
@@ -2723,7 +2723,7 @@ gtk_range_scroll_event (GtkWidget      *widget,
 			GdkEventScroll *event)
 {
   GtkRange *range = GTK_RANGE (widget);
-  GtkRangePriv *priv = range->priv;
+  GtkRangePrivate *priv = range->priv;
 
   if (gtk_widget_get_realized (widget))
     {
@@ -2753,7 +2753,7 @@ gtk_range_motion_notify (GtkWidget      *widget,
 			 GdkEventMotion *event)
 {
   GtkRange *range = GTK_RANGE (widget);
-  GtkRangePriv *priv = range->priv;
+  GtkRangePrivate *priv = range->priv;
 
   gdk_event_request_motions (event);
 
@@ -2775,7 +2775,7 @@ gtk_range_enter_notify (GtkWidget        *widget,
 			GdkEventCrossing *event)
 {
   GtkRange *range = GTK_RANGE (widget);
-  GtkRangePriv *priv = range->priv;
+  GtkRangePrivate *priv = range->priv;
 
   priv->mouse_x = event->x;
   priv->mouse_y = event->y;
@@ -2791,7 +2791,7 @@ gtk_range_leave_notify (GtkWidget        *widget,
 			GdkEventCrossing *event)
 {
   GtkRange *range = GTK_RANGE (widget);
-  GtkRangePriv *priv = range->priv;
+  GtkRangePrivate *priv = range->priv;
 
   priv->mouse_x = -1;
   priv->mouse_y = -1;
@@ -2806,7 +2806,7 @@ static void
 gtk_range_grab_notify (GtkWidget *widget,
 		       gboolean   was_grabbed)
 {
-  GtkRangePriv *priv = GTK_RANGE (widget)->priv;
+  GtkRangePrivate *priv = GTK_RANGE (widget)->priv;
 
   if (priv->grab_device &&
       gtk_widget_device_is_shadowed (widget, priv->grab_device))
@@ -2830,8 +2830,8 @@ gtk_range_state_changed (GtkWidget    *widget,
   }
 
 static gboolean
-layout_changed (GtkRangePriv *priv1,
-		GtkRangePriv *priv2)
+layout_changed (GtkRangePrivate *priv1,
+		GtkRangePrivate *priv2)
 {
   check_rectangle (priv1->slider, priv2->slider);
   check_rectangle (priv1->trough, priv2->trough);
@@ -2851,8 +2851,8 @@ gtk_range_adjustment_changed (GtkAdjustment *adjustment,
 			      gpointer       data)
 {
   GtkRange *range = GTK_RANGE (data);
-  GtkRangePriv *priv = range->priv;
-  GtkRangePriv priv_aux = *priv;
+  GtkRangePrivate *priv = range->priv;
+  GtkRangePrivate priv_aux = *priv;
 
   priv->recalc_marks = TRUE;
   priv->need_recalc = TRUE;
@@ -2875,7 +2875,7 @@ static gboolean
 force_repaint (gpointer data)
 {
   GtkRange *range = GTK_RANGE (data);
-  GtkRangePriv *priv = range->priv;
+  GtkRangePrivate *priv = range->priv;
   GtkWidget *widget = GTK_WIDGET (range);
 
   priv->repaint_id = 0;
@@ -2890,8 +2890,8 @@ gtk_range_adjustment_value_changed (GtkAdjustment *adjustment,
 				    gpointer       data)
 {
   GtkRange *range = GTK_RANGE (data);
-  GtkRangePriv *priv = range->priv;
-  GtkRangePriv priv_aux = *priv;
+  GtkRangePrivate *priv = range->priv;
+  GtkRangePrivate priv_aux = *priv;
 
   priv->need_recalc = TRUE;
   gtk_range_calc_layout (range, priv->adjustment->value);
@@ -2922,7 +2922,7 @@ gtk_range_style_set (GtkWidget *widget,
                      GtkStyle  *previous_style)
 {
   GtkRange *range = GTK_RANGE (widget);
-  GtkRangePriv *priv = range->priv;
+  GtkRangePrivate *priv = range->priv;
 
   priv->need_recalc = TRUE;
 
@@ -2934,7 +2934,7 @@ apply_marks (GtkRange *range,
              gdouble   oldval,
              gdouble  *newval)
 {
-  GtkRangePriv *priv = range->priv;
+  GtkRangePrivate *priv = range->priv;
   gint i;
   gdouble mark;
 
@@ -2953,7 +2953,7 @@ apply_marks (GtkRange *range,
 static void
 step_back (GtkRange *range)
 {
-  GtkRangePriv *priv = range->priv;
+  GtkRangePrivate *priv = range->priv;
   gdouble newval;
   gboolean handled;
 
@@ -2966,7 +2966,7 @@ step_back (GtkRange *range)
 static void
 step_forward (GtkRange *range)
 {
-  GtkRangePriv *priv = range->priv;
+  GtkRangePrivate *priv = range->priv;
   gdouble newval;
   gboolean handled;
 
@@ -2980,7 +2980,7 @@ step_forward (GtkRange *range)
 static void
 page_back (GtkRange *range)
 {
-  GtkRangePriv *priv = range->priv;
+  GtkRangePrivate *priv = range->priv;
   gdouble newval;
   gboolean handled;
 
@@ -2993,7 +2993,7 @@ page_back (GtkRange *range)
 static void
 page_forward (GtkRange *range)
 {
-  GtkRangePriv *priv = range->priv;
+  GtkRangePrivate *priv = range->priv;
   gdouble newval;
   gboolean handled;
 
@@ -3006,7 +3006,7 @@ page_forward (GtkRange *range)
 static void
 scroll_begin (GtkRange *range)
 {
-  GtkRangePriv *priv = range->priv;
+  GtkRangePrivate *priv = range->priv;
   gboolean handled;
 
   g_signal_emit (range, signals[CHANGE_VALUE], 0,
@@ -3017,7 +3017,7 @@ scroll_begin (GtkRange *range)
 static void
 scroll_end (GtkRange *range)
 {
-  GtkRangePriv *priv = range->priv;
+  GtkRangePrivate *priv = range->priv;
   gdouble newval;
   gboolean handled;
 
@@ -3030,7 +3030,7 @@ static gboolean
 gtk_range_scroll (GtkRange     *range,
                   GtkScrollType scroll)
 {
-  GtkRangePriv *priv = range->priv;
+  GtkRangePrivate *priv = range->priv;
   gdouble old_value = priv->adjustment->value;
 
   switch (scroll)
@@ -3130,7 +3130,7 @@ static void
 gtk_range_move_slider (GtkRange     *range,
                        GtkScrollType scroll)
 {
-  GtkRangePriv *priv = range->priv;
+  GtkRangePrivate *priv = range->priv;
   gboolean cursor_only;
 
   g_object_get (gtk_widget_get_settings (GTK_WIDGET (range)),
@@ -3259,7 +3259,7 @@ gtk_range_get_props (GtkRange  *range,
 static gboolean
 gtk_range_update_mouse_location (GtkRange *range)
 {
-  GtkRangePriv *priv = range->priv;
+  GtkRangePrivate *priv = range->priv;
   GtkAllocation allocation;
   gint x, y;
   MouseLocation old;
@@ -3404,7 +3404,7 @@ gtk_range_calc_request (GtkRange      *range,
                         gboolean      *has_steppers_cd,
                         gint          *slider_length_p)
 {
-  GtkRangePriv *priv = range->priv;
+  GtkRangePrivate *priv = range->priv;
   gint slider_length;
   gint n_steppers;
   gint n_steppers_ab;
@@ -3480,7 +3480,7 @@ static void
 gtk_range_calc_layout (GtkRange *range,
 		       gdouble   adjustment_value)
 {
-  GtkRangePriv *priv = range->priv;
+  GtkRangePrivate *priv = range->priv;
   gint slider_width, stepper_size, focus_width, trough_border, stepper_spacing;
   gint slider_length;
   GtkBorder border;
@@ -3872,7 +3872,7 @@ static GdkRectangle*
 get_area (GtkRange     *range,
           MouseLocation location)
 {
-  GtkRangePriv *priv = range->priv;
+  GtkRangePrivate *priv = range->priv;
 
   switch (location)
     {
@@ -3900,7 +3900,7 @@ get_area (GtkRange     *range,
 static void
 gtk_range_calc_marks (GtkRange *range)
 {
-  GtkRangePriv *priv = range->priv;
+  GtkRangePrivate *priv = range->priv;
   gint i;
 
   if (!priv->recalc_marks)
@@ -3926,7 +3926,7 @@ gtk_range_real_change_value (GtkRange     *range,
                              GtkScrollType scroll,
                              gdouble       value)
 {
-  GtkRangePriv *priv = range->priv;
+  GtkRangePrivate *priv = range->priv;
 
   /* potentially adjust the bounds _before_ we clamp */
   g_signal_emit (range, signals[ADJUST_BOUNDS], 0, value);
@@ -3982,7 +3982,7 @@ gtk_range_real_change_value (GtkRange     *range,
 static void
 gtk_range_update_value (GtkRange *range)
 {
-  GtkRangePriv *priv = range->priv;
+  GtkRangePrivate *priv = range->priv;
 
   gtk_range_remove_update_timer (range);
 
@@ -4004,7 +4004,7 @@ static gboolean
 second_timeout (gpointer data)
 {
   GtkRange *range = GTK_RANGE (data);
-  GtkRangePriv *priv = range->priv;
+  GtkRangePrivate *priv = range->priv;
 
   gtk_range_scroll (range, priv->timer->step);
 
@@ -4015,7 +4015,7 @@ static gboolean
 initial_timeout (gpointer data)
 {
   GtkRange *range = GTK_RANGE (data);
-  GtkRangePriv *priv = range->priv;
+  GtkRangePrivate *priv = range->priv;
   GtkSettings *settings;
   guint        timeout;
 
@@ -4033,7 +4033,7 @@ static void
 gtk_range_add_step_timer (GtkRange      *range,
                           GtkScrollType  step)
 {
-  GtkRangePriv *priv = range->priv;
+  GtkRangePrivate *priv = range->priv;
   GtkSettings *settings;
   guint        timeout;
 
@@ -4056,7 +4056,7 @@ gtk_range_add_step_timer (GtkRange      *range,
 static void
 gtk_range_remove_step_timer (GtkRange *range)
 {
-  GtkRangePriv *priv = range->priv;
+  GtkRangePrivate *priv = range->priv;
 
   if (priv->timer)
     {
@@ -4073,7 +4073,7 @@ static gboolean
 update_timeout (gpointer data)
 {
   GtkRange *range = GTK_RANGE (data);
-  GtkRangePriv *priv = range->priv;
+  GtkRangePrivate *priv = range->priv;
 
   gtk_range_update_value (range);
   priv->update_timeout_id = 0;
@@ -4085,7 +4085,7 @@ update_timeout (gpointer data)
 static void
 gtk_range_reset_update_timer (GtkRange *range)
 {
-  GtkRangePriv *priv = range->priv;
+  GtkRangePrivate *priv = range->priv;
 
   gtk_range_remove_update_timer (range);
 
@@ -4097,7 +4097,7 @@ gtk_range_reset_update_timer (GtkRange *range)
 static void
 gtk_range_remove_update_timer (GtkRange *range)
 {
-  GtkRangePriv *priv = range->priv;
+  GtkRangePrivate *priv = range->priv;
 
   if (priv->update_timeout_id != 0)
     {
@@ -4111,7 +4111,7 @@ _gtk_range_set_stop_values (GtkRange *range,
                             gdouble  *values,
                             gint      n_values)
 {
-  GtkRangePriv *priv = range->priv;
+  GtkRangePrivate *priv = range->priv;
   gint i;
 
   g_free (priv->marks);
@@ -4132,7 +4132,7 @@ gint
 _gtk_range_get_stop_positions (GtkRange  *range,
                                gint     **values)
 {
-  GtkRangePriv *priv = range->priv;
+  GtkRangePrivate *priv = range->priv;
 
   gtk_range_calc_marks (range);
 
diff --git a/gtk/gtkrange.h b/gtk/gtkrange.h
index 81b18ba194..f2b91b8edc 100644
--- a/gtk/gtkrange.h
+++ b/gtk/gtkrange.h
@@ -46,15 +46,15 @@ G_BEGIN_DECLS
 #define GTK_IS_RANGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_RANGE))
 #define GTK_RANGE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_RANGE, GtkRangeClass))
 
-typedef struct _GtkRange        GtkRange;
-typedef struct _GtkRangePriv    GtkRangePriv;
-typedef struct _GtkRangeClass   GtkRangeClass;
+typedef struct _GtkRange              GtkRange;
+typedef struct _GtkRangePrivate       GtkRangePrivate;
+typedef struct _GtkRangeClass         GtkRangeClass;
 
 struct _GtkRange
 {
   GtkWidget widget;
 
-  GtkRangePriv *priv;
+  GtkRangePrivate *priv;
 };
 
 struct _GtkRangeClass
diff --git a/gtk/gtkruler.c b/gtk/gtkruler.c
index 1e32dc6a3f..eff3bfe824 100644
--- a/gtk/gtkruler.c
+++ b/gtk/gtkruler.c
@@ -41,7 +41,7 @@
 
 #define ROUND(x) ((int) ((x) + 0.5))
 
-struct _GtkRulerPriv
+struct _GtkRulerPrivate
 {
   GtkOrientation        orientation;
   GtkRulerMetric       *metric;
@@ -183,18 +183,18 @@ gtk_ruler_class_init (GtkRulerClass *class)
 						      GTK_PIXELS,
 						      GTK_PARAM_READWRITE));  
 
-  g_type_class_add_private (gobject_class, sizeof (GtkRulerPriv));
+  g_type_class_add_private (gobject_class, sizeof (GtkRulerPrivate));
 }
 
 static void
 gtk_ruler_init (GtkRuler *ruler)
 {
   GtkWidget *widget = GTK_WIDGET (ruler);
-  GtkRulerPriv *priv;
+  GtkRulerPrivate *priv;
 
   ruler->priv = G_TYPE_INSTANCE_GET_PRIVATE (ruler,
                                              GTK_TYPE_RULER,
-                                             GtkRulerPriv);
+                                             GtkRulerPrivate);
   priv = ruler->priv;
 
   priv->orientation = GTK_ORIENTATION_HORIZONTAL;
@@ -221,7 +221,7 @@ gtk_ruler_set_property (GObject      *object,
 			GParamSpec   *pspec)
 {
   GtkRuler *ruler = GTK_RULER (object);
-  GtkRulerPriv *priv = ruler->priv;
+  GtkRulerPrivate *priv = ruler->priv;
 
   switch (prop_id)
     {
@@ -261,7 +261,7 @@ gtk_ruler_get_property (GObject      *object,
 			GParamSpec   *pspec)
 {
   GtkRuler *ruler = GTK_RULER (object);
-  GtkRulerPriv *priv = ruler->priv;
+  GtkRulerPrivate *priv = ruler->priv;
 
   switch (prop_id)
     {
@@ -311,7 +311,7 @@ void
 gtk_ruler_set_metric (GtkRuler      *ruler,
 		      GtkMetricType  metric)
 {
-  GtkRulerPriv *priv;
+  GtkRulerPrivate *priv;
 
   g_return_if_fail (GTK_IS_RULER (ruler));
 
@@ -336,7 +336,7 @@ gtk_ruler_set_metric (GtkRuler      *ruler,
 GtkMetricType
 gtk_ruler_get_metric (GtkRuler *ruler)
 {
-  GtkRulerPriv *priv;
+  GtkRulerPrivate *priv;
   gint i;
 
   g_return_val_if_fail (GTK_IS_RULER (ruler), 0);
@@ -370,7 +370,7 @@ gtk_ruler_set_range (GtkRuler *ruler,
 		     gdouble   position,
 		     gdouble   max_size)
 {
-  GtkRulerPriv *priv;
+  GtkRulerPrivate *priv;
 
   g_return_if_fail (GTK_IS_RULER (ruler));
 
@@ -422,7 +422,7 @@ gtk_ruler_get_range (GtkRuler *ruler,
 		     gdouble  *position,
 		     gdouble  *max_size)
 {
-  GtkRulerPriv *priv;
+  GtkRulerPrivate *priv;
 
   g_return_if_fail (GTK_IS_RULER (ruler));
 
@@ -496,7 +496,7 @@ static void
 gtk_ruler_unrealize (GtkWidget *widget)
 {
   GtkRuler *ruler = GTK_RULER (widget);
-  GtkRulerPriv *priv = ruler->priv;
+  GtkRulerPrivate *priv = ruler->priv;
 
   if (priv->backing_store)
     {
@@ -512,7 +512,7 @@ gtk_ruler_size_request (GtkWidget      *widget,
                         GtkRequisition *requisition)
 {
   GtkRuler *ruler = GTK_RULER (widget);
-  GtkRulerPriv *priv = ruler->priv;
+  GtkRulerPrivate *priv = ruler->priv;
 
   if (priv->orientation == GTK_ORIENTATION_HORIZONTAL)
     {
@@ -549,7 +549,7 @@ gtk_ruler_motion_notify (GtkWidget      *widget,
                          GdkEventMotion *event)
 {
   GtkRuler *ruler = GTK_RULER (widget);
-  GtkRulerPriv *priv = ruler->priv;
+  GtkRulerPrivate *priv = ruler->priv;
   gint x;
   gint y;
 
@@ -578,7 +578,7 @@ gtk_ruler_expose (GtkWidget      *widget,
   if (gtk_widget_is_drawable (widget))
     {
       GtkRuler *ruler = GTK_RULER (widget);
-      GtkRulerPriv *priv = ruler->priv;
+      GtkRulerPrivate *priv = ruler->priv;
       cairo_t *cr;
 
       gtk_ruler_draw_ticks (ruler);
@@ -598,7 +598,7 @@ gtk_ruler_expose (GtkWidget      *widget,
 static void
 gtk_ruler_make_pixmap (GtkRuler *ruler)
 {
-  GtkRulerPriv *priv = ruler->priv;
+  GtkRulerPrivate *priv = ruler->priv;
   GtkWidget *widget;
   gint width;
   gint height;
@@ -628,7 +628,7 @@ static void
 gtk_ruler_real_draw_ticks (GtkRuler *ruler)
 {
   GtkWidget *widget = GTK_WIDGET (ruler);
-  GtkRulerPriv *priv = ruler->priv;
+  GtkRulerPrivate *priv = ruler->priv;
   cairo_t *cr;
   gint i, j;
   gint width, height;
@@ -841,7 +841,7 @@ static void
 gtk_ruler_real_draw_pos (GtkRuler *ruler)
 {
   GtkWidget *widget = GTK_WIDGET (ruler);
-  GtkRulerPriv *priv = ruler->priv;
+  GtkRulerPrivate *priv = ruler->priv;
   gint x, y;
   gint width, height;
   gint bs_width, bs_height;
diff --git a/gtk/gtkruler.h b/gtk/gtkruler.h
index b86bd27734..f3ebf0ce3b 100644
--- a/gtk/gtkruler.h
+++ b/gtk/gtkruler.h
@@ -55,10 +55,10 @@ G_BEGIN_DECLS
 #define GTK_RULER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_RULER, GtkRulerClass))
 
 
-typedef struct _GtkRuler        GtkRuler;
-typedef struct _GtkRulerPriv    GtkRulerPriv;
-typedef struct _GtkRulerClass   GtkRulerClass;
-typedef struct _GtkRulerMetric  GtkRulerMetric;
+typedef struct _GtkRuler              GtkRuler;
+typedef struct _GtkRulerPrivate       GtkRulerPrivate;
+typedef struct _GtkRulerClass         GtkRulerClass;
+typedef struct _GtkRulerMetric        GtkRulerMetric;
 
 /* All distances below are in 1/72nd's of an inch. (According to
  * Adobe that's a point, but points are really 1/72.27 in.)
@@ -68,7 +68,7 @@ struct _GtkRuler
   GtkWidget widget;
 
   /* <private> */
-  GtkRulerPriv *priv;
+  GtkRulerPrivate *priv;
 };
 
 struct _GtkRulerClass
diff --git a/gtk/gtkscale.c b/gtk/gtkscale.c
index 65ca0276fa..e03013dc23 100644
--- a/gtk/gtkscale.c
+++ b/gtk/gtkscale.c
@@ -51,7 +51,7 @@
 
 typedef struct _GtkScaleMark GtkScaleMark;
 
-struct _GtkScalePriv
+struct _GtkScalePrivate
 {
   PangoLayout  *layout;
 
@@ -377,7 +377,7 @@ gtk_scale_class_init (GtkScaleClass *class)
   add_slider_binding (binding_set, GDK_KP_End, 0,
                       GTK_SCROLL_END);
 
-  g_type_class_add_private (gobject_class, sizeof (GtkScalePriv));
+  g_type_class_add_private (gobject_class, sizeof (GtkScalePrivate));
 }
 
 static void
@@ -394,12 +394,12 @@ gtk_scale_orientation_notify (GtkRange         *range,
 static void
 gtk_scale_init (GtkScale *scale)
 {
-  GtkScalePriv *priv;
+  GtkScalePrivate *priv;
   GtkRange *range = GTK_RANGE (scale);
 
   scale->priv = G_TYPE_INSTANCE_GET_PRIVATE (scale,
                                              GTK_TYPE_SCALE,
-                                             GtkScalePriv);
+                                             GtkScalePrivate);
   priv = scale->priv;
 
   gtk_widget_set_can_focus (GTK_WIDGET (scale), TRUE);
@@ -451,7 +451,7 @@ gtk_scale_get_property (GObject      *object,
 			GParamSpec   *pspec)
 {
   GtkScale *scale = GTK_SCALE (object);
-  GtkScalePriv *priv = scale->priv;
+  GtkScalePrivate *priv = scale->priv;
 
   switch (prop_id)
     {
@@ -562,7 +562,7 @@ void
 gtk_scale_set_digits (GtkScale *scale,
 		      gint      digits)
 {
-  GtkScalePriv *priv;
+  GtkScalePrivate *priv;
   GtkRange *range;
 
   g_return_if_fail (GTK_IS_SCALE (scale));
@@ -613,7 +613,7 @@ void
 gtk_scale_set_draw_value (GtkScale *scale,
 			  gboolean  draw_value)
 {
-  GtkScalePriv *priv;
+  GtkScalePrivate *priv;
 
   g_return_if_fail (GTK_IS_SCALE (scale));
 
@@ -665,7 +665,7 @@ void
 gtk_scale_set_value_pos (GtkScale        *scale,
 			 GtkPositionType  pos)
 {
-  GtkScalePriv *priv;
+  GtkScalePrivate *priv;
   GtkWidget *widget;
 
   g_return_if_fail (GTK_IS_SCALE (scale));
@@ -705,7 +705,7 @@ static void
 gtk_scale_get_range_border (GtkRange  *range,
                             GtkBorder *border)
 {
-  GtkScalePriv *priv;
+  GtkScalePrivate *priv;
   GtkWidget *widget;
   GtkScale *scale;
   gint w, h;
@@ -780,7 +780,7 @@ _gtk_scale_get_value_size (GtkScale *scale,
                            gint     *width,
                            gint     *height)
 {
-  GtkScalePriv *priv = scale->priv;
+  GtkScalePrivate *priv = scale->priv;
   GtkRange *range;
 
   if (priv->draw_value)
@@ -839,7 +839,7 @@ gtk_scale_get_mark_label_size (GtkScale        *scale,
                                gint            *width2,
                                gint            *height2)
 {
-  GtkScalePriv *priv = scale->priv;
+  GtkScalePrivate *priv = scale->priv;
   PangoLayout *layout;
   PangoRectangle logical_rect;
   GSList *m;
@@ -974,7 +974,7 @@ gtk_scale_expose (GtkWidget      *widget,
                   GdkEventExpose *event)
 {
   GtkScale *scale = GTK_SCALE (widget);
-  GtkScalePriv *priv = scale->priv;
+  GtkScalePrivate *priv = scale->priv;
   GtkRange *range = GTK_RANGE (scale);
   GtkStateType state_type;
   GtkStyle *style;
@@ -1166,7 +1166,7 @@ gtk_scale_real_get_layout_offsets (GtkScale *scale,
                                    gint     *x,
                                    gint     *y)
 {
-  GtkScalePriv *priv = scale->priv;
+  GtkScalePrivate *priv = scale->priv;
   GtkAllocation allocation;
   GtkWidget *widget = GTK_WIDGET (scale);
   GtkRange *range = GTK_RANGE (widget);
@@ -1274,7 +1274,7 @@ gchar*
 _gtk_scale_format_value (GtkScale *scale,
                          gdouble   value)
 {
-  GtkScalePriv *priv = scale->priv;
+  GtkScalePrivate *priv = scale->priv;
   gchar *fmt = NULL;
 
   g_signal_emit (scale,
@@ -1317,7 +1317,7 @@ gtk_scale_finalize (GObject *object)
 PangoLayout *
 gtk_scale_get_layout (GtkScale *scale)
 {
-  GtkScalePriv *priv;
+  GtkScalePrivate *priv;
   gchar *txt;
 
   g_return_val_if_fail (GTK_IS_SCALE (scale), NULL);
@@ -1380,7 +1380,7 @@ gtk_scale_get_layout_offsets (GtkScale *scale,
 void
 _gtk_scale_clear_layout (GtkScale *scale)
 {
-  GtkScalePriv *priv = scale->priv;
+  GtkScalePrivate *priv = scale->priv;
 
   g_return_if_fail (GTK_IS_SCALE (scale));
 
@@ -1409,7 +1409,7 @@ gtk_scale_mark_free (GtkScaleMark *mark)
 void
 gtk_scale_clear_marks (GtkScale *scale)
 {
-  GtkScalePriv *priv;
+  GtkScalePrivate *priv;
 
   g_return_if_fail (GTK_IS_SCALE (scale));
 
@@ -1464,7 +1464,7 @@ gtk_scale_add_mark (GtkScale        *scale,
                     GtkPositionType  position,
                     const gchar     *markup)
 {
-  GtkScalePriv *priv;
+  GtkScalePrivate *priv;
   GtkScaleMark *mark;
   GSList *m;
   gdouble *values;
diff --git a/gtk/gtkscale.h b/gtk/gtkscale.h
index b3ac39737a..7436b020e7 100644
--- a/gtk/gtkscale.h
+++ b/gtk/gtkscale.h
@@ -45,16 +45,16 @@ G_BEGIN_DECLS
 #define GTK_SCALE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_SCALE, GtkScaleClass))
 
 
-typedef struct _GtkScale        GtkScale;
-typedef struct _GtkScalePriv    GtkScalePriv;
-typedef struct _GtkScaleClass   GtkScaleClass;
+typedef struct _GtkScale              GtkScale;
+typedef struct _GtkScalePrivate       GtkScalePrivate;
+typedef struct _GtkScaleClass         GtkScaleClass;
 
 struct _GtkScale
 {
   GtkRange range;
 
   /* <private> */
-  GtkScalePriv *priv;
+  GtkScalePrivate *priv;
 };
 
 struct _GtkScaleClass
diff --git a/gtk/gtkseparator.c b/gtk/gtkseparator.c
index db293c9059..43f9ae5c9b 100644
--- a/gtk/gtkseparator.c
+++ b/gtk/gtkseparator.c
@@ -42,7 +42,7 @@
  */
 
 
-struct _GtkSeparatorPriv
+struct _GtkSeparatorPrivate
 {
   GtkOrientation orientation;
 };
@@ -89,18 +89,18 @@ gtk_separator_class_init (GtkSeparatorClass *class)
                                     PROP_ORIENTATION,
                                     "orientation");
 
-  g_type_class_add_private (object_class, sizeof (GtkSeparatorPriv));
+  g_type_class_add_private (object_class, sizeof (GtkSeparatorPrivate));
 }
 
 static void
 gtk_separator_init (GtkSeparator *separator)
 {
   GtkWidget *widget = GTK_WIDGET (separator);
-  GtkSeparatorPriv *private;
+  GtkSeparatorPrivate *private;
 
   separator->priv = G_TYPE_INSTANCE_GET_PRIVATE (separator,
                                                  GTK_TYPE_SEPARATOR,
-                                                 GtkSeparatorPriv);
+                                                 GtkSeparatorPrivate);
   private = separator->priv;
 
   gtk_widget_set_has_window (GTK_WIDGET (separator), FALSE);
@@ -118,7 +118,7 @@ gtk_separator_set_property (GObject      *object,
                             GParamSpec   *pspec)
 {
   GtkSeparator *separator = GTK_SEPARATOR (object);
-  GtkSeparatorPriv *private = separator->priv;
+  GtkSeparatorPrivate *private = separator->priv;
 
   switch (prop_id)
     {
@@ -139,7 +139,7 @@ gtk_separator_get_property (GObject    *object,
                             GParamSpec *pspec)
 {
   GtkSeparator *separator = GTK_SEPARATOR (object);
-  GtkSeparatorPriv *private = separator->priv;
+  GtkSeparatorPrivate *private = separator->priv;
 
   switch (prop_id)
     {
@@ -157,7 +157,7 @@ gtk_separator_size_request (GtkWidget      *widget,
                             GtkRequisition *requisition)
 {
   GtkSeparator *separator = GTK_SEPARATOR (widget);
-  GtkSeparatorPriv *private = separator->priv;
+  GtkSeparatorPrivate *private = separator->priv;
   gboolean wide_separators;
   gint     separator_width;
   gint     separator_height;
@@ -192,7 +192,7 @@ gtk_separator_expose (GtkWidget      *widget,
                       GdkEventExpose *event)
 {
   GtkSeparator *separator = GTK_SEPARATOR (widget);
-  GtkSeparatorPriv *private = separator->priv;
+  GtkSeparatorPrivate *private = separator->priv;
   gboolean wide_separators;
   gint     separator_width;
   gint     separator_height;
diff --git a/gtk/gtkseparator.h b/gtk/gtkseparator.h
index b1a416756e..64096cd3e4 100644
--- a/gtk/gtkseparator.h
+++ b/gtk/gtkseparator.h
@@ -45,15 +45,15 @@ G_BEGIN_DECLS
 #define GTK_SEPARATOR_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_SEPARATOR, GtkSeparatorClass))
 
 
-typedef struct _GtkSeparator       GtkSeparator;
-typedef struct _GtkSeparatorPriv   GtkSeparatorPriv;
-typedef struct _GtkSeparatorClass  GtkSeparatorClass;
+typedef struct _GtkSeparator              GtkSeparator;
+typedef struct _GtkSeparatorPrivate       GtkSeparatorPrivate;
+typedef struct _GtkSeparatorClass         GtkSeparatorClass;
 
 struct _GtkSeparator
 {
   GtkWidget widget;
 
-  GtkSeparatorPriv *priv;
+  GtkSeparatorPrivate *priv;
 };
 
 struct _GtkSeparatorClass
diff --git a/gtk/gtksizegroup.c b/gtk/gtksizegroup.c
index f0496e5cb1..87f5c48584 100644
--- a/gtk/gtksizegroup.c
+++ b/gtk/gtksizegroup.c
@@ -29,7 +29,7 @@
 
 
 
-struct _GtkSizeGroupPriv
+struct _GtkSizeGroupPrivate
 {
   GtkRequisition  requisition;
 
@@ -138,7 +138,7 @@ add_group_to_closure (GtkSizeGroup    *group,
 		      GSList         **groups,
 		      GSList         **widgets)
 {
-  GtkSizeGroupPriv *priv = group->priv;
+  GtkSizeGroupPrivate *priv = group->priv;
   GSList *tmp_widgets;
   
   *groups = g_slist_prepend (*groups, group);
@@ -171,7 +171,7 @@ add_widget_to_closure (GtkWidget       *widget,
   while (tmp_groups)
     {
       GtkSizeGroup *tmp_group = tmp_groups->data;
-      GtkSizeGroupPriv *tmp_priv = tmp_group->priv;
+      GtkSizeGroupPrivate *tmp_priv = tmp_group->priv;
 
       if ((tmp_priv->mode == GTK_SIZE_GROUP_BOTH || tmp_priv->mode == mode) &&
 	  !is_visited (tmp_group))
@@ -205,7 +205,7 @@ reset_group_sizes (GSList *groups)
   while (tmp_list)
     {
       GtkSizeGroup *tmp_group = tmp_list->data;
-      GtkSizeGroupPriv *tmp_priv = tmp_group->priv;
+      GtkSizeGroupPrivate *tmp_priv = tmp_group->priv;
 
       tmp_priv->have_width = FALSE;
       tmp_priv->have_height = FALSE;
@@ -311,7 +311,7 @@ queue_resize_on_widget (GtkWidget *widget,
 static void
 queue_resize_on_group (GtkSizeGroup *size_group)
 {
-  GtkSizeGroupPriv *priv = size_group->priv;
+  GtkSizeGroupPrivate *priv = size_group->priv;
 
   if (priv->widgets)
     queue_resize_on_widget (priv->widgets->data, TRUE);
@@ -362,7 +362,7 @@ gtk_size_group_class_init (GtkSizeGroupClass *klass)
 							 FALSE,
 							 GTK_PARAM_READWRITE));
 
-  g_type_class_add_private (klass, sizeof (GtkSizeGroupPriv));
+  g_type_class_add_private (klass, sizeof (GtkSizeGroupPrivate));
 
   initialize_size_group_quarks ();
 }
@@ -370,11 +370,11 @@ gtk_size_group_class_init (GtkSizeGroupClass *klass)
 static void
 gtk_size_group_init (GtkSizeGroup *size_group)
 {
-  GtkSizeGroupPriv *priv;
+  GtkSizeGroupPrivate *priv;
 
   size_group->priv = G_TYPE_INSTANCE_GET_PRIVATE (size_group,
                                                   GTK_TYPE_SIZE_GROUP,
-                                                  GtkSizeGroupPriv);
+                                                  GtkSizeGroupPrivate);
   priv = size_group->priv;
 
   priv->widgets = NULL;
@@ -424,7 +424,7 @@ gtk_size_group_get_property (GObject      *object,
 			     GParamSpec   *pspec)
 {
   GtkSizeGroup *size_group = GTK_SIZE_GROUP (object);
-  GtkSizeGroupPriv *priv = size_group->priv;
+  GtkSizeGroupPrivate *priv = size_group->priv;
 
   switch (prop_id)
     {
@@ -452,7 +452,7 @@ GtkSizeGroup *
 gtk_size_group_new (GtkSizeGroupMode mode)
 {
   GtkSizeGroup *size_group = g_object_new (GTK_TYPE_SIZE_GROUP, NULL);
-  GtkSizeGroupPriv *priv = size_group->priv;
+  GtkSizeGroupPrivate *priv = size_group->priv;
 
   priv->mode = mode;
 
@@ -475,7 +475,7 @@ void
 gtk_size_group_set_mode (GtkSizeGroup     *size_group,
 			 GtkSizeGroupMode  mode)
 {
-  GtkSizeGroupPriv *priv;
+  GtkSizeGroupPrivate *priv;
 
   g_return_if_fail (GTK_IS_SIZE_GROUP (size_group));
 
@@ -524,7 +524,7 @@ void
 gtk_size_group_set_ignore_hidden (GtkSizeGroup *size_group,
 				  gboolean      ignore_hidden)
 {
-  GtkSizeGroupPriv *priv;
+  GtkSizeGroupPrivate *priv;
 
   g_return_if_fail (GTK_IS_SIZE_GROUP (size_group));
 
@@ -583,7 +583,7 @@ void
 gtk_size_group_add_widget (GtkSizeGroup     *size_group,
 			   GtkWidget        *widget)
 {
-  GtkSizeGroupPriv *priv;
+  GtkSizeGroupPrivate *priv;
   GSList *groups;
   
   g_return_if_fail (GTK_IS_SIZE_GROUP (size_group));
@@ -621,7 +621,7 @@ void
 gtk_size_group_remove_widget (GtkSizeGroup *size_group,
 			      GtkWidget    *widget)
 {
-  GtkSizeGroupPriv *priv;
+  GtkSizeGroupPrivate *priv;
   GSList *groups;
   
   g_return_if_fail (GTK_IS_SIZE_GROUP (size_group));
@@ -723,7 +723,7 @@ compute_dimension (GtkWidget        *widget,
   else
     {
       GtkSizeGroup *group = groups->data;
-      GtkSizeGroupPriv *priv = group->priv;
+      GtkSizeGroupPrivate *priv = group->priv;
 
       if (mode == GTK_SIZE_GROUP_HORIZONTAL && priv->have_width)
 	result = priv->requisition.width;
@@ -755,7 +755,7 @@ compute_dimension (GtkWidget        *widget,
 	  while (tmp_list)
 	    {
 	      GtkSizeGroup *tmp_group = tmp_list->data;
-              GtkSizeGroupPriv *tmp_priv = tmp_group->priv;
+              GtkSizeGroupPrivate *tmp_priv = tmp_group->priv;
 
 	      if (mode == GTK_SIZE_GROUP_HORIZONTAL)
 		{
diff --git a/gtk/gtksizegroup.h b/gtk/gtksizegroup.h
index ec39c710d8..a014881ce5 100644
--- a/gtk/gtksizegroup.h
+++ b/gtk/gtksizegroup.h
@@ -37,16 +37,16 @@ G_BEGIN_DECLS
 #define GTK_SIZE_GROUP_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_SIZE_GROUP, GtkSizeGroupClass))
 
 
-typedef struct _GtkSizeGroup       GtkSizeGroup;
-typedef struct _GtkSizeGroupPriv   GtkSizeGroupPriv;
-typedef struct _GtkSizeGroupClass  GtkSizeGroupClass;
+typedef struct _GtkSizeGroup              GtkSizeGroup;
+typedef struct _GtkSizeGroupPrivate       GtkSizeGroupPrivate;
+typedef struct _GtkSizeGroupClass         GtkSizeGroupClass;
 
 struct _GtkSizeGroup
 {
   GObject parent_instance;
 
   /* <private> */
-  GtkSizeGroupPriv *priv;
+  GtkSizeGroupPrivate *priv;
 };
 
 struct _GtkSizeGroupClass
diff --git a/gtk/gtkspinbutton.c b/gtk/gtkspinbutton.c
index 330f3277ce..19b00291e6 100644
--- a/gtk/gtkspinbutton.c
+++ b/gtk/gtkspinbutton.c
@@ -50,7 +50,7 @@
 #define MIN_ARROW_WIDTH       6
 
 
-struct _GtkSpinButtonPriv
+struct _GtkSpinButtonPrivate
 {
   GtkSpinButtonUpdatePolicy update_policy;
   GtkAdjustment *adjustment;
@@ -400,7 +400,7 @@ gtk_spin_button_class_init (GtkSpinButtonClass *class)
   add_spin_binding (binding_set, GDK_Page_Up, GDK_CONTROL_MASK, GTK_SCROLL_END);
   add_spin_binding (binding_set, GDK_Page_Down, GDK_CONTROL_MASK, GTK_SCROLL_START);
 
-  g_type_class_add_private (class, sizeof (GtkSpinButtonPriv));
+  g_type_class_add_private (class, sizeof (GtkSpinButtonPrivate));
 }
 
 static void
@@ -416,7 +416,7 @@ gtk_spin_button_set_property (GObject      *object,
 			      GParamSpec   *pspec)
 {
   GtkSpinButton *spin_button = GTK_SPIN_BUTTON (object);
-  GtkSpinButtonPriv *priv = spin_button->priv;
+  GtkSpinButtonPrivate *priv = spin_button->priv;
 
   switch (prop_id)
     {
@@ -468,7 +468,7 @@ gtk_spin_button_get_property (GObject      *object,
 			      GParamSpec   *pspec)
 {
   GtkSpinButton *spin_button = GTK_SPIN_BUTTON (object);
-  GtkSpinButtonPriv *priv = spin_button->priv;
+  GtkSpinButtonPrivate *priv = spin_button->priv;
 
   switch (prop_id)
     {
@@ -505,11 +505,11 @@ gtk_spin_button_get_property (GObject      *object,
 static void
 gtk_spin_button_init (GtkSpinButton *spin_button)
 {
-  GtkSpinButtonPriv *priv;
+  GtkSpinButtonPrivate *priv;
 
   spin_button->priv = G_TYPE_INSTANCE_GET_PRIVATE (spin_button,
                                                    GTK_TYPE_SPIN_BUTTON,
-                                                   GtkSpinButtonPriv);
+                                                   GtkSpinButtonPrivate);
   priv = spin_button->priv;
 
   priv->adjustment = NULL;
@@ -552,7 +552,7 @@ static void
 gtk_spin_button_map (GtkWidget *widget)
 {
   GtkSpinButton *spin_button = GTK_SPIN_BUTTON (widget);
-  GtkSpinButtonPriv *priv = spin_button->priv;
+  GtkSpinButtonPrivate *priv = spin_button->priv;
 
   if (gtk_widget_get_realized (widget) && !gtk_widget_get_mapped (widget))
     {
@@ -565,7 +565,7 @@ static void
 gtk_spin_button_unmap (GtkWidget *widget)
 {
   GtkSpinButton *spin_button = GTK_SPIN_BUTTON (widget);
-  GtkSpinButtonPriv *priv = spin_button->priv;
+  GtkSpinButtonPrivate *priv = spin_button->priv;
 
   if (gtk_widget_get_mapped (widget))
     {
@@ -580,7 +580,7 @@ static void
 gtk_spin_button_realize (GtkWidget *widget)
 {
   GtkSpinButton *spin_button = GTK_SPIN_BUTTON (widget);
-  GtkSpinButtonPriv *priv = spin_button->priv;
+  GtkSpinButtonPrivate *priv = spin_button->priv;
   GdkWindowAttr attributes;
   gint attributes_mask;
   gboolean return_val;
@@ -628,7 +628,7 @@ static void
 gtk_spin_button_unrealize (GtkWidget *widget)
 {
   GtkSpinButton *spin = GTK_SPIN_BUTTON (widget);
-  GtkSpinButtonPriv *priv = spin->priv;
+  GtkSpinButtonPrivate *priv = spin->priv;
 
   GTK_WIDGET_CLASS (gtk_spin_button_parent_class)->unrealize (widget);
 
@@ -668,7 +668,7 @@ gtk_spin_button_size_request (GtkWidget      *widget,
 			      GtkRequisition *requisition)
 {
   GtkSpinButton *spin_button = GTK_SPIN_BUTTON (widget);
-  GtkSpinButtonPriv *priv = spin_button->priv;
+  GtkSpinButtonPrivate *priv = spin_button->priv;
   GtkEntry *entry = GTK_ENTRY (widget);
   gint arrow_size;
 
@@ -735,7 +735,7 @@ gtk_spin_button_size_allocate (GtkWidget     *widget,
 			       GtkAllocation *allocation)
 {
   GtkSpinButton *spin = GTK_SPIN_BUTTON (widget);
-  GtkSpinButtonPriv *priv = spin->priv;
+  GtkSpinButtonPrivate *priv = spin->priv;
   GtkAllocation panel_allocation;
   gint arrow_size;
   gint panel_width;
@@ -774,7 +774,7 @@ gtk_spin_button_expose (GtkWidget      *widget,
 			GdkEventExpose *event)
 {
   GtkSpinButton *spin = GTK_SPIN_BUTTON (widget);
-  GtkSpinButtonPriv *priv = spin->priv;
+  GtkSpinButtonPrivate *priv = spin->priv;
 
   if (gtk_widget_is_drawable (widget))
     {
@@ -819,7 +819,7 @@ static gboolean
 spin_button_at_limit (GtkSpinButton *spin_button,
                      GtkArrowType   arrow)
 {
-  GtkSpinButtonPriv *priv = spin_button->priv;
+  GtkSpinButtonPrivate *priv = spin_button->priv;
   GtkArrowType effective_arrow;
 
   if (priv->wrap)
@@ -846,7 +846,7 @@ gtk_spin_button_draw_arrow (GtkSpinButton *spin_button,
 			    GdkRectangle  *area,
 			    GtkArrowType   arrow_type)
 {
-  GtkSpinButtonPriv *priv;
+  GtkSpinButtonPrivate *priv;
   GtkStateType state_type;
   GtkShadowType shadow_type;
   GtkWidget *widget;
@@ -957,7 +957,7 @@ gtk_spin_button_enter_notify (GtkWidget        *widget,
 			      GdkEventCrossing *event)
 {
   GtkSpinButton *spin = GTK_SPIN_BUTTON (widget);
-  GtkSpinButtonPriv *priv = spin->priv;
+  GtkSpinButtonPrivate *priv = spin->priv;
 
   if (event->window == priv->panel)
     {
@@ -987,7 +987,7 @@ gtk_spin_button_leave_notify (GtkWidget        *widget,
 			      GdkEventCrossing *event)
 {
   GtkSpinButton *spin = GTK_SPIN_BUTTON (widget);
-  GtkSpinButtonPriv *priv = spin->priv;
+  GtkSpinButtonPrivate *priv = spin->priv;
 
   priv->in_child = NO_ARROW;
   gtk_widget_queue_draw (GTK_WIDGET (spin));
@@ -1039,7 +1039,7 @@ gtk_spin_button_style_set (GtkWidget *widget,
 		           GtkStyle  *previous_style)
 {
   GtkSpinButton *spin = GTK_SPIN_BUTTON (widget);
-  GtkSpinButtonPriv *priv = spin->priv;
+  GtkSpinButtonPrivate *priv = spin->priv;
 
   if (previous_style && gtk_widget_get_realized (widget))
     gtk_style_set_background (widget->style, priv->panel, GTK_STATE_NORMAL);
@@ -1053,7 +1053,7 @@ gtk_spin_button_scroll (GtkWidget      *widget,
 			GdkEventScroll *event)
 {
   GtkSpinButton *spin = GTK_SPIN_BUTTON (widget);
-  GtkSpinButtonPriv *priv = spin->priv;
+  GtkSpinButtonPrivate *priv = spin->priv;
 
   if (event->direction == GDK_SCROLL_UP)
     {
@@ -1076,7 +1076,7 @@ gtk_spin_button_scroll (GtkWidget      *widget,
 static void
 gtk_spin_button_stop_spinning (GtkSpinButton *spin)
 {
-  GtkSpinButtonPriv *priv = spin->priv;
+  GtkSpinButtonPrivate *priv = spin->priv;
 
   if (priv->timer)
     {
@@ -1100,7 +1100,7 @@ start_spinning (GtkSpinButton *spin,
 		GtkArrowType   click_child,
 		gdouble        step)
 {
-  GtkSpinButtonPriv *priv;
+  GtkSpinButtonPrivate *priv;
 
   g_return_if_fail (click_child == GTK_ARROW_UP || click_child == GTK_ARROW_DOWN);
 
@@ -1131,7 +1131,7 @@ gtk_spin_button_button_press (GtkWidget      *widget,
 			      GdkEventButton *event)
 {
   GtkSpinButton *spin = GTK_SPIN_BUTTON (widget);
-  GtkSpinButtonPriv *priv = spin->priv;
+  GtkSpinButtonPrivate *priv = spin->priv;
 
   if (!priv->button)
     {
@@ -1175,7 +1175,7 @@ gtk_spin_button_button_release (GtkWidget      *widget,
 				GdkEventButton *event)
 {
   GtkSpinButton *spin = GTK_SPIN_BUTTON (widget);
-  GtkSpinButtonPriv *priv = spin->priv;
+  GtkSpinButtonPrivate *priv = spin->priv;
   gint arrow_size;
 
   arrow_size = spin_button_get_arrow_size (spin);
@@ -1225,7 +1225,7 @@ gtk_spin_button_motion_notify (GtkWidget      *widget,
 			       GdkEventMotion *event)
 {
   GtkSpinButton *spin = GTK_SPIN_BUTTON (widget);
-  GtkSpinButtonPriv *priv = spin->priv;
+  GtkSpinButtonPrivate *priv = spin->priv;
 
   if (priv->button)
     return FALSE;
@@ -1258,7 +1258,7 @@ gtk_spin_button_motion_notify (GtkWidget      *widget,
 static gint
 gtk_spin_button_timer (GtkSpinButton *spin_button)
 {
-  GtkSpinButtonPriv *priv = spin_button->priv;
+  GtkSpinButtonPrivate *priv = spin_button->priv;
   gboolean retval = FALSE;
 
   if (priv->timer)
@@ -1324,7 +1324,7 @@ static void
 gtk_spin_button_real_change_value (GtkSpinButton *spin,
 				   GtkScrollType  scroll)
 {
-  GtkSpinButtonPriv *priv = spin->priv;
+  GtkSpinButtonPrivate *priv = spin->priv;
   gdouble old_value;
 
   /* When the key binding is activated, there may be an outstanding
@@ -1422,7 +1422,7 @@ gtk_spin_button_key_release (GtkWidget   *widget,
 			     GdkEventKey *event)
 {
   GtkSpinButton *spin = GTK_SPIN_BUTTON (widget);
-  GtkSpinButtonPriv *priv = spin->priv;
+  GtkSpinButtonPrivate *priv = spin->priv;
 
   /* We only get a release at the end of a key repeat run, so reset the timer_step */
   priv->timer_step = priv->adjustment->step_increment;
@@ -1435,7 +1435,7 @@ static void
 gtk_spin_button_snap (GtkSpinButton *spin_button,
 		      gdouble        val)
 {
-  GtkSpinButtonPriv *priv = spin_button->priv;
+  GtkSpinButtonPrivate *priv = spin_button->priv;
   gdouble inc;
   gdouble tmp;
 
@@ -1492,7 +1492,7 @@ gtk_spin_button_insert_text (GtkEditable *editable,
 {
   GtkEntry *entry = GTK_ENTRY (editable);
   GtkSpinButton *spin = GTK_SPIN_BUTTON (editable);
-  GtkSpinButtonPriv *priv = spin->priv;
+  GtkSpinButtonPrivate *priv = spin->priv;
   GtkEditableClass *parent_editable_iface = g_type_interface_peek (gtk_spin_button_parent_class, GTK_TYPE_EDITABLE);
 
   if (priv->numeric)
@@ -1593,7 +1593,7 @@ static void
 gtk_spin_button_real_spin (GtkSpinButton *spin_button,
 			   gdouble        increment)
 {
-  GtkSpinButtonPriv *priv = spin_button->priv;
+  GtkSpinButtonPrivate *priv = spin_button->priv;
   GtkAdjustment *adj;
   gdouble new_value = 0.0;
   gboolean wrapped = FALSE;
@@ -1658,7 +1658,7 @@ gtk_spin_button_default_input (GtkSpinButton *spin_button,
 static gint
 gtk_spin_button_default_output (GtkSpinButton *spin_button)
 {
-  GtkSpinButtonPriv *priv = spin_button->priv;
+  GtkSpinButtonPrivate *priv = spin_button->priv;
 
   gchar *buf = g_strdup_printf ("%0.*f", priv->digits, priv->adjustment->value);
 
@@ -1692,7 +1692,7 @@ gtk_spin_button_configure (GtkSpinButton  *spin_button,
 			   gdouble         climb_rate,
 			   guint           digits)
 {
-  GtkSpinButtonPriv *priv;
+  GtkSpinButtonPrivate *priv;
 
   g_return_if_fail (GTK_IS_SPIN_BUTTON (spin_button));
 
@@ -1793,7 +1793,7 @@ static void
 adjustment_changed_cb (GtkAdjustment *adjustment, gpointer data)
 {
   GtkSpinButton *spin_button = GTK_SPIN_BUTTON (data);
-  GtkSpinButtonPriv *priv = spin_button->priv;
+  GtkSpinButtonPrivate *priv = spin_button->priv;
 
   priv->timer_step = priv->adjustment->step_increment;
   gtk_widget_queue_resize (GTK_WIDGET (spin_button));
@@ -1810,7 +1810,7 @@ void
 gtk_spin_button_set_adjustment (GtkSpinButton *spin_button,
 				GtkAdjustment *adjustment)
 {
-  GtkSpinButtonPriv *priv;
+  GtkSpinButtonPrivate *priv;
 
   g_return_if_fail (GTK_IS_SPIN_BUTTON (spin_button));
 
@@ -1875,7 +1875,7 @@ void
 gtk_spin_button_set_digits (GtkSpinButton *spin_button,
 			    guint          digits)
 {
-  GtkSpinButtonPriv *priv;
+  GtkSpinButtonPrivate *priv;
 
   g_return_if_fail (GTK_IS_SPIN_BUTTON (spin_button));
 
@@ -1922,7 +1922,7 @@ gtk_spin_button_set_increments (GtkSpinButton *spin_button,
 				gdouble        step,
 				gdouble        page)
 {
-  GtkSpinButtonPriv *priv;
+  GtkSpinButtonPrivate *priv;
 
   g_return_if_fail (GTK_IS_SPIN_BUTTON (spin_button));
 
@@ -1946,7 +1946,7 @@ gtk_spin_button_get_increments (GtkSpinButton *spin_button,
 				gdouble       *step,
 				gdouble       *page)
 {
-  GtkSpinButtonPriv *priv;
+  GtkSpinButtonPrivate *priv;
 
   g_return_if_fail (GTK_IS_SPIN_BUTTON (spin_button));
 
@@ -1971,7 +1971,7 @@ gtk_spin_button_set_range (GtkSpinButton *spin_button,
 			   gdouble        min,
 			   gdouble        max)
 {
-  GtkSpinButtonPriv *priv;
+  GtkSpinButtonPrivate *priv;
   gdouble value;
 
   g_return_if_fail (GTK_IS_SPIN_BUTTON (spin_button));
@@ -2005,7 +2005,7 @@ gtk_spin_button_get_range (GtkSpinButton *spin_button,
 			   gdouble       *min,
 			   gdouble       *max)
 {
-  GtkSpinButtonPriv *priv;
+  GtkSpinButtonPrivate *priv;
 
   g_return_if_fail (GTK_IS_SPIN_BUTTON (spin_button));
 
@@ -2044,7 +2044,7 @@ gtk_spin_button_get_value (GtkSpinButton *spin_button)
 gint
 gtk_spin_button_get_value_as_int (GtkSpinButton *spin_button)
 {
-  GtkSpinButtonPriv *priv;
+  GtkSpinButtonPrivate *priv;
   gdouble val;
 
   g_return_val_if_fail (GTK_IS_SPIN_BUTTON (spin_button), 0);
@@ -2069,7 +2069,7 @@ void
 gtk_spin_button_set_value (GtkSpinButton *spin_button, 
 			   gdouble        value)
 {
-  GtkSpinButtonPriv *priv;
+  GtkSpinButtonPrivate *priv;
 
   g_return_if_fail (GTK_IS_SPIN_BUTTON (spin_button));
 
@@ -2098,7 +2098,7 @@ void
 gtk_spin_button_set_update_policy (GtkSpinButton             *spin_button,
 				   GtkSpinButtonUpdatePolicy  policy)
 {
-  GtkSpinButtonPriv *priv;
+  GtkSpinButtonPrivate *priv;
 
   g_return_if_fail (GTK_IS_SPIN_BUTTON (spin_button));
 
@@ -2140,7 +2140,7 @@ void
 gtk_spin_button_set_numeric (GtkSpinButton  *spin_button,
 			     gboolean        numeric)
 {
-  GtkSpinButtonPriv *priv;
+  GtkSpinButtonPrivate *priv;
 
   g_return_if_fail (GTK_IS_SPIN_BUTTON (spin_button));
 
@@ -2184,7 +2184,7 @@ void
 gtk_spin_button_set_wrap (GtkSpinButton  *spin_button,
 			  gboolean        wrap)
 {
-  GtkSpinButtonPriv *priv;
+  GtkSpinButtonPrivate *priv;
 
   g_return_if_fail (GTK_IS_SPIN_BUTTON (spin_button));
 
@@ -2260,7 +2260,7 @@ void
 gtk_spin_button_set_snap_to_ticks (GtkSpinButton *spin_button,
 				   gboolean       snap_to_ticks)
 {
-  GtkSpinButtonPriv *priv;
+  GtkSpinButtonPrivate *priv;
   guint new_val;
 
   g_return_if_fail (GTK_IS_SPIN_BUTTON (spin_button));
@@ -2310,7 +2310,7 @@ gtk_spin_button_spin (GtkSpinButton *spin_button,
 		      GtkSpinType    direction,
 		      gdouble        increment)
 {
-  GtkSpinButtonPriv *priv;
+  GtkSpinButtonPrivate *priv;
   GtkAdjustment *adj;
   gdouble diff;
 
@@ -2386,7 +2386,7 @@ gtk_spin_button_spin (GtkSpinButton *spin_button,
 void 
 gtk_spin_button_update (GtkSpinButton *spin_button)
 {
-  GtkSpinButtonPriv *priv;
+  GtkSpinButtonPrivate *priv;
   gdouble val;
   gint error = 0;
   gint return_val;
diff --git a/gtk/gtkspinbutton.h b/gtk/gtkspinbutton.h
index ba38984f26..2e431631cf 100644
--- a/gtk/gtkspinbutton.h
+++ b/gtk/gtkspinbutton.h
@@ -68,9 +68,9 @@ typedef enum
 } GtkSpinType;
 
 
-typedef struct _GtkSpinButton	    GtkSpinButton;
-typedef struct _GtkSpinButtonPriv   GtkSpinButtonPriv;
-typedef struct _GtkSpinButtonClass  GtkSpinButtonClass;
+typedef struct _GtkSpinButton              GtkSpinButton;
+typedef struct _GtkSpinButtonPrivate       GtkSpinButtonPrivate;
+typedef struct _GtkSpinButtonClass         GtkSpinButtonClass;
 
 
 struct _GtkSpinButton
@@ -78,7 +78,7 @@ struct _GtkSpinButton
   GtkEntry entry;
 
   /* <private> */
-  GtkSpinButtonPriv *priv;
+  GtkSpinButtonPrivate *priv;
 };
 
 struct _GtkSpinButtonClass
diff --git a/gtk/gtkstatusbar.c b/gtk/gtkstatusbar.c
index b521907720..7924067700 100644
--- a/gtk/gtkstatusbar.c
+++ b/gtk/gtkstatusbar.c
@@ -75,7 +75,7 @@
  */
 typedef struct _GtkStatusbarMsg GtkStatusbarMsg;
 
-struct _GtkStatusbarPriv
+struct _GtkStatusbarPrivate
 {
   GtkWidget     *frame;
   GtkWidget     *label;
@@ -250,20 +250,20 @@ gtk_statusbar_class_init (GtkStatusbarClass *class)
                                                               GTK_SHADOW_IN,
                                                               GTK_PARAM_READABLE));
 
-   g_type_class_add_private (class, sizeof (GtkStatusbarPriv));
+   g_type_class_add_private (class, sizeof (GtkStatusbarPrivate));
 }
 
 static void
 gtk_statusbar_init (GtkStatusbar *statusbar)
 {
-  GtkStatusbarPriv *priv;
+  GtkStatusbarPrivate *priv;
   GtkBox *box = GTK_BOX (statusbar);
   GtkWidget *message_area;
   GtkShadowType shadow_type;
 
   statusbar->priv = G_TYPE_INSTANCE_GET_PRIVATE (statusbar,
                                                  GTK_TYPE_STATUSBAR,
-                                                 GtkStatusbarPriv);
+                                                 GtkStatusbarPrivate);
   priv = statusbar->priv;
 
   gtk_widget_set_redraw_on_allocate (GTK_WIDGET (box), TRUE);
@@ -314,7 +314,7 @@ gtk_statusbar_buildable_get_internal_child (GtkBuildable *buildable,
                                             const gchar  *childname)
 {
   GtkStatusbar *statusbar = GTK_STATUSBAR (buildable);
-  GtkStatusbarPriv *priv = statusbar->priv;
+  GtkStatusbarPrivate *priv = statusbar->priv;
 
     if (strcmp (childname, "message_area") == 0)
       return G_OBJECT (gtk_bin_get_child (GTK_BIN (priv->frame)));
@@ -342,7 +342,7 @@ gtk_statusbar_update (GtkStatusbar *statusbar,
 		      guint	    context_id,
 		      const gchar  *text)
 {
-  GtkStatusbarPriv *priv;
+  GtkStatusbarPrivate *priv;
 
   g_return_if_fail (GTK_IS_STATUSBAR (statusbar));
 
@@ -370,7 +370,7 @@ guint
 gtk_statusbar_get_context_id (GtkStatusbar *statusbar,
 			      const gchar  *context_description)
 {
-  GtkStatusbarPriv *priv;
+  GtkStatusbarPrivate *priv;
   gchar *string;
   guint id;
   
@@ -412,7 +412,7 @@ gtk_statusbar_push (GtkStatusbar *statusbar,
 		    guint	  context_id,
 		    const gchar  *text)
 {
-  GtkStatusbarPriv *priv;
+  GtkStatusbarPrivate *priv;
   GtkStatusbarMsg *msg;
 
   g_return_val_if_fail (GTK_IS_STATUSBAR (statusbar), 0);
@@ -452,7 +452,7 @@ void
 gtk_statusbar_pop (GtkStatusbar *statusbar,
 		   guint	 context_id)
 {
-  GtkStatusbarPriv *priv;
+  GtkStatusbarPrivate *priv;
   GtkStatusbarMsg *msg;
 
   g_return_if_fail (GTK_IS_STATUSBAR (statusbar));
@@ -502,7 +502,7 @@ gtk_statusbar_remove (GtkStatusbar *statusbar,
 		      guint	   context_id,
 		      guint        message_id)
 {
-  GtkStatusbarPriv *priv;
+  GtkStatusbarPrivate *priv;
   GtkStatusbarMsg *msg;
 
   g_return_if_fail (GTK_IS_STATUSBAR (statusbar));
@@ -555,7 +555,7 @@ void
 gtk_statusbar_remove_all (GtkStatusbar *statusbar,
                           guint         context_id)
 {
-  GtkStatusbarPriv *priv;
+  GtkStatusbarPrivate *priv;
   GtkStatusbarMsg *msg;
   GSList *prev, *list;
 
@@ -622,7 +622,7 @@ void
 gtk_statusbar_set_has_resize_grip (GtkStatusbar *statusbar,
 				   gboolean      setting)
 {
-  GtkStatusbarPriv *priv;
+  GtkStatusbarPrivate *priv;
 
   g_return_if_fail (GTK_IS_STATUSBAR (statusbar));
 
@@ -681,7 +681,7 @@ gtk_statusbar_get_has_resize_grip (GtkStatusbar *statusbar)
 GtkWidget*
 gtk_statusbar_get_message_area (GtkStatusbar *statusbar)
 {
-  GtkStatusbarPriv *priv;
+  GtkStatusbarPrivate *priv;
 
   g_return_val_if_fail (GTK_IS_STATUSBAR (statusbar), NULL);
 
@@ -694,7 +694,7 @@ static void
 gtk_statusbar_destroy (GtkObject *object)
 {
   GtkStatusbar *statusbar = GTK_STATUSBAR (object);
-  GtkStatusbarPriv *priv = statusbar->priv;
+  GtkStatusbarPrivate *priv = statusbar->priv;
   GSList *list;
 
   for (list = priv->messages; list; list = list->next)
@@ -742,7 +742,7 @@ gtk_statusbar_get_property (GObject    *object,
 			    GParamSpec *pspec)
 {
   GtkStatusbar *statusbar = GTK_STATUSBAR (object);
-  GtkStatusbarPriv *priv = statusbar->priv;
+  GtkStatusbarPrivate *priv = statusbar->priv;
 
   switch (prop_id) 
     {
@@ -801,7 +801,7 @@ get_grip_rect (GtkStatusbar *statusbar,
 static void
 set_grip_cursor (GtkStatusbar *statusbar)
 {
-  GtkStatusbarPriv *priv = statusbar->priv;
+  GtkStatusbarPrivate *priv = statusbar->priv;
 
   if (priv->has_resize_grip && priv->grip_window != NULL)
     {
@@ -830,7 +830,7 @@ static void
 gtk_statusbar_create_window (GtkStatusbar *statusbar)
 {
   GtkWidget *widget;
-  GtkStatusbarPriv *priv = statusbar->priv;
+  GtkStatusbarPrivate *priv = statusbar->priv;
   GdkWindowAttr attributes;
   gint attributes_mask;
   GdkRectangle rect;
@@ -883,7 +883,7 @@ gtk_statusbar_state_changed (GtkWidget    *widget,
 static void
 gtk_statusbar_destroy_window (GtkStatusbar *statusbar)
 {
-  GtkStatusbarPriv *priv = statusbar->priv;
+  GtkStatusbarPrivate *priv = statusbar->priv;
 
   gdk_window_set_user_data (priv->grip_window, NULL);
   gdk_window_destroy (priv->grip_window);
@@ -894,7 +894,7 @@ static void
 gtk_statusbar_realize (GtkWidget *widget)
 {
   GtkStatusbar *statusbar = GTK_STATUSBAR (widget);
-  GtkStatusbarPriv *priv = statusbar->priv;
+  GtkStatusbarPrivate *priv = statusbar->priv;
 
   GTK_WIDGET_CLASS (gtk_statusbar_parent_class)->realize (widget);
 
@@ -906,7 +906,7 @@ static void
 gtk_statusbar_unrealize (GtkWidget *widget)
 {
   GtkStatusbar *statusbar = GTK_STATUSBAR (widget);
-  GtkStatusbarPriv *priv = statusbar->priv;
+  GtkStatusbarPrivate *priv = statusbar->priv;
 
   if (priv->grip_window)
     gtk_statusbar_destroy_window (statusbar);
@@ -918,7 +918,7 @@ static void
 gtk_statusbar_map (GtkWidget *widget)
 {
   GtkStatusbar *statusbar = GTK_STATUSBAR (widget);
-  GtkStatusbarPriv *priv = statusbar->priv;
+  GtkStatusbarPrivate *priv = statusbar->priv;
 
   GTK_WIDGET_CLASS (gtk_statusbar_parent_class)->map (widget);
 
@@ -930,7 +930,7 @@ static void
 gtk_statusbar_unmap (GtkWidget *widget)
 {
   GtkStatusbar *statusbar = GTK_STATUSBAR (widget);
-  GtkStatusbarPriv *priv = statusbar->priv;
+  GtkStatusbarPrivate *priv = statusbar->priv;
 
   if (priv->grip_window)
     gdk_window_hide (priv->grip_window);
@@ -943,7 +943,7 @@ gtk_statusbar_button_press (GtkWidget      *widget,
                             GdkEventButton *event)
 {
   GtkStatusbar *statusbar = GTK_STATUSBAR (widget);
-  GtkStatusbarPriv *priv = statusbar->priv;
+  GtkStatusbarPrivate *priv = statusbar->priv;
   GtkWidget *ancestor;
   GdkWindowEdge edge;
 
@@ -981,7 +981,7 @@ gtk_statusbar_expose_event (GtkWidget      *widget,
                             GdkEventExpose *event)
 {
   GtkStatusbar *statusbar = GTK_STATUSBAR (widget);
-  GtkStatusbarPriv *priv = statusbar->priv;
+  GtkStatusbarPrivate *priv = statusbar->priv;
   GtkStyle *style;
   GdkRectangle rect;
 
@@ -1019,7 +1019,7 @@ gtk_statusbar_size_request (GtkWidget      *widget,
 			    GtkRequisition *requisition)
 {
   GtkStatusbar *statusbar = GTK_STATUSBAR (widget);
-  GtkStatusbarPriv *priv = statusbar->priv;
+  GtkStatusbarPrivate *priv = statusbar->priv;
   GtkShadowType shadow_type;
 
   gtk_widget_style_get (GTK_WIDGET (statusbar), "shadow-type", &shadow_type, NULL);  
@@ -1034,7 +1034,7 @@ gtk_statusbar_size_request (GtkWidget      *widget,
 static gboolean
 has_extra_children (GtkStatusbar *statusbar)
 {
-  GtkStatusbarPriv *priv = statusbar->priv;
+  GtkStatusbarPrivate *priv = statusbar->priv;
   GtkPackType child_pack_type, frame_pack_type;
   GtkWidget *child, *frame;
   GList *l, *children;
@@ -1084,7 +1084,7 @@ gtk_statusbar_size_allocate  (GtkWidget     *widget,
                               GtkAllocation *allocation)
 {
   GtkStatusbar *statusbar = GTK_STATUSBAR (widget);
-  GtkStatusbarPriv *priv = statusbar->priv;
+  GtkStatusbarPrivate *priv = statusbar->priv;
   gboolean extra_children = FALSE;
   GdkRectangle rect;
 
@@ -1166,7 +1166,7 @@ label_selectable_changed (GtkWidget  *label,
 			  gpointer    data)
 {
   GtkStatusbar *statusbar = GTK_STATUSBAR (data);
-  GtkStatusbarPriv *priv = statusbar->priv;
+  GtkStatusbarPrivate *priv = statusbar->priv;
 
   if (statusbar &&
       priv->has_resize_grip && priv->grip_window)
diff --git a/gtk/gtkstatusbar.h b/gtk/gtkstatusbar.h
index a9cc43c156..8c39403e9f 100644
--- a/gtk/gtkstatusbar.h
+++ b/gtk/gtkstatusbar.h
@@ -44,16 +44,16 @@ G_BEGIN_DECLS
 #define GTK_STATUSBAR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_STATUSBAR, GtkStatusbarClass))
 
 
-typedef struct _GtkStatusbar      GtkStatusbar;
-typedef struct _GtkStatusbarPriv  GtkStatusbarPriv;
-typedef struct _GtkStatusbarClass GtkStatusbarClass;
+typedef struct _GtkStatusbar              GtkStatusbar;
+typedef struct _GtkStatusbarPrivate       GtkStatusbarPrivate;
+typedef struct _GtkStatusbarClass         GtkStatusbarClass;
 
 struct _GtkStatusbar
 {
   GtkHBox parent_widget;
 
   /* <private> */
-  GtkStatusbarPriv *priv;
+  GtkStatusbarPrivate *priv;
 };
 
 struct _GtkStatusbarClass
diff --git a/gtk/gtktable.c b/gtk/gtktable.c
index 5072822383..0380aa0c39 100644
--- a/gtk/gtktable.c
+++ b/gtk/gtktable.c
@@ -31,7 +31,7 @@
 
 
 
-struct _GtkTablePriv
+struct _GtkTablePrivate
 {
   GtkTableRowCol *cols;
   GtkTableRowCol *rows;
@@ -240,7 +240,7 @@ gtk_table_class_init (GtkTableClass *class)
 								 0, 65535, 0,
 								 GTK_PARAM_READWRITE));
 
-  g_type_class_add_private (class, sizeof (GtkTablePriv));
+  g_type_class_add_private (class, sizeof (GtkTablePrivate));
 }
 
 static GType
@@ -256,7 +256,7 @@ gtk_table_get_property (GObject      *object,
 			GParamSpec   *pspec)
 {
   GtkTable *table = GTK_TABLE (object);
-  GtkTablePriv *priv = table->priv;
+  GtkTablePrivate *priv = table->priv;
 
   switch (prop_id)
     {
@@ -288,7 +288,7 @@ gtk_table_set_property (GObject      *object,
 			GParamSpec   *pspec)
 {
   GtkTable *table = GTK_TABLE (object);
-  GtkTablePriv *priv = table->priv;
+  GtkTablePrivate *priv = table->priv;
 
   switch (prop_id)
     {
@@ -321,7 +321,7 @@ gtk_table_set_child_property (GtkContainer    *container,
 			      GParamSpec      *pspec)
 {
   GtkTable *table = GTK_TABLE (container);
-  GtkTablePriv *priv = table->priv;
+  GtkTablePrivate *priv = table->priv;
   GtkTableChild *table_child;
   GList *list;
 
@@ -402,7 +402,7 @@ gtk_table_get_child_property (GtkContainer    *container,
 			      GParamSpec      *pspec)
 {
   GtkTable *table = GTK_TABLE (container);
-  GtkTablePriv *priv = table->priv;
+  GtkTablePrivate *priv = table->priv;
   GtkTableChild *table_child;
   GList *list;
 
@@ -459,11 +459,11 @@ gtk_table_get_child_property (GtkContainer    *container,
 static void
 gtk_table_init (GtkTable *table)
 {
-  GtkTablePriv *priv;
+  GtkTablePrivate *priv;
 
   table->priv = G_TYPE_INSTANCE_GET_PRIVATE (table,
                                              GTK_TYPE_TABLE,
-                                             GtkTablePriv);
+                                             GtkTablePrivate);
   priv = table->priv;
 
   gtk_widget_set_has_window (GTK_WIDGET (table), FALSE);
@@ -487,7 +487,7 @@ gtk_table_new (guint	rows,
 	       gboolean homogeneous)
 {
   GtkTable *table;
-  GtkTablePriv *priv;
+  GtkTablePrivate *priv;
 
   if (rows == 0)
     rows = 1;
@@ -509,7 +509,7 @@ gtk_table_resize (GtkTable *table,
 		  guint     n_rows,
 		  guint     n_cols)
 {
-  GtkTablePriv *priv;
+  GtkTablePrivate *priv;
 
   g_return_if_fail (GTK_IS_TABLE (table));
   g_return_if_fail (n_rows > 0 && n_rows <= 65535);
@@ -593,7 +593,7 @@ gtk_table_attach (GtkTable	  *table,
 		  guint		   xpadding,
 		  guint		   ypadding)
 {
-  GtkTablePriv *priv = table->priv;
+  GtkTablePrivate *priv = table->priv;
   GtkTableChild *table_child;
   
   g_return_if_fail (GTK_IS_TABLE (table));
@@ -654,7 +654,7 @@ gtk_table_set_row_spacing (GtkTable *table,
 			   guint     row,
 			   guint     spacing)
 {
-  GtkTablePriv *priv;
+  GtkTablePrivate *priv;
 
   g_return_if_fail (GTK_IS_TABLE (table));
 
@@ -685,7 +685,7 @@ guint
 gtk_table_get_row_spacing (GtkTable *table,
 			   guint     row)
 {
-  GtkTablePriv *priv;
+  GtkTablePrivate *priv;
 
   g_return_val_if_fail (GTK_IS_TABLE (table), 0);
 
@@ -701,7 +701,7 @@ gtk_table_set_col_spacing (GtkTable *table,
 			   guint     column,
 			   guint     spacing)
 {
-  GtkTablePriv *priv;
+  GtkTablePrivate *priv;
 
   g_return_if_fail (GTK_IS_TABLE (table));
 
@@ -732,7 +732,7 @@ guint
 gtk_table_get_col_spacing (GtkTable *table,
 			   guint     column)
 {
-  GtkTablePriv *priv;
+  GtkTablePrivate *priv;
 
   g_return_val_if_fail (GTK_IS_TABLE (table), 0);
 
@@ -747,7 +747,7 @@ void
 gtk_table_set_row_spacings (GtkTable *table,
 			    guint     spacing)
 {
-  GtkTablePriv *priv;
+  GtkTablePrivate *priv;
   guint row;
   
   g_return_if_fail (GTK_IS_TABLE (table));
@@ -786,7 +786,7 @@ void
 gtk_table_set_col_spacings (GtkTable *table,
 			    guint     spacing)
 {
-  GtkTablePriv *priv;
+  GtkTablePrivate *priv;
   guint col;
 
   g_return_if_fail (GTK_IS_TABLE (table));
@@ -825,7 +825,7 @@ void
 gtk_table_set_homogeneous (GtkTable *table,
 			   gboolean  homogeneous)
 {
-  GtkTablePriv *priv;
+  GtkTablePrivate *priv;
 
   g_return_if_fail (GTK_IS_TABLE (table));
 
@@ -877,7 +877,7 @@ gtk_table_get_size (GtkTable *table,
                     guint    *rows,
                     guint    *columns)
 {
-  GtkTablePriv *priv;
+  GtkTablePrivate *priv;
 
   g_return_if_fail (GTK_IS_TABLE (table));
 
@@ -894,7 +894,7 @@ static void
 gtk_table_finalize (GObject *object)
 {
   GtkTable *table = GTK_TABLE (object);
-  GtkTablePriv *priv = table->priv;
+  GtkTablePrivate *priv = table->priv;
 
   g_free (priv->rows);
   g_free (priv->cols);
@@ -907,7 +907,7 @@ gtk_table_size_request (GtkWidget      *widget,
 			GtkRequisition *requisition)
 {
   GtkTable *table = GTK_TABLE (widget);
-  GtkTablePriv *priv = table->priv;
+  GtkTablePrivate *priv = table->priv;
   gint row, col;
   guint border_width;
 
@@ -960,7 +960,7 @@ gtk_table_remove (GtkContainer *container,
 		  GtkWidget    *widget)
 {
   GtkTable *table = GTK_TABLE (container);
-  GtkTablePriv *priv = table->priv;
+  GtkTablePrivate *priv = table->priv;
   GtkTableChild *child;
   GtkWidget *widget_container = GTK_WIDGET (container);
   GList *children;
@@ -995,7 +995,7 @@ gtk_table_forall (GtkContainer *container,
 		  gpointer	callback_data)
 {
   GtkTable *table = GTK_TABLE (container);
-  GtkTablePriv *priv = table->priv;
+  GtkTablePrivate *priv = table->priv;
   GtkTableChild *child;
   GList *children;
 
@@ -1013,7 +1013,7 @@ gtk_table_forall (GtkContainer *container,
 static void
 gtk_table_size_request_init (GtkTable *table)
 {
-  GtkTablePriv *priv = table->priv;
+  GtkTablePrivate *priv = table->priv;
   GtkTableChild *child;
   GList *children;
   gint row, col;
@@ -1049,7 +1049,7 @@ gtk_table_size_request_init (GtkTable *table)
 static void
 gtk_table_size_request_pass1 (GtkTable *table)
 {
-  GtkTablePriv *priv = table->priv;
+  GtkTablePrivate *priv = table->priv;
   GtkTableChild *child;
   GList *children;
   gint width;
@@ -1088,7 +1088,7 @@ gtk_table_size_request_pass1 (GtkTable *table)
 static void
 gtk_table_size_request_pass2 (GtkTable *table)
 {
-  GtkTablePriv *priv = table->priv;
+  GtkTablePrivate *priv = table->priv;
   gint max_width;
   gint max_height;
   gint row, col;
@@ -1113,7 +1113,7 @@ gtk_table_size_request_pass2 (GtkTable *table)
 static void
 gtk_table_size_request_pass3 (GtkTable *table)
 {
-  GtkTablePriv *priv = table->priv;
+  GtkTablePrivate *priv = table->priv;
   GtkTableChild *child;
   GList *children;
   gint width, height;
@@ -1238,7 +1238,7 @@ gtk_table_size_request_pass3 (GtkTable *table)
 static void
 gtk_table_size_allocate_init (GtkTable *table)
 {
-  GtkTablePriv *priv = table->priv;
+  GtkTablePrivate *priv = table->priv;
   GtkTableChild *child;
   GList *children;
   gint row, col;
@@ -1433,7 +1433,7 @@ gtk_table_size_allocate_init (GtkTable *table)
 static void
 gtk_table_size_allocate_pass1 (GtkTable *table)
 {
-  GtkTablePriv *priv = table->priv;
+  GtkTablePrivate *priv = table->priv;
   GtkAllocation allocation;
   gint real_width;
   gint real_height;
@@ -1640,7 +1640,7 @@ gtk_table_size_allocate_pass1 (GtkTable *table)
 static void
 gtk_table_size_allocate_pass2 (GtkTable *table)
 {
-  GtkTablePriv *priv = table->priv;
+  GtkTablePrivate *priv = table->priv;
   GtkTableChild *child;
   GList *children;
   gint max_width;
diff --git a/gtk/gtktable.h b/gtk/gtktable.h
index f71b3e7d4f..b2f807ad90 100644
--- a/gtk/gtktable.h
+++ b/gtk/gtktable.h
@@ -45,18 +45,18 @@ G_BEGIN_DECLS
 #define GTK_TABLE_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_TABLE, GtkTableClass))
 
 
-typedef struct _GtkTable	GtkTable;
-typedef struct _GtkTablePriv    GtkTablePriv;
-typedef struct _GtkTableClass	GtkTableClass;
-typedef struct _GtkTableChild	GtkTableChild;
-typedef struct _GtkTableRowCol	GtkTableRowCol;
+typedef struct _GtkTable              GtkTable;
+typedef struct _GtkTablePrivate       GtkTablePrivate;
+typedef struct _GtkTableClass         GtkTableClass;
+typedef struct _GtkTableChild         GtkTableChild;
+typedef struct _GtkTableRowCol        GtkTableRowCol;
 
 struct _GtkTable
 {
   GtkContainer container;
 
   /* <private> */
-  GtkTablePriv *priv;
+  GtkTablePrivate *priv;
 };
 
 struct _GtkTableClass
diff --git a/gtk/gtktearoffmenuitem.c b/gtk/gtktearoffmenuitem.c
index 234a705ad3..5e68892069 100644
--- a/gtk/gtktearoffmenuitem.c
+++ b/gtk/gtktearoffmenuitem.c
@@ -34,7 +34,7 @@
 #define TEAR_LENGTH 5
 #define BORDER_SPACING  3
 
-struct _GtkTearoffMenuItemPriv
+struct _GtkTearoffMenuItemPrivate
 {
   guint torn_off : 1;
 };
@@ -70,17 +70,17 @@ gtk_tearoff_menu_item_class_init (GtkTearoffMenuItemClass *klass)
 
   menu_item_class->activate = gtk_tearoff_menu_item_activate;
 
-  g_type_class_add_private (klass, sizeof (GtkTearoffMenuItemPriv));
+  g_type_class_add_private (klass, sizeof (GtkTearoffMenuItemPrivate));
 }
 
 static void
 gtk_tearoff_menu_item_init (GtkTearoffMenuItem *tearoff_menu_item)
 {
-  GtkTearoffMenuItemPriv *priv;
+  GtkTearoffMenuItemPrivate *priv;
 
   tearoff_menu_item->priv = G_TYPE_INSTANCE_GET_PRIVATE (tearoff_menu_item,
                                                          GTK_TYPE_TEAROFF_MENU_ITEM,
-                                                         GtkTearoffMenuItemPriv);
+                                                         GtkTearoffMenuItemPrivate);
   priv = tearoff_menu_item->priv;
 
   priv->torn_off = FALSE;
@@ -260,7 +260,7 @@ tearoff_state_changed (GtkMenu            *menu,
 		       gpointer            data)
 {
   GtkTearoffMenuItem *tearoff_menu_item = GTK_TEAROFF_MENU_ITEM (data);
-  GtkTearoffMenuItemPriv *priv = tearoff_menu_item->priv;
+  GtkTearoffMenuItemPrivate *priv = tearoff_menu_item->priv;
 
   priv->torn_off = gtk_menu_get_tearoff_state (menu);
 }
@@ -270,7 +270,7 @@ gtk_tearoff_menu_item_parent_set (GtkWidget *widget,
 				  GtkWidget *previous)
 {
   GtkTearoffMenuItem *tearoff_menu_item = GTK_TEAROFF_MENU_ITEM (widget);
-  GtkTearoffMenuItemPriv *priv = tearoff_menu_item->priv;
+  GtkTearoffMenuItemPrivate *priv = tearoff_menu_item->priv;
   GtkMenu *menu;
   GtkWidget *parent;
 
diff --git a/gtk/gtktearoffmenuitem.h b/gtk/gtktearoffmenuitem.h
index 2b84059638..80a4dad65a 100644
--- a/gtk/gtktearoffmenuitem.h
+++ b/gtk/gtktearoffmenuitem.h
@@ -45,16 +45,16 @@ G_BEGIN_DECLS
 #define GTK_TEAROFF_MENU_ITEM_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_TEAROFF_MENU_ITEM, GtkTearoffMenuItemClass))
 
 
-typedef struct _GtkTearoffMenuItem       GtkTearoffMenuItem;
-typedef struct _GtkTearoffMenuItemPriv   GtkTearoffMenuItemPriv;
-typedef struct _GtkTearoffMenuItemClass  GtkTearoffMenuItemClass;
+typedef struct _GtkTearoffMenuItem              GtkTearoffMenuItem;
+typedef struct _GtkTearoffMenuItemPrivate       GtkTearoffMenuItemPrivate;
+typedef struct _GtkTearoffMenuItemClass         GtkTearoffMenuItemClass;
 
 struct _GtkTearoffMenuItem
 {
   GtkMenuItem menu_item;
 
   /* <private> */
-  GtkTearoffMenuItemPriv *priv;
+  GtkTearoffMenuItemPrivate *priv;
 };
 
 struct _GtkTearoffMenuItemClass
diff --git a/gtk/gtktexttagtable.c b/gtk/gtktexttagtable.c
index 1b311a6a87..b8b7afd604 100644
--- a/gtk/gtktexttagtable.c
+++ b/gtk/gtktexttagtable.c
@@ -33,7 +33,7 @@
 #include <stdlib.h>
 
 
-struct _GtkTextTagTablePriv
+struct _GtkTextTagTablePrivate
 {
   GHashTable *hash;
   GSList     *anonymous;
@@ -112,17 +112,17 @@ gtk_text_tag_table_class_init (GtkTextTagTableClass *klass)
                   1,
                   GTK_TYPE_TEXT_TAG);
 
-  g_type_class_add_private (klass, sizeof (GtkTextTagTablePriv));
+  g_type_class_add_private (klass, sizeof (GtkTextTagTablePrivate));
 }
 
 static void
 gtk_text_tag_table_init (GtkTextTagTable *table)
 {
-  GtkTextTagTablePriv *priv;
+  GtkTextTagTablePrivate *priv;
 
   table->priv = G_TYPE_INSTANCE_GET_PRIVATE (table,
                                              GTK_TYPE_TEXT_TAG_TABLE,
-                                             GtkTextTagTablePriv);
+                                             GtkTextTagTablePrivate);
   priv = table->priv;
 
   priv->hash = g_hash_table_new (g_str_hash, g_str_equal);
@@ -150,7 +150,7 @@ static void
 foreach_unref (GtkTextTag *tag, gpointer data)
 {
   GtkTextTagTable *table = GTK_TEXT_TAG_TABLE (tag->table);
-  GtkTextTagTablePriv *priv = table->priv;
+  GtkTextTagTablePrivate *priv = table->priv;
   GSList *tmp;
   
   /* We don't want to emit the remove signal here; so we just unparent
@@ -174,7 +174,7 @@ static void
 gtk_text_tag_table_finalize (GObject *object)
 {
   GtkTextTagTable *table = GTK_TEXT_TAG_TABLE (object);
-  GtkTextTagTablePriv *priv = table->priv;
+  GtkTextTagTablePrivate *priv = table->priv;
 
   gtk_text_tag_table_foreach (table, foreach_unref, NULL);
 
@@ -231,7 +231,7 @@ void
 gtk_text_tag_table_add (GtkTextTagTable *table,
                         GtkTextTag      *tag)
 {
-  GtkTextTagTablePriv *priv;
+  GtkTextTagTablePrivate *priv;
   guint size;
 
   g_return_if_fail (GTK_IS_TEXT_TAG_TABLE (table));
@@ -282,7 +282,7 @@ GtkTextTag*
 gtk_text_tag_table_lookup (GtkTextTagTable *table,
                            const gchar     *name)
 {
-  GtkTextTagTablePriv *priv;
+  GtkTextTagTablePrivate *priv;
 
   g_return_val_if_fail (GTK_IS_TEXT_TAG_TABLE (table), NULL);
   g_return_val_if_fail (name != NULL, NULL);
@@ -305,7 +305,7 @@ void
 gtk_text_tag_table_remove (GtkTextTagTable *table,
                            GtkTextTag      *tag)
 {
-  GtkTextTagTablePriv *priv;
+  GtkTextTagTablePrivate *priv;
   GSList *tmp;
   
   g_return_if_fail (GTK_IS_TEXT_TAG_TABLE (table));
@@ -387,7 +387,7 @@ gtk_text_tag_table_foreach (GtkTextTagTable       *table,
                             GtkTextTagTableForeach func,
                             gpointer               data)
 {
-  GtkTextTagTablePriv *priv;
+  GtkTextTagTablePrivate *priv;
   struct ForeachData d;
 
   g_return_if_fail (GTK_IS_TEXT_TAG_TABLE (table));
@@ -413,7 +413,7 @@ gtk_text_tag_table_foreach (GtkTextTagTable       *table,
 gint
 gtk_text_tag_table_get_size (GtkTextTagTable *table)
 {
-  GtkTextTagTablePriv *priv;
+  GtkTextTagTablePrivate *priv;
 
   g_return_val_if_fail (GTK_IS_TEXT_TAG_TABLE (table), 0);
 
@@ -426,7 +426,7 @@ void
 _gtk_text_tag_table_add_buffer (GtkTextTagTable *table,
                                 gpointer         buffer)
 {
-  GtkTextTagTablePriv *priv = table->priv;
+  GtkTextTagTablePrivate *priv = table->priv;
 
   priv->buffers = g_slist_prepend (priv->buffers, buffer);
 }
@@ -445,7 +445,7 @@ void
 _gtk_text_tag_table_remove_buffer (GtkTextTagTable *table,
                                    gpointer         buffer)
 {
-  GtkTextTagTablePriv *priv = table->priv;
+  GtkTextTagTablePrivate *priv = table->priv;
 
   gtk_text_tag_table_foreach (table, foreach_remove_tag, buffer);
 
diff --git a/gtk/gtktexttagtable.h b/gtk/gtktexttagtable.h
index 9ce2feb61c..9697b87bda 100644
--- a/gtk/gtktexttagtable.h
+++ b/gtk/gtktexttagtable.h
@@ -44,14 +44,14 @@ typedef void (* GtkTextTagTableForeach) (GtkTextTag *tag, gpointer data);
 #define GTK_IS_TEXT_TAG_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TEXT_TAG_TABLE))
 #define GTK_TEXT_TAG_TABLE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_TEXT_TAG_TABLE, GtkTextTagTableClass))
 
-typedef struct _GtkTextTagTablePriv  GtkTextTagTablePriv;
-typedef struct _GtkTextTagTableClass GtkTextTagTableClass;
+typedef struct _GtkTextTagTablePrivate       GtkTextTagTablePrivate;
+typedef struct _GtkTextTagTableClass         GtkTextTagTableClass;
 
 struct _GtkTextTagTable
 {
   GObject parent_instance;
 
-  GtkTextTagTablePriv *priv;
+  GtkTextTagTablePrivate *priv;
 };
 
 struct _GtkTextTagTableClass
diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c
index 02505b6dfc..69938f1c9e 100644
--- a/gtk/gtktoolbar.c
+++ b/gtk/gtktoolbar.c
@@ -80,7 +80,7 @@ typedef struct _ToolbarContent ToolbarContent;
 #define ACCEL_THRESHOLD 0.18	   /* After how much time in seconds will items start speeding up */
 
 
-struct _GtkToolbarPriv
+struct _GtkToolbarPrivate
 {
   GtkIconSize      icon_size;
   GtkMenu         *menu;
@@ -602,7 +602,7 @@ gtk_toolbar_class_init (GtkToolbarClass *klass)
   add_ctrl_tab_bindings (binding_set, 0, GTK_DIR_TAB_FORWARD);
   add_ctrl_tab_bindings (binding_set, GDK_SHIFT_MASK, GTK_DIR_TAB_BACKWARD);
 
-  g_type_class_add_private (gobject_class, sizeof (GtkToolbarPriv));
+  g_type_class_add_private (gobject_class, sizeof (GtkToolbarPrivate));
 }
 
 static void
@@ -618,11 +618,11 @@ toolbar_tool_shell_iface_init (GtkToolShellIface *iface)
 static void
 gtk_toolbar_init (GtkToolbar *toolbar)
 {
-  GtkToolbarPriv *priv;
+  GtkToolbarPrivate *priv;
 
   toolbar->priv = G_TYPE_INSTANCE_GET_PRIVATE (toolbar,
                                                GTK_TYPE_TOOLBAR,
-                                               GtkToolbarPriv);
+                                               GtkToolbarPrivate);
   priv = toolbar->priv;
 
   gtk_widget_set_can_focus (GTK_WIDGET (toolbar), FALSE);
@@ -667,7 +667,7 @@ gtk_toolbar_set_property (GObject      *object,
 			  GParamSpec   *pspec)
 {
   GtkToolbar *toolbar = GTK_TOOLBAR (object);
-  GtkToolbarPriv *priv = toolbar->priv;
+  GtkToolbarPrivate *priv = toolbar->priv;
 
   switch (prop_id)
     {
@@ -703,7 +703,7 @@ gtk_toolbar_get_property (GObject    *object,
 			  GParamSpec *pspec)
 {
   GtkToolbar *toolbar = GTK_TOOLBAR (object);
-  GtkToolbarPriv *priv = toolbar->priv;
+  GtkToolbarPrivate *priv = toolbar->priv;
 
   switch (prop_id)
     {
@@ -732,7 +732,7 @@ static void
 gtk_toolbar_map (GtkWidget *widget)
 {
   GtkToolbar *toolbar = GTK_TOOLBAR (widget);
-  GtkToolbarPriv *priv = toolbar->priv;
+  GtkToolbarPrivate *priv = toolbar->priv;
 
   GTK_WIDGET_CLASS (gtk_toolbar_parent_class)->map (widget);
 
@@ -744,7 +744,7 @@ static void
 gtk_toolbar_unmap (GtkWidget *widget)
 {
   GtkToolbar *toolbar = GTK_TOOLBAR (widget);
-  GtkToolbarPriv *priv = toolbar->priv;
+  GtkToolbarPrivate *priv = toolbar->priv;
 
   if (priv->event_window)
     gdk_window_hide (priv->event_window);
@@ -757,7 +757,7 @@ gtk_toolbar_realize (GtkWidget *widget)
 {
   GtkAllocation allocation;
   GtkToolbar *toolbar = GTK_TOOLBAR (widget);
-  GtkToolbarPriv *priv = toolbar->priv;
+  GtkToolbarPrivate *priv = toolbar->priv;
   GdkWindow *window;
   GdkWindowAttr attributes;
   gint attributes_mask;
@@ -797,7 +797,7 @@ static void
 gtk_toolbar_unrealize (GtkWidget *widget)
 {
   GtkToolbar *toolbar = GTK_TOOLBAR (widget);
-  GtkToolbarPriv *priv = toolbar->priv;
+  GtkToolbarPrivate *priv = toolbar->priv;
 
   if (priv->event_window)
     {
@@ -815,7 +815,7 @@ gtk_toolbar_expose (GtkWidget      *widget,
 {
   GtkAllocation allocation;
   GtkToolbar *toolbar = GTK_TOOLBAR (widget);
-  GtkToolbarPriv *priv = toolbar->priv;
+  GtkToolbarPrivate *priv = toolbar->priv;
   GList *list;
   guint border_width;
 
@@ -854,7 +854,7 @@ gtk_toolbar_size_request (GtkWidget      *widget,
 			  GtkRequisition *requisition)
 {
   GtkToolbar *toolbar = GTK_TOOLBAR (widget);
-  GtkToolbarPriv *priv = toolbar->priv;
+  GtkToolbarPrivate *priv = toolbar->priv;
   GList *list;
   gint max_child_height;
   gint max_child_width;
@@ -983,7 +983,7 @@ position (GtkToolbar *toolbar,
           gint        to,
           gdouble     elapsed)
 {
-  GtkToolbarPriv *priv = toolbar->priv;
+  GtkToolbarPrivate *priv = toolbar->priv;
   gint n_pixels;
 
   if (!priv->animation)
@@ -1016,7 +1016,7 @@ compute_intermediate_allocation (GtkToolbar          *toolbar,
 				 const GtkAllocation *goal,
 				 GtkAllocation       *intermediate)
 {
-  GtkToolbarPriv *priv = toolbar->priv;
+  GtkToolbarPrivate *priv = toolbar->priv;
   gdouble elapsed = g_timer_elapsed (priv->timer, NULL);
 
   intermediate->x      = position (toolbar, start->x, goal->x, elapsed);
@@ -1054,7 +1054,7 @@ static gint
 get_item_size (GtkToolbar     *toolbar,
 	       ToolbarContent *content)
 {
-  GtkToolbarPriv *priv = toolbar->priv;
+  GtkToolbarPrivate *priv = toolbar->priv;
   GtkRequisition requisition;
   
   toolbar_content_size_request (content, toolbar, &requisition);
@@ -1079,7 +1079,7 @@ static gboolean
 slide_idle_handler (gpointer data)
 {
   GtkToolbar *toolbar = GTK_TOOLBAR (data);
-  GtkToolbarPriv *priv = toolbar->priv;
+  GtkToolbarPrivate *priv = toolbar->priv;
   GList *list;
 
   if (priv->need_sync)
@@ -1174,7 +1174,7 @@ gtk_toolbar_begin_sliding (GtkToolbar *toolbar)
 {
   GtkAllocation allocation;
   GtkWidget *widget = GTK_WIDGET (toolbar);
-  GtkToolbarPriv *priv = toolbar->priv;
+  GtkToolbarPrivate *priv = toolbar->priv;
   GtkStyle *style;
   GList *list;
   gint cur_x;
@@ -1274,7 +1274,7 @@ gtk_toolbar_begin_sliding (GtkToolbar *toolbar)
 static void
 gtk_toolbar_stop_sliding (GtkToolbar *toolbar)
 {
-  GtkToolbarPriv *priv = toolbar->priv;
+  GtkToolbarPrivate *priv = toolbar->priv;
 
   if (priv->is_sliding)
     {
@@ -1317,7 +1317,7 @@ static void
 menu_deactivated (GtkWidget  *menu,
 		  GtkToolbar *toolbar)
 {
-  GtkToolbarPriv *priv = toolbar->priv;
+  GtkToolbarPrivate *priv = toolbar->priv;
 
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->arrow_button), FALSE);
 }
@@ -1327,7 +1327,7 @@ menu_detached (GtkWidget  *widget,
 	       GtkMenu    *menu)
 {
   GtkToolbar *toolbar = GTK_TOOLBAR (widget);
-  GtkToolbarPriv *priv = toolbar->priv;
+  GtkToolbarPrivate *priv = toolbar->priv;
 
   priv->menu = NULL;
 }
@@ -1335,7 +1335,7 @@ menu_detached (GtkWidget  *widget,
 static void
 rebuild_menu (GtkToolbar *toolbar)
 {
-  GtkToolbarPriv *priv = toolbar->priv;
+  GtkToolbarPrivate *priv = toolbar->priv;
   GList *list, *children;
 
   if (!priv->menu)
@@ -1403,7 +1403,7 @@ gtk_toolbar_size_allocate (GtkWidget     *widget,
 {
   GtkAllocation widget_allocation;
   GtkToolbar *toolbar = GTK_TOOLBAR (widget);
-  GtkToolbarPriv *priv = toolbar->priv;
+  GtkToolbarPrivate *priv = toolbar->priv;
   GtkAllocation *allocations;
   ItemState *new_states;
   GtkAllocation arrow_allocation;
@@ -1786,7 +1786,7 @@ gtk_toolbar_size_allocate (GtkWidget     *widget,
 static void
 gtk_toolbar_update_button_relief (GtkToolbar *toolbar)
 {
-  GtkToolbarPriv *priv = toolbar->priv;
+  GtkToolbarPrivate *priv = toolbar->priv;
   GtkReliefStyle relief;
 
   relief = get_button_relief (toolbar);
@@ -1804,7 +1804,7 @@ gtk_toolbar_style_set (GtkWidget *widget,
 		       GtkStyle  *prev_style)
 {
   GtkToolbar *toolbar = GTK_TOOLBAR (widget);
-  GtkToolbarPriv *priv = toolbar->priv;
+  GtkToolbarPrivate *priv = toolbar->priv;
 
   priv->max_homogeneous_pixels = -1;
 
@@ -1821,7 +1821,7 @@ static GList *
 gtk_toolbar_list_children_in_focus_order (GtkToolbar       *toolbar,
 					  GtkDirectionType  dir)
 {
-  GtkToolbarPriv *priv = toolbar->priv;
+  GtkToolbarPrivate *priv = toolbar->priv;
   GList *result = NULL;
   GList *list;
   gboolean rtl;
@@ -1974,7 +1974,7 @@ toolbar_get_settings (GtkToolbar *toolbar)
 static void
 style_change_notify (GtkToolbar *toolbar)
 {
-  GtkToolbarPriv *priv = toolbar->priv;
+  GtkToolbarPrivate *priv = toolbar->priv;
 
   if (!priv->style_set)
     {
@@ -1987,7 +1987,7 @@ style_change_notify (GtkToolbar *toolbar)
 static void
 icon_size_change_notify (GtkToolbar *toolbar)
 {
-  GtkToolbarPriv *priv = toolbar->priv;
+  GtkToolbarPrivate *priv = toolbar->priv;
 
   if (!priv->icon_size_set)
     {
@@ -2000,7 +2000,7 @@ icon_size_change_notify (GtkToolbar *toolbar)
 static void
 animation_change_notify (GtkToolbar *toolbar)
 {
-  GtkToolbarPriv *priv = toolbar->priv;
+  GtkToolbarPrivate *priv = toolbar->priv;
   GtkSettings *settings = toolbar_get_settings (toolbar);
   gboolean animation;
 
@@ -2032,7 +2032,7 @@ gtk_toolbar_screen_changed (GtkWidget *widget,
 			    GdkScreen *previous_screen)
 {
   GtkToolbar *toolbar = GTK_TOOLBAR (widget);
-  GtkToolbarPriv *priv = toolbar->priv;
+  GtkToolbarPrivate *priv = toolbar->priv;
   GtkSettings *old_settings = toolbar_get_settings (toolbar);
   GtkSettings *settings;
   
@@ -2073,7 +2073,7 @@ find_drop_index (GtkToolbar *toolbar,
 		 gint        x,
 		 gint        y)
 {
-  GtkToolbarPriv *priv = toolbar->priv;
+  GtkToolbarPrivate *priv = toolbar->priv;
   GList *interesting_content;
   GList *list;
   GtkOrientation orientation;
@@ -2163,7 +2163,7 @@ find_drop_index (GtkToolbar *toolbar,
 static void
 reset_all_placeholders (GtkToolbar *toolbar)
 {
-  GtkToolbarPriv *priv = toolbar->priv;
+  GtkToolbarPrivate *priv = toolbar->priv;
   GList *list;
   
   for (list = priv->content; list != NULL; list = list->next)
@@ -2178,7 +2178,7 @@ static gint
 physical_to_logical (GtkToolbar *toolbar,
 		     gint        physical)
 {
-  GtkToolbarPriv *priv = toolbar->priv;
+  GtkToolbarPrivate *priv = toolbar->priv;
   GList *list;
   int logical;
   
@@ -2203,7 +2203,7 @@ static gint
 logical_to_physical (GtkToolbar *toolbar,
 		     gint        logical)
 {
-  GtkToolbarPriv *priv = toolbar->priv;
+  GtkToolbarPrivate *priv = toolbar->priv;
   GList *list;
   gint physical;
   
@@ -2253,7 +2253,7 @@ gtk_toolbar_set_drop_highlight_item (GtkToolbar  *toolbar,
 				     gint         index_)
 {
   ToolbarContent *content;
-  GtkToolbarPriv *priv;
+  GtkToolbarPrivate *priv;
   gint n_items;
   GtkRequisition requisition;
   GtkRequisition old_requisition;
@@ -2409,7 +2409,7 @@ static void
 gtk_toolbar_show_all (GtkWidget *widget)
 {
   GtkToolbar *toolbar = GTK_TOOLBAR (widget);
-  GtkToolbarPriv *priv = toolbar->priv;
+  GtkToolbarPrivate *priv = toolbar->priv;
   GList *list;
 
   for (list = priv->content; list != NULL; list = list->next)
@@ -2426,7 +2426,7 @@ static void
 gtk_toolbar_hide_all (GtkWidget *widget)
 {
   GtkToolbar *toolbar = GTK_TOOLBAR (widget);
-  GtkToolbarPriv *priv = toolbar->priv;
+  GtkToolbarPrivate *priv = toolbar->priv;
   GList *list;
 
   for (list = priv->content; list != NULL; list = list->next)
@@ -2453,7 +2453,7 @@ gtk_toolbar_remove (GtkContainer *container,
 		    GtkWidget    *widget)
 {
   GtkToolbar *toolbar = GTK_TOOLBAR (container);
-  GtkToolbarPriv *priv = toolbar->priv;
+  GtkToolbarPrivate *priv = toolbar->priv;
   ToolbarContent *content_to_remove;
   GList *list;
 
@@ -2484,7 +2484,7 @@ gtk_toolbar_forall (GtkContainer *container,
 		    gpointer      callback_data)
 {
   GtkToolbar *toolbar = GTK_TOOLBAR (container);
-  GtkToolbarPriv *priv = toolbar->priv;
+  GtkToolbarPrivate *priv = toolbar->priv;
   GList *list;
   
   g_return_if_fail (callback != NULL);
@@ -2519,7 +2519,7 @@ gtk_toolbar_child_type (GtkContainer *container)
 static void
 gtk_toolbar_reconfigured (GtkToolbar *toolbar)
 {
-  GtkToolbarPriv *priv = toolbar->priv;
+  GtkToolbarPrivate *priv = toolbar->priv;
   GList *list;
   
   list = priv->content;
@@ -2538,7 +2538,7 @@ static void
 gtk_toolbar_orientation_changed (GtkToolbar    *toolbar,
 				 GtkOrientation orientation)
 {
-  GtkToolbarPriv *priv = toolbar->priv;
+  GtkToolbarPrivate *priv = toolbar->priv;
 
   if (priv->orientation != orientation)
     {
@@ -2560,7 +2560,7 @@ static void
 gtk_toolbar_real_style_changed (GtkToolbar     *toolbar,
 				GtkToolbarStyle style)
 {
-  GtkToolbarPriv *priv = toolbar->priv;
+  GtkToolbarPrivate *priv = toolbar->priv;
 
   if (priv->style != style)
     {
@@ -2582,7 +2582,7 @@ menu_position_func (GtkMenu  *menu,
 {
   GtkAllocation allocation;
   GtkToolbar *toolbar = GTK_TOOLBAR (user_data);
-  GtkToolbarPriv *priv = toolbar->priv;
+  GtkToolbarPrivate *priv = toolbar->priv;
   GtkRequisition req;
   GtkRequisition menu_req;
   GdkRectangle monitor;
@@ -2637,7 +2637,7 @@ static void
 show_menu (GtkToolbar     *toolbar,
 	   GdkEventButton *event)
 {
-  GtkToolbarPriv *priv = toolbar->priv;
+  GtkToolbarPrivate *priv = toolbar->priv;
 
   rebuild_menu (toolbar);
 
@@ -2653,7 +2653,7 @@ static void
 gtk_toolbar_arrow_button_clicked (GtkWidget  *button,
 				  GtkToolbar *toolbar)
 {
-  GtkToolbarPriv *priv = toolbar->priv;
+  GtkToolbarPrivate *priv = toolbar->priv;
 
   if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->arrow_button)) &&
       (!priv->menu || !gtk_widget_get_visible (GTK_WIDGET (priv->menu))))
@@ -2792,7 +2792,7 @@ gint
 gtk_toolbar_get_item_index (GtkToolbar  *toolbar,
 			    GtkToolItem *item)
 {
-  GtkToolbarPriv *priv;
+  GtkToolbarPrivate *priv;
   GList *list;
   int n;
   
@@ -2830,7 +2830,7 @@ void
 gtk_toolbar_set_style (GtkToolbar      *toolbar,
 		       GtkToolbarStyle  style)
 {
-  GtkToolbarPriv *priv;
+  GtkToolbarPrivate *priv;
 
   g_return_if_fail (GTK_IS_TOOLBAR (toolbar));
 
@@ -2867,7 +2867,7 @@ gtk_toolbar_get_style (GtkToolbar *toolbar)
 void
 gtk_toolbar_unset_style (GtkToolbar *toolbar)
 {
-  GtkToolbarPriv *priv;
+  GtkToolbarPrivate *priv;
   GtkToolbarStyle style;
   
   g_return_if_fail (GTK_IS_TOOLBAR (toolbar));
@@ -2905,7 +2905,7 @@ gtk_toolbar_unset_style (GtkToolbar *toolbar)
 gint
 gtk_toolbar_get_n_items (GtkToolbar *toolbar)
 {
-  GtkToolbarPriv *priv;
+  GtkToolbarPrivate *priv;
 
   g_return_val_if_fail (GTK_IS_TOOLBAR (toolbar), -1);
 
@@ -2931,7 +2931,7 @@ GtkToolItem *
 gtk_toolbar_get_nth_item (GtkToolbar *toolbar,
 			  gint        n)
 {
-  GtkToolbarPriv *priv;
+  GtkToolbarPrivate *priv;
   ToolbarContent *content;
   gint n_items;
   
@@ -3004,7 +3004,7 @@ void
 gtk_toolbar_set_show_arrow (GtkToolbar *toolbar,
 			    gboolean    show_arrow)
 {
-  GtkToolbarPriv *priv;
+  GtkToolbarPrivate *priv;
 
   g_return_if_fail (GTK_IS_TOOLBAR (toolbar));
 
@@ -3075,7 +3075,7 @@ gtk_toolbar_finalize (GObject *object)
 {
   GList *list;
   GtkToolbar *toolbar = GTK_TOOLBAR (object);
-  GtkToolbarPriv *priv = toolbar->priv;
+  GtkToolbarPrivate *priv = toolbar->priv;
 
   if (priv->arrow_button)
     gtk_widget_unparent (priv->arrow_button);
@@ -3120,7 +3120,7 @@ void
 gtk_toolbar_set_icon_size (GtkToolbar  *toolbar,
 			   GtkIconSize  icon_size)
 {
-  GtkToolbarPriv *priv;
+  GtkToolbarPrivate *priv;
 
   g_return_if_fail (GTK_IS_TOOLBAR (toolbar));
   g_return_if_fail (icon_size != GTK_ICON_SIZE_INVALID);
@@ -3154,7 +3154,7 @@ gtk_toolbar_set_icon_size (GtkToolbar  *toolbar,
 void
 gtk_toolbar_unset_icon_size (GtkToolbar *toolbar)
 {
-  GtkToolbarPriv *priv;
+  GtkToolbarPrivate *priv;
   GtkIconSize size;
 
   g_return_if_fail (GTK_IS_TOOLBAR (toolbar));
@@ -3212,7 +3212,7 @@ toolbar_content_new_tool_item (GtkToolbar  *toolbar,
 			       gboolean     is_placeholder,
 			       gint	    pos)
 {
-  GtkToolbarPriv *priv = toolbar->priv;
+  GtkToolbarPrivate *priv = toolbar->priv;
   ToolbarContent *content;
 
   content = g_slice_new0 (ToolbarContent);
@@ -3242,7 +3242,7 @@ static void
 toolbar_content_remove (ToolbarContent *content,
 			GtkToolbar     *toolbar)
 {
-  GtkToolbarPriv *priv = toolbar->priv;
+  GtkToolbarPrivate *priv = toolbar->priv;
 
   gtk_widget_unparent (GTK_WIDGET (content->item));
 
@@ -3296,7 +3296,7 @@ static gboolean
 toolbar_content_visible (ToolbarContent *content,
 			 GtkToolbar     *toolbar)
 {
-  GtkToolbarPriv *priv = toolbar->priv;
+  GtkToolbarPrivate *priv = toolbar->priv;
   GtkToolItem *item;
 
   item = content->item;
@@ -3334,7 +3334,7 @@ static gboolean
 toolbar_content_is_homogeneous (ToolbarContent *content,
 				GtkToolbar     *toolbar)
 {
-  GtkToolbarPriv *priv = toolbar->priv;
+  GtkToolbarPrivate *priv = toolbar->priv;
   GtkRequisition requisition;
   gboolean result;
   
@@ -3619,7 +3619,7 @@ _gtk_toolbar_paint_space_line (GtkWidget           *widget,
 			       const GdkRectangle  *area,
 			       const GtkAllocation *allocation)
 {
-  GtkToolbarPriv *priv = toolbar->priv;
+  GtkToolbarPrivate *priv = toolbar->priv;
   GtkOrientation orientation;
   GtkStateType  state;
   GtkStyle     *style;
@@ -3736,7 +3736,7 @@ static GtkIconSize
 toolbar_get_icon_size (GtkToolShell *shell)
 {
   GtkToolbar *toolbar = GTK_TOOLBAR (shell);
-  GtkToolbarPriv *priv = toolbar->priv;
+  GtkToolbarPrivate *priv = toolbar->priv;
 
   return priv->icon_size;
 }
@@ -3745,7 +3745,7 @@ static GtkOrientation
 toolbar_get_orientation (GtkToolShell *shell)
 {
   GtkToolbar *toolbar = GTK_TOOLBAR (shell);
-  GtkToolbarPriv *priv = toolbar->priv;
+  GtkToolbarPrivate *priv = toolbar->priv;
 
   return priv->orientation;
 }
@@ -3754,7 +3754,7 @@ static GtkToolbarStyle
 toolbar_get_style (GtkToolShell *shell)
 {
   GtkToolbar *toolbar = GTK_TOOLBAR (shell);
-  GtkToolbarPriv *priv = toolbar->priv;
+  GtkToolbarPrivate *priv = toolbar->priv;
 
   return priv->style;
 }
@@ -3769,7 +3769,7 @@ static void
 toolbar_rebuild_menu (GtkToolShell *shell)
 {
   GtkToolbar *toolbar = GTK_TOOLBAR (shell);
-  GtkToolbarPriv *priv = toolbar->priv;
+  GtkToolbarPrivate *priv = toolbar->priv;
   GList *list;
 
   priv->need_rebuild = TRUE;
diff --git a/gtk/gtktoolbar.h b/gtk/gtktoolbar.h
index 4aa7c23984..922fa0e790 100644
--- a/gtk/gtktoolbar.h
+++ b/gtk/gtktoolbar.h
@@ -56,15 +56,15 @@ typedef enum
   GTK_TOOLBAR_SPACE_LINE
 } GtkToolbarSpaceStyle;
 
-typedef struct _GtkToolbar           GtkToolbar;
-typedef struct _GtkToolbarPriv       GtkToolbarPriv;
-typedef struct _GtkToolbarClass      GtkToolbarClass;
+typedef struct _GtkToolbar              GtkToolbar;
+typedef struct _GtkToolbarPrivate       GtkToolbarPrivate;
+typedef struct _GtkToolbarClass         GtkToolbarClass;
 
 struct _GtkToolbar
 {
   GtkContainer container;
 
-  GtkToolbarPriv *priv;
+  GtkToolbarPrivate *priv;
 };
 
 struct _GtkToolbarClass
diff --git a/gtk/gtkviewport.c b/gtk/gtkviewport.c
index f244742c2b..59a5084c5e 100644
--- a/gtk/gtkviewport.c
+++ b/gtk/gtkviewport.c
@@ -51,7 +51,7 @@
  * exactly this, so you can ignore the presence of the viewport.
  */
 
-struct _GtkViewportPriv
+struct _GtkViewportPrivate
 {
   GtkAdjustment  *hadjustment;
   GtkAdjustment  *vadjustment;
@@ -183,7 +183,7 @@ gtk_viewport_class_init (GtkViewportClass *class)
 		  GTK_TYPE_ADJUSTMENT,
 		  GTK_TYPE_ADJUSTMENT);
 
-  g_type_class_add_private (class, sizeof (GtkViewportPriv));
+  g_type_class_add_private (class, sizeof (GtkViewportPrivate));
 }
 
 static void
@@ -220,7 +220,7 @@ gtk_viewport_get_property (GObject         *object,
 			   GParamSpec      *pspec)
 {
   GtkViewport *viewport = GTK_VIEWPORT (object);
-  GtkViewportPriv *priv = viewport->priv;
+  GtkViewportPrivate *priv = viewport->priv;
 
   switch (prop_id)
     {
@@ -242,11 +242,11 @@ gtk_viewport_get_property (GObject         *object,
 static void
 gtk_viewport_init (GtkViewport *viewport)
 {
-  GtkViewportPriv *priv;
+  GtkViewportPrivate *priv;
 
   viewport->priv = G_TYPE_INSTANCE_GET_PRIVATE (viewport,
                                                 GTK_TYPE_VIEWPORT,
-                                                GtkViewportPriv);
+                                                GtkViewportPrivate);
   priv = viewport->priv;
 
   gtk_widget_set_has_window (GTK_WIDGET (viewport), TRUE);
@@ -337,7 +337,7 @@ gtk_viewport_destroy (GtkObject *object)
 GtkAdjustment*
 gtk_viewport_get_hadjustment (GtkViewport *viewport)
 {
-  GtkViewportPriv *priv;
+  GtkViewportPrivate *priv;
 
   g_return_val_if_fail (GTK_IS_VIEWPORT (viewport), NULL);
 
@@ -360,7 +360,7 @@ gtk_viewport_get_hadjustment (GtkViewport *viewport)
 GtkAdjustment*
 gtk_viewport_get_vadjustment (GtkViewport *viewport)
 {
-  GtkViewportPriv *priv;
+  GtkViewportPrivate *priv;
 
   g_return_val_if_fail (GTK_IS_VIEWPORT (viewport), NULL);
 
@@ -376,7 +376,7 @@ static void
 viewport_get_view_allocation (GtkViewport   *viewport,
 			      GtkAllocation *view_allocation)
 {
-  GtkViewportPriv *priv = viewport->priv;
+  GtkViewportPrivate *priv = viewport->priv;
   GtkStyle *style;
   GtkWidget *widget = GTK_WIDGET (viewport);
   GtkAllocation allocation;
@@ -590,7 +590,7 @@ void
 gtk_viewport_set_shadow_type (GtkViewport   *viewport,
 			      GtkShadowType  type)
 {
-  GtkViewportPriv *priv;
+  GtkViewportPrivate *priv;
   GtkAllocation allocation;
   GtkWidget *widget;
 
@@ -672,7 +672,7 @@ static void
 gtk_viewport_realize (GtkWidget *widget)
 {
   GtkViewport *viewport = GTK_VIEWPORT (widget);
-  GtkViewportPriv *priv = viewport->priv;
+  GtkViewportPrivate *priv = viewport->priv;
   GtkBin *bin = GTK_BIN (widget);
   GtkAdjustment *hadjustment = gtk_viewport_get_hadjustment (viewport);
   GtkAdjustment *vadjustment = gtk_viewport_get_vadjustment (viewport);
@@ -761,7 +761,7 @@ static void
 gtk_viewport_unrealize (GtkWidget *widget)
 {
   GtkViewport *viewport = GTK_VIEWPORT (widget);
-  GtkViewportPriv *priv = viewport->priv;
+  GtkViewportPrivate *priv = viewport->priv;
 
   gdk_window_set_user_data (priv->view_window, NULL);
   gdk_window_destroy (priv->view_window);
@@ -781,7 +781,7 @@ gtk_viewport_paint (GtkWidget    *widget,
   if (gtk_widget_is_drawable (widget))
     {
       GtkViewport *viewport = GTK_VIEWPORT (widget);
-      GtkViewportPriv *priv = viewport->priv;
+      GtkViewportPrivate *priv = viewport->priv;
 
       gtk_paint_shadow (gtk_widget_get_style (widget),
                         gtk_widget_get_window (widget),
@@ -800,7 +800,7 @@ gtk_viewport_expose (GtkWidget      *widget,
   if (gtk_widget_is_drawable (widget))
     {
       viewport = GTK_VIEWPORT (widget);
-      GtkViewportPriv *priv = viewport->priv;
+      GtkViewportPrivate *priv = viewport->priv;
 
       if (event->window == gtk_widget_get_window (widget))
 	gtk_viewport_paint (widget, &event->area);
@@ -824,7 +824,7 @@ gtk_viewport_add (GtkContainer *container,
 {
   GtkBin *bin = GTK_BIN (container);
   GtkViewport *viewport = GTK_VIEWPORT (bin);
-  GtkViewportPriv *priv = viewport->priv;
+  GtkViewportPrivate *priv = viewport->priv;
 
   g_return_if_fail (gtk_bin_get_child (bin) == NULL);
 
@@ -839,7 +839,7 @@ gtk_viewport_size_allocate (GtkWidget     *widget,
 {
   GtkAllocation widget_allocation;
   GtkViewport *viewport = GTK_VIEWPORT (widget);
-  GtkViewportPriv *priv = viewport->priv;
+  GtkViewportPrivate *priv = viewport->priv;
   GtkBin *bin = GTK_BIN (widget);
   guint border_width;
   gboolean hadjustment_value_changed, vadjustment_value_changed;
@@ -909,7 +909,7 @@ gtk_viewport_adjustment_value_changed (GtkAdjustment *adjustment,
 				       gpointer       data)
 {
   GtkViewport *viewport = GTK_VIEWPORT (data);
-  GtkViewportPriv *priv = viewport->priv;
+  GtkViewportPrivate *priv = viewport->priv;
   GtkBin *bin = GTK_BIN (data);
   GtkWidget *child;
 
@@ -943,7 +943,7 @@ gtk_viewport_style_set (GtkWidget *widget,
      {
         GtkStyle *style;
 	GtkViewport *viewport = GTK_VIEWPORT (widget);
-        GtkViewportPriv *priv = viewport->priv;
+        GtkViewportPrivate *priv = viewport->priv;
 
         style = gtk_widget_get_style (widget);
         gtk_style_set_background (style, priv->bin_window, GTK_STATE_NORMAL);
@@ -968,7 +968,7 @@ gtk_viewport_get_size (GtkSizeRequest *widget,
 		       gint           *natural_size)
 {
   GtkViewport *viewport = GTK_VIEWPORT (widget);
-  GtkViewportPriv *priv = viewport->priv;
+  GtkViewportPrivate *priv = viewport->priv;
   GtkStyle  *style;
   GtkWidget *child;
   gint       child_min, child_nat;
diff --git a/gtk/gtkviewport.h b/gtk/gtkviewport.h
index 3495410c5a..fcbff21dd8 100644
--- a/gtk/gtkviewport.h
+++ b/gtk/gtkviewport.h
@@ -47,16 +47,16 @@ G_BEGIN_DECLS
 #define GTK_VIEWPORT_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_VIEWPORT, GtkViewportClass))
 
 
-typedef struct _GtkViewport       GtkViewport;
-typedef struct _GtkViewportPriv   GtkViewportPriv;
-typedef struct _GtkViewportClass  GtkViewportClass;
+typedef struct _GtkViewport              GtkViewport;
+typedef struct _GtkViewportPrivate       GtkViewportPrivate;
+typedef struct _GtkViewportClass         GtkViewportClass;
 
 struct _GtkViewport
 {
   GtkBin bin;
 
   /* <private> */
-  GtkViewportPriv *priv;
+  GtkViewportPrivate *priv;
 };
 
 struct _GtkViewportClass
author	Javier Jardón <jjardon@gnome.org>	2010-08-26 19:15:37 +0200
committer	Javier Jardón <jjardon@gnome.org>	2010-08-27 04:48:23 +0200
commit	1e5d7c022596b7146638ef8bd74f544725f9bf2b (patch)
tree	61505bd6664441c672463e0d3c085aa199a8dbd8
parent	c6a44d849424ac77c478d56ff727ebc742d054b0 (diff)
download	gtk+-1e5d7c022596b7146638ef8bd74f544725f9bf2b.tar.gz