Update to correspond with dbus spec

    Upper-cased method names per the recommendation in the dbus specification.

20 files changed, 288 insertions, 261 deletions

diff --git a/atk-adaptor/accessible-adaptor.c b/atk-adaptor/accessible-adaptor.c
index 6124080..cf92b0f 100644
--- a/atk-adaptor/accessible-adaptor.c
+++ b/atk-adaptor/accessible-adaptor.c
@@ -31,7 +31,7 @@
 #include "accessible-register.h"
 
 static dbus_bool_t
-impl_get_name (DBusMessageIter *iter, void *user_data)
+impl_get_Name (DBusMessageIter *iter, void *user_data)
 {
   AtkObject *object = (AtkObject *) user_data;
 
@@ -41,7 +41,7 @@ impl_get_name (DBusMessageIter *iter, void *user_data)
 }
 
 static dbus_bool_t
-impl_set_name (DBusMessageIter *iter, void *user_data)
+impl_set_Name (DBusMessageIter *iter, void *user_data)
 {
   AtkObject *object = (AtkObject *) user_data;
   const char *name = droute_get_v_string (iter);
@@ -53,7 +53,7 @@ impl_set_name (DBusMessageIter *iter, void *user_data)
 }
 
 static dbus_bool_t
-impl_get_description (DBusMessageIter *iter, void *user_data)
+impl_get_Description (DBusMessageIter *iter, void *user_data)
 {
   AtkObject *object = (AtkObject *) user_data;
 
@@ -63,7 +63,7 @@ impl_get_description (DBusMessageIter *iter, void *user_data)
 }
 
 static dbus_bool_t
-impl_set_description (DBusMessageIter *iter, void *user_data)
+impl_set_Description (DBusMessageIter *iter, void *user_data)
 {
   AtkObject *object = (AtkObject *) user_data;
   const char *description = droute_get_v_string (iter);
@@ -75,7 +75,7 @@ impl_set_description (DBusMessageIter *iter, void *user_data)
 }
 
 static dbus_bool_t
-impl_get_parent (DBusMessageIter *iter, void *user_data)
+impl_get_Parent (DBusMessageIter *iter, void *user_data)
 {
   AtkObject *object = (AtkObject *) user_data;
 
@@ -87,7 +87,7 @@ impl_get_parent (DBusMessageIter *iter, void *user_data)
 }
 
 static dbus_bool_t
-impl_get_childCount (DBusMessageIter *iter, void *user_data)
+impl_get_ChildCount (DBusMessageIter *iter, void *user_data)
 {
   AtkObject *object = (AtkObject *) user_data;
 
@@ -99,7 +99,7 @@ impl_get_childCount (DBusMessageIter *iter, void *user_data)
 }
 
 static DBusMessage *
-impl_getChildAtIndex (DBusConnection *bus,
+impl_GetChildAtIndex (DBusConnection *bus,
                       DBusMessage *message,
                       void *user_data)
 {
@@ -118,7 +118,7 @@ impl_getChildAtIndex (DBusConnection *bus,
 }
 
 static DBusMessage *
-impl_getChildren (DBusConnection *bus,
+impl_GetChildren (DBusConnection *bus,
                   DBusMessage *message,
                   void *user_data)
 {
@@ -159,7 +159,7 @@ oom:
 }
 
 static DBusMessage *
-impl_getIndexInParent (DBusConnection *bus,
+impl_GetIndexInParent (DBusConnection *bus,
                        DBusMessage *message,
                        void *user_data)
 {
@@ -224,7 +224,7 @@ spi_relation_type_from_atk_relation_type (AtkRelationType type)
 }
 
 static DBusMessage *
-impl_getRelationSet (DBusConnection *bus,
+impl_GetRelationSet (DBusConnection *bus,
                      DBusMessage *message,
                      void *user_data)
 {
@@ -415,7 +415,7 @@ spi_accessible_role_from_atk_role (AtkRole role)
 }
 
 static DBusMessage *
-impl_getRole (DBusConnection *bus, DBusMessage *message, void *user_data)
+impl_GetRole (DBusConnection *bus, DBusMessage *message, void *user_data)
 {
   AtkObject *object = (AtkObject *) user_data;
   gint role;
@@ -445,7 +445,7 @@ impl_get_role_str (void *datum)
 }
 
 static DBusMessage *
-impl_getRoleName (DBusConnection *bus,
+impl_GetRoleName (DBusConnection *bus,
                   DBusMessage *message,
                   void *user_data)
 {
@@ -470,7 +470,7 @@ impl_getRoleName (DBusConnection *bus,
 }
 
 static DBusMessage *
-impl_getLocalizedRoleName (DBusConnection *bus,
+impl_GetLocalizedRoleName (DBusConnection *bus,
                            DBusMessage *message,
                            void *user_data)
 {
@@ -495,7 +495,7 @@ impl_getLocalizedRoleName (DBusConnection *bus,
 }
 
 static DBusMessage *
-impl_getState (DBusConnection *bus,
+impl_GetState (DBusConnection *bus,
                DBusMessage *message,
                void *user_data)
 {
@@ -517,7 +517,7 @@ impl_getState (DBusConnection *bus,
 }
 
 static DBusMessage *
-impl_getAttributes (DBusConnection *bus,
+impl_GetAttributes (DBusConnection *bus,
                     DBusMessage *message,
                     void *user_data)
 {
@@ -543,7 +543,7 @@ impl_getAttributes (DBusConnection *bus,
 }
 
 static DBusMessage *
-impl_getApplication (DBusConnection *bus,
+impl_GetApplication (DBusConnection *bus,
                      DBusMessage *message,
                      void *user_data)
 {
@@ -552,7 +552,7 @@ impl_getApplication (DBusConnection *bus,
 }
 
 static DBusMessage *
-impl_getInterfaces (DBusConnection *bus,
+impl_GetInterfaces (DBusConnection *bus,
                     DBusMessage *message,
                     void *user_data)
 {
@@ -576,25 +576,25 @@ impl_getInterfaces (DBusConnection *bus,
 }
 
 static DRouteMethod methods[] = {
-  {impl_getChildAtIndex, "getChildAtIndex"},
-  {impl_getChildren, "getChildren"},
-  {impl_getIndexInParent, "getIndexInParent"},
-  {impl_getRelationSet, "getRelationSet"},
-  {impl_getRole, "getRole"},
-  {impl_getRoleName, "getRoleName"},
-  {impl_getLocalizedRoleName, "getLocalizedRoleName"},
-  {impl_getState, "getState"},
-  {impl_getAttributes, "getAttributes"},
-  {impl_getApplication, "getApplication"},
-  {impl_getInterfaces, "getInterfaces"},
+  {impl_GetChildAtIndex, "GetChildAtIndex"},
+  {impl_GetChildren, "GetChildren"},
+  {impl_GetIndexInParent, "GetIndexInParent"},
+  {impl_GetRelationSet, "GetRelationSet"},
+  {impl_GetRole, "GetRole"},
+  {impl_GetRoleName, "GetRoleName"},
+  {impl_GetLocalizedRoleName, "GetLocalizedRoleName"},
+  {impl_GetState, "GetState"},
+  {impl_GetAttributes, "GetAttributes"},
+  {impl_GetApplication, "GetApplication"},
+  {impl_GetInterfaces, "GetInterfaces"},
   {NULL, NULL}
 };
 
 static DRouteProperty properties[] = {
-  {impl_get_name, impl_set_name, "name"},
-  {impl_get_description, impl_set_description, "description"},
-  {impl_get_parent, NULL, "parent"},
-  {impl_get_childCount, NULL, "childCount"},
+  {impl_get_Name, impl_set_Name, "Name"},
+  {impl_get_Description, impl_set_Description, "Description"},
+  {impl_get_Parent, NULL, "Parent"},
+  {impl_get_ChildCount, NULL, "ChildCount"},
   {NULL, NULL, NULL}
 };
 
diff --git a/atk-adaptor/accessible-marshaller.c b/atk-adaptor/accessible-marshaller.c
index fdd8a6d..4ef9b20 100644
--- a/atk-adaptor/accessible-marshaller.c
+++ b/atk-adaptor/accessible-marshaller.c
@@ -211,7 +211,7 @@ append_atk_object_interfaces (AtkObject *object, DBusMessageIter *iter)
  *
  * The object is marshalled including all its client side cache data.
  * The format of the structure is (ooaoassusau).
- * This is used in the updateTree signal and the getTree method
+ * This is used in the updateTree signal and the GetTree method
  * of the org.freedesktop.atspi.Tree interface.
  *
  * To marshal an object its parent, and all its children must already
diff --git a/atk-adaptor/accessible-register.c b/atk-adaptor/accessible-register.c
index f144fe9..3441c0c 100644
--- a/atk-adaptor/accessible-register.c
+++ b/atk-adaptor/accessible-register.c
@@ -756,7 +756,8 @@ tree_update_property_action (GSignalInvocationHint *signal_hint,
       pname = values[0].property_name;
       if (strcmp (pname, "accessible-name") == 0 ||
           strcmp (pname, "accessible-description") == 0 ||
-          strcmp (pname, "accessible-parent") == 0)
+          strcmp (pname, "accessible-parent") == 0 ||
+          strcmp (pname, "accessible-role") == 0)
         {
           update_accessible (accessible);
         }
diff --git a/atk-adaptor/action-adaptor.c b/atk-adaptor/action-adaptor.c
index bb00541..8f3f565 100644
--- a/atk-adaptor/action-adaptor.c
+++ b/atk-adaptor/action-adaptor.c
@@ -28,7 +28,7 @@
 #include "common/spi-dbus.h"
 
 static dbus_bool_t
-impl_get_nActions (DBusMessageIter *iter, void *user_data)
+impl_get_NActions (DBusMessageIter *iter, void *user_data)
 {
   AtkAction *action = (AtkAction *) user_data;
 
@@ -114,7 +114,7 @@ impl_get_keybinding (DBusConnection *bus, DBusMessage *message, void *user_data)
   return reply;
 }
 
-static DBusMessage *impl_getActions(DBusConnection *bus, DBusMessage *message, void *user_data)
+static DBusMessage *impl_GetActions(DBusConnection *bus, DBusMessage *message, void *user_data)
 {
   AtkAction *action = (AtkAction *) user_data;
   DBusMessage *reply;
@@ -153,7 +153,7 @@ oom:
   return reply;
 }
 
-static DBusMessage *impl_doAction(DBusConnection *bus, DBusMessage *message, void *user_data)
+static DBusMessage *impl_DoAction(DBusConnection *bus, DBusMessage *message, void *user_data)
 {
   AtkAction *action = (AtkAction *) user_data;
   DBusError error;
@@ -180,17 +180,17 @@ static DBusMessage *impl_doAction(DBusConnection *bus, DBusMessage *message, voi
 
 DRouteMethod methods[] =
 {
-  { impl_get_description, "getDescription" },
-  { impl_get_name, "getName" },
-  { impl_get_keybinding, "getKeyBinding" },
-  {impl_getActions, "getActions"},
-  {impl_doAction, "doAction"},
+  { impl_get_description, "GetDescription" },
+  { impl_get_name, "GetName" },
+  { impl_get_keybinding, "GetKeyBinding" },
+  {impl_GetActions, "GetActions"},
+  {impl_DoAction, "DoAction"},
   {NULL, NULL }
 };
 
 static DRouteProperty properties[] =
 {
-  { impl_get_nActions, NULL, "nActions" },
+  { impl_get_NActions, NULL, "NActions" },
   { NULL, NULL }
 };
 
diff --git a/atk-adaptor/application-adaptor.c b/atk-adaptor/application-adaptor.c
index 2faefcd..aab2694 100644
--- a/atk-adaptor/application-adaptor.c
+++ b/atk-adaptor/application-adaptor.c
@@ -82,7 +82,7 @@ impl_resume (DBusConnection * bus, DBusMessage * message, void *user_data)
 }
 
 static DBusMessage *
-impl_getLocale (DBusConnection * bus, DBusMessage * message, void *user_data)
+impl_GetLocale (DBusConnection * bus, DBusMessage * message, void *user_data)
 {
   return NULL;
 }
@@ -92,7 +92,7 @@ static DRouteMethod methods[] = {
   {impl_registerObjectEventListener, "registerObjectEventListener"},
   {impl_pause, "pause"},
   {impl_resume, "resume"},
-  {impl_getLocale, "getLocale"},
+  {impl_GetLocale, "GetLocale"},
   {NULL, NULL}
 };
 
diff --git a/atk-adaptor/bridge.c b/atk-adaptor/bridge.c
index efde9d1..36d32c7 100644
--- a/atk-adaptor/bridge.c
+++ b/atk-adaptor/bridge.c
@@ -148,7 +148,7 @@ register_application (SpiAppData *app)
   message = dbus_message_new_method_call (SPI_DBUS_NAME_REGISTRY,
                                           SPI_DBUS_PATH_REGISTRY,
                                           SPI_DBUS_INTERFACE_REGISTRY,
-                                          "registerApplication");
+                                          "RegisterApplication");
   dbus_message_set_no_reply (message, TRUE);
 
   uname = dbus_bus_get_unique_name(app->bus);
@@ -174,7 +174,7 @@ deregister_application (SpiAppData *app)
   message = dbus_message_new_method_call (SPI_DBUS_NAME_REGISTRY,
                                           SPI_DBUS_PATH_REGISTRY,
                                           SPI_DBUS_INTERFACE_REGISTRY,
-                                          "deregisterApplication");
+                                          "DeregisterApplication");
   dbus_message_set_no_reply (message, TRUE);
 
   uname = dbus_bus_get_unique_name(app->bus);
@@ -240,6 +240,12 @@ adaptor_init (gint *argc, gchar **argv[])
   DBusConnection *bus;
   AtkObject *root;
   gchar *introspection_directory;
+  static gboolean inited = FALSE;
+
+  if (inited)
+    return 0;
+
+  inited = TRUE;
 
   DRoutePath *treepath, *accpath;
 
diff --git a/atk-adaptor/collection-adaptor.c b/atk-adaptor/collection-adaptor.c
index 3c2b11c..ec7640b 100644
--- a/atk-adaptor/collection-adaptor.c
+++ b/atk-adaptor/collection-adaptor.c
@@ -699,7 +699,7 @@ static void free_mrp_data(MatchRulePrivate *mrp)
 }
 
 static DBusMessage *
-getMatchesFrom (DBusMessage *message,
+GetMatchesFrom (DBusMessage *message,
 		     AtkObject *current_object,
 		     MatchRulePrivate *mrp,
 		     const Accessibility_Collection_SortOrder sortby,
@@ -780,7 +780,7 @@ inorder (AtkObject *collection, MatchRulePrivate *mrp,
 */
 
 static DBusMessage *
-getMatchesInOrder (DBusMessage *message,
+GetMatchesInOrder (DBusMessage *message,
 		   AtkObject *current_object,
 		   MatchRulePrivate *mrp,
 		   const Accessibility_Collection_SortOrder sortby,
@@ -814,7 +814,7 @@ getMatchesInOrder (DBusMessage *message,
 */
 
 static DBusMessage *
-getMatchesInBackOrder (DBusMessage *message,
+GetMatchesInBackOrder (DBusMessage *message,
 		   AtkObject *current_object,
 		   MatchRulePrivate *mrp,
 		   const Accessibility_Collection_SortOrder sortby,
@@ -841,7 +841,7 @@ getMatchesInBackOrder (DBusMessage *message,
 }
 
 static DBusMessage *
-getMatchesTo (DBusMessage *message,
+GetMatchesTo (DBusMessage *message,
 	      AtkObject *current_object,
 	      MatchRulePrivate *mrp,
 	      const Accessibility_Collection_SortOrder sortby,
@@ -878,7 +878,7 @@ getMatchesTo (DBusMessage *message,
 }
 
 static DBusMessage *
-impl_getMatchesFrom (DBusConnection *bus, DBusMessage *message, void *user_data)
+impl_GetMatchesFrom (DBusConnection *bus, DBusMessage *message, void *user_data)
 {
   char *current_object_path = NULL;
   AtkObject *current_object;
@@ -914,15 +914,15 @@ impl_getMatchesFrom (DBusConnection *bus, DBusMessage *message, void *user_data)
 
   switch (tree){
   case Accessibility_Collection_TREE_RESTRICT_CHILDREN : 
-    return getMatchesFrom (message, current_object, 
+    return GetMatchesFrom (message, current_object, 
                            &rule, sortby, TRUE, count, traverse);
     break;
   case Accessibility_Collection_TREE_RESTRICT_SIBLING :
-    return getMatchesFrom (message, current_object, 
+    return GetMatchesFrom (message, current_object, 
                            &rule, sortby, FALSE, count, traverse); 
     break;
   case Accessibility_Collection_TREE_INORDER :
-    return getMatchesInOrder (message, current_object, 
+    return GetMatchesInOrder (message, current_object, 
                               &rule, sortby, TRUE, count, traverse); 
     break;
   default : return NULL;
@@ -930,7 +930,7 @@ impl_getMatchesFrom (DBusConnection *bus, DBusMessage *message, void *user_data)
 }
 
 static DBusMessage *
-impl_getMatchesTo (DBusConnection *bus, DBusMessage *message, void *user_data)
+impl_GetMatchesTo (DBusConnection *bus, DBusMessage *message, void *user_data)
 {
   char *current_object_path = NULL;
   AtkObject *current_object;
@@ -969,15 +969,15 @@ impl_getMatchesTo (DBusConnection *bus, DBusMessage *message, void *user_data)
 
   switch (tree){
   case Accessibility_Collection_TREE_RESTRICT_CHILDREN : 
-    return getMatchesTo (message, current_object, 
+    return GetMatchesTo (message, current_object, 
                          &rule, sortby, recurse, TRUE, count, traverse); 
     break;
   case Accessibility_Collection_TREE_RESTRICT_SIBLING :
-    return getMatchesTo (message, current_object, 
+    return GetMatchesTo (message, current_object, 
                          &rule, sortby, recurse, FALSE, count, traverse); 
     break;
   case Accessibility_Collection_TREE_INORDER :
-    return getMatchesInBackOrder (message, current_object, 
+    return GetMatchesInBackOrder (message, current_object, 
                                   &rule, sortby, count); 
     break;
   default : return NULL;
@@ -985,7 +985,7 @@ impl_getMatchesTo (DBusConnection *bus, DBusMessage *message, void *user_data)
 }
 
 static DBusMessage *
-impl_getMatches(DBusConnection *bus, DBusMessage *message, void *user_data)
+impl_GetMatches(DBusConnection *bus, DBusMessage *message, void *user_data)
 {
   AtkObject *obj = atk_dbus_path_to_object (dbus_message_get_path (message));
   DBusMessageIter iter;
@@ -1018,9 +1018,9 @@ impl_getMatches(DBusConnection *bus, DBusMessage *message, void *user_data)
 }
 
 static DRouteMethod methods[] = {
-  { impl_getMatchesFrom, "getMatchesFrom" },
-  { impl_getMatchesTo, "getMatchesTo" },
-  { impl_getMatches, "getMatches" },
+  { impl_GetMatchesFrom, "GetMatchesFrom" },
+  { impl_GetMatchesTo, "GetMatchesTo" },
+  { impl_GetMatches, "GetMatches" },
   {NULL, NULL}
 };
 
diff --git a/atk-adaptor/component-adaptor.c b/atk-adaptor/component-adaptor.c
index 34a21de..eeb36f9 100644
--- a/atk-adaptor/component-adaptor.c
+++ b/atk-adaptor/component-adaptor.c
@@ -60,7 +60,7 @@ impl_contains (DBusConnection * bus, DBusMessage * message, void *user_data)
 }
 
 static DBusMessage *
-impl_getAccessibleAtPoint (DBusConnection * bus, DBusMessage * message,
+impl_GetAccessibleAtPoint (DBusConnection * bus, DBusMessage * message,
                            void *user_data)
 {
   AtkComponent *component = (AtkComponent *) user_data;
@@ -86,7 +86,7 @@ impl_getAccessibleAtPoint (DBusConnection * bus, DBusMessage * message,
 }
 
 static DBusMessage *
-impl_getExtents (DBusConnection * bus, DBusMessage * message, void *user_data)
+impl_GetExtents (DBusConnection * bus, DBusMessage * message, void *user_data)
 {
   AtkComponent *component = (AtkComponent *) user_data;
   DBusError error;
@@ -108,7 +108,7 @@ impl_getExtents (DBusConnection * bus, DBusMessage * message, void *user_data)
 }
 
 static DBusMessage *
-impl_getPosition (DBusConnection * bus, DBusMessage * message,
+impl_GetPosition (DBusConnection * bus, DBusMessage * message,
                   void *user_data)
 {
   AtkComponent *component = (AtkComponent *) user_data;
@@ -140,7 +140,7 @@ impl_getPosition (DBusConnection * bus, DBusMessage * message,
 }
 
 static DBusMessage *
-impl_getSize (DBusConnection * bus, DBusMessage * message, void *user_data)
+impl_GetSize (DBusConnection * bus, DBusMessage * message, void *user_data)
 {
   AtkComponent *component = (AtkComponent *) user_data;
   gint iwidth = 0, iheight = 0;
@@ -163,7 +163,7 @@ impl_getSize (DBusConnection * bus, DBusMessage * message, void *user_data)
 }
 
 static DBusMessage *
-impl_getLayer (DBusConnection * bus, DBusMessage * message, void *user_data)
+impl_GetLayer (DBusConnection * bus, DBusMessage * message, void *user_data)
 {
   AtkComponent *component = (AtkComponent *) user_data;
   AtkLayer atklayer;
@@ -212,7 +212,7 @@ impl_getLayer (DBusConnection * bus, DBusMessage * message, void *user_data)
 }
 
 static DBusMessage *
-impl_getMDIZOrder (DBusConnection * bus, DBusMessage * message,
+impl_GetMDIZOrder (DBusConnection * bus, DBusMessage * message,
                    void *user_data)
 {
   AtkComponent *component = (AtkComponent *) user_data;
@@ -232,7 +232,7 @@ impl_getMDIZOrder (DBusConnection * bus, DBusMessage * message,
 }
 
 static DBusMessage *
-impl_grabFocus (DBusConnection * bus, DBusMessage * message, void *user_data)
+impl_GrabFocus (DBusConnection * bus, DBusMessage * message, void *user_data)
 {
   AtkComponent *component = (AtkComponent *) user_data;
   dbus_bool_t rv;
@@ -266,7 +266,7 @@ impl_deregisterFocusHandler (DBusConnection * bus, DBusMessage * message,
 #endif
 
 static DBusMessage *
-impl_getAlpha (DBusConnection * bus, DBusMessage * message, void *user_data)
+impl_GetAlpha (DBusConnection * bus, DBusMessage * message, void *user_data)
 {
   AtkComponent *component = (AtkComponent *) user_data;
   double rv;
@@ -287,16 +287,16 @@ impl_getAlpha (DBusConnection * bus, DBusMessage * message, void *user_data)
 
 static DRouteMethod methods[] = {
   {impl_contains, "contains"},
-  {impl_getAccessibleAtPoint, "getAccessibleAtPoint"},
-  {impl_getExtents, "getExtents"},
-  {impl_getPosition, "getPosition"},
-  {impl_getSize, "getSize"},
-  {impl_getLayer, "getLayer"},
-  {impl_getMDIZOrder, "getMDIZOrder"},
-  {impl_grabFocus, "grabFocus"},
+  {impl_GetAccessibleAtPoint, "GetAccessibleAtPoint"},
+  {impl_GetExtents, "GetExtents"},
+  {impl_GetPosition, "GetPosition"},
+  {impl_GetSize, "GetSize"},
+  {impl_GetLayer, "GetLayer"},
+  {impl_GetMDIZOrder, "GetMDIZOrder"},
+  {impl_GrabFocus, "GrabFocus"},
   //{impl_registerFocusHandler, "registerFocusHandler"},
   //{impl_deregisterFocusHandler, "deregisterFocusHandler"},
-  {impl_getAlpha, "getAlpha"},
+  {impl_GetAlpha, "GetAlpha"},
   {NULL, NULL}
 };
 
diff --git a/atk-adaptor/document-adaptor.c b/atk-adaptor/document-adaptor.c
index 889abf4..7cf1af7 100644
--- a/atk-adaptor/document-adaptor.c
+++ b/atk-adaptor/document-adaptor.c
@@ -30,7 +30,7 @@
 #include "accessible-marshaller.h"
 
 static DBusMessage *
-impl_getLocale (DBusConnection *bus,
+impl_GetLocale (DBusConnection *bus,
                 DBusMessage *message,
                 void *user_data)
 {
@@ -53,7 +53,7 @@ impl_getLocale (DBusConnection *bus,
 }
 
 static DBusMessage *
-impl_getAttributeValue (DBusConnection * bus, DBusMessage * message,
+impl_GetAttributeValue (DBusConnection * bus, DBusMessage * message,
                         void *user_data)
 {
   AtkDocument *document = (AtkDocument *) user_data;
@@ -83,7 +83,7 @@ impl_getAttributeValue (DBusConnection * bus, DBusMessage * message,
 }
 
 static DBusMessage *
-impl_getAttributes (DBusConnection * bus, DBusMessage * message,
+impl_GetAttributes (DBusConnection * bus, DBusMessage * message,
                     void *user_data)
 {
   AtkDocument *document = (AtkDocument *) user_data;
@@ -109,9 +109,9 @@ impl_getAttributes (DBusConnection * bus, DBusMessage * message,
 }
 
 static DRouteMethod methods[] = {
-  {impl_getLocale, "getLocale"},
-  {impl_getAttributeValue, "getAttributeValue"},
-  {impl_getAttributes, "getAttributes"},
+  {impl_GetLocale, "GetLocale"},
+  {impl_GetAttributeValue, "GetAttributeValue"},
+  {impl_GetAttributes, "GetAttributes"},
   {NULL, NULL}
 };
 
diff --git a/atk-adaptor/editabletext-adaptor.c b/atk-adaptor/editabletext-adaptor.c
index d088154..76f8ca1 100644
--- a/atk-adaptor/editabletext-adaptor.c
+++ b/atk-adaptor/editabletext-adaptor.c
@@ -28,7 +28,7 @@
 #include "common/spi-dbus.h"
 
 static DBusMessage *
-impl_setTextContents (DBusConnection * bus, DBusMessage * message,
+impl_SetTextContents (DBusConnection * bus, DBusMessage * message,
                       void *user_data)
 {
   AtkEditableText *editable = (AtkEditableText *) user_data;
@@ -58,7 +58,7 @@ impl_setTextContents (DBusConnection * bus, DBusMessage * message,
 }
 
 static DBusMessage *
-impl_insertText (DBusConnection * bus, DBusMessage * message, void *user_data)
+impl_InsertText (DBusConnection * bus, DBusMessage * message, void *user_data)
 {
   AtkEditableText *editable = (AtkEditableText *) user_data;
   dbus_int32_t position, length;
@@ -91,7 +91,7 @@ impl_insertText (DBusConnection * bus, DBusMessage * message, void *user_data)
 }
 
 static DBusMessage *
-impl_copyText (DBusConnection * bus, DBusMessage * message, void *user_data)
+impl_CopyText (DBusConnection * bus, DBusMessage * message, void *user_data)
 {
   AtkEditableText *editable = (AtkEditableText *) user_data;
   dbus_int32_t startPos, endPos;
@@ -111,7 +111,7 @@ impl_copyText (DBusConnection * bus, DBusMessage * message, void *user_data)
 }
 
 static DBusMessage *
-impl_cutText (DBusConnection * bus, DBusMessage * message, void *user_data)
+impl_CutText (DBusConnection * bus, DBusMessage * message, void *user_data)
 {
   AtkEditableText *editable = (AtkEditableText *) user_data;
   dbus_int32_t startPos, endPos;
@@ -141,7 +141,7 @@ impl_cutText (DBusConnection * bus, DBusMessage * message, void *user_data)
 }
 
 static DBusMessage *
-impl_deleteText (DBusConnection * bus, DBusMessage * message, void *user_data)
+impl_DeleteText (DBusConnection * bus, DBusMessage * message, void *user_data)
 {
   AtkEditableText *editable = (AtkEditableText *) user_data;
   dbus_int32_t startPos, endPos;
@@ -171,7 +171,7 @@ impl_deleteText (DBusConnection * bus, DBusMessage * message, void *user_data)
 }
 
 static DBusMessage *
-impl_pasteText (DBusConnection * bus, DBusMessage * message, void *user_data)
+impl_PasteText (DBusConnection * bus, DBusMessage * message, void *user_data)
 {
   AtkEditableText *editable = (AtkEditableText *) user_data;
   dbus_int32_t position;
@@ -200,12 +200,12 @@ impl_pasteText (DBusConnection * bus, DBusMessage * message, void *user_data)
 }
 
 static DRouteMethod methods[] = {
-  {impl_setTextContents, "setTextContents"},
-  {impl_insertText, "insertText"},
-  {impl_copyText, "copyText"},
-  {impl_cutText, "cutText"},
-  {impl_deleteText, "deleteText"},
-  {impl_pasteText, "pasteText"},
+  {impl_SetTextContents, "SetTextContents"},
+  {impl_InsertText, "InsertText"},
+  {impl_CopyText, "CopyText"},
+  {impl_CutText, "CutText"},
+  {impl_DeleteText, "DeleteText"},
+  {impl_PasteText, "PasteText"},
   {NULL, NULL}
 };
 
diff --git a/atk-adaptor/event.c b/atk-adaptor/event.c
index 824ef15..6e26b93 100644
--- a/atk-adaptor/event.c
+++ b/atk-adaptor/event.c
@@ -73,7 +73,7 @@ send_and_allow_reentry (DBusConnection *bus, DBusMessage *message)
 }
 
 static gboolean
-Accessibility_DeviceEventController_notifyListenersSync(const Accessibility_DeviceEvent *key_event)
+Accessibility_DeviceEventController_NotifyListenersSync(const Accessibility_DeviceEvent *key_event)
 {
   DBusMessage *message;
   DBusError error;
@@ -83,7 +83,7 @@ Accessibility_DeviceEventController_notifyListenersSync(const Accessibility_Devi
   dbus_message_new_method_call(SPI_DBUS_NAME_REGISTRY, 
                                SPI_DBUS_PATH_DEC,
                                SPI_DBUS_INTERFACE_DEC,
-                               "notifyListenersSync");
+                               "NotifyListenersSync");
 
   dbus_error_init(&error);
   if (spi_dbus_marshal_deviceEvent(message, key_event))
@@ -154,7 +154,7 @@ spi_atk_bridge_key_listener (AtkKeyEventStruct *event, gpointer data)
 
   spi_init_keystroke_from_atk_key_event (&key_event, event);
 
-  result = Accessibility_DeviceEventController_notifyListenersSync (&key_event);
+  result = Accessibility_DeviceEventController_NotifyListenersSync (&key_event);
 
   if (key_event.event_string) g_free (key_event.event_string);
 
@@ -175,6 +175,23 @@ spi_atk_bridge_key_listener (AtkKeyEventStruct *event, gpointer data)
  * the AT-SPI event.
  */
 
+static gchar *
+DBusSignalName (const gchar *s)
+{
+  gchar *ret = g_strdup (s);
+  gchar *t;
+
+  if (!ret)
+    return NULL;
+  ret [0] = toupper (ret [0]);
+  while ((t = strchr (ret, '-')) != NULL)
+  {
+    memmove (t, t + 1, strlen (t));
+    *t = toupper (*t);
+  }
+  return ret;
+}
+
 static void 
 emit(AtkObject  *accessible,
      const char *klass,
@@ -186,6 +203,7 @@ emit(AtkObject  *accessible,
      const void *val)
 {
   gchar *path;
+  gchar *cname;
 
   /* TODO this is a hack, used becuase child-added events are not guaranteed.
    * On recieving an event from a non-registered object we check if it can be safely 
@@ -205,7 +223,9 @@ emit(AtkObject  *accessible,
       return;
   }
 
-  spi_dbus_emit_signal (atk_adaptor_app_data->bus, path, klass, major, minor, detail1, detail2, type, val);
+  cname = DBusSignalName (major);
+  spi_dbus_emit_signal (atk_adaptor_app_data->bus, path, klass, cname, minor, detail1, detail2, type, val);
+  g_free (cname);
   g_free(path);
 }
 
@@ -224,7 +244,7 @@ emit_rect(AtkObject  *accessible,
 {
   DBusMessage *sig;
   DBusMessageIter iter, variant, sub;
-  gchar *path, *cname, *t;
+  gchar *path, *cname;
   dbus_int32_t dummy = 0;
 
   path = atk_dbus_object_to_path (accessible, FALSE);
@@ -245,8 +265,7 @@ emit_rect(AtkObject  *accessible,
    * name in D-Bus (Why not??!?) The names need converting
    * on this side, and again on the client side.
    */
-  cname = g_strdup(major);
-  while ((t = strchr(cname, '-')) != NULL) *t = '_';
+  cname = DBusSignalName (major);
 
   sig = dbus_message_new_signal(path, klass, cname);
   g_free(path);
@@ -316,6 +335,7 @@ property_event_listener (GSignalInvocationHint *signal_hint,
   pname = values[0].property_name;
   if (strcmp (pname, "accessible-name") == 0 ||
       strcmp (pname, "accessible-description") == 0 ||
+      strcmp (pname, "accessible-role") == 0 ||
       strcmp (pname, "accessible-parent") == 0)
   {
       return TRUE;
diff --git a/atk-adaptor/hyperlink-adaptor.c b/atk-adaptor/hyperlink-adaptor.c
index b839a0a..8e0acb0 100644
--- a/atk-adaptor/hyperlink-adaptor.c
+++ b/atk-adaptor/hyperlink-adaptor.c
@@ -39,7 +39,7 @@ get_hyperlink (void *user_data)
 }
 
 static dbus_bool_t
-impl_get_nAnchors (DBusMessageIter * iter, void *user_data)
+impl_get_NAnchors (DBusMessageIter * iter, void *user_data)
 {
   AtkHyperlink *link = (AtkHyperlink *) user_data;
   g_return_val_if_fail (ATK_IS_HYPERLINK (user_data), FALSE);
@@ -48,7 +48,7 @@ impl_get_nAnchors (DBusMessageIter * iter, void *user_data)
 
 
 static dbus_bool_t
-impl_get_startIndex (DBusMessageIter * iter,
+impl_get_StartIndex (DBusMessageIter * iter,
                      void *user_data)
 {
   AtkHyperlink *link = get_hyperlink (user_data);
@@ -57,7 +57,7 @@ impl_get_startIndex (DBusMessageIter * iter,
 }
 
 static dbus_bool_t
-impl_get_endIndex (DBusMessageIter * iter, void *user_data)
+impl_get_EndIndex (DBusMessageIter * iter, void *user_data)
 {
   AtkHyperlink *link = get_hyperlink (user_data);
   g_return_val_if_fail (ATK_IS_HYPERLINK (user_data), FALSE);
@@ -65,7 +65,7 @@ impl_get_endIndex (DBusMessageIter * iter, void *user_data)
 }
 
 static DBusMessage *
-impl_getObject (DBusConnection * bus, DBusMessage * message, void *user_data)
+impl_GetObject (DBusConnection * bus, DBusMessage * message, void *user_data)
 {
   AtkHyperlink *link = get_hyperlink (user_data);
   DBusError error;
@@ -85,7 +85,7 @@ impl_getObject (DBusConnection * bus, DBusMessage * message, void *user_data)
 }
 
 static DBusMessage *
-impl_getURI (DBusConnection * bus, DBusMessage * message, void *user_data)
+impl_GetURI (DBusConnection * bus, DBusMessage * message, void *user_data)
 {
   AtkHyperlink *link = get_hyperlink (user_data);
   dbus_int32_t i;
@@ -116,7 +116,7 @@ impl_getURI (DBusConnection * bus, DBusMessage * message, void *user_data)
 }
 
 static DBusMessage *
-impl_isValid (DBusConnection * bus, DBusMessage * message, void *user_data)
+impl_IsValid (DBusConnection * bus, DBusMessage * message, void *user_data)
 {
   AtkHyperlink *link = get_hyperlink (user_data);
   dbus_bool_t rv;
@@ -136,16 +136,16 @@ impl_isValid (DBusConnection * bus, DBusMessage * message, void *user_data)
 }
 
 static DRouteMethod methods[] = {
-  {impl_getObject, "getObject"},
-  {impl_getURI, "getURI"},
-  {impl_isValid, "isValid"},
+  {impl_GetObject, "GetObject"},
+  {impl_GetURI, "GetURI"},
+  {impl_IsValid, "IsValid"},
   {NULL, NULL}
 };
 
 static DRouteProperty properties[] = {
-  {impl_get_nAnchors, NULL, "nAnchors"},
-  {impl_get_startIndex, NULL, "startIndex"},
-  {impl_get_endIndex, NULL, "endIndex"},
+  {impl_get_NAnchors, NULL, "NAnchors"},
+  {impl_get_StartIndex, NULL, "StartIndex"},
+  {impl_get_EndIndex, NULL, "EndIndex"},
   {NULL, NULL, NULL}
 };
 
diff --git a/atk-adaptor/hypertext-adaptor.c b/atk-adaptor/hypertext-adaptor.c
index 452cc76..c5ee329 100644
--- a/atk-adaptor/hypertext-adaptor.c
+++ b/atk-adaptor/hypertext-adaptor.c
@@ -29,7 +29,7 @@
 #include "accessible-marshaller.h"
 
 static DBusMessage *
-impl_getNLinks (DBusConnection * bus, DBusMessage * message, void *user_data)
+impl_GetNLinks (DBusConnection * bus, DBusMessage * message, void *user_data)
 {
   AtkHypertext *hypertext = (AtkHypertext *) user_data;
   gint rv;
@@ -48,7 +48,7 @@ impl_getNLinks (DBusConnection * bus, DBusMessage * message, void *user_data)
 }
 
 static DBusMessage *
-impl_getLink (DBusConnection * bus, DBusMessage * message, void *user_data)
+impl_GetLink (DBusConnection * bus, DBusMessage * message, void *user_data)
 {
   AtkHypertext *hypertext = (AtkHypertext *) user_data;
   DBusError error;
@@ -68,7 +68,7 @@ impl_getLink (DBusConnection * bus, DBusMessage * message, void *user_data)
 }
 
 static DBusMessage *
-impl_getLinkIndex (DBusConnection * bus, DBusMessage * message,
+impl_GetLinkIndex (DBusConnection * bus, DBusMessage * message,
                    void *user_data)
 {
   AtkHypertext *hypertext = (AtkHypertext *) user_data;
@@ -96,9 +96,9 @@ impl_getLinkIndex (DBusConnection * bus, DBusMessage * message,
 }
 
 static DRouteMethod methods[] = {
-  {impl_getNLinks, "getNLinks"},
-  {impl_getLink, "getLink"},
-  {impl_getLinkIndex, "getLinkIndex"},
+  {impl_GetNLinks, "GetNLinks"},
+  {impl_GetLink, "GetLink"},
+  {impl_GetLinkIndex, "GetLinkIndex"},
   {NULL, NULL}
 };
 
diff --git a/atk-adaptor/image-adaptor.c b/atk-adaptor/image-adaptor.c
index 500ea23..e1b801a 100644
--- a/atk-adaptor/image-adaptor.c
+++ b/atk-adaptor/image-adaptor.c
@@ -28,7 +28,7 @@
 #include "common/spi-dbus.h"
 
 static dbus_bool_t
-impl_get_imageDescription (DBusMessageIter * iter,
+impl_get_ImageDescription (DBusMessageIter * iter,
                            void *user_data)
 {
   AtkImage *image = (AtkImage *) user_data;
@@ -38,7 +38,7 @@ impl_get_imageDescription (DBusMessageIter * iter,
 }
 
 static dbus_bool_t
-impl_get_imageLocale (DBusMessageIter * iter,
+impl_get_ImageLocale (DBusMessageIter * iter,
                       void *user_data)
 {
   AtkImage *image = (AtkImage *) user_data;
@@ -47,7 +47,7 @@ impl_get_imageLocale (DBusMessageIter * iter,
 }
 
 static DBusMessage *
-impl_getImageExtents (DBusConnection * bus, DBusMessage * message,
+impl_GetImageExtents (DBusConnection * bus, DBusMessage * message,
                       void *user_data)
 {
   AtkImage *image = (AtkImage *) user_data;
@@ -69,7 +69,7 @@ impl_getImageExtents (DBusConnection * bus, DBusMessage * message,
 }
 
 static DBusMessage *
-impl_getImagePosition (DBusConnection * bus, DBusMessage * message,
+impl_GetImagePosition (DBusConnection * bus, DBusMessage * message,
                        void *user_data)
 {
   AtkImage *image = (AtkImage *) user_data;
@@ -100,7 +100,7 @@ impl_getImagePosition (DBusConnection * bus, DBusMessage * message,
 }
 
 static DBusMessage *
-impl_getImageSize (DBusConnection * bus, DBusMessage * message,
+impl_GetImageSize (DBusConnection * bus, DBusMessage * message,
                    void *user_data)
 {
   AtkImage *image = (AtkImage *) user_data;
@@ -123,15 +123,15 @@ impl_getImageSize (DBusConnection * bus, DBusMessage * message,
 }
 
 static DRouteMethod methods[] = {
-  {impl_getImageExtents, "getImageExtents"},
-  {impl_getImagePosition, "getImagePosition"},
-  {impl_getImageSize, "getImageSize"},
+  {impl_GetImageExtents, "GetImageExtents"},
+  {impl_GetImagePosition, "GetImagePosition"},
+  {impl_GetImageSize, "GetImageSize"},
   {NULL, NULL}
 };
 
 static DRouteProperty properties[] = {
-  {impl_get_imageDescription, NULL, "imageDescription"},
-  {impl_get_imageLocale, NULL, "imageLocale"},
+  {impl_get_ImageDescription, NULL, "ImageDescription"},
+  {impl_get_ImageLocale, NULL, "ImageLocale"},
   {NULL, NULL, NULL}
 };
 
diff --git a/atk-adaptor/selection-adaptor.c b/atk-adaptor/selection-adaptor.c
index 1fee235..7735488 100644
--- a/atk-adaptor/selection-adaptor.c
+++ b/atk-adaptor/selection-adaptor.c
@@ -29,7 +29,7 @@
 #include "accessible-marshaller.h"
 
 static dbus_bool_t
-impl_get_nSelectedChildren (DBusMessageIter * iter,
+impl_get_NSelectedChildren (DBusMessageIter * iter,
                             void *user_data)
 {
   AtkSelection *selection = (AtkSelection *) user_data;
@@ -40,7 +40,7 @@ impl_get_nSelectedChildren (DBusMessageIter * iter,
 }
 
 /*static char *
-impl_get_nSelectedChildren_str (void *datum)
+impl_get_NSelectedChildren_str (void *datum)
 {
   g_return_val_if_fail (ATK_IS_SELECTION (user_data), FALSE);
   return g_strdup_printf ("%d",
@@ -49,7 +49,7 @@ impl_get_nSelectedChildren_str (void *datum)
 }*/
 
 static DBusMessage *
-impl_getSelectedChild (DBusConnection * bus, DBusMessage * message,
+impl_GetSelectedChild (DBusConnection * bus, DBusMessage * message,
                        void *user_data)
 {
   AtkSelection *selection = (AtkSelection *) user_data;
@@ -71,7 +71,7 @@ impl_getSelectedChild (DBusConnection * bus, DBusMessage * message,
 }
 
 static DBusMessage *
-impl_selectChild (DBusConnection * bus, DBusMessage * message,
+impl_SelectChild (DBusConnection * bus, DBusMessage * message,
                   void *user_data)
 {
   AtkSelection *selection = (AtkSelection *) user_data;
@@ -99,7 +99,7 @@ impl_selectChild (DBusConnection * bus, DBusMessage * message,
 }
 
 static DBusMessage *
-impl_deselectSelectedChild (DBusConnection * bus, DBusMessage * message,
+impl_DeselectSelectedChild (DBusConnection * bus, DBusMessage * message,
                             void *user_data)
 {
   AtkSelection *selection = (AtkSelection *) user_data;
@@ -128,7 +128,7 @@ impl_deselectSelectedChild (DBusConnection * bus, DBusMessage * message,
 }
 
 static DBusMessage *
-impl_isChildSelected (DBusConnection * bus, DBusMessage * message,
+impl_IsChildSelected (DBusConnection * bus, DBusMessage * message,
                       void *user_data)
 {
   AtkSelection *selection = (AtkSelection *) user_data;
@@ -156,7 +156,7 @@ impl_isChildSelected (DBusConnection * bus, DBusMessage * message,
 }
 
 static DBusMessage *
-impl_selectAll (DBusConnection * bus, DBusMessage * message, void *user_data)
+impl_SelectAll (DBusConnection * bus, DBusMessage * message, void *user_data)
 {
   AtkSelection *selection = (AtkSelection *) user_data;
   dbus_bool_t rv;
@@ -175,7 +175,7 @@ impl_selectAll (DBusConnection * bus, DBusMessage * message, void *user_data)
 }
 
 static DBusMessage *
-impl_clearSelection (DBusConnection * bus, DBusMessage * message,
+impl_ClearSelection (DBusConnection * bus, DBusMessage * message,
                      void *user_data)
 {
   AtkSelection *selection = (AtkSelection *) user_data;
@@ -195,7 +195,7 @@ impl_clearSelection (DBusConnection * bus, DBusMessage * message,
 }
 
 static DBusMessage *
-impl_deselectChild (DBusConnection * bus, DBusMessage * message,
+impl_DeselectChild (DBusConnection * bus, DBusMessage * message,
                     void *user_data)
 {
   AtkSelection *selection = (AtkSelection *) user_data;
@@ -236,18 +236,18 @@ impl_deselectChild (DBusConnection * bus, DBusMessage * message,
 }
 
 static DRouteMethod methods[] = {
-  {impl_getSelectedChild, "getSelectedChild"},
-  {impl_selectChild, "selectChild"},
-  {impl_deselectSelectedChild, "deselectSelectedChild"},
-  {impl_isChildSelected, "isChildSelected"},
-  {impl_selectAll, "selectAll"},
-  {impl_clearSelection, "clearSelection"},
-  {impl_deselectChild, "deselectChild"},
+  {impl_GetSelectedChild, "GetSelectedChild"},
+  {impl_SelectChild, "SelectChild"},
+  {impl_DeselectSelectedChild, "DeselectSelectedChild"},
+  {impl_IsChildSelected, "IsChildSelected"},
+  {impl_SelectAll, "SelectAll"},
+  {impl_ClearSelection, "ClearSelection"},
+  {impl_DeselectChild, "DeselectChild"},
   {NULL, NULL}
 };
 
 static DRouteProperty properties[] = {
-  {impl_get_nSelectedChildren, NULL, "nSelectedChildren"},
+  {impl_get_NSelectedChildren, NULL, "NSelectedChildren"},
   {NULL, NULL, NULL}
 };
 
diff --git a/atk-adaptor/streamablecontent-adaptor.c b/atk-adaptor/streamablecontent-adaptor.c
index 8b3d40b..cf15bbd 100644
--- a/atk-adaptor/streamablecontent-adaptor.c
+++ b/atk-adaptor/streamablecontent-adaptor.c
@@ -265,7 +265,7 @@ impl_accessibility_streamable_get_stream (PortableServer_Servant servant,
 }
 
 /*
- * CORBA Accessibility::StreamableContent::getURI method implementation
+ * CORBA Accessibility::StreamableContent::GetURI method implementation
  */
 static CORBA_string
 impl_accessibility_streamable_get_uri (PortableServer_Servant servant,
@@ -291,7 +291,7 @@ spi_streamable_class_init (SpiStreamableClass *klass)
         epv->getContentTypes = impl_accessibility_streamable_get_content_types;
         epv->getContent = impl_accessibility_streamable_get_content;
 	epv->getStream = impl_accessibility_streamable_get_stream;
-	epv->getURI = impl_accessibility_streamable_get_uri;
+	epv->GetURI = impl_accessibility_streamable_get_uri;
 }
 
 static void
diff --git a/atk-adaptor/table-adaptor.c b/atk-adaptor/table-adaptor.c
index 33aaa99..a49ea66 100644
--- a/atk-adaptor/table-adaptor.c
+++ b/atk-adaptor/table-adaptor.c
@@ -29,7 +29,7 @@
 #include "common/spi-dbus.h"
 
 static dbus_bool_t
-impl_get_nRows (DBusMessageIter * iter, void *user_data)
+impl_get_NRows (DBusMessageIter * iter, void *user_data)
 {
   AtkTable *table = (AtkTable *) user_data;
   g_return_val_if_fail (ATK_IS_TABLE (user_data), FALSE);
@@ -37,7 +37,7 @@ impl_get_nRows (DBusMessageIter * iter, void *user_data)
 }
 
 static dbus_bool_t
-impl_get_nColumns (DBusMessageIter * iter, void *user_data)
+impl_get_NColumns (DBusMessageIter * iter, void *user_data)
 {
   AtkTable *table = (AtkTable *) user_data;
   g_return_val_if_fail (ATK_IS_TABLE (user_data), FALSE);
@@ -45,7 +45,7 @@ impl_get_nColumns (DBusMessageIter * iter, void *user_data)
 }
 
 static dbus_bool_t
-impl_get_caption (DBusMessageIter * iter, void *user_data)
+impl_get_Caption (DBusMessageIter * iter, void *user_data)
 {
   AtkTable *table = (AtkTable *) user_data;
   g_return_val_if_fail (ATK_IS_TABLE (user_data), FALSE);
@@ -54,7 +54,7 @@ impl_get_caption (DBusMessageIter * iter, void *user_data)
 }
 
 static dbus_bool_t
-impl_get_summary (DBusMessageIter * iter, void *user_data)
+impl_get_Summary (DBusMessageIter * iter, void *user_data)
 {
   AtkTable *table = (AtkTable *) user_data;
   g_return_val_if_fail (ATK_IS_TABLE (user_data), FALSE);
@@ -63,7 +63,7 @@ impl_get_summary (DBusMessageIter * iter, void *user_data)
 }
 
 static dbus_bool_t
-impl_get_nSelectedRows (DBusMessageIter * iter,
+impl_get_NSelectedRows (DBusMessageIter * iter,
                         void *user_data)
 {
   AtkTable *table = (AtkTable *) user_data;
@@ -77,7 +77,7 @@ impl_get_nSelectedRows (DBusMessageIter * iter,
 }
 
 static dbus_bool_t
-impl_get_nSelectedColumns (DBusMessageIter * iter,
+impl_get_NSelectedColumns (DBusMessageIter * iter,
                            void *user_data)
 {
   AtkTable *table = (AtkTable *) user_data;
@@ -91,7 +91,7 @@ impl_get_nSelectedColumns (DBusMessageIter * iter,
 }
 
 static DBusMessage *
-impl_getAccessibleAt (DBusConnection * bus, DBusMessage * message,
+impl_GetAccessibleAt (DBusConnection * bus, DBusMessage * message,
                       void *user_data)
 {
   AtkTable *table = (AtkTable *) user_data;
@@ -113,7 +113,7 @@ impl_getAccessibleAt (DBusConnection * bus, DBusMessage * message,
 }
 
 static DBusMessage *
-impl_getIndexAt (DBusConnection * bus, DBusMessage * message, void *user_data)
+impl_GetIndexAt (DBusConnection * bus, DBusMessage * message, void *user_data)
 {
   AtkTable *table = (AtkTable *) user_data;
   dbus_int32_t row, column;
@@ -141,7 +141,7 @@ impl_getIndexAt (DBusConnection * bus, DBusMessage * message, void *user_data)
 }
 
 static DBusMessage *
-impl_getRowAtIndex (DBusConnection * bus, DBusMessage * message,
+impl_GetRowAtIndex (DBusConnection * bus, DBusMessage * message,
                     void *user_data)
 {
   AtkTable *table = (AtkTable *) user_data;
@@ -169,7 +169,7 @@ impl_getRowAtIndex (DBusConnection * bus, DBusMessage * message,
 }
 
 static DBusMessage *
-impl_getColumnAtIndex (DBusConnection * bus, DBusMessage * message,
+impl_GetColumnAtIndex (DBusConnection * bus, DBusMessage * message,
                        void *user_data)
 {
   AtkTable *table = (AtkTable *) user_data;
@@ -197,7 +197,7 @@ impl_getColumnAtIndex (DBusConnection * bus, DBusMessage * message,
 }
 
 static DBusMessage *
-impl_getRowDescription (DBusConnection * bus, DBusMessage * message,
+impl_GetRowDescription (DBusConnection * bus, DBusMessage * message,
                         void *user_data)
 {
   dbus_int32_t row;
@@ -227,7 +227,7 @@ impl_getRowDescription (DBusConnection * bus, DBusMessage * message,
 }
 
 static DBusMessage *
-impl_getColumnDescription (DBusConnection * bus, DBusMessage * message,
+impl_GetColumnDescription (DBusConnection * bus, DBusMessage * message,
                            void *user_data)
 {
   AtkTable *table = (AtkTable *) user_data;
@@ -257,7 +257,7 @@ impl_getColumnDescription (DBusConnection * bus, DBusMessage * message,
 }
 
 static DBusMessage *
-impl_getRowExtentAt (DBusConnection * bus, DBusMessage * message,
+impl_GetRowExtentAt (DBusConnection * bus, DBusMessage * message,
                      void *user_data)
 {
   AtkTable *table = (AtkTable *) user_data;
@@ -286,7 +286,7 @@ impl_getRowExtentAt (DBusConnection * bus, DBusMessage * message,
 }
 
 static DBusMessage *
-impl_getColumnExtentAt (DBusConnection * bus, DBusMessage * message,
+impl_GetColumnExtentAt (DBusConnection * bus, DBusMessage * message,
                         void *user_data)
 {
   AtkTable *table = (AtkTable *) user_data;
@@ -315,7 +315,7 @@ impl_getColumnExtentAt (DBusConnection * bus, DBusMessage * message,
 }
 
 static DBusMessage *
-impl_getRowHeader (DBusConnection * bus, DBusMessage * message,
+impl_GetRowHeader (DBusConnection * bus, DBusMessage * message,
                    void *user_data)
 {
   AtkTable *table = (AtkTable *) user_data;
@@ -337,7 +337,7 @@ impl_getRowHeader (DBusConnection * bus, DBusMessage * message,
 }
 
 static DBusMessage *
-impl_getColumnHeader (DBusConnection * bus, DBusMessage * message,
+impl_GetColumnHeader (DBusConnection * bus, DBusMessage * message,
                       void *user_data)
 {
   AtkTable *table = (AtkTable *) user_data;
@@ -359,7 +359,7 @@ impl_getColumnHeader (DBusConnection * bus, DBusMessage * message,
 }
 
 static DBusMessage *
-impl_getSelectedRows (DBusConnection * bus, DBusMessage * message,
+impl_GetSelectedRows (DBusConnection * bus, DBusMessage * message,
                       void *user_data)
 {
   AtkTable *table = (AtkTable *) user_data;
@@ -385,7 +385,7 @@ impl_getSelectedRows (DBusConnection * bus, DBusMessage * message,
 }
 
 static DBusMessage *
-impl_getSelectedColumns (DBusConnection * bus, DBusMessage * message,
+impl_GetSelectedColumns (DBusConnection * bus, DBusMessage * message,
                          void *user_data)
 {
   AtkTable *table = (AtkTable *) user_data;
@@ -411,7 +411,7 @@ impl_getSelectedColumns (DBusConnection * bus, DBusMessage * message,
 }
 
 static DBusMessage *
-impl_isRowSelected (DBusConnection * bus, DBusMessage * message,
+impl_IsRowSelected (DBusConnection * bus, DBusMessage * message,
                     void *user_data)
 {
   AtkTable *table = (AtkTable *) user_data;
@@ -439,7 +439,7 @@ impl_isRowSelected (DBusConnection * bus, DBusMessage * message,
 }
 
 static DBusMessage *
-impl_isColumnSelected (DBusConnection * bus, DBusMessage * message,
+impl_IsColumnSelected (DBusConnection * bus, DBusMessage * message,
                        void *user_data)
 {
   AtkTable *table = (AtkTable *) user_data;
@@ -467,7 +467,7 @@ impl_isColumnSelected (DBusConnection * bus, DBusMessage * message,
 }
 
 static DBusMessage *
-impl_isSelected (DBusConnection * bus, DBusMessage * message, void *user_data)
+impl_IsSelected (DBusConnection * bus, DBusMessage * message, void *user_data)
 {
   AtkTable *table = (AtkTable *) user_data;
   dbus_int32_t row, column;
@@ -495,7 +495,7 @@ impl_isSelected (DBusConnection * bus, DBusMessage * message, void *user_data)
 }
 
 static DBusMessage *
-impl_addRowSelection (DBusConnection * bus, DBusMessage * message,
+impl_AddRowSelection (DBusConnection * bus, DBusMessage * message,
                       void *user_data)
 {
   AtkTable *table = (AtkTable *) user_data;
@@ -523,7 +523,7 @@ impl_addRowSelection (DBusConnection * bus, DBusMessage * message,
 }
 
 static DBusMessage *
-impl_addColumnSelection (DBusConnection * bus, DBusMessage * message,
+impl_AddColumnSelection (DBusConnection * bus, DBusMessage * message,
                          void *user_data)
 {
   AtkTable *table = (AtkTable *) user_data;
@@ -551,7 +551,7 @@ impl_addColumnSelection (DBusConnection * bus, DBusMessage * message,
 }
 
 static DBusMessage *
-impl_removeRowSelection (DBusConnection * bus, DBusMessage * message,
+impl_RemoveRowSelection (DBusConnection * bus, DBusMessage * message,
                          void *user_data)
 {
   AtkTable *table = (AtkTable *) user_data;
@@ -579,7 +579,7 @@ impl_removeRowSelection (DBusConnection * bus, DBusMessage * message,
 }
 
 static DBusMessage *
-impl_removeColumnSelection (DBusConnection * bus, DBusMessage * message,
+impl_RemoveColumnSelection (DBusConnection * bus, DBusMessage * message,
                             void *user_data)
 {
   AtkTable *table = (AtkTable *) user_data;
@@ -607,7 +607,7 @@ impl_removeColumnSelection (DBusConnection * bus, DBusMessage * message,
 }
 
 static DBusMessage *
-impl_getRowColumnExtentsAtIndex (DBusConnection * bus, DBusMessage * message,
+impl_GetRowColumnExtentsAtIndex (DBusConnection * bus, DBusMessage * message,
                                  void *user_data)
 {
   AtkTable *table = (AtkTable *) user_data;
@@ -652,36 +652,36 @@ impl_getRowColumnExtentsAtIndex (DBusConnection * bus, DBusMessage * message,
 }
 
 static DRouteMethod methods[] = {
-  {impl_getAccessibleAt, "getAccessibleAt"},
-  {impl_getIndexAt, "getIndexAt"},
-  {impl_getRowAtIndex, "getRowAtIndex"},
-  {impl_getColumnAtIndex, "getColumnAtIndex"},
-  {impl_getRowDescription, "getRowDescription"},
-  {impl_getColumnDescription, "getColumnDescription"},
-  {impl_getRowExtentAt, "getRowExtentAt"},
-  {impl_getColumnExtentAt, "getColumnExtentAt"},
-  {impl_getRowHeader, "getRowHeader"},
-  {impl_getColumnHeader, "getColumnHeader"},
-  {impl_getSelectedRows, "getSelectedRows"},
-  {impl_getSelectedColumns, "getSelectedColumns"},
-  {impl_isRowSelected, "isRowSelected"},
-  {impl_isColumnSelected, "isColumnSelected"},
-  {impl_isSelected, "isSelected"},
-  {impl_addRowSelection, "addRowSelection"},
-  {impl_addColumnSelection, "addColumnSelection"},
-  {impl_removeRowSelection, "removeRowSelection"},
-  {impl_removeColumnSelection, "removeColumnSelection"},
-  {impl_getRowColumnExtentsAtIndex, "getRowColumnExtentsAtIndex"},
+  {impl_GetAccessibleAt, "GetAccessibleAt"},
+  {impl_GetIndexAt, "GetIndexAt"},
+  {impl_GetRowAtIndex, "GetRowAtIndex"},
+  {impl_GetColumnAtIndex, "GetColumnAtIndex"},
+  {impl_GetRowDescription, "GetRowDescription"},
+  {impl_GetColumnDescription, "GetColumnDescription"},
+  {impl_GetRowExtentAt, "GetRowExtentAt"},
+  {impl_GetColumnExtentAt, "GetColumnExtentAt"},
+  {impl_GetRowHeader, "GetRowHeader"},
+  {impl_GetColumnHeader, "GetColumnHeader"},
+  {impl_GetSelectedRows, "GetSelectedRows"},
+  {impl_GetSelectedColumns, "GetSelectedColumns"},
+  {impl_IsRowSelected, "IsRowSelected"},
+  {impl_IsColumnSelected, "IsColumnSelected"},
+  {impl_IsSelected, "IsSelected"},
+  {impl_AddRowSelection, "AddRowSelection"},
+  {impl_AddColumnSelection, "AddColumnSelection"},
+  {impl_RemoveRowSelection, "RemoveRowSelection"},
+  {impl_RemoveColumnSelection, "RemoveColumnSelection"},
+  {impl_GetRowColumnExtentsAtIndex, "GetRowColumnExtentsAtIndex"},
   {NULL, NULL}
 };
 
 static DRouteProperty properties[] = {
-  {impl_get_nRows, NULL, "nRows"},
-  {impl_get_nColumns, NULL, "nColumns"},
-  {impl_get_caption, NULL, "caption"},
-  {impl_get_summary, NULL, "summary"},
-  {impl_get_nSelectedRows, NULL, "nSelectedRows"},
-  {impl_get_nSelectedColumns, NULL, "nSelectedColumns"},
+  {impl_get_NRows, NULL, "NRows"},
+  {impl_get_NColumns, NULL, "NColumns"},
+  {impl_get_Caption, NULL, "Caption"},
+  {impl_get_Summary, NULL, "Summary"},
+  {impl_get_NSelectedRows, NULL, "nSelectedRows"},
+  {impl_get_NSelectedColumns, NULL, "nSelectedColumns"},
   {NULL, NULL, NULL}
 };
 
diff --git a/atk-adaptor/text-adaptor.c b/atk-adaptor/text-adaptor.c
index dd10b8d..4fd42ab 100644
--- a/atk-adaptor/text-adaptor.c
+++ b/atk-adaptor/text-adaptor.c
@@ -32,7 +32,7 @@
 #include "accessible-marshaller.h"
 
 static dbus_bool_t
-impl_get_characterCount (DBusMessageIter * iter,
+impl_get_CharacterCount (DBusMessageIter * iter,
                          void *user_data)
 {
   AtkText *text = (AtkText *) user_data;
@@ -41,7 +41,7 @@ impl_get_characterCount (DBusMessageIter * iter,
 }
 
 static dbus_bool_t
-impl_get_caretOffset (DBusMessageIter * iter,
+impl_get_CaretOffset (DBusMessageIter * iter,
                       void *user_data)
 {
   AtkText *text = (AtkText *) user_data;
@@ -50,7 +50,7 @@ impl_get_caretOffset (DBusMessageIter * iter,
 }
 
 static DBusMessage *
-impl_getText (DBusConnection * bus, DBusMessage * message, void *user_data)
+impl_GetText (DBusConnection * bus, DBusMessage * message, void *user_data)
 {
   AtkText *text = (AtkText *) user_data;
   dbus_int32_t startOffset, endOffset;
@@ -81,7 +81,7 @@ impl_getText (DBusConnection * bus, DBusMessage * message, void *user_data)
 }
 
 static DBusMessage *
-impl_setCaretOffset (DBusConnection * bus, DBusMessage * message,
+impl_SetCaretOffset (DBusConnection * bus, DBusMessage * message,
                      void *user_data)
 {
   AtkText *text = (AtkText *) user_data;
@@ -109,7 +109,7 @@ impl_setCaretOffset (DBusConnection * bus, DBusMessage * message,
 }
 
 static DBusMessage *
-impl_getTextBeforeOffset (DBusConnection * bus, DBusMessage * message,
+impl_GetTextBeforeOffset (DBusConnection * bus, DBusMessage * message,
                           void *user_data)
 {
   AtkText *text = (AtkText *) user_data;
@@ -149,7 +149,7 @@ impl_getTextBeforeOffset (DBusConnection * bus, DBusMessage * message,
 }
 
 static DBusMessage *
-impl_getTextAtOffset (DBusConnection * bus, DBusMessage * message,
+impl_GetTextAtOffset (DBusConnection * bus, DBusMessage * message,
                       void *user_data)
 {
   AtkText *text = (AtkText *) user_data;
@@ -188,7 +188,7 @@ impl_getTextAtOffset (DBusConnection * bus, DBusMessage * message,
 }
 
 static DBusMessage *
-impl_getTextAfterOffset (DBusConnection * bus, DBusMessage * message,
+impl_GetTextAfterOffset (DBusConnection * bus, DBusMessage * message,
                          void *user_data)
 {
   AtkText *text = (AtkText *) user_data;
@@ -228,7 +228,7 @@ impl_getTextAfterOffset (DBusConnection * bus, DBusMessage * message,
 }
 
 static DBusMessage *
-impl_getCharacterAtOffset (DBusConnection * bus, DBusMessage * message,
+impl_GetCharacterAtOffset (DBusConnection * bus, DBusMessage * message,
                          void *user_data)
 {
   AtkText *text = (AtkText *) user_data;
@@ -255,7 +255,7 @@ impl_getCharacterAtOffset (DBusConnection * bus, DBusMessage * message,
 }
 
 static DBusMessage *
-impl_getAttributeValue (DBusConnection * bus, DBusMessage * message,
+impl_GetAttributeValue (DBusConnection * bus, DBusMessage * message,
                         void *user_data)
 {
   AtkText *text = (AtkText *) user_data;
@@ -337,7 +337,7 @@ _string_from_attribute_set (AtkAttributeSet * set)
 }
 
 static DBusMessage *
-impl_getAttributes (DBusConnection * bus, DBusMessage * message,
+impl_GetAttributes (DBusConnection * bus, DBusMessage * message,
                     void *user_data)
 {
   AtkText *text = (AtkText *) user_data;
@@ -376,7 +376,7 @@ impl_getAttributes (DBusConnection * bus, DBusMessage * message,
 }
 
 static DBusMessage *
-impl_getDefaultAttributes (DBusConnection * bus, DBusMessage * message,
+impl_GetDefaultAttributes (DBusConnection * bus, DBusMessage * message,
                            void *user_data)
 {
   AtkText *text = (AtkText *) user_data;
@@ -401,7 +401,7 @@ impl_getDefaultAttributes (DBusConnection * bus, DBusMessage * message,
 }
 
 static DBusMessage *
-impl_getCharacterExtents (DBusConnection * bus, DBusMessage * message,
+impl_GetCharacterExtents (DBusConnection * bus, DBusMessage * message,
                           void *user_data)
 {
   AtkText *text = (AtkText *) user_data;
@@ -438,7 +438,7 @@ impl_getCharacterExtents (DBusConnection * bus, DBusMessage * message,
 }
 
 static DBusMessage *
-impl_getOffsetAtPoint (DBusConnection * bus, DBusMessage * message,
+impl_GetOffsetAtPoint (DBusConnection * bus, DBusMessage * message,
                        void *user_data)
 {
   AtkText *text = (AtkText *) user_data;
@@ -468,7 +468,7 @@ impl_getOffsetAtPoint (DBusConnection * bus, DBusMessage * message,
 }
 
 static DBusMessage *
-impl_getNSelections (DBusConnection * bus, DBusMessage * message,
+impl_GetNSelections (DBusConnection * bus, DBusMessage * message,
                      void *user_data)
 {
   AtkText *text = (AtkText *) user_data;
@@ -488,7 +488,7 @@ impl_getNSelections (DBusConnection * bus, DBusMessage * message,
 }
 
 static DBusMessage *
-impl_getSelection (DBusConnection * bus, DBusMessage * message,
+impl_GetSelection (DBusConnection * bus, DBusMessage * message,
                    void *user_data)
 {
   AtkText *text = (AtkText *) user_data;
@@ -522,7 +522,7 @@ impl_getSelection (DBusConnection * bus, DBusMessage * message,
 }
 
 static DBusMessage *
-impl_addSelection (DBusConnection * bus, DBusMessage * message,
+impl_AddSelection (DBusConnection * bus, DBusMessage * message,
                    void *user_data)
 {
   AtkText *text = (AtkText *) user_data;
@@ -551,7 +551,7 @@ impl_addSelection (DBusConnection * bus, DBusMessage * message,
 }
 
 static DBusMessage *
-impl_removeSelection (DBusConnection * bus, DBusMessage * message,
+impl_RemoveSelection (DBusConnection * bus, DBusMessage * message,
                       void *user_data)
 {
   AtkText *text = (AtkText *) user_data;
@@ -579,7 +579,7 @@ impl_removeSelection (DBusConnection * bus, DBusMessage * message,
 }
 
 static DBusMessage *
-impl_setSelection (DBusConnection * bus, DBusMessage * message,
+impl_SetSelection (DBusConnection * bus, DBusMessage * message,
                    void *user_data)
 {
   AtkText *text = (AtkText *) user_data;
@@ -608,7 +608,7 @@ impl_setSelection (DBusConnection * bus, DBusMessage * message,
 }
 
 static DBusMessage *
-impl_getRangeExtents (DBusConnection * bus, DBusMessage * message,
+impl_GetRangeExtents (DBusConnection * bus, DBusMessage * message,
                       void *user_data)
 {
   AtkText *text = (AtkText *) user_data;
@@ -648,7 +648,7 @@ impl_getRangeExtents (DBusConnection * bus, DBusMessage * message,
 #define MAXRANGELEN 512
 
 static DBusMessage *
-impl_getBoundedRanges (DBusConnection * bus, DBusMessage * message,
+impl_GetBoundedRanges (DBusConnection * bus, DBusMessage * message,
                        void *user_data)
 {
   AtkText *text = (AtkText *) user_data;
@@ -721,7 +721,7 @@ impl_getBoundedRanges (DBusConnection * bus, DBusMessage * message,
 }
 
 static DBusMessage *
-impl_getAttributeRun (DBusConnection * bus, DBusMessage * message,
+impl_GetAttributeRun (DBusConnection * bus, DBusMessage * message,
                       void *user_data)
 {
   DBusError error;
@@ -776,7 +776,7 @@ impl_getAttributeRun (DBusConnection * bus, DBusMessage * message,
 }
 
 static DBusMessage *
-impl_getDefaultAttributeSet (DBusConnection * bus, DBusMessage * message,
+impl_GetDefaultAttributeSet (DBusConnection * bus, DBusMessage * message,
                              void *user_data)
 {
   AtkText *text = (AtkText *) user_data;
@@ -803,32 +803,32 @@ impl_getDefaultAttributeSet (DBusConnection * bus, DBusMessage * message,
 }
 
 static DRouteMethod methods[] = {
-  {impl_getText, "getText"},
-  {impl_setCaretOffset, "setCaretOffset"},
-  {impl_getTextBeforeOffset, "getTextBeforeOffset"},
-  {impl_getTextAtOffset, "getTextAtOffset"},
-  {impl_getTextAfterOffset, "getTextAfterOffset"},
-  {impl_getCharacterAtOffset, "getCharacterAtOffset"},
-  {impl_getAttributeValue, "getAttributeValue"},
-  {impl_getAttributes, "getAttributes"},
-  {impl_getDefaultAttributes, "getDefaultAttributes"},
-  {impl_getCharacterExtents, "getCharacterExtents"},
-  {impl_getOffsetAtPoint, "getOffsetAtPoint"},
-  {impl_getNSelections, "getNSelections"},
-  {impl_getSelection, "getSelection"},
-  {impl_addSelection, "addSelection"},
-  {impl_removeSelection, "removeSelection"},
-  {impl_setSelection, "setSelection"},
-  {impl_getRangeExtents, "getRangeExtents"},
-  {impl_getBoundedRanges, "getBoundedRanges"},
-  {impl_getAttributeRun, "getAttributeRun"},
-  {impl_getDefaultAttributeSet, "getDefaultAttributeSet"},
+  {impl_GetText, "GetText"},
+  {impl_SetCaretOffset, "SetCaretOffset"},
+  {impl_GetTextBeforeOffset, "GetTextBeforeOffset"},
+  {impl_GetTextAtOffset, "GetTextAtOffset"},
+  {impl_GetTextAfterOffset, "GetTextAfterOffset"},
+  {impl_GetCharacterAtOffset, "GetCharacterAtOffset"},
+  {impl_GetAttributeValue, "GetAttributeValue"},
+  {impl_GetAttributes, "GetAttributes"},
+  {impl_GetDefaultAttributes, "GetDefaultAttributes"},
+  {impl_GetCharacterExtents, "GetCharacterExtents"},
+  {impl_GetOffsetAtPoint, "GetOffsetAtPoint"},
+  {impl_GetNSelections, "GetNSelections"},
+  {impl_GetSelection, "GetSelection"},
+  {impl_AddSelection, "AddSelection"},
+  {impl_RemoveSelection, "RemoveSelection"},
+  {impl_SetSelection, "SetSelection"},
+  {impl_GetRangeExtents, "GetRangeExtents"},
+  {impl_GetBoundedRanges, "GetBoundedRanges"},
+  {impl_GetAttributeRun, "GetAttributeRun"},
+  {impl_GetDefaultAttributeSet, "GetDefaultAttributeSet"},
   {NULL, NULL}
 };
 
 static DRouteProperty properties[] = {
-  {impl_get_characterCount, NULL, "characterCount"},
-  {impl_get_caretOffset, NULL, "caretOffset"},
+  {impl_get_CharacterCount, NULL, "CharacterCount"},
+  {impl_get_CaretOffset, NULL, "CaretOffset"},
   {NULL, NULL, NULL}
 };
 
diff --git a/atk-adaptor/tree-adaptor.c b/atk-adaptor/tree-adaptor.c
index f4cc660..6f21fa6 100644
--- a/atk-adaptor/tree-adaptor.c
+++ b/atk-adaptor/tree-adaptor.c
@@ -53,7 +53,7 @@ spi_emit_cache_removal (guint ref,  DBusConnection *bus)
 
   if ((message = dbus_message_new_signal ("/org/freedesktop/atspi/tree",
                                           SPI_DBUS_INTERFACE_TREE,
-                                          "removeAccessible"))) {
+                                          "RemoveAccessible"))) {
     DBusMessageIter iter;
     gchar *path;
 
@@ -75,7 +75,7 @@ spi_emit_cache_update (AtkObject *accessible, DBusConnection *bus)
 
   if ((message = dbus_message_new_signal ("/org/freedesktop/atspi/tree",
                                           SPI_DBUS_INTERFACE_TREE,
-                                          "updateAccessible"))) {
+                                          "UpdateAccessible"))) {
     DBusMessageIter iter;
 
     dbus_message_iter_init_append (message, &iter);
@@ -91,7 +91,7 @@ spi_emit_cache_update (AtkObject *accessible, DBusConnection *bus)
 /*---------------------------------------------------------------------------*/
 
 static DBusMessage *
-impl_getRoot (DBusConnection *bus, DBusMessage *message, void *user_data)
+impl_GetRoot (DBusConnection *bus, DBusMessage *message, void *user_data)
 {
   AtkObject *root = atk_get_root();
   char *path;
@@ -120,7 +120,7 @@ impl_getRoot (DBusConnection *bus, DBusMessage *message, void *user_data)
 /*---------------------------------------------------------------------------*/
 
 static DBusMessage *
-impl_getTree (DBusConnection *bus, DBusMessage *message, void *user_data)
+impl_GetTree (DBusConnection *bus, DBusMessage *message, void *user_data)
 {
   DBusMessage *reply;
   DBusMessageIter iter, iter_array;
@@ -137,8 +137,8 @@ impl_getTree (DBusConnection *bus, DBusMessage *message, void *user_data)
 /*---------------------------------------------------------------------------*/
 
 static DRouteMethod methods[] = {
-  {impl_getRoot, "getRoot"},
-  {impl_getTree, "getTree"},
+  {impl_GetRoot, "GetRoot"},
+  {impl_GetTree, "GetTree"},
   {NULL, NULL}
 };
 
diff --git a/atk-adaptor/value-adaptor.c b/atk-adaptor/value-adaptor.c
index 6ca6f5d..5002627 100644
--- a/atk-adaptor/value-adaptor.c
+++ b/atk-adaptor/value-adaptor.c
@@ -30,7 +30,7 @@
 #include "common/spi-dbus.h"
 
 static dbus_bool_t
-impl_get_minimumValue (DBusMessageIter * iter,
+impl_get_MinimumValue (DBusMessageIter * iter,
                        void *user_data)
 {
   AtkValue *value = (AtkValue *) user_data;
@@ -55,7 +55,7 @@ impl_get_minimumValue (DBusMessageIter * iter,
 }
 
 static dbus_bool_t
-impl_get_maximumValue (DBusMessageIter * iter,
+impl_get_MaximumValue (DBusMessageIter * iter,
                        void *user_data)
 {
   AtkValue *value = (AtkValue *) user_data;
@@ -80,7 +80,7 @@ impl_get_maximumValue (DBusMessageIter * iter,
 }
 
 static dbus_bool_t
-impl_get_minimumIncrement (DBusMessageIter * iter,
+impl_get_MinimumIncrement (DBusMessageIter * iter,
                            void *user_data)
 {
   AtkValue *value = (AtkValue *) user_data;
@@ -105,7 +105,7 @@ impl_get_minimumIncrement (DBusMessageIter * iter,
 }
 
 static dbus_bool_t
-impl_get_currentValue (DBusMessageIter * iter,
+impl_get_CurrentValue (DBusMessageIter * iter,
                        void *user_data)
 {
   AtkValue *value = (AtkValue *) user_data;
@@ -165,10 +165,10 @@ impl_set_currentValue (DBusMessageIter * iter,
 }
 
 static DRouteProperty properties[] = {
-  {impl_get_minimumValue, NULL, "minimumValue"},
-  {impl_get_maximumValue, NULL, "maximumValue"},
-  {impl_get_minimumIncrement, NULL, "minimumIncrement"},
-  {impl_get_currentValue, impl_set_currentValue, "currentValue"},
+  {impl_get_MinimumValue, NULL, "MinimumValue"},
+  {impl_get_MaximumValue, NULL, "MaximumValue"},
+  {impl_get_MinimumIncrement, NULL, "MinimumIncrement"},
+  {impl_get_CurrentValue, impl_set_currentValue, "CurrentValue"},
   {NULL, NULL, NULL}
 };