diff --git a/examples/plugins/example.c b/examples/plugins/example.c
index 7a4a7d093b..b958272bb1 100644
--- a/examples/plugins/example.c
+++ b/examples/plugins/example.c
@@ -47,8 +47,8 @@ static GstPadFactory sink_factory = {
   GST_PAD_FACTORY_CAPS(
   "example_sink",					/* the name of the caps */
      "unknown/unknown",					/* the mime type of the caps */
-     "something",  	GST_PROPS_INT (1),		/* a property */
-     "foo", 		GST_PROPS_BOOLEAN (TRUE)	/* another property */
+     "something",	GST_PROPS_INT (1),		/* a property */
+     "foo",		GST_PROPS_BOOLEAN (TRUE)	/* another property */
   ),
   NULL
 };
@@ -65,13 +65,13 @@ static GstPadFactory src_factory = {
 };
 
 
-static void 	gst_example_class_init		(GstExampleClass *klass);
-static void 	gst_example_init		(GstExample *example);
+static void	gst_example_class_init		(GstExampleClass *klass);
+static void	gst_example_init		(GstExample *example);
 
-static void 	gst_example_chain 		(GstPad *pad, GstBuffer *buf);
+static void	gst_example_chain		(GstPad *pad, GstBuffer *buf);
 
-static void 	gst_example_set_arg		(GtkObject *object,GtkArg *arg,guint id);
-static void 	gst_example_get_arg		(GtkObject *object,GtkArg *arg,guint id);
+static void	gst_example_set_arg		(GtkObject *object,GtkArg *arg,guint id);
+static void	gst_example_get_arg		(GtkObject *object,GtkArg *arg,guint id);
 
 GstPadTemplate *src_template, *sink_template;
 
@@ -79,7 +79,7 @@ static GstElementClass *parent_class = NULL;
 //static guint gst_example_signals[LAST_SIGNAL] = { 0 };
 
 GtkType
-gst_example_get_type(void) 
+gst_example_get_type(void)
 {
   static GtkType example_type = 0;
 
@@ -99,8 +99,8 @@ gst_example_get_type(void)
   return example_type;
 }
 
-static void 
-gst_example_class_init (GstExampleClass *klass) 
+static void
+gst_example_class_init (GstExampleClass *klass)
 {
   GtkObjectClass *gtkobject_class;
   GstElementClass *gstelement_class;
@@ -113,12 +113,12 @@ gst_example_class_init (GstExampleClass *klass)
   gtk_object_add_arg_type("GstExample::active", GTK_TYPE_INT,
                           GTK_ARG_READWRITE, ARG_ACTIVE);
 
-  gtkobject_class->set_arg = gst_example_set_arg;  
+  gtkobject_class->set_arg = gst_example_set_arg;
   gtkobject_class->get_arg = gst_example_get_arg;
 }
 
-static void 
-gst_example_init(GstExample *example) 
+static void
+gst_example_init(GstExample *example)
 {
   example->sinkpad = gst_pad_new_from_template (sink_template, "sink");
   gst_element_add_pad(GST_ELEMENT(example),example->sinkpad);
@@ -130,8 +130,8 @@ gst_example_init(GstExample *example)
   example->active = FALSE;
 }
 
-static void 
-gst_example_chain (GstPad *pad, GstBuffer *buf) 
+static void
+gst_example_chain (GstPad *pad, GstBuffer *buf)
 {
   GstExample *example;
 
@@ -152,8 +152,8 @@ gst_example_chain (GstPad *pad, GstBuffer *buf)
   gst_pad_push(example->srcpad,buf);
 }
 
-static void 
-gst_example_set_arg (GtkObject *object,GtkArg *arg,guint id) 
+static void
+gst_example_set_arg (GtkObject *object,GtkArg *arg,guint id)
 {
   GstExample *example;
 
@@ -171,8 +171,8 @@ gst_example_set_arg (GtkObject *object,GtkArg *arg,guint id)
   }
 }
 
-static void 
-gst_example_get_arg (GtkObject *object,GtkArg *arg,guint id) 
+static void
+gst_example_get_arg (GtkObject *object,GtkArg *arg,guint id)
 {
   GstExample *example;
 
@@ -191,7 +191,7 @@ gst_example_get_arg (GtkObject *object,GtkArg *arg,guint id)
 }
 
 GstPlugin*
-plugin_init (GModule *module) 
+plugin_init (GModule *module)
 {
   GstPlugin *plugin;
   GstElementFactory *factory;
diff --git a/examples/plugins/example.h b/examples/plugins/example.h
index a04f5ba297..d7f19a3f99 100644
--- a/examples/plugins/example.h
+++ b/examples/plugins/example.h
@@ -30,6 +30,7 @@ extern "C" {
 
 /* Definition of structure storing data for this element. */
 typedef struct _GstExample GstExample;
+
 struct _GstExample {
   GstElement element;
 
diff --git a/gst/gstxml.c b/gst/gstxml.c
index 78d5def445..6f92516f7f 100644
--- a/gst/gstxml.c
+++ b/gst/gstxml.c
@@ -121,7 +121,7 @@ gst_xml_write (GstElement *element)
   xmlNewGlobalNs (doc, "http://gstreamer.net/gst-core/1.0/", "gst");
   ns = xmlNewNs (doc->xmlRootNode, "http://gstreamer.net/gst-core/1.0/", "gst");
 
-  doc->xmlRootNode = xmlNewDocNode (doc, ns, "GST-Pipeline", NULL);
+  doc->xmlRootNode = xmlNewDocNode (doc, ns, "gstreamer", NULL);
 
   elementnode = xmlNewChild (doc->xmlRootNode, NULL, "element", NULL);
 
@@ -146,7 +146,7 @@ gst_xml_real_parse (GstXML *xml, xmlDocPtr doc, const guchar *root)
     g_warning("gstxml: document of wrong type, core namespace not found\n");
     return FALSE;
   }
-  if (strcmp(cur->name, "GST-Pipeline")) {
+  if (strcmp(cur->name, "gstreamer")) {
     g_warning("gstxml: XML file is in wrong format\n");
     return FALSE;
   }
diff --git a/tests/old/examples/plugins/example.c b/tests/old/examples/plugins/example.c
index 7a4a7d093b..b958272bb1 100644
--- a/tests/old/examples/plugins/example.c
+++ b/tests/old/examples/plugins/example.c
@@ -47,8 +47,8 @@ static GstPadFactory sink_factory = {
   GST_PAD_FACTORY_CAPS(
   "example_sink",					/* the name of the caps */
      "unknown/unknown",					/* the mime type of the caps */
-     "something",  	GST_PROPS_INT (1),		/* a property */
-     "foo", 		GST_PROPS_BOOLEAN (TRUE)	/* another property */
+     "something",	GST_PROPS_INT (1),		/* a property */
+     "foo",		GST_PROPS_BOOLEAN (TRUE)	/* another property */
   ),
   NULL
 };
@@ -65,13 +65,13 @@ static GstPadFactory src_factory = {
 };
 
 
-static void 	gst_example_class_init		(GstExampleClass *klass);
-static void 	gst_example_init		(GstExample *example);
+static void	gst_example_class_init		(GstExampleClass *klass);
+static void	gst_example_init		(GstExample *example);
 
-static void 	gst_example_chain 		(GstPad *pad, GstBuffer *buf);
+static void	gst_example_chain		(GstPad *pad, GstBuffer *buf);
 
-static void 	gst_example_set_arg		(GtkObject *object,GtkArg *arg,guint id);
-static void 	gst_example_get_arg		(GtkObject *object,GtkArg *arg,guint id);
+static void	gst_example_set_arg		(GtkObject *object,GtkArg *arg,guint id);
+static void	gst_example_get_arg		(GtkObject *object,GtkArg *arg,guint id);
 
 GstPadTemplate *src_template, *sink_template;
 
@@ -79,7 +79,7 @@ static GstElementClass *parent_class = NULL;
 //static guint gst_example_signals[LAST_SIGNAL] = { 0 };
 
 GtkType
-gst_example_get_type(void) 
+gst_example_get_type(void)
 {
   static GtkType example_type = 0;
 
@@ -99,8 +99,8 @@ gst_example_get_type(void)
   return example_type;
 }
 
-static void 
-gst_example_class_init (GstExampleClass *klass) 
+static void
+gst_example_class_init (GstExampleClass *klass)
 {
   GtkObjectClass *gtkobject_class;
   GstElementClass *gstelement_class;
@@ -113,12 +113,12 @@ gst_example_class_init (GstExampleClass *klass)
   gtk_object_add_arg_type("GstExample::active", GTK_TYPE_INT,
                           GTK_ARG_READWRITE, ARG_ACTIVE);
 
-  gtkobject_class->set_arg = gst_example_set_arg;  
+  gtkobject_class->set_arg = gst_example_set_arg;
   gtkobject_class->get_arg = gst_example_get_arg;
 }
 
-static void 
-gst_example_init(GstExample *example) 
+static void
+gst_example_init(GstExample *example)
 {
   example->sinkpad = gst_pad_new_from_template (sink_template, "sink");
   gst_element_add_pad(GST_ELEMENT(example),example->sinkpad);
@@ -130,8 +130,8 @@ gst_example_init(GstExample *example)
   example->active = FALSE;
 }
 
-static void 
-gst_example_chain (GstPad *pad, GstBuffer *buf) 
+static void
+gst_example_chain (GstPad *pad, GstBuffer *buf)
 {
   GstExample *example;
 
@@ -152,8 +152,8 @@ gst_example_chain (GstPad *pad, GstBuffer *buf)
   gst_pad_push(example->srcpad,buf);
 }
 
-static void 
-gst_example_set_arg (GtkObject *object,GtkArg *arg,guint id) 
+static void
+gst_example_set_arg (GtkObject *object,GtkArg *arg,guint id)
 {
   GstExample *example;
 
@@ -171,8 +171,8 @@ gst_example_set_arg (GtkObject *object,GtkArg *arg,guint id)
   }
 }
 
-static void 
-gst_example_get_arg (GtkObject *object,GtkArg *arg,guint id) 
+static void
+gst_example_get_arg (GtkObject *object,GtkArg *arg,guint id)
 {
   GstExample *example;
 
@@ -191,7 +191,7 @@ gst_example_get_arg (GtkObject *object,GtkArg *arg,guint id)
 }
 
 GstPlugin*
-plugin_init (GModule *module) 
+plugin_init (GModule *module)
 {
   GstPlugin *plugin;
   GstElementFactory *factory;
diff --git a/tests/old/examples/plugins/example.h b/tests/old/examples/plugins/example.h
index a04f5ba297..d7f19a3f99 100644
--- a/tests/old/examples/plugins/example.h
+++ b/tests/old/examples/plugins/example.h
@@ -30,6 +30,7 @@ extern "C" {
 
 /* Definition of structure storing data for this element. */
 typedef struct _GstExample GstExample;
+
 struct _GstExample {
   GstElement element;