diff --git a/ChangeLog b/ChangeLog
index 9ced67d92..36c960a4c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2003-10-23  Martin Willemoes Hansen  <mwh@sysrq.dk>
+
+	* gtk/Gtk.metadata: Added metadata from sources/Gtk.metadata
+	* gtk/gtk-api.xml: Reflects changes of the metadata move, 
+	  tags are swapped around.
+	* sources/Gtk.metadata: Removed metadata, which are moved to 
+	  gtk/Gtk.metadata
+
 2003-10-22  Martin Willemoes Hansen  <mwh@sysrq.dk>
 
 	* gtk/Gtk.metadata: Added metadata from sources/Gtk.metadata
diff --git a/gtk/Gtk.metadata b/gtk/Gtk.metadata
index de765511d..c18c170b4 100644
--- a/gtk/Gtk.metadata
+++ b/gtk/Gtk.metadata
@@ -1,6 +1,8 @@
 <?xml version="1.0"?>
 <metadata>
   <attr path="//callback[@cname='GtkClipboardGetFunc']/*/*[@type='GtkSelectionData*']" name="pass_as">ref</attr>
+  <attr path="//interface[@cname='GtkCellEditable']/signal[@name='RemoveWidget']" name="name">WidgetRemoved</attr>
+  <attr path="//interface[@cname='GtkCellEditable']/method[@name='EditingDone']" name="name">FinishEditing</attr>
   <attr path="//interface[@cname='GtkEditable']/method[@name='GetEditable']" name="name">GetIsEditable</attr>
   <attr path="//interface[@cname='GtkEditable']/method[@name='SetEditable']" name="name">SetIsEditable</attr>
   <attr path="//interface[@cname='GtkEditable']/method[@name='InsertText']/*/*[@name='position']" name="pass_as">ref</attr>
@@ -13,6 +15,15 @@
   <attr path="//interface[@cname='GtkTreeModel']/method[@name='IterNext']/*/*[@name='iter']" name="pass_as">out</attr>
   <attr path="//interface[@cname='GtkTreeModel']/method[@name='IterNthChild']/*/*[@name='iter']" name="pass_as">out</attr>
   <attr path="//interface[@cname='GtkTreeModel']/method[@name='IterParent']/*/*[@name='iter']" name="pass_as">out</attr>
+  <attr path="//interface[@cname='GtkTreeModel']/method[@name='RowChanged']" name="name">EmitRowChanged</attr>
+  <attr path="//interface[@cname='GtkTreeModel']/method[@name='RowDeleted']" name="name">EmitRowDeleted</attr>
+  <attr path="//interface[@cname='GtkTreeModel']/method[@name='RowHasChildToggled']" name="name">EmitRowHasChildToggled</attr>
+  <attr path="//interface[@cname='GtkTreeModel']/method[@name='RowInserted']" name="name">EmitRowInserted</attr>
+  <attr path="//interface[@cname='GtkTreeModel']/method[@name='RowsReordered']" name="name">EmitRowsReordered</attr>
+  <attr path="//interface[@cname='GtkTreeSortable']/method[@name='SortColumnChanged']" name="name">ChangeSortColumn</attr>
+  <attr path="//object[@cname='GtkAdjustment']/method[@name='Changed']" name="name">Change</attr>
+  <attr path="//object[@cname='GtkAdjustment']/method[@name='ValueChanged']" name="name">ChangeValue</attr>
+  <attr path="//object[@cname='GtkBin']/method[@name='GetChild']" name="new_flag">1</attr>
   <attr path="//object[@cname='GtkButton']/constructor[@cname='gtk_button_new_with_mnemonic']" name="preferred">1</attr>
   <attr path="//object[@cname='GtkButton']/signal[@name='Activate']" name="name">Activated</attr>
   <attr path="//object[@cname='GtkButton']/signal[@name='Enter']" name="name">Entered</attr>
@@ -20,21 +31,36 @@
   <attr path="//object[@cname='GtkButton']/method[@name='Clicked']" name="name">Click</attr>
   <attr path="//object[@cname='GtkButton']/method[@name='Pressed']" name="name">Press</attr>
   <attr path="//object[@cname='GtkButton']/method[@name='Released']" name="name">Release</attr>
+  <attr path="//object[@cname='GtkCalendar']/method[@name='DisplayOptions']" name="name">SetDisplayOptions</attr>
   <attr path="//object[@cname='GtkCheckButton']/constructor[@cname='gtk_check_button_new_with_mnemonic']" name="preferred">1</attr>
   <attr path="//object[@cname='GtkCheckMenuItem']/constructor[@cname='gtk_check_menu_item_new_with_mnemonic']" name="preferred">1</attr>
+  <attr path="//object[@cname='GtkCheckMenuItem']/method[@name='Toggled']" name="name">Toggle</attr>
   <attr path="//object[@cname='GtkContainer']/signal[@name='Add']" name="name">Added</attr>
   <attr path="//object[@cname='GtkContainer']/signal[@name='Remove']" name="name">Removed</attr>
   <attr path="//object[@cname='GtkContainer']/signal[@name='SetFocusChild']" name="name">FocusChildSet</attr>
+  <attr path="//object[@cname='GtkContainer']/signal[@name='CheckResize']" name="name">ResizeChecked</attr>
+  <attr path="//object[@cname='GtkDialog']/method[@name='Response']" name="name">Respond</attr>
   <attr path="//object[@cname='GtkEntry']/signal[@name='Activate']" name="name">Activated</attr>
   <attr path="//object[@cname='GtkEntry']/signal[@name='PasteClipboard']" name="name">ClipboardPasted</attr>
   <attr path="//object[@cname='GtkEntry']/signal[@name='CutClipboard']" name="name">ClipboardCut</attr>
   <attr path="//object[@cname='GtkEntry']/signal[@name='CopyClipboard']" name="name">ClipboardCopied</attr>
   <attr path="//object[@cname='GtkImageMenuItem']/constructor[@cname='gtk_image_menu_item_new_with_mnemonic']" name="preferred">1</attr>
   <attr path="//object[@cname='GtkIMContext']/signal[@name='DeleteSurrounding']" name="name">SurroundingDeleted</attr>
+  <attr path="//object[@cname='GtkInvisible']/property[@name='Screen']" name="new_flag">1</attr>
   <attr path="//object[@cname='GtkItem']/signal[@name='Select']" name="name">Selected</attr>
   <attr path="//object[@cname='GtkItem']/signal[@name='Deselect']" name="name">Deselected</attr>
   <attr path="//object[@cname='GtkItem']/signal[@name='Toggle']" name="name">Toggled</attr>
   <attr path="//object[@cname='GtkLabel']/constructor[@cname='gtk_label_new']" name="preferred">1</attr>
+  <attr path="//object[@cname='GtkLayout']/signal[@name='SetScrollAdjustments']" name="name">ScrollAdjustmentsSet</attr>
+  <attr path="//object[@cname='GtkListStore']/constructor[@cname='gtk_list_store_newv']/parameters" name="va_type">length_param</attr>
+  <attr path="//object[@cname='GtkListStore']/method[@name='Append']/*/*[@name='iter']" name="pass_as">out</attr>
+  <attr path="//object[@cname='GtkListStore']/method[@name='Insert']/*/*[@name='iter']" name="pass_as">out</attr>
+  <attr path="//object[@cname='GtkListStore']/method[@name='InsertAfter']/*/*[@name='iter']" name="pass_as">out</attr>
+  <attr path="//object[@cname='GtkListStore']/method[@name='InsertBefore']/*/*[@name='iter']" name="pass_as">out</attr>
+  <attr path="//object[@cname='GtkListStore']/method[@name='Prepend']/*/*[@name='iter']" name="pass_as">out</attr>
+  <attr path="//object[@cname='GtkListStore']/method[@name='Remove']/*/*[@name='iter']" name="pass_as">out</attr>
+  <attr path="//object[@cname='GtkListStore']/method[@name='SetColumnTypes']/*/*[@name='types']" name="array">1</attr>
+  <attr path="//object[@cname='GtkMenu']/method[@name='SetScreen']" name="new_flag">1</attr>
   <attr path="//object[@cname='GtkMenuItem']/constructor[@cname='gtk_menu_item_new_with_mnemonic']" name="preferred">1</attr>
   <attr path="//object[@cname='GtkMenuItem']/signal[@name='Activate']" name="name">Activated</attr>
   <attr path="//object[@cname='GtkMenuItem']/signal[@name='Deactivate']" name="name">Deactivated</attr>
@@ -45,18 +71,13 @@
   <attr path="//object[@cname='GtkMenuItem']/signal[@name='MnemonicActivate']" name="name">MnemonicActivated</attr>
   <attr path="//object[@cname='GtkMenuItem']/signal[@name='SizeRequest']" name="name">SizeRequested</attr>
   <attr path="//object[@cname='GtkMenuItem']/signal[@name='ChildNotify']" name="name">ChildNotified</attr>
-  <attr path="//object[@cname='GtkListStore']/constructor[@cname='gtk_list_store_newv']/parameters" name="va_type">length_param</attr>
-  <attr path="//object[@cname='GtkListStore']/method[@name='Append']/*/*[@name='iter']" name="pass_as">out</attr>
-  <attr path="//object[@cname='GtkListStore']/method[@name='Insert']/*/*[@name='iter']" name="pass_as">out</attr>
-  <attr path="//object[@cname='GtkListStore']/method[@name='InsertAfter']/*/*[@name='iter']" name="pass_as">out</attr>
-  <attr path="//object[@cname='GtkListStore']/method[@name='InsertBefore']/*/*[@name='iter']" name="pass_as">out</attr>
-  <attr path="//object[@cname='GtkListStore']/method[@name='Prepend']/*/*[@name='iter']" name="pass_as">out</attr>
-  <attr path="//object[@cname='GtkListStore']/method[@name='Remove']/*/*[@name='iter']" name="pass_as">out</attr>
-  <attr path="//object[@cname='GtkListStore']/method[@name='SetColumnTypes']/*/*[@name='types']" name="array">1</attr>
+  <attr path="//object[@cname='GtkMenuShell']/signal[@name='Deactivate']" name="name">Deactivated</attr>
+  <attr path="//object[@cname='GtkObject']/signal[@name='Destroy']" name="name">Destroyed</attr>
   <attr path="//object[@cname='GtkProgressBar']" name="parent">GtkWidget</attr>
   <attr path="//object[@cname='GtkRadioButton']/constructor[@cname='gtk_radio_button_new_with_mnemonic']" name="preferred">1</attr>
   <attr path="//object[@cname='GtkRadioMenuItem']/constructor[@cname='gtk_radio_menu_item_new_with_mnemonic']" name="preferred">1</attr>
   <attr path="//object[@cname='GtkScrolledWindow']/method[@name='GetPolicy']/*/*[@type='GtkPolicyType*']" name="pass_as">out</attr>
+  <attr path="//object[@cname='GtkText']/signal[@name='SetScrollAdjustments']" name="name">ScrollAdjustmentsSet</attr>
   <attr path="//object[@cname='GtkTextBuffer']/method[@name='GetBounds']/*/*[@type='GtkTextIter*']" name="pass_as">out</attr>
   <attr path="//object[@cname='GtkTextBuffer']/method[@name='GetEndIter']/*/*[@type='GtkTextIter*']" name="pass_as">out</attr>
   <attr path="//object[@cname='GtkTextBuffer']/method[@name='GetIterAtChildAnchor']/*/*[@type='GtkTextIter*']" name="pass_as">out</attr>
@@ -69,16 +90,19 @@
   <attr path="//object[@cname='GtkTextBuffer']/method[@name='GetStartIter']/*/*[@type='GtkTextIter*']" name="pass_as">out</attr>
   <attr path="//object[@cname='GtkTextBuffer']/method[@name='GetInsert']" name="name">GetInsertMark</attr>
   <attr path="//object[@cname='GtkTextBuffer']/signal[@name='ApplyTag']" name="name">TagApplied</attr>
+  <attr path="//object[@cname='GtkTextBuffer']/signal[@name='BeginUserAction']" name="name">UserActionBegun</attr>
+  <attr path="//object[@cname='GtkTextBuffer']/signal[@name='EndUserAction']" name="name">UserActionEnded</attr>
   <attr path="//object[@cname='GtkTextBuffer']/signal[@name='InsertChildAnchor']" name="name">ChildAnchorInserted</attr>
   <attr path="//object[@cname='GtkTextBuffer']/signal[@name='InsertPixbuf']" name="name">PixbufInserted</attr>
-  <attr path="//object[@cname='GtkTextBuffer']/signal[@name='RemoveTag']" name="name">TagRemoved</attr>
   <attr path="//object[@cname='GtkTextBuffer']/signal[@name='RemoveChildAnchor']" name="name">ChildAnchorRemoved</attr>
+  <attr path="//object[@cname='GtkTextBuffer']/signal[@name='RemoveTag']" name="name">TagRemoved</attr>
   <attr path="//object[@cname='GtkTextLayout']/method[@name='GetIterAtLine']/*/*[@type='GtkTextIter*']" name="pass_as">out</attr>
   <attr path="//object[@cname='GtkTextTag']/method[@name='Event']" name="name">ProcessEvent</attr>
   <attr path="//object[@cname='GtkTextTag']/signal[@name='Event']" name="name">TextEvent</attr>
   <attr path="//object[@cname='GtkTextTag']/property[@name='Weight']" name="type">PangoWeight</attr>
   <attr path="//object[@cname='GtkTextView']/method[@name='GetIterAtLocation']/*/*[@type='GtkTextIter*']" name="pass_as">out</attr>
   <attr path="//object[@cname='GtkTextView']/method[@name='GetLineAtY']/*/*[@type='GtkTextIter*']" name="pass_as">out</attr>
+  <attr path="//object[@cname='GtkTextView']/signal[@name='SetScrollAdjustments']" name="name">ScrollAdjustmentsSet</attr>
   <attr path="//object[@cname='GtkToggleButton']/constructor[@cname='gtk_toggle_button_new_with_mnemonic']" name="preferred">1</attr>
   <attr path="//object[@cname='GtkToggleButton']/method[@name='Toggled']" name="name">Toggle</attr>
   <attr path="//object[@cname='GtkTreeModelSort']/method[@name='ConvertChildIterToIter']/*/*[@name='sort_iter']" name="pass_as">out</attr>
@@ -99,8 +123,21 @@
   <attr path="//object[@cname='GtkTreeView']/method[@name='GetDestRowAtPos']/*/*[@name='path']" name="pass_as">out</attr>
   <attr path="//object[@cname='GtkTreeView']/method[@name='GetDragDestRow']/*/*[@name='pos']" name="pass_as">out</attr>
   <attr path="//object[@cname='GtkTreeView']/method[@name='GetDragDestRow']/*/*[@name='path']" name="pass_as">out</attr>
+  <attr path="//object[@cname='GtkTreeView']/method[@name='RowActivated']" name="name">ActivateRow</attr>
+  <attr path="//object[@cname='GtkTreeView']/method[@name='RowExpanded']" name="name">RowExpand</attr>
+  <attr path="//object[@cname='GtkTreeView']/signal[@name='SetScrollAdjustments']" name="name">ScrollAdjustmentsSet</attr>
+  <attr path="//object[@cname='GtkTreeViewColumn']/method[@name='Clicked']" name="name">Click</attr>
+  <attr path="//object[@cname='GtkViewport']/signal[@name='SetScrollAdjustments']" name="name">ScrollAdjustmentsSet</attr>
   <attr path="//object[@cname='GtkWidget']/method[@name='ClassPath']/*/*[@type='gchar**']" name="pass_as">out</attr>
   <attr path="//object[@cname='GtkWidget']/method[@name='Event']" name="name">ProcessEvent</attr>
+  <attr path="//object[@cname='GtkWidget']/method[@name='GetStyle']" name="needs_ref">1</attr>
+  <attr path="//object[@cname='GtkWidget']/method[@name='GetModifierStyle']" name="needs_ref">1</attr>
+  <attr path="//object[@cname='GtkWidget']/method[@name='GetDefaultStyle']" name="needs_ref">1</attr>
+  <attr path="//object[@cname='GtkWidget']/method[@name='GetParentWindow']" name="needs_ref">1</attr>
+  <attr path="//object[@cname='GtkWidget']/method[@name='GetColormap']" name="needs_ref">1</attr>
+  <attr path="//object[@cname='GtkWidget']/method[@name='GetVisual']" name="needs_ref">1</attr>
+  <attr path="//object[@cname='GtkWidget']/method[@name='GetDefaultColormap']" name="needs_ref">1</attr>
+  <attr path="//object[@cname='GtkWidget']/method[@name='GetDefaultVisual']" name="needs_ref">1</attr>
   <attr path="//object[@cname='GtkWidget']/method[@name='Intersect']/*/*[@name='intersection']" name="pass_as">out</attr>
   <attr path="//object[@cname='GtkWidget']/method[@name='IsFocus']" name="name">GetIsFocus</attr>
   <attr path="//object[@cname='GtkWidget']/method[@name='Path']/*/*[@type='gchar**']" name="pass_as">out</attr>
@@ -119,8 +156,15 @@
   <attr path="//object[@cname='GtkWidget']/signal[@name='SizeRequest']" name="name">SizeRequested</attr>
   <attr path="//object[@cname='GtkWidget']/signal[@name='Unmap']" name="name">Unmapped</attr>
   <attr path="//object[@cname='GtkWidget']/signal[@name='Unrealize']" name="name">Unrealized</attr>
+  <attr path="//object[@cname='GtkWindow']/signal[@name='ActivateDefault']" name="name">DefaultActivated</attr>
+  <attr path="//object[@cname='GtkWindow']/signal[@name='ActivateFocus']" name="name">FocusActivated</attr>
+  <attr path="//object[@cname='GtkWindow']/property[@name='Screen']" name="new_flag">1</attr>
+  <attr path="//object[@cname='GtkWindow']/method[@name='GetPosition']/*/*[@type='gint*']" name="pass_as">out</attr>
+  <attr path="//object[@cname='GtkWindow']/method[@name='GetSize']/*/*[@type='gint*']" name="pass_as">out</attr>
+  <attr path="//object[@cname='GtkWindow']/method[@name='GetDefaultSize']/*/*[@type='gint*']" name="pass_as">out</attr>
   <attr path="//struct[@cname='GtkTargetEntry']/field[@cname='flags']" name="type">GtkTargetFlags</attr>
   <attr path="//class[@cname='GtkAccelerator_']/method[@name='GetDefaultModMask']/return-type" name="type">GdkModifierType</attr>
+  <attr path="//class[@cname='GtkStock_']" name="name">StockManager</attr>
   <move-node path="//class[@cname='GtkGlobal']/method[@name='PaintArrow']">//object[@cname='GtkStyle']</move-node>
   <move-node path="//class[@cname='GtkGlobal']/method[@name='PaintBox']">//object[@cname='GtkStyle']</move-node>
   <move-node path="//class[@cname='GtkGlobal']/method[@name='PaintBoxGap']">//object[@cname='GtkStyle']</move-node>
diff --git a/gtk/gtk-api.xml b/gtk/gtk-api.xml
index 85cfa327a..b9bcc46f2 100644
--- a/gtk/gtk-api.xml
+++ b/gtk/gtk-api.xml
@@ -832,13 +832,13 @@
           <parameter type="GtkCellEditable*" name="cell_editable" />
         </parameters>
       </signal>
-      <signal name="WidgetRemoved" cname="remove_widget" when="LAST">
+      <signal cname="remove_widget" when="LAST" name="WidgetRemoved">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkCellEditable*" name="cell_editable" />
         </parameters>
       </signal>
-      <method name="FinishEditing" cname="gtk_cell_editable_editing_done">
+      <method cname="gtk_cell_editable_editing_done" name="FinishEditing">
         <return-type type="void" />
       </method>
       <method name="GetType" cname="gtk_cell_editable_get_type" shared="true">
@@ -1154,34 +1154,34 @@
           <parameter type="GtkTreeIter*" name="iter" />
         </parameters>
       </method>
-      <method name="EmitRowChanged" cname="gtk_tree_model_row_changed">
+      <method cname="gtk_tree_model_row_changed" name="EmitRowChanged">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkTreePath*" name="path" />
           <parameter type="GtkTreeIter*" name="iter" />
         </parameters>
       </method>
-      <method name="EmitRowDeleted" cname="gtk_tree_model_row_deleted">
+      <method cname="gtk_tree_model_row_deleted" name="EmitRowDeleted">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkTreePath*" name="path" />
         </parameters>
       </method>
-      <method name="EmitRowHasChildToggled" cname="gtk_tree_model_row_has_child_toggled">
+      <method cname="gtk_tree_model_row_has_child_toggled" name="EmitRowHasChildToggled">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkTreePath*" name="path" />
           <parameter type="GtkTreeIter*" name="iter" />
         </parameters>
       </method>
-      <method name="EmitRowInserted" cname="gtk_tree_model_row_inserted">
+      <method cname="gtk_tree_model_row_inserted" name="EmitRowInserted">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkTreePath*" name="path" />
           <parameter type="GtkTreeIter*" name="iter" />
         </parameters>
       </method>
-      <method name="EmitRowsReordered" cname="gtk_tree_model_rows_reordered">
+      <method cname="gtk_tree_model_rows_reordered" name="EmitRowsReordered">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkTreePath*" name="path" />
@@ -1240,7 +1240,7 @@
           <parameter type="GtkDestroyNotify" name="destroy" />
         </parameters>
       </method>
-      <method name="ChangeSortColumn" cname="gtk_tree_sortable_sort_column_changed">
+      <method cname="gtk_tree_sortable_sort_column_changed" name="ChangeSortColumn">
         <return-type type="void" />
       </method>
     </interface>
@@ -1394,7 +1394,7 @@
           <parameter type="GtkAdjustment*" name="adjustment" />
         </parameters>
       </signal>
-      <method name="Change" cname="gtk_adjustment_changed">
+      <method cname="gtk_adjustment_changed" name="Change">
         <return-type type="void" />
       </method>
       <method name="ClampPage" cname="gtk_adjustment_clamp_page">
@@ -1426,7 +1426,7 @@
           <parameter type="gdouble" name="value" />
         </parameters>
       </method>
-      <method name="ChangeValue" cname="gtk_adjustment_value_changed">
+      <method cname="gtk_adjustment_value_changed" name="ChangeValue">
         <return-type type="void" />
       </method>
     </object>
@@ -1850,7 +1850,7 @@
       <method name="ClearMarks" cname="gtk_calendar_clear_marks">
         <return-type type="void" />
       </method>
-      <method name="SetDisplayOptions" cname="gtk_calendar_display_options">
+      <method cname="gtk_calendar_display_options" name="SetDisplayOptions">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkCalendarDisplayOptions" name="flags" />
@@ -2159,7 +2159,7 @@
           <parameter type="gboolean" name="setting" />
         </parameters>
       </method>
-      <method name="Toggle" cname="gtk_check_menu_item_toggled">
+      <method cname="gtk_check_menu_item_toggled" name="Toggle">
         <return-type type="void" />
       </method>
     </object>
@@ -2455,7 +2455,7 @@
           <parameter type="GtkWidget*" name="widget" />
         </parameters>
       </signal>
-      <signal name="ResizeChecked" cname="check_resize" when="LAST">
+      <signal cname="check_resize" when="LAST" name="ResizeChecked">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkContainer*" name="container" />
@@ -2782,7 +2782,7 @@
           <parameter ellipsis="true" />
         </parameters>
       </constructor>
-      <method name="Respond" cname="gtk_dialog_response">
+      <method cname="gtk_dialog_response" name="Respond">
         <return-type type="void" />
         <parameters>
           <parameter type="gint" name="response_id" />
@@ -4250,7 +4250,7 @@
       <property name="Vadjustment" cname="vadjustment" type="GtkAdjustment" readable="true" writeable="true" />
       <property name="Width" cname="width" type="guint" readable="true" writeable="true" />
       <property name="Height" cname="height" type="guint" readable="true" writeable="true" />
-      <signal name="ScrollAdjustmentsSet" cname="set_scroll_adjustments" when="LAST">
+      <signal cname="set_scroll_adjustments" when="LAST" name="ScrollAdjustmentsSet">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkLayout*" name="layout" />
@@ -4701,7 +4701,7 @@
       <field cname="ignore_leave" bits="1" type="guint" />
       <field cname="menu_flag" bits="1" type="guint" />
       <field cname="ignore_enter" bits="1" type="guint" />
-      <signal name="Deactivated" cname="deactivate" when="FIRST">
+      <signal cname="deactivate" when="FIRST" name="Deactivated">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkMenuShell*" name="menu_shell" />
@@ -5120,7 +5120,7 @@
     <object name="Object" cname="GtkObject" parent="GObject">
       <field cname="flags" type="guint32" />
       <property name="UserData" cname="user_data" type="gpointer" readable="true" writeable="true" />
-      <signal name="Destroyed" cname="destroy" when="CLEANUP">
+      <signal cname="destroy" when="CLEANUP" name="Destroyed">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkObject*" name="object" />
@@ -6827,13 +6827,13 @@
           <parameter type="const-GtkTextIter*" name="end_char" />
         </parameters>
       </signal>
-      <signal name="UserActionBegun" cname="begin_user_action" when="LAST">
+      <signal cname="begin_user_action" when="LAST" name="UserActionBegun">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkTextBuffer*" name="buffer" />
         </parameters>
       </signal>
-      <signal name="UserActionEnded" cname="end_user_action" when="LAST">
+      <signal cname="end_user_action" when="LAST" name="UserActionEnded">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkTextBuffer*" name="buffer" />
@@ -7534,7 +7534,7 @@
           <parameter type="GtkDirectionType" name="direction" />
         </parameters>
       </signal>
-      <signal name="ScrollAdjustmentsSet" cname="set_scroll_adjustments" when="LAST">
+      <signal cname="set_scroll_adjustments" when="LAST" name="ScrollAdjustmentsSet">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkTextView*" name="text_view" />
@@ -8523,7 +8523,7 @@
       <property name="RulesHint" cname="rules_hint" type="gboolean" readable="true" writeable="true" />
       <property name="EnableSearch" cname="enable_search" type="gboolean" readable="true" writeable="true" />
       <property name="SearchColumn" cname="search_column" type="gint" readable="true" writeable="true" />
-      <signal name="ScrollAdjustmentsSet" cname="set_scroll_adjustments" when="LAST">
+      <signal cname="set_scroll_adjustments" when="LAST" name="ScrollAdjustmentsSet">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkTreeView*" name="tree_view" />
@@ -8854,14 +8854,14 @@
           <parameter type="GtkTreeViewColumn*" name="column" />
         </parameters>
       </method>
-      <method name="ActivateRow" cname="gtk_tree_view_row_activated">
+      <method cname="gtk_tree_view_row_activated" name="ActivateRow">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkTreePath*" name="path" />
           <parameter type="GtkTreeViewColumn*" name="column" />
         </parameters>
       </method>
-      <method name="RowExpand" cname="gtk_tree_view_row_expanded">
+      <method cname="gtk_tree_view_row_expanded" name="RowExpand">
         <return-type type="gboolean" />
         <parameters>
           <parameter type="GtkTreePath*" name="path" />
@@ -9119,7 +9119,7 @@
           <parameter type="GtkCellRenderer*" name="cell_renderer" />
         </parameters>
       </method>
-      <method name="Click" cname="gtk_tree_view_column_clicked">
+      <method cname="gtk_tree_view_column_clicked" name="Click">
         <return-type type="void" />
       </method>
       <method name="FocusCell" cname="gtk_tree_view_column_focus_cell">
@@ -9337,7 +9337,7 @@
       <property name="Hadjustment" cname="hadjustment" type="GtkAdjustment" readable="true" writeable="true" construct-only="true" />
       <property name="Vadjustment" cname="vadjustment" type="GtkAdjustment" readable="true" writeable="true" construct-only="true" />
       <property name="ShadowType" cname="shadow_type" type="GtkShadowType" readable="true" writeable="true" />
-      <signal name="ScrollAdjustmentsSet" cname="set_scroll_adjustments" when="LAST">
+      <signal cname="set_scroll_adjustments" when="LAST" name="ScrollAdjustmentsSet">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkViewport*" name="viewport" />
@@ -10533,13 +10533,13 @@
           <parameter type="GdkEvent*" name="event" />
         </parameters>
       </signal>
-      <signal name="FocusActivated" cname="activate_focus" when="LAST">
+      <signal cname="activate_focus" when="LAST" name="FocusActivated">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkWindow*" name="window" />
         </parameters>
       </signal>
-      <signal name="DefaultActivated" cname="activate_default" when="LAST">
+      <signal cname="activate_default" when="LAST" name="DefaultActivated">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkWindow*" name="window" />
@@ -13118,7 +13118,7 @@
         </parameters>
       </method>
     </class>
-    <class name="StockManager" cname="GtkStock_">
+    <class cname="GtkStock_" name="StockManager">
       <method name="Add" cname="gtk_stock_add" shared="true">
         <return-type type="void" />
         <parameters>
diff --git a/sources/Gtk.metadata b/sources/Gtk.metadata
index c6e2346e9..7550fc0c8 100644
--- a/sources/Gtk.metadata
+++ b/sources/Gtk.metadata
@@ -1,348 +1,6 @@
 <?xml version="1.0"?>
 <metadata>
 
-<!-- renames -->
-<rule>
-  <class name="GtkMenuShell">
-    <signal>Deactivate</signal>
-  </class>
-  <data>
-    <attribute target="signal">
-      <name>name</name>
-      <value>Deactivated</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkCellEditable">
-    <signal>RemoveWidget</signal>
-  </class>
-  <data>
-    <attribute target="signal">
-      <name>name</name>
-      <value>WidgetRemoved</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkCellEditable">
-    <method>EditingDone</method>
-  </class>
-  <data>
-    <attribute target="method">
-      <name>name</name>
-      <value>FinishEditing</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkWindow">
-    <signal>ActivateDefault</signal>
-  </class>
-  <data>
-    <attribute target="signal">
-      <name>name</name>
-      <value>DefaultActivated</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkWindow">
-    <signal>ActivateFocus</signal>
-  </class>
-  <data>
-    <attribute target="signal">
-      <name>name</name>
-      <value>FocusActivated</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkWindow">
-    <method>GetPosition</method>
-  </class>
-  <data>
-    <attribute target="param">
-      <filter level="type">gint*</filter>
-      <name>pass_as</name>
-      <value>out</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkWindow">
-    <method>GetSize</method>
-    <method>GetDefaultSize</method>
-  </class>
-  <data>
-    <attribute target="param">
-      <filter level="type">gint*</filter>
-      <name>pass_as</name>
-      <value>out</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkAdjustment">
-    <method>Changed</method>
-  </class>
-  <data>
-    <attribute target="method">
-      <name>name</name>
-      <value>Change</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkAdjustment">
-    <method>ValueChanged</method>
-  </class>
-  <data>
-    <attribute target="method">
-      <name>name</name>
-      <value>ChangeValue</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkObject">
-    <signal>Destroy</signal>
-  </class>
-  <data>
-    <attribute target="signal">
-      <name>name</name>
-      <value>Destroyed</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkTreeView">
-    <method>RowActivated</method>
-  </class>
-  <data>
-    <attribute target="method">
-      <name>name</name>
-      <value>ActivateRow</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkTreeView">
-    <method>RowExpanded</method>
-  </class>
-  <data>
-    <attribute target="method">
-      <name>name</name>
-      <value>RowExpand</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkTreeModel">
-    <method>RowDeleted</method>
-  </class>
-  <data>
-    <attribute target="method">
-      <name>name</name>
-      <value>EmitRowDeleted</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkTreeModel">
-    <method>RowHasChildToggled</method>
-  </class>
-  <data>
-    <attribute target="method">
-      <name>name</name>
-      <value>EmitRowHasChildToggled</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkTreeModel">
-    <method>RowInserted</method>
-  </class>
-  <data>
-    <attribute target="method">
-      <name>name</name>
-      <value>EmitRowInserted</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkTreeModel">
-    <method>RowChanged</method>
-  </class>
-  <data>
-    <attribute target="method">
-      <name>name</name>
-      <value>EmitRowChanged</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkTreeModel">
-    <method>RowsReordered</method>
-  </class>
-  <data>
-    <attribute target="method">
-      <name>name</name>
-      <value>EmitRowsReordered</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkTreeSortable">
-    <method>SortColumnChanged</method>
-  </class>
-  <data>
-    <attribute target="method">
-      <name>name</name>
-      <value>ChangeSortColumn</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkDialog">
-    <method>Response</method>
-  </class>
-  <data>
-    <attribute target="method">
-      <name>name</name>
-      <value>Respond</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkTextBuffer">
-    <signal>EndUserAction</signal>
-  </class>
-  <data>
-    <attribute target="signal">
-      <name>name</name>
-      <value>UserActionEnded</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkTextBuffer">
-    <signal>BeginUserAction</signal>
-  </class>
-  <data>
-    <attribute target="signal">
-      <name>name</name>
-      <value>UserActionBegun</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkCheckMenuItem">
-    <method>Toggled</method>
-  </class>
-  <data>
-    <attribute target="method">
-      <name>name</name>
-      <value>Toggle</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkContainer">
-    <signal>CheckResize</signal>
-  </class>
-  <data>
-    <attribute target="signal">
-      <name>name</name>
-      <value>ResizeChecked</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkTreeViewColumn">
-    <method>Clicked</method>
-  </class>
-  <data>
-    <attribute target="method">
-      <name>name</name>
-      <value>Click</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkLayout">
-    <signal>SetScrollAdjustments</signal>
-  </class>
-  <class name="GtkText">
-    <signal>SetScrollAdjustments</signal>
-  </class>
-  <class name="GtkTextView">
-    <signal>SetScrollAdjustments</signal>
-  </class>
-  <class name="GtkTreeView">
-    <signal>SetScrollAdjustments</signal>
-  </class>
-  <class name="GtkViewport">
-    <signal>SetScrollAdjustments</signal>
-  </class>
-  <data>
-    <attribute target="signal">
-      <name>name</name>
-      <value>ScrollAdjustmentsSet</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkCalendar">
-    <method>DisplayOptions</method>
-  </class>
-  <data>
-    <attribute target="method">
-      <name>name</name>
-      <value>SetDisplayOptions</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkStock_"/>
-  <data>
-    <attribute target="class">
-      <name>name</name>
-      <value>StockManager</value>
-    </attribute>
-  </data>
-</rule>
-
-<!-- new_flags -->
-<rule>
-  <class name="GtkInvisible">
-    <property>Screen</property>
-  </class>
-  <class name="GtkWindow">
-    <property>Screen</property>
-  </class>
-  <data>
-    <attribute target="property">
-      <name>new_flag</name>
-      <value>1</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkBin">
-    <method>GetChild</method>
-  </class>
-  <class name="GtkMenu">
-    <method>SetScreen</method>
-  </class>
-  <data>
-    <attribute target="method">
-      <name>new_flag</name>
-      <value>1</value>
-    </attribute>
-  </data>
-</rule>
-
 <!-- hidden classes -->
 <rule>
   <class name="GtkBindingArg"/>
@@ -1036,25 +694,4 @@
   </data>
 </rule>
 
-
-<!-- reference rules -->
-<rule>
-  <class name="GtkWidget">
-    <method>GetStyle</method>
-    <method>GetModifierStyle</method>
-    <method>GetDefaultStyle</method>
-    <method>GetParentWindow</method>
-    <method>GetColormap</method>
-    <method>GetVisual</method>
-    <method>GetDefaultColormap</method>
-    <method>GetDefaultVisual</method>
-  </class>
-  <data>
-    <attribute target="method">
-      <name>needs_ref</name>
-      <value>1</value>
-    </attribute>
-  </data>
-</rule>
-
 </metadata>