diff --git a/ChangeLog b/ChangeLog
index fdcd34fd4..60b94a12e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+2003-07-10  Mike Kestner <mkestner@speakeasy.net>
+
+	* api/*-api.xml : regenerated
+	* gdk/Threads.cs : killed since the methods are now gen'd
+	* generator/ClassGen.cs : new, static class generatable
+	* generator/Parameters.cs : mangle new and byte as param names
+	* generator/Parser.cs : parse new <class> elements
+	* generator/SymbolTable.cs : add GC SimpleGen
+	* parser/gapi2xml.pl : static class element fixes
+	* parser/GAPI/Metadata.pm : add class element
+	* sources/Art.metadata: new, rename Affine.ToString method
+	* sources/Atk.metadata: rename State class
+	* sources/Gdk.metadata: hide Pixbuf static class for now. rename
+	Event and Pango static classes to avoid collisions.
+	* sources/Gnome.metadata: rename Gtk and Gdk static classes to 
+	avoid collisions.
+	* sources/GnomeDb.metadata: rename Stock static class to 
+	avoid collisions.
+	* sources/Gtk.metadata: rename Stock static class to 
+	avoid collisions. Hide Idle class.
+
 2003-07-08  Ettore Perazzoli  <ettore@ximian.com>
 
 	* gtk/Layout.custom: New file, adding the Layout::BinWindow
diff --git a/api/art-api.xml b/api/art-api.xml
index e0ba010f6..4a7adc195 100644
--- a/api/art-api.xml
+++ b/api/art-api.xml
@@ -749,7 +749,7 @@
       <field cname="dash" type="double*"/>
     </struct>
     <alias name="ArtBoolean" cname="art_boolean" type="int"/>
-    <Class name="Affine">
+    <class name="Affine" cname="ArtAffine_">
       <method name="Equal" cname="art_affine_equal" shared="true">
         <return-type type="int"/>
         <parameters>
@@ -829,7 +829,7 @@
           <parameter type="double" name="theta"/>
         </parameters>
       </method>
-      <method name="ToString" cname="art_affine_to_string" shared="true">
+      <method name="ToStringArray" cname="art_affine_to_string" shared="true">
         <return-type type="void"/>
         <parameters>
           <parameter type="char" array="true" name="str"/>
@@ -844,8 +844,8 @@
           <parameter type="double" name="ty"/>
         </parameters>
       </method>
-    </Class>
-    <Class name="Global">
+    </class>
+    <class name="Global" cname="ArtGlobal">
       <method name="BezPathToVec" cname="art_bez_path_to_vec" shared="true">
         <return-type type="ArtVpath*"/>
         <parameters>
@@ -889,8 +889,8 @@
           <parameter type="int*" name="p_nrects"/>
         </parameters>
       </method>
-    </Class>
-    <Class name="Rgb">
+    </class>
+    <class name="Rgb" cname="ArtRgb_">
       <method name="AAffine" cname="art_rgb_a_affine" shared="true">
         <return-type type="void"/>
         <parameters>
@@ -1030,8 +1030,8 @@
           <parameter type="ArtAlphaGamma*" name="alphagamma"/>
         </parameters>
       </method>
-    </Class>
-    <Class name="Rgba">
+    </class>
+    <class name="Rgba" cname="ArtRgba_">
       <method name="FillRun" cname="art_rgba_fill_run" shared="true">
         <return-type type="void"/>
         <parameters>
@@ -1061,6 +1061,6 @@
           <parameter type="int" name="n"/>
         </parameters>
       </method>
-    </Class>
+    </class>
   </namespace>
 </api>
diff --git a/api/atk-api.xml b/api/atk-api.xml
index d4b56536d..bf7e82dbe 100644
--- a/api/atk-api.xml
+++ b/api/atk-api.xml
@@ -1383,7 +1383,7 @@
       <field cname="new_value" type="GValue"/>
     </struct>
     <alias name="State" cname="AtkState" type="guint64"/>
-    <Class name="Global">
+    <class name="Global" cname="AtkGlobal">
       <method name="AddFocusTracker" cname="atk_add_focus_tracker" shared="true">
         <return-type type="guint"/>
         <parameters>
@@ -1434,8 +1434,26 @@
           <parameter type="guint" name="listener_id"/>
         </parameters>
       </method>
-    </Class>
-    <Class name="Focus">
+      <method name="RoleForName" cname="atk_role_for_name" shared="true">
+        <return-type type="AtkRole"/>
+        <parameters>
+          <parameter type="const-gchar*" name="name"/>
+        </parameters>
+      </method>
+      <method name="RoleGetName" cname="atk_role_get_name" shared="true">
+        <return-type type="const-gchar*"/>
+        <parameters>
+          <parameter type="AtkRole" name="role"/>
+        </parameters>
+      </method>
+      <method name="RoleRegister" cname="atk_role_register" shared="true">
+        <return-type type="AtkRole"/>
+        <parameters>
+          <parameter type="const-gchar*" name="name"/>
+        </parameters>
+      </method>
+    </class>
+    <class name="Focus" cname="AtkFocus_">
       <method name="TrackerInit" cname="atk_focus_tracker_init" shared="true">
         <return-type type="void"/>
         <parameters>
@@ -1448,28 +1466,8 @@
           <parameter type="AtkObject*" name="object"/>
         </parameters>
       </method>
-    </Class>
-    <Class name="Role">
-      <method name="ForName" cname="atk_role_for_name" shared="true">
-        <return-type type="AtkRole"/>
-        <parameters>
-          <parameter type="const-gchar*" name="name"/>
-        </parameters>
-      </method>
-      <method name="GetName" cname="atk_role_get_name" shared="true">
-        <return-type type="const-gchar*"/>
-        <parameters>
-          <parameter type="AtkRole" name="role"/>
-        </parameters>
-      </method>
-      <method name="Register" cname="atk_role_register" shared="true">
-        <return-type type="AtkRole"/>
-        <parameters>
-          <parameter type="const-gchar*" name="name"/>
-        </parameters>
-      </method>
-    </Class>
-    <Class name="State">
+    </class>
+    <class name="StateManager" cname="AtkState_">
       <method name="TypeForName" cname="atk_state_type_for_name" shared="true">
         <return-type type="AtkStateType"/>
         <parameters>
@@ -1488,6 +1486,6 @@
           <parameter type="const-gchar*" name="name"/>
         </parameters>
       </method>
-    </Class>
+    </class>
   </namespace>
 </api>
diff --git a/api/gda-api.xml b/api/gda-api.xml
index b976dfce7..c025104e7 100644
--- a/api/gda-api.xml
+++ b/api/gda-api.xml
@@ -2660,7 +2660,7 @@
     <struct name="XqlValueRefClass" cname="GdaXqlValueRefClass">
       <field cname="parent_class" type="GdaXqlAtomClass"/>
     </struct>
-    <Class name="Config">
+    <class name="Config" cname="GdaConfig_">
       <method name="AddListener" cname="gda_config_add_listener" shared="true">
         <return-type type="guint"/>
         <parameters>
@@ -2843,8 +2843,8 @@
           <parameter type="const-gchar*" name="new_value"/>
         </parameters>
       </method>
-    </Class>
-    <Class name="File">
+    </class>
+    <class name="File" cname="GdaFile_">
       <method name="Load" cname="gda_file_load" shared="true">
         <return-type type="gchar*"/>
         <parameters>
@@ -2859,8 +2859,8 @@
           <parameter type="gint" name="len"/>
         </parameters>
       </method>
-    </Class>
-    <Class name="Log">
+    </class>
+    <class name="Log" cname="GdaLog_">
       <method name="CleanAll" cname="gda_log_clean_all" shared="true">
         <return-type type="void"/>
         <parameters>
@@ -2905,8 +2905,8 @@
           <parameter ellipsis="true"/>
         </parameters>
       </method>
-    </Class>
-    <Class name="Main">
+    </class>
+    <class name="Main" cname="GdaMain_">
       <method name="Quit" cname="gda_main_quit" shared="true">
         <return-type type="void"/>
       </method>
@@ -2917,8 +2917,8 @@
           <parameter type="gpointer" name="user_data"/>
         </parameters>
       </method>
-    </Class>
-    <Class name="Global">
+    </class>
+    <class name="Global" cname="GdaGlobal">
       <method name="SqlReplacePlaceholders" cname="gda_sql_replace_placeholders" shared="true">
         <return-type type="gchar*"/>
         <parameters>
@@ -2932,8 +2932,8 @@
           <parameter type="GHashTable*" name="hash_table"/>
         </parameters>
       </method>
-    </Class>
-    <Class name="Type">
+    </class>
+    <class name="Type" cname="GdaType_">
       <method name="FromString" cname="gda_type_from_string" shared="true">
         <return-type type="GdaValueType"/>
         <parameters>
@@ -2946,8 +2946,8 @@
           <parameter type="GdaValueType" name="type"/>
         </parameters>
       </method>
-    </Class>
-    <Class name="Xql">
+    </class>
+    <class name="Xql" cname="GdaXql_">
       <method name="DestroyHashPair" cname="gda_xql_destroy_hash_pair" shared="true">
         <return-type type="gboolean"/>
         <parameters>
@@ -2991,6 +2991,6 @@
           <parameter type="xmlNode*" name="parNode"/>
         </parameters>
       </method>
-    </Class>
+    </class>
   </namespace>
 </api>
diff --git a/api/gdk-api.xml b/api/gdk-api.xml
index f8a95b3f6..03b4bc6d0 100644
--- a/api/gdk-api.xml
+++ b/api/gdk-api.xml
@@ -2333,7 +2333,7 @@
         <return-type type="gchar*"/>
       </method>
     </struct>
-    <Class name="Global">
+    <class name="Global" cname="GdkGlobal">
       <method name="AddClientMessageFilter" cname="gdk_add_client_message_filter" shared="true">
         <return-type type="void"/>
         <parameters>
@@ -2446,8 +2446,8 @@
           <parameter type="guint32" name="wc"/>
         </parameters>
       </method>
-    </Class>
-    <Class name="Drag">
+    </class>
+    <class name="Drag" cname="GdkDrag_">
       <method name="Abort" cname="gdk_drag_abort" shared="true">
         <return-type type="void"/>
         <parameters>
@@ -2514,8 +2514,8 @@
           <parameter type="guint32" name="time"/>
         </parameters>
       </method>
-    </Class>
-    <Class name="Drop">
+    </class>
+    <class name="Drop" cname="GdkDrop_">
       <method name="Finish" cname="gdk_drop_finish" shared="true">
         <return-type type="void"/>
         <parameters>
@@ -2532,16 +2532,16 @@
           <parameter type="guint32" name="time"/>
         </parameters>
       </method>
-    </Class>
-    <Class name="Error">
+    </class>
+    <class name="Error" cname="GdkError_">
       <method name="TrapPop" cname="gdk_error_trap_pop" shared="true">
         <return-type type="gint"/>
       </method>
       <method name="TrapPush" cname="gdk_error_trap_push" shared="true">
         <return-type type="void"/>
       </method>
-    </Class>
-    <Class name="Event">
+    </class>
+    <class name="EventHelper" cname="GdkEvent_">
       <method name="Copy" cname="gdk_event_copy" shared="true">
         <return-type type="GdkEvent*"/>
         <parameters>
@@ -2633,8 +2633,8 @@
           <parameter type="GdkEvent*" name="event"/>
         </parameters>
       </method>
-    </Class>
-    <Class name="Keyboard">
+    </class>
+    <class name="Keyboard" cname="GdkKeyboard_">
       <method name="Grab" cname="gdk_keyboard_grab" shared="true">
         <return-type type="GdkGrabStatus"/>
         <parameters>
@@ -2649,8 +2649,8 @@
           <parameter type="guint32" name="time"/>
         </parameters>
       </method>
-    </Class>
-    <Class name="Keyval">
+    </class>
+    <class name="Keyval" cname="GdkKeyval_">
       <method name="ConvertCase" cname="gdk_keyval_convert_case" shared="true">
         <return-type type="void"/>
         <parameters>
@@ -2701,8 +2701,8 @@
           <parameter type="guint" name="keyval"/>
         </parameters>
       </method>
-    </Class>
-    <Class name="Pango">
+    </class>
+    <class name="PangoHelper" cname="GdkPango_">
       <method name="ContextGet" cname="gdk_pango_context_get" shared="true">
         <return-type type="PangoContext*"/>
       </method>
@@ -2733,8 +2733,8 @@
           <parameter type="gint" name="n_ranges"/>
         </parameters>
       </method>
-    </Class>
-    <Class name="Pixbuf">
+    </class>
+    <class name="Pixbuf" cname="GdkPixbuf_" hidden="1">
       <method name="GetFromDrawable" cname="gdk_pixbuf_get_from_drawable" shared="true">
         <return-type type="GdkPixbuf*"/>
         <parameters>
@@ -2831,8 +2831,8 @@
           <parameter type="int" name="y_dither"/>
         </parameters>
       </method>
-    </Class>
-    <Class name="Pointer">
+    </class>
+    <class name="Pointer" cname="GdkPointer_">
       <method name="Grab" cname="gdk_pointer_grab" shared="true">
         <return-type type="GdkGrabStatus"/>
         <parameters>
@@ -2853,8 +2853,8 @@
           <parameter type="guint32" name="time"/>
         </parameters>
       </method>
-    </Class>
-    <Class name="Property">
+    </class>
+    <class name="Property" cname="GdkProperty_">
       <method name="Change" cname="gdk_property_change" shared="true">
         <return-type type="void"/>
         <parameters>
@@ -2889,8 +2889,8 @@
           <parameter type="guchar**" name="data"/>
         </parameters>
       </method>
-    </Class>
-    <Class name="Query">
+    </class>
+    <class name="Query" cname="GdkQuery_">
       <method name="Depths" cname="gdk_query_depths" shared="true">
         <return-type type="void"/>
         <parameters>
@@ -2905,8 +2905,8 @@
           <parameter type="gint*" name="count"/>
         </parameters>
       </method>
-    </Class>
-    <Class name="Rgb">
+    </class>
+    <class name="Rgb" cname="GdkRgb_">
       <method name="Ditherable" cname="gdk_rgb_ditherable" shared="true">
         <return-type type="gboolean"/>
       </method>
@@ -2941,8 +2941,8 @@
           <parameter type="gboolean" name="verbose"/>
         </parameters>
       </method>
-    </Class>
-    <Class name="Selection">
+    </class>
+    <class name="Selection" cname="GdkSelection_">
       <method name="Convert" cname="gdk_selection_convert" shared="true">
         <return-type type="void"/>
         <parameters>
@@ -2986,8 +2986,8 @@
           <parameter type="guint32" name="time"/>
         </parameters>
       </method>
-    </Class>
-    <Class name="Text">
+    </class>
+    <class name="Text" cname="GdkText_">
       <method name="PropertyToTextList" cname="gdk_text_property_to_text_list" shared="true">
         <return-type type="gint"/>
         <parameters>
@@ -3008,8 +3008,8 @@
           <parameter type="gchar***" name="list"/>
         </parameters>
       </method>
-    </Class>
-    <Class name="Threads">
+    </class>
+    <class name="Threads" cname="GdkThreads_">
       <method name="Enter" cname="gdk_threads_enter" shared="true">
         <return-type type="void"/>
       </method>
@@ -3019,7 +3019,7 @@
       <method name="Leave" cname="gdk_threads_leave" shared="true">
         <return-type type="void"/>
       </method>
-    </Class>
+    </class>
   </namespace>
   <namespace name="Gdk" library="libgdk_pixbuf-2.0-0.dll">
     <enum name="Colorspace" cname="GdkColorspace" type="enum">
diff --git a/api/glade-api.xml b/api/glade-api.xml
index 40a06d1d4..42a253b56 100644
--- a/api/glade-api.xml
+++ b/api/glade-api.xml
@@ -265,7 +265,7 @@
       <field cname="children" type="GladeChildInfo*"/>
       <field cname="n_children" type="guint"/>
     </struct>
-    <Class name="Global">
+    <class name="Global" cname="GladeGlobal">
       <method name="EnumFromString" cname="glade_enum_from_string" shared="true">
         <return-type type="gint"/>
         <parameters>
@@ -322,8 +322,8 @@
           <parameter type="gpointer" name="user_data"/>
         </parameters>
       </method>
-    </Class>
-    <Class name="Parser">
+    </class>
+    <class name="Parser" cname="GladeParser_">
       <method name="ParseBuffer" cname="glade_parser_parse_buffer" shared="true">
         <return-type type="GladeInterface*"/>
         <parameters>
@@ -339,8 +339,8 @@
           <parameter type="const-gchar*" name="domain"/>
         </parameters>
       </method>
-    </Class>
-    <Class name="Standard">
+    </class>
+    <class name="Standard" cname="GladeStandard_">
       <method name="BuildChildren" cname="glade_standard_build_children" shared="true">
         <return-type type="void"/>
         <parameters>
@@ -357,6 +357,6 @@
           <parameter type="GladeWidgetInfo*" name="info"/>
         </parameters>
       </method>
-    </Class>
+    </class>
   </namespace>
 </api>
diff --git a/api/gnome-api.xml b/api/gnome-api.xml
index 9b5b7a19d..0281bae41 100644
--- a/api/gnome-api.xml
+++ b/api/gnome-api.xml
@@ -208,7 +208,7 @@
       <field cname="numsubtrees" type="gint"/>
       <field cname="numactions" type="gint"/>
     </struct>
-    <Class name="Global">
+    <class name="Global" cname="GnomeGlobal">
       <method name="BonoboModuleInfoGet" cname="gnome_bonobo_module_info_get" shared="true">
         <return-type type="const-GnomeModuleInfo*"/>
       </method>
@@ -290,13 +290,13 @@
       <method name="UtilUserShell" cname="gnome_util_user_shell" shared="true">
         <return-type type="char*"/>
       </method>
-    </Class>
-    <Class name="Config">
+    </class>
+    <class name="Config" cname="GnomeConfig_">
       <method name="AssembleVector" cname="gnome_config_assemble_vector" shared="true">
         <return-type type="char*"/>
         <parameters>
           <parameter type="int" name="argc"/>
-          <parameter type="const-char*" name="const-argv"/>
+          <parameter type="const-char*" name="argv"/>
         </parameters>
       </method>
       <method name="CleanFile_" cname="gnome_config_clean_file_" shared="true">
@@ -450,7 +450,7 @@
           <parameter type="gboolean" name="priv"/>
         </parameters>
       </method>
-      <method name="SetSetHandler" cname="gnome_config_set_set_handler" shared="true">
+      <method name="SetSetHandler" cname="gnome_config_set_set_handler" shared="true" hidden="1">
         <return-type type="void"/>
         <parameters>
           <parameter type="void" name="(*func)(void*"/>
@@ -465,7 +465,7 @@
           <parameter type="gboolean" name="priv"/>
         </parameters>
       </method>
-      <method name="SetSyncHandler" cname="gnome_config_set_sync_handler" shared="true">
+      <method name="SetSyncHandler" cname="gnome_config_set_sync_handler" shared="true" hidden="1">
         <return-type type="void"/>
         <parameters>
           <parameter type="void" name="(*func)(void*"/>
@@ -499,8 +499,8 @@
           <parameter type="gboolean" name="priv"/>
         </parameters>
       </method>
-    </Class>
-    <Class name="Gconf">
+    </class>
+    <class name="Gconf" cname="GnomeGconf_">
       <method name="GetAppSettingsRelative" cname="gnome_gconf_get_app_settings_relative" shared="true">
         <return-type type="gchar*"/>
         <parameters>
@@ -514,8 +514,8 @@
           <parameter type="const-gchar*" name="subkey"/>
         </parameters>
       </method>
-    </Class>
-    <Class name="Help">
+    </class>
+    <class name="Help" cname="GnomeHelp_">
       <method name="Display" cname="gnome_help_display" shared="true">
         <return-type type="gboolean"/>
         <parameters>
@@ -554,8 +554,8 @@
       <method name="ErrorQuark" cname="gnome_help_error_quark" shared="true">
         <return-type type="GQuark"/>
       </method>
-    </Class>
-    <Class name="Score">
+    </class>
+    <class name="Score" cname="GnomeScore_">
       <method name="GetNotable" cname="gnome_score_get_notable" shared="true">
         <return-type type="gint"/>
         <parameters>
@@ -580,8 +580,8 @@
           <parameter type="/*" name="Pass"/>
         </parameters>
       </method>
-    </Class>
-    <Class name="Sound">
+    </class>
+    <class name="Sound" cname="GnomeSound_">
       <method name="ConnectionGet" cname="gnome_sound_connection_get" shared="true">
         <return-type type="int"/>
       </method>
@@ -607,8 +607,8 @@
       <method name="Shutdown" cname="gnome_sound_shutdown" shared="true">
         <return-type type="void"/>
       </method>
-    </Class>
-    <Class name="Triggers">
+    </class>
+    <class name="Triggers" cname="GnomeTriggers_">
       <method name="AddTrigger" cname="gnome_triggers_add_trigger" shared="true">
         <return-type type="void"/>
         <parameters>
@@ -639,8 +639,8 @@
           <parameter type="const-char*" array="true" name="supinfo"/>
         </parameters>
       </method>
-    </Class>
-    <Class name="Url">
+    </class>
+    <class name="Url" cname="GnomeUrl_">
       <method name="ErrorQuark" cname="gnome_url_error_quark" shared="true">
         <return-type type="GQuark"/>
       </method>
@@ -651,8 +651,8 @@
           <parameter type="GError**" name="error"/>
         </parameters>
       </method>
-    </Class>
-    <Class name="User">
+    </class>
+    <class name="User" cname="GnomeUser_">
       <method name="AccelsDirGet" cname="gnome_user_accels_dir_get" shared="true">
         <return-type type="const-char*"/>
       </method>
@@ -662,7 +662,7 @@
       <method name="PrivateDirGet" cname="gnome_user_private_dir_get" shared="true">
         <return-type type="const-char*"/>
       </method>
-    </Class>
+    </class>
   </namespace>
   <namespace name="Gnome" library="gnomecanvas-2">
     <object name="Canvas" cname="GnomeCanvas" parent="GtkLayout">
@@ -3930,7 +3930,7 @@
       <field cname="ac_mods" type="GdkModifierType"/>
       <field cname="widget" type="GtkWidget*"/>
     </struct>
-    <Class name="Global">
+    <class name="Global" cname="GnomeGlobal">
       <method name="AcceleratorsSync" cname="gnome_accelerators_sync" shared="true">
         <return-type type="void"/>
       </method>
@@ -3953,8 +3953,8 @@
       <method name="TypeInit" cname="gnome_type_init" shared="true">
         <return-type type="void"/>
       </method>
-    </Class>
-    <Class name="Gdk">
+    </class>
+    <class name="GdkHelper" cname="GnomeGdk_">
       <method name="PixbufNewFromUri" cname="gnome_gdk_pixbuf_new_from_uri" shared="true">
         <return-type type="GdkPixbuf*"/>
         <parameters>
@@ -3976,8 +3976,8 @@
           <parameter type="GnomeGdkPixbufAsyncHandle*" name="handle"/>
         </parameters>
       </method>
-    </Class>
-    <Class name="Gtk">
+    </class>
+    <class name="GtkHelper" cname="GnomeGtk_">
       <method name="ModuleInfoGet" cname="gnome_gtk_module_info_get" shared="true">
         <return-type type="const-GnomeModuleInfo*"/>
       </method>
@@ -3989,8 +3989,8 @@
           <parameter type="gpointer" name="user_data"/>
         </parameters>
       </method>
-    </Class>
-    <Class name="Popup">
+    </class>
+    <class name="Popup" cname="GnomePopup_">
       <method name="MenuAppend" cname="gnome_popup_menu_append" shared="true">
         <return-type type="void"/>
         <parameters>
@@ -4047,8 +4047,8 @@
           <parameter type="GtkAccelGroup*" name="accelgroup"/>
         </parameters>
       </method>
-    </Class>
-    <Class name="Window">
+    </class>
+    <class name="Window" cname="GnomeWindow_">
       <method name="IconInit" cname="gnome_window_icon_init" shared="true">
         <return-type type="void"/>
       </method>
@@ -4093,7 +4093,7 @@
           <parameter type="const-gchar*" name="extension"/>
         </parameters>
       </method>
-    </Class>
+    </class>
     <object name="Stock" cname="GnomeStock">
       <static-string cname="GNOME_STOCK_ABOUT" name="About" value="gnome-stock-about"/>
       <static-string cname="GNOME_STOCK_ATTACH" name="Attach" value="gnome-stock-attach"/>
diff --git a/api/gnomedb-api.xml b/api/gnomedb-api.xml
index 145e99e49..1e470003a 100644
--- a/api/gnomedb-api.xml
+++ b/api/gnomedb-api.xml
@@ -732,7 +732,7 @@
         </parameters>
       </callback>
     </struct>
-    <Class name="Config">
+    <class name="Config" cname="GnomeDbConfig_">
       <method name="AddListener" cname="gnome_db_config_add_listener" shared="true">
         <return-type type="guint"/>
         <parameters>
@@ -903,8 +903,8 @@
           <parameter type="const-gchar*" name="new_value"/>
         </parameters>
       </method>
-    </Class>
-    <Class name="Main">
+    </class>
+    <class name="Main" cname="GnomeDbMain_">
       <method name="Quit" cname="gnome_db_main_quit" shared="true">
         <return-type type="void"/>
       </method>
@@ -915,8 +915,8 @@
           <parameter type="gpointer" name="user_data"/>
         </parameters>
       </method>
-    </Class>
-    <Class name="Global">
+    </class>
+    <class name="Global" cname="GnomeDbGlobal">
       <method name="ModelToGtkTreeView" cname="gnome_db_model_to_gtk_tree_view" shared="true">
         <return-type type="GtkTreeView*"/>
         <parameters>
@@ -978,8 +978,8 @@
           <parameter ellipsis="true"/>
         </parameters>
       </method>
-    </Class>
-    <Class name="New">
+    </class>
+    <class name="New" cname="GnomeDbNew_">
       <method name="BrowserWidget" cname="gnome_db_new_browser_widget" shared="true">
         <return-type type="GtkWidget*"/>
       </method>
@@ -1119,8 +1119,8 @@
       <method name="VseparatorWidget" cname="gnome_db_new_vseparator_widget" shared="true">
         <return-type type="GtkWidget*"/>
       </method>
-    </Class>
-    <Class name="Option">
+    </class>
+    <class name="Option" cname="GnomeDbOption_">
       <method name="MenuAddItem" cname="gnome_db_option_menu_add_item" shared="true">
         <return-type type="void"/>
         <parameters>
@@ -1141,8 +1141,8 @@
           <parameter type="const-gchar*" name="selection"/>
         </parameters>
       </method>
-    </Class>
-    <Class name="Stock">
+    </class>
+    <class name="StockManager" cname="GnomeDbStock_">
       <method name="GetIconPath" cname="gnome_db_stock_get_icon_path" shared="true">
         <return-type type="gchar*"/>
         <parameters>
@@ -1161,8 +1161,8 @@
           <parameter type="const-gchar*" name="pixmapfile"/>
         </parameters>
       </method>
-    </Class>
-    <Class name="Text">
+    </class>
+    <class name="Text" cname="GnomeDbText_">
       <method name="Clear" cname="gnome_db_text_clear" shared="true">
         <return-type type="void"/>
         <parameters>
@@ -1221,7 +1221,7 @@
           <parameter type="gint" name="len"/>
         </parameters>
       </method>
-    </Class>
+    </class>
     <object name="Stock" cname="GnomeDbStock">
       <static-string cname="GNOME_DB_STOCK_AGGREGATES" name="Aggregates" value="gnome-db-aggregates"/>
       <static-string cname="GNOME_DB_STOCK_COMMIT" name="Commit" value="gnome-db-commit"/>
diff --git a/api/gst-api.xml b/api/gst-api.xml
index 4d8877f35..26c761c62 100644
--- a/api/gst-api.xml
+++ b/api/gst-api.xml
@@ -3057,7 +3057,7 @@
       <field cname="pc" type="void*"/>
       <field cname="magic_number" type="int"/>
     </struct>
-    <Class name="Class">
+    <class name="Class" cname="GstClass_">
       <method name="SignalConnect" cname="gst_class_signal_connect" shared="true">
         <return-type type="guint"/>
         <parameters>
@@ -3075,8 +3075,8 @@
           <parameter type="xmlNodePtr" name="self"/>
         </parameters>
       </method>
-    </Class>
-    <Class name="Global">
+    </class>
+    <class name="Global" cname="GstGlobal">
       <method name="CpuGetFlags" cname="gst_cpu_get_flags" shared="true">
         <return-type type="GstCPUFlags"/>
       </method>
@@ -3086,6 +3086,28 @@
       <method name="ExtraGetFilenameType" cname="gst_extra_get_filename_type" shared="true">
         <return-type type="GType"/>
       </method>
+      <method name="FormatGetByNick" cname="gst_format_get_by_nick" shared="true">
+        <return-type type="GstFormat"/>
+        <parameters>
+          <parameter type="const-gchar*" name="nick"/>
+        </parameters>
+      </method>
+      <method name="FormatGetDefinitions" cname="gst_format_get_definitions" shared="true">
+        <return-type type="const-GList*"/>
+      </method>
+      <method name="FormatGetDetails" cname="gst_format_get_details" shared="true">
+        <return-type type="const-GstFormatDefinition*"/>
+        <parameters>
+          <parameter type="GstFormat" name="format"/>
+        </parameters>
+      </method>
+      <method name="FormatRegister" cname="gst_format_register" shared="true">
+        <return-type type="GstFormat"/>
+        <parameters>
+          <parameter type="const-gchar*" name="nick"/>
+          <parameter type="const-gchar*" name="description"/>
+        </parameters>
+      </method>
       <method name="LibraryLoad" cname="gst_library_load" shared="true">
         <return-type type="gboolean"/>
         <parameters>
@@ -3109,32 +3131,8 @@
           <parameter type="GError**" name="error"/>
         </parameters>
       </method>
-    </Class>
-    <Class name="Format">
-      <method name="GetByNick" cname="gst_format_get_by_nick" shared="true">
-        <return-type type="GstFormat"/>
-        <parameters>
-          <parameter type="const-gchar*" name="nick"/>
-        </parameters>
-      </method>
-      <method name="GetDefinitions" cname="gst_format_get_definitions" shared="true">
-        <return-type type="const-GList*"/>
-      </method>
-      <method name="GetDetails" cname="gst_format_get_details" shared="true">
-        <return-type type="const-GstFormatDefinition*"/>
-        <parameters>
-          <parameter type="GstFormat" name="format"/>
-        </parameters>
-      </method>
-      <method name="Register" cname="gst_format_register" shared="true">
-        <return-type type="GstFormat"/>
-        <parameters>
-          <parameter type="const-gchar*" name="nick"/>
-          <parameter type="const-gchar*" name="description"/>
-        </parameters>
-      </method>
-    </Class>
-    <Class name="Print">
+    </class>
+    <class name="Print" cname="GstPrint_">
       <method name="ElementArgs" cname="gst_print_element_args" shared="true">
         <return-type type="void"/>
         <parameters>
@@ -3151,8 +3149,8 @@
           <parameter type="GstPad*" name="pad"/>
         </parameters>
       </method>
-    </Class>
-    <Class name="Util">
+    </class>
+    <class name="Util" cname="GstUtil_">
       <method name="DumpMem" cname="gst_util_dump_mem" shared="true">
         <return-type type="void"/>
         <parameters>
@@ -3239,6 +3237,6 @@
           <parameter type="const-gchar*" name="value_str"/>
         </parameters>
       </method>
-    </Class>
+    </class>
   </namespace>
 </api>
diff --git a/api/gtk-api.xml b/api/gtk-api.xml
index 4d98e0268..3c492935d 100644
--- a/api/gtk-api.xml
+++ b/api/gtk-api.xml
@@ -11517,7 +11517,7 @@
       <field cname="shape_mask" type="GdkBitmap*"/>
     </struct>
     <struct name="WindowGeometryInfo" cname="GtkWindowGeometryInfo" opaque="true" hidden="1"/>
-    <Class name="Accel">
+    <class name="Accel" cname="GtkAccel_">
       <method name="GroupsActivate" cname="gtk_accel_groups_activate" shared="true">
         <return-type type="gboolean"/>
         <parameters>
@@ -11606,10 +11606,10 @@
           <parameter type="gint" name="fd"/>
         </parameters>
       </method>
-    </Class>
-    <Class name="Accelerator">
+    </class>
+    <class name="Accelerator" cname="GtkAccelerator_">
       <method name="GetDefaultModMask" cname="gtk_accelerator_get_default_mod_mask" shared="true">
-        <return-type type="guint"/>
+        <return-type type="GdkModifierType"/>
       </method>
       <method name="Name" cname="gtk_accelerator_name" shared="true">
         <return-type type="gchar*"/>
@@ -11639,8 +11639,8 @@
           <parameter type="GdkModifierType" name="modifiers"/>
         </parameters>
       </method>
-    </Class>
-    <Class name="Global">
+    </class>
+    <class name="Global" cname="GtkGlobal">
       <method name="BindingParseBinding" cname="gtk_binding_parse_binding" shared="true">
         <return-type type="guint"/>
         <parameters>
@@ -11741,8 +11741,8 @@
           <parameter type="GtkType" name="type"/>
         </parameters>
       </method>
-    </Class>
-    <Class name="Ctree">
+    </class>
+    <class name="Ctree" cname="GtkCtree_">
       <method name="ExpanderStyleGetType" cname="gtk_ctree_expander_style_get_type" shared="true">
         <return-type type="GType"/>
       </method>
@@ -11755,8 +11755,8 @@
       <method name="PosGetType" cname="gtk_ctree_pos_get_type" shared="true">
         <return-type type="GType"/>
       </method>
-    </Class>
-    <Class name="Decorated">
+    </class>
+    <class name="Decorated" cname="GtkDecorated_">
       <method name="WindowCalculateFrameSize" cname="gtk_decorated_window_calculate_frame_size" shared="true">
         <return-type type="void"/>
         <parameters>
@@ -11786,8 +11786,8 @@
           <parameter type="const-gchar*" name="title"/>
         </parameters>
       </method>
-    </Class>
-    <Class name="Drag">
+    </class>
+    <class name="Drag" cname="GtkDrag_">
       <method name="Begin" cname="gtk_drag_begin" shared="true">
         <return-type type="GdkDragContext*"/>
         <parameters>
@@ -11973,8 +11973,8 @@
           <parameter type="GtkWidget*" name="widget"/>
         </parameters>
       </method>
-    </Class>
-    <Class name="Gc">
+    </class>
+    <class name="Gc" cname="GtkGc_">
       <method name="Get" cname="gtk_gc_get" shared="true">
         <return-type type="GdkGC*"/>
         <parameters>
@@ -11990,8 +11990,8 @@
           <parameter type="GdkGC*" name="gc"/>
         </parameters>
       </method>
-    </Class>
-    <Class name="Grab">
+    </class>
+    <class name="Grab" cname="GtkGrab_">
       <method name="Add" cname="gtk_grab_add" shared="true">
         <return-type type="void"/>
         <parameters>
@@ -12007,8 +12007,8 @@
           <parameter type="GtkWidget*" name="widget"/>
         </parameters>
       </method>
-    </Class>
-    <Class name="Icon">
+    </class>
+    <class name="Icon" cname="GtkIcon_">
       <method name="SizeFromName" cname="gtk_icon_size_from_name" shared="true">
         <return-type type="GtkIconSize"/>
         <parameters>
@@ -12044,8 +12044,8 @@
           <parameter type="GtkIconSize" name="target"/>
         </parameters>
       </method>
-    </Class>
-    <Class name="Idle">
+    </class>
+    <class name="Idle" cname="GtkIdle_" hidden="1">
       <method name="Add" cname="gtk_idle_add" shared="true">
         <return-type type="guint"/>
         <parameters>
@@ -12083,8 +12083,8 @@
           <parameter type="gpointer" name="data"/>
         </parameters>
       </method>
-    </Class>
-    <Class name="Init">
+    </class>
+    <class name="Init" cname="GtkInit_">
       <method name="AbiCheck" cname="gtk_init_abi_check" shared="true">
         <return-type type="void"/>
         <parameters>
@@ -12119,8 +12119,8 @@
           <parameter type="size_t" name="sizeof_GtkBox"/>
         </parameters>
       </method>
-    </Class>
-    <Class name="Input">
+    </class>
+    <class name="Input" cname="GtkInput_">
       <method name="AddFull" cname="gtk_input_add_full" shared="true">
         <return-type type="guint"/>
         <parameters>
@@ -12138,8 +12138,8 @@
           <parameter type="guint" name="input_handler_id"/>
         </parameters>
       </method>
-    </Class>
-    <Class name="Key">
+    </class>
+    <class name="Key" cname="GtkKey_">
       <method name="SnooperInstall" cname="gtk_key_snooper_install" shared="true">
         <return-type type="guint"/>
         <parameters>
@@ -12153,8 +12153,8 @@
           <parameter type="guint" name="snooper_handler_id"/>
         </parameters>
       </method>
-    </Class>
-    <Class name="Main">
+    </class>
+    <class name="Main" cname="GtkMain_">
       <method name="DoEvent" cname="gtk_main_do_event" shared="true">
         <return-type type="void"/>
         <parameters>
@@ -12176,8 +12176,8 @@
       <method name="Quit" cname="gtk_main_quit" shared="true">
         <return-type type="void"/>
       </method>
-    </Class>
-    <Class name="Paint">
+    </class>
+    <class name="Paint" cname="GtkPaint_">
       <method name="Arrow" cname="gtk_paint_arrow" shared="true">
         <return-type type="void"/>
         <parameters>
@@ -12500,8 +12500,8 @@
           <parameter type="gint" name="x"/>
         </parameters>
       </method>
-    </Class>
-    <Class name="Quit">
+    </class>
+    <class name="Quit" cname="GtkQuit_">
       <method name="Add" cname="gtk_quit_add" shared="true">
         <return-type type="guint"/>
         <parameters>
@@ -12539,8 +12539,8 @@
           <parameter type="gpointer" name="data"/>
         </parameters>
       </method>
-    </Class>
-    <Class name="Rc">
+    </class>
+    <class name="Rc" cname="GtkRc_">
       <method name="AddDefaultFile" cname="gtk_rc_add_default_file" shared="true">
         <return-type type="void"/>
         <parameters>
@@ -12643,8 +12643,8 @@
           <parameter type="gchar**" name="filenames"/>
         </parameters>
       </method>
-    </Class>
-    <Class name="Selection">
+    </class>
+    <class name="Selection" cname="GtkSelection_">
       <method name="AddTarget" cname="gtk_selection_add_target" shared="true">
         <return-type type="void"/>
         <parameters>
@@ -12728,8 +12728,8 @@
           <parameter type="GdkEventSelection*" name="event"/>
         </parameters>
       </method>
-    </Class>
-    <Class name="Stock">
+    </class>
+    <class name="StockManager" cname="GtkStock_">
       <method name="Add" cname="gtk_stock_add" shared="true">
         <return-type type="void"/>
         <parameters>
@@ -12754,16 +12754,16 @@
           <parameter type="GtkStockItem*" name="item"/>
         </parameters>
       </method>
-    </Class>
-    <Class name="Submenu">
+    </class>
+    <class name="Submenu" cname="GtkSubmenu_">
       <method name="DirectionGetType" cname="gtk_submenu_direction_get_type" shared="true">
         <return-type type="GType"/>
       </method>
       <method name="PlacementGetType" cname="gtk_submenu_placement_get_type" shared="true">
         <return-type type="GType"/>
       </method>
-    </Class>
-    <Class name="Text">
+    </class>
+    <class name="Text" cname="GtkText_">
       <method name="ByteBeginsUtf8Char" cname="gtk_text_byte_begins_utf8_char" shared="true">
         <return-type type="gboolean"/>
         <parameters>
@@ -12786,8 +12786,8 @@
           <parameter type="GList**" name="widgets"/>
         </parameters>
       </method>
-    </Class>
-    <Class name="Timeout">
+    </class>
+    <class name="Timeout" cname="GtkTimeout_">
       <method name="Add" cname="gtk_timeout_add" shared="true">
         <return-type type="guint"/>
         <parameters>
@@ -12812,8 +12812,8 @@
           <parameter type="guint" name="timeout_handler_id"/>
         </parameters>
       </method>
-    </Class>
-    <Class name="Tree">
+    </class>
+    <class name="Tree" cname="GtkTree_">
       <method name="GetRowDragData" cname="gtk_tree_get_row_drag_data" shared="true">
         <return-type type="gboolean"/>
         <parameters>
@@ -12830,7 +12830,7 @@
           <parameter type="GtkTreePath*" name="path"/>
         </parameters>
       </method>
-    </Class>
+    </class>
     <object name="Stock" cname="GtkStock">
       <static-string cname="GTK_STOCK_ADD" name="Add" value="gtk-add"/>
       <static-string cname="GTK_STOCK_APPLY" name="Apply" value="gtk-apply"/>
diff --git a/api/pango-api.xml b/api/pango-api.xml
index 0eab308bf..49a7a906d 100644
--- a/api/pango-api.xml
+++ b/api/pango-api.xml
@@ -1503,7 +1503,7 @@
       </method>
     </struct>
     <alias name="XSubfont" cname="PangoXSubfont" type="guint16"/>
-    <Class name="Attr">
+    <class name="Attr" cname="PangoAttr_">
       <method name="BackgroundNew" cname="pango_attr_background_new" shared="true">
         <return-type type="PangoAttribute*"/>
         <parameters>
@@ -1586,8 +1586,8 @@
           <parameter type="PangoWeight" name="weight"/>
         </parameters>
       </method>
-    </Class>
-    <Class name="Global">
+    </class>
+    <class name="Global" cname="PangoGlobal">
       <method name="ConfigKeyGet" cname="pango_config_key_get" shared="true">
         <return-type type="char*"/>
         <parameters>
@@ -1755,8 +1755,8 @@
           <parameter type="const-char*" name="str"/>
         </parameters>
       </method>
-    </Class>
-    <Class name="Indic">
+    </class>
+    <class name="Indic" cname="PangoIndic_">
       <method name="Compact" cname="pango_indic_compact" shared="true">
         <return-type type="void"/>
         <parameters>
@@ -1795,8 +1795,8 @@
           <parameter type="PangoGlyphString*" name="glyphs"/>
         </parameters>
       </method>
-    </Class>
-    <Class name="X">
+    </class>
+    <class name="X" cname="PangoX_">
       <method name="ApplyLigatures" cname="pango_x_apply_ligatures" shared="true">
         <return-type type="gboolean"/>
         <parameters>
@@ -1935,8 +1935,8 @@
           <parameter type="Display*" name="display"/>
         </parameters>
       </method>
-    </Class>
-    <Class name="Xft">
+    </class>
+    <class name="Xft" cname="PangoXft_">
       <method name="FontGetDisplay" cname="pango_xft_font_get_display" shared="true">
         <return-type type="Display*"/>
         <parameters>
@@ -2001,6 +2001,6 @@
           <parameter type="gint" name="y"/>
         </parameters>
       </method>
-    </Class>
+    </class>
   </namespace>
 </api>
diff --git a/api/rsvg-api.xml b/api/rsvg-api.xml
index cbbb7dc84..956fa140c 100644
--- a/api/rsvg-api.xml
+++ b/api/rsvg-api.xml
@@ -177,7 +177,7 @@
       <field cname="fy" type="double"/>
       <field cname="stops" type="RsvgGradientStops*"/>
     </struct>
-    <Class name="Css">
+    <class name="Css" cname="RsvgCss_">
       <method name="ParamArgOffset" cname="rsvg_css_param_arg_offset" shared="true">
         <return-type type="int"/>
         <parameters>
@@ -216,8 +216,8 @@
           <parameter type="const-char*" name="str"/>
         </parameters>
       </method>
-    </Class>
-    <Class name="Global">
+    </class>
+    <class name="Global" cname="RsvgGlobal">
       <method name="ErrorQuark" cname="rsvg_error_quark" shared="true">
         <return-type type="GQuark"/>
       </method>
@@ -235,8 +235,8 @@
           <parameter type="const-RsvgPSCtx*" name="ctx"/>
         </parameters>
       </method>
-    </Class>
-    <Class name="Pixbuf">
+    </class>
+    <class name="Pixbuf" cname="RsvgPixbuf_">
       <method name="FromFile" cname="rsvg_pixbuf_from_file" shared="true">
         <return-type type="GdkPixbuf*"/>
         <parameters>
@@ -282,6 +282,6 @@
           <parameter type="GError**" name="error"/>
         </parameters>
       </method>
-    </Class>
+    </class>
   </namespace>
 </api>
diff --git a/gdk/Threads.cs b/gdk/Threads.cs
deleted file mode 100644
index 4b5db0b61..000000000
--- a/gdk/Threads.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-// Threads.cs - thread awareness
-//
-// Author: Alp Toker <alp@atoker.com>
-//
-// (c) 2002 Alp Toker
-
-namespace Gdk
-{
-	using System;
-	using System.Runtime.InteropServices;
-
-	public class Threads
-	{
-		[DllImport("libgdk-win32-2.0-0.dll")]
-		static extern void gdk_threads_init ();
-
-		public static void Init ()
-		{
-			gdk_threads_init ();
-		}
-
-		[DllImport("libgdk-win32-2.0-0.dll")]
-		static extern void gdk_threads_enter ();
-
-		public static void Enter ()
-		{
-			gdk_threads_enter ();
-		}
-
-		[DllImport("libgdk-win32-2.0-0.dll")]
-		static extern void gdk_threads_leave ();
-
-		public static void Leave ()
-		{
-			gdk_threads_leave ();
-		}
-	}
-}
diff --git a/generator/ClassGen.cs b/generator/ClassGen.cs
new file mode 100644
index 000000000..56f5602dd
--- /dev/null
+++ b/generator/ClassGen.cs
@@ -0,0 +1,51 @@
+// GtkSharp.Generation.ObjectGen.cs - The Object Generatable.
+//
+// Author: Mike Kestner <mkestner@speakeasy.net>
+//
+// (c) 2001-2003 Mike Kestner
+
+namespace GtkSharp.Generation {
+
+	using System;
+	using System.Collections;
+	using System.IO;
+	using System.Text;
+	using System.Xml;
+
+	public class ClassGen : ClassBase, IGeneratable  {
+
+		private ArrayList strings = new ArrayList();
+		private static Hashtable namespaces = new Hashtable ();
+
+		public ClassGen (XmlElement ns, XmlElement elem) : base (ns, elem) {}
+
+		public void Generate ()
+		{
+			if (!DoGenerate)
+				return;
+
+			StreamWriter sw = CreateWriter ();
+
+			sw.WriteLine ("\tusing System.Runtime.InteropServices;");
+			sw.WriteLine ();
+
+			SymbolTable table = SymbolTable.Table;
+
+			sw.WriteLine ("#region Autogenerated code");
+			sw.Write ("\tpublic class " + Name);
+			sw.WriteLine (" {");
+			sw.WriteLine ();
+
+			GenProperties (sw);
+			GenMethods (sw, null, null, false);
+			
+			sw.WriteLine ("#endregion");
+			AppendCustom(sw);
+
+			sw.WriteLine ("\t}");
+
+			CloseWriter (sw);
+		}
+	}
+}
+
diff --git a/generator/Parameters.cs b/generator/Parameters.cs
index 728b12f1c..3301a0a13 100644
--- a/generator/Parameters.cs
+++ b/generator/Parameters.cs
@@ -112,6 +112,10 @@ namespace GtkSharp.Generation {
 				return "out_param";
 			case "fixed":
 				return "mfixed";
+			case "byte":
+				return "_byte";
+			case "new":
+				return "_new";
 			default:
 				break;
 			}
diff --git a/generator/Parser.cs b/generator/Parser.cs
index dc317a64c..1c5d8a518 100644
--- a/generator/Parser.cs
+++ b/generator/Parser.cs
@@ -103,6 +103,10 @@ namespace GtkSharp.Generation {
 					igen = new ObjectGen (ns, elem);
 					break;
 
+				case "class":
+					igen = new ClassGen (ns, elem);
+					break;
+
 				case "struct":
 					if (elem.HasAttribute ("opaque"))
 						igen = new OpaqueGen (ns, elem);
@@ -120,6 +124,7 @@ namespace GtkSharp.Generation {
 					SymbolTable.Table.AddType (igen);
 				}
 			}
+
 		}
 
 		private void ParseSymbol (XmlElement symbol)
diff --git a/generator/SymbolTable.cs b/generator/SymbolTable.cs
index 17a8ee961..97d167652 100644
--- a/generator/SymbolTable.cs
+++ b/generator/SymbolTable.cs
@@ -65,6 +65,7 @@ namespace GtkSharp.Generation {
 			AddType (new SimpleGen ("float", "float"));
 			AddType (new StringGen ("gunichar"));
 			AddType (new SimpleGen ("uint1", "bool"));
+			AddType (new SimpleGen ("GC", "IntPtr"));
 			AddType (new SimpleGen ("GPtrArray", "IntPtr[]"));
 			AddType (new SimpleGen ("GType", "uint"));
 			AddType (new SimpleGen ("GError", "IntPtr"));
diff --git a/parser/GAPI/Metadata.pm b/parser/GAPI/Metadata.pm
index d7ae5a23d..bfb041562 100644
--- a/parser/GAPI/Metadata.pm
+++ b/parser/GAPI/Metadata.pm
@@ -182,7 +182,7 @@ sub fixupNamespace {
 	foreach $rule (@{$self->{rules}}) {
 		my ($classes_ref, $data_list_ref) = @$rule;
 		for ($node = $ns_node->firstChild; $node; $node = $node->nextSibling ()) {
-			next if not ($node->nodeName eq "object" or $node->nodeName eq "interface" or $node->nodeName eq "struct" or $node->nodeName eq "boxed" or $node->nodeName eq "callback");
+			next if not ($node->nodeName eq "object" or $node->nodeName eq "interface" or $node->nodeName eq "struct" or $node->nodeName eq "boxed" or $node->nodeName eq "callback" or $node->nodeName eq "class");
 			my $class, $methods_ref, $attr;
 			foreach $attr ($node->attributes) {
 				if ($attr->name eq "cname") {
diff --git a/parser/gapi2xml.pl b/parser/gapi2xml.pl
index e6087a2f1..c1d049c7f 100755
--- a/parser/gapi2xml.pl
+++ b/parser/gapi2xml.pl
@@ -562,9 +562,12 @@ sub addStaticFuncElems
 
 		if ($mname =~ /($ns_prefix)_([a-zA-Z]+)_\w+/) {
 			$classname = $2;
-			$prefix = $1 . "_" . $2 . "_";
+			$key = $prefix = $1 . "_" . $2 . "_";
+			$key =~ s/_//g;
 			$cnt = 1;
-			if ($classname ne "set" && $classname ne "get" &&
+			if (exists ($enums{$key})) {
+				$cnt = 1; 
+			} elsif ($classname ne "set" && $classname ne "get" &&
 			    $classname ne "scan" && $classname ne "find" &&
 			    $classname ne "add" && $classname ne "remove" &&
 			    $classname ne "free" && $classname ne "register" &&
@@ -576,8 +579,9 @@ sub addStaticFuncElems
 				$mdef = delete $fdefs{$mname};
 
 				if (!$global_el) {
-					$global_el = $doc->createElement('Class');
+					$global_el = $doc->createElement('class');
 					$global_el->setAttribute('name', "Global");
+					$global_el->setAttribute('cname', $ns . "Global");
 					$ns_elem->appendChild($global_el);
 				}
 				$el = addNameElem($global_el, 'method', $mname, $ns_prefix);
@@ -587,8 +591,9 @@ sub addStaticFuncElems
 				parseParms ($el, $mdef, 0);
 				next;
 			} else {
-				$class_el = $doc->createElement('Class');
+				$class_el = $doc->createElement('class');
 				$class_el->setAttribute('name', StudlyCaps($classname));
+				$class_el->setAttribute('cname', StudlyCaps($prefix));
 				$ns_elem->appendChild($class_el);
 
 				for ($j = 0; $j < $cnt; $j++) {
@@ -641,6 +646,7 @@ sub addParamsElem
 	$parent->appendChild($parms_elem);
 	foreach $parm (@params) {
 		$parm =~ s/\s+(\*+)/\1 /g;
+		$parm =~ s/(\*+)\s*const/\1/g;
 		$parm =~ s/const\s+/const-/g;
 		if ($parm =~ /(.*)\(\s*\**\s*(\w+)\)\s+\((.*)\)/) {
 			my $ret = $1; my $cbn = $2; my $params = $3;
diff --git a/sources/Art.metadata b/sources/Art.metadata
new file mode 100644
index 000000000..24d73ae6b
--- /dev/null
+++ b/sources/Art.metadata
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<metadata>
+
+<!-- renames -->
+<rule>
+  <class name="ArtAffine_">
+    <method>ToString</method>
+  </class>
+  <data>
+    <attribute target="method">
+      <name>name</name>
+      <value>ToStringArray</value>
+    </attribute>
+  </data>
+</rule>
+
+</metadata>
diff --git a/sources/Atk.metadata b/sources/Atk.metadata
index bb1f17e50..1b16585fe 100644
--- a/sources/Atk.metadata
+++ b/sources/Atk.metadata
@@ -24,5 +24,14 @@
     </attribute>
   </data>
 </rule>
+<rule>
+  <class name="AtkState_"/>
+  <data>
+    <attribute target="class">
+      <name>name</name>
+      <value>StateManager</value>
+    </attribute>
+  </data>
+</rule>
 
 </metadata>
diff --git a/sources/Gdk.metadata b/sources/Gdk.metadata
index 6f8f34939..1de4e7347 100644
--- a/sources/Gdk.metadata
+++ b/sources/Gdk.metadata
@@ -21,7 +21,7 @@
   </class>
   <data>
     <attribute target="param">
-      <filter level="type">const-guchar*</filter>
+      <filter level="name">buf</filter>
         <name>array</name>
      <value>1</value>
     </attribute>
@@ -245,4 +245,34 @@
     </attribute>
   </data>
 </rule>
+<rule>
+  <class name="GdkPixbuf_"/>
+  <data>
+    <attribute target="class">
+      <name>hidden</name>
+      <value>1</value>
+    </attribute>
+  </data>
+</rule>
+
+<!-- renames -->
+<rule>
+  <class name="GdkEvent_"/>
+  <data>
+    <attribute target="class">
+      <name>name</name>
+      <value>EventHelper</value>
+    </attribute>
+  </data>
+</rule>
+<rule>
+  <class name="GdkPango_"/>
+  <data>
+    <attribute target="class">
+      <name>name</name>
+      <value>PangoHelper</value>
+    </attribute>
+  </data>
+</rule>
+
 </metadata>
diff --git a/sources/Gnome.metadata b/sources/Gnome.metadata
index b74a6df35..bc623ab69 100644
--- a/sources/Gnome.metadata
+++ b/sources/Gnome.metadata
@@ -123,6 +123,24 @@
     </attribute>
   </data>
 </rule>
+<rule>
+  <class name="GnomeGdk_"/>
+  <data>
+    <attribute target="class">
+      <name>name</name>
+      <value>GdkHelper</value>
+    </attribute>
+  </data>
+</rule>
+<rule>
+  <class name="GnomeGtk_"/>
+  <data>
+    <attribute target="class">
+      <name>name</name>
+      <value>GtkHelper</value>
+    </attribute>
+  </data>
+</rule>
 <rule>
   <class name="GnomeIconList">
     <signal>SelectIcon</signal>
@@ -221,6 +239,10 @@
   <class name="GnomeIconEntry">
     <method>PickDialog</method>
   </class>
+  <class name="GnomeConfig_">
+    <method>SetSetHandler</method>
+    <method>SetSyncHandler</method>
+  </class>
   <data>
     <attribute target="method">
       <name>hidden</name>
diff --git a/sources/GnomeDb.metadata b/sources/GnomeDb.metadata
index d32185296..ceab80578 100644
--- a/sources/GnomeDb.metadata
+++ b/sources/GnomeDb.metadata
@@ -22,5 +22,14 @@
     </attribute>
   </data>
 </rule>
+<rule>
+  <class name="GnomeDbStock_"/>
+  <data>
+    <attribute target="class">
+      <name>name</name>
+      <value>StockManager</value>
+    </attribute>
+  </data>
+</rule>
 
 </metadata>
diff --git a/sources/Gtk.metadata b/sources/Gtk.metadata
index 9ff2af482..60f239162 100644
--- a/sources/Gtk.metadata
+++ b/sources/Gtk.metadata
@@ -495,6 +495,17 @@
 </rule>
 
 <!-- renames -->
+<rule>
+  <class name="GtkAccelerator_">
+    <method>GetDefaultModMask</method>
+  </class>
+  <data>
+    <attribute target="return">
+      <name>type</name>
+      <value>GdkModifierType</value>
+    </attribute>
+  </data>
+</rule>
 <rule>
   <class name="GtkEditable">
     <method>GetEditable</method>
@@ -1584,6 +1595,15 @@
     </attribute>
   </data>
 </rule>
+<rule>
+  <class name="GtkStock_"/>
+  <data>
+    <attribute target="class">
+      <name>name</name>
+      <value>StockManager</value>
+    </attribute>
+  </data>
+</rule>
 
 <!-- hides -->
 <rule>
@@ -1728,6 +1748,15 @@
     </attribute>
   </data>
 </rule>
+<rule>
+  <class name="GtkIdle_"/>
+   <data>
+    <attribute target="class">
+      <name>hidden</name>
+      <value>1</value>
+    </attribute>
+   </data>
+</rule>
 
 <!-- overloads -->
 <rule>