(in-package :gtk)
 
-(defcfun gtk-combobox-get-active-iter :boolean
+(defcfun gtk-combo-box-get-active-iter :boolean
   (combo-box g-object)
   (iter (g-boxed-ref tree-iter)))
 
-(defun combobox-get-active-iter (combo-box)
+(defun combo-box-get-active-iter (combo-box)
   (let ((i (make-instance 'tree-iter)))
-    (if (gtk-combobox-get-active-iter combo-box i)
+    (if (gtk-combo-box-get-active-iter combo-box i)
         i
         (release i))))
 
 
 
 (export 'icon-view-unselect-path)
 
-(defcfun (icon-view-path-selected-p "gtk_icon_view_is_path_selected") :boolean
+(defcfun (icon-view-path-selected-p "gtk_icon_view_path_is_selected") :boolean
   (icon-view g-object)
   (path (g-boxed-ref tree-path)))
 
 
 
 (export 'notebook-tab-label-widget)
 
-(defcfun gtk-notebook-set-menu-label-widget :void
+(defcfun (gtk-notebook-set-menu-label-widget "gtk_notebook_set_menu_label") :void
   (notebook g-object)
   (child g-object)
   (menu-label g-object))
   (gtk-notebook-set-menu-label-widget notebook child new-value)
   new-value)
 
-(defcfun gtk-notebook-set-tab-label-widget :void
+(defcfun (gtk-notebook-set-tab-label-widget "gtk_notebook_set_tab_label") :void
   (notebook g-object)
   (child g-object)
   (tab-label g-object))
 
 
 (export 'toolbar-insert)
 
-(defcfun (toolbar-item-index "gtk_toolbar_item_index") :int
+(defcfun (toolbar-item-index "gtk_toolbar_get_item_index") :int
   (toolbar g-object)
   (item g-object))
 
 
 (in-package :gtk)
 
-(defcfun gtk-paned-pack-1 :void
+(defcfun gtk-paned-pack1 :void
   (paned g-object)
   (child g-object)
   (resize :boolean)
   (shrink :boolean))
 
 (defun paned-pack-1 (paned child &key (resize nil) (shrink t))
-  (gtk-paned-pack-1 paned child resize shrink))
+  (gtk-paned-pack1 paned child resize shrink))
 
-(export 'panged-pack-1)
+(export 'paned-pack-1)
 
-(defcfun gtk-paned-pack-2 :void
+(defcfun gtk-paned-pack2 :void
   (paned g-object)
   (child g-object)
   (resize :boolean)
   (shrink :boolean))
 
 (defun paned-pack-2 (paned child &key (resize t) (shrink t))
-  (gtk-paned-pack-2 paned child resize shrink))
+  (gtk-paned-pack2 paned child resize shrink))
 
 (export 'paned-pack-2)
 
 
 
 (export 'size-group-remove-widget)
 
-(defcfun (size-group-widgets "gtk_size_group_widgets") (gslist g-object :free-from-foreign nil)
+(defcfun (size-group-widgets "gtk_size_group_get_widgets") (gslist g-object :free-from-foreign nil)
   (size-group g-object))
 
 (export 'size-group-widgets)
\ No newline at end of file
 
     (unless (null-pointer-p ptr)
       (get-stable-pointer-value ptr))))
 
-(defcfun gtk-tree-selection-selected :boolean
+(defcfun gtk-tree-selection-get-selected :boolean
   (selection g-object)
   (model :pointer)
   (iter (g-boxed-ref tree-iter)))
 
 (defun tree-selection-selected (tree-selection)
   (let ((iter (make-instance 'tree-iter)))
-    (if (gtk-tree-selection-selected tree-selection (null-pointer) iter)
+    (if (gtk-tree-selection-get-selected tree-selection (null-pointer) iter)
         iter
         (release iter))))
 
 
 (export 'map-tree-selection-rows)
 
-(defcfun gtk-tree-selection-selected-rows (glist (g-boxed-ref tree-path) :free-from-foreign t)
+(defcfun gtk-tree-selection-get-selected-rows (glist (g-boxed-ref tree-path) :free-from-foreign t)
   (selection g-object)
   (model :pointer))
 
 (defun tree-selection-selected-rows (tree-selection)
-  (gtk-tree-selection-selected-rows tree-selection (null-pointer)))
+  (gtk-tree-selection-get-selected-rows tree-selection (null-pointer)))
 
 (export 'tree-selection-selected-rows)
 
 
 
 (export 'tree-view-get-column)
 
-(defcfun (tree-view-columns "gtk_tree_view_columns") (glist g-object)
+(defcfun (tree-view-columns "gtk_tree_view_get_columns") (glist g-object)
   (tree-view g-object))
 
 (export 'tree-view-columns)
                                             (callback stable-pointer-free-destroy-notify-callback))
       (gtk-tree-view-set-row-separator-func tree-view (null-pointer) (null-pointer) (null-pointer))))
 
-(defcfun (tree-view-rubber-banding-active "gtk_tree_view_get_rubber_banding_active") :boolean
+(defcfun (tree-view-rubber-banding-active "gtk_tree_view_is_rubber_banding_active") :boolean
   (tree-view g-object))
 
 (export 'tree-view-rubber-banding-active)
 
 
 (export 'action-group-action)
 
-(defcfun (action-group-actions "gtk_action_group_actions") (glist g-object :free-from-foreign t)
+(defcfun (action-group-actions "gtk_action_group_list_actions") (glist g-object :free-from-foreign t)
   (action-group g-object))
 
 (export 'action-group-actions)
 
 (export 'action-group-add-action)
 
-(defcfun (action-remove-action "gtk_action_remove_action") :void
+(defcfun (action-group-remove-action "gtk_action_group_remove_action") :void
   (action-group g-object)
   (action g-object))
 
-(export 'action-remove-action)
+(export 'action-group-remove-action)
 
 (defcallback gtk-translate-func-callback (:string :free-to-foreign nil :free-from-foreign nil)
     ((path (:string :free-from-foreign nil)) (data :pointer))
 
 (export 'action-create-icon)
 
-(defcfun (action-create-menu-item "gtk_action_create_menu-item") g-object
+(defcfun (action-create-menu-item "gtk_action_create_menu_item") g-object
   (action g-object))
 
 (export 'action-create-menu-item)
 
-(defcfun (action-create-tool-item "gtk_action_create_tool-item") g-object
+(defcfun (action-create-tool-item "gtk_action_create_tool_item") g-object
   (action g-object))
 
 (export 'action-create-tool-item)