diff --git a/apps/aqhome-tool/data/adddata.c b/apps/aqhome-tool/data/adddata.c
index 9214576..fc35742 100644
--- a/apps/aqhome-tool/data/adddata.c
+++ b/apps/aqhome-tool/data/adddata.c
@@ -135,7 +135,7 @@ int AQH_Tool_AddDataPoint(GWEN_DB_NODE *dbGlobalArgs, int argc, char **argv)
     {
       GWEN_ARGS_FLAGS_HAS_ARGUMENT, /* flags */
       GWEN_ArgsType_Char,           /* type */
-      "clientId",                   /* name */
+      "brokerClientId",             /* name */
       0,                            /* minnum */
       1,                            /* maxnum */
       "c",                          /* short option */
diff --git a/apps/aqhome-tool/data/getdatapoints.c b/apps/aqhome-tool/data/getdatapoints.c
index 7599091..13ee8e2 100644
--- a/apps/aqhome-tool/data/getdatapoints.c
+++ b/apps/aqhome-tool/data/getdatapoints.c
@@ -150,7 +150,7 @@ int AQH_Tool_GetDataPoints(GWEN_DB_NODE *dbGlobalArgs, int argc, char **argv)
     {
       GWEN_ARGS_FLAGS_HAS_ARGUMENT, /* flags */
       GWEN_ArgsType_Char,           /* type */
-      "clientId",                   /* name */
+      "brokerClientId",             /* name */
       0,                            /* minnum */
       1,                            /* maxnum */
       "c",                          /* short option */
diff --git a/apps/aqhome-tool/data/getdevices.c b/apps/aqhome-tool/data/getdevices.c
index 29c9918..50e83bd 100644
--- a/apps/aqhome-tool/data/getdevices.c
+++ b/apps/aqhome-tool/data/getdevices.c
@@ -79,7 +79,7 @@ int AQH_Tool_GetDevices(GWEN_DB_NODE *dbGlobalArgs, int argc, char **argv)
     {
       GWEN_ARGS_FLAGS_HAS_ARGUMENT, /* flags */
       GWEN_ArgsType_Char,           /* type */
-      "clientId",                   /* name */
+      "brokerClientId",             /* name */
       0,                            /* minnum */
       1,                            /* maxnum */
       "c",                          /* short option */
diff --git a/apps/aqhome-tool/data/getlastdatapoint.c b/apps/aqhome-tool/data/getlastdatapoint.c
index c86592a..741d167 100644
--- a/apps/aqhome-tool/data/getlastdatapoint.c
+++ b/apps/aqhome-tool/data/getlastdatapoint.c
@@ -103,7 +103,7 @@ int AQH_Tool_GetLastDataPoint(GWEN_DB_NODE *dbGlobalArgs, int argc, char **argv)
     {
       GWEN_ARGS_FLAGS_HAS_ARGUMENT, /* flags */
       GWEN_ArgsType_Char,           /* type */
-      "clientId",                   /* name */
+      "brokerClientId",             /* name */
       0,                            /* minnum */
       1,                            /* maxnum */
       "c",                          /* short option */
diff --git a/apps/aqhome-tool/data/getvalues.c b/apps/aqhome-tool/data/getvalues.c
index ef10aa1..27a6c9a 100644
--- a/apps/aqhome-tool/data/getvalues.c
+++ b/apps/aqhome-tool/data/getvalues.c
@@ -79,7 +79,7 @@ int AQH_Tool_GetValues(GWEN_DB_NODE *dbGlobalArgs, int argc, char **argv)
     {
       GWEN_ARGS_FLAGS_HAS_ARGUMENT, /* flags */
       GWEN_ArgsType_Char,           /* type */
-      "clientId",                   /* name */
+      "brokerClientId",             /* name */
       0,                            /* minnum */
       1,                            /* maxnum */
       "c",                          /* short option */
diff --git a/apps/aqhome-tool/data/moddevice.c b/apps/aqhome-tool/data/moddevice.c
index d121cbf..91bc6fe 100644
--- a/apps/aqhome-tool/data/moddevice.c
+++ b/apps/aqhome-tool/data/moddevice.c
@@ -79,7 +79,7 @@ int AQH_Tool_ModDevice(GWEN_DB_NODE *dbGlobalArgs, int argc, char **argv)
     {
       GWEN_ARGS_FLAGS_HAS_ARGUMENT, /* flags */
       GWEN_ArgsType_Char,           /* type */
-      "clientId",                   /* name */
+      "brokerClientId",             /* name */
       0,                            /* minnum */
       1,                            /* maxnum */
       "c",                          /* short option */
diff --git a/apps/aqhome-tool/data/setdata.c b/apps/aqhome-tool/data/setdata.c
index 2fdbd03..9c7ec71 100644
--- a/apps/aqhome-tool/data/setdata.c
+++ b/apps/aqhome-tool/data/setdata.c
@@ -112,7 +112,7 @@ int AQH_Tool_SetData(GWEN_DB_NODE *dbGlobalArgs, int argc, char **argv)
     {
       GWEN_ARGS_FLAGS_HAS_ARGUMENT, /* flags */
       GWEN_ArgsType_Char,           /* type */
-      "clientId",                   /* name */
+      "brokerClientId",             /* name */
       0,                            /* minnum */
       1,                            /* maxnum */
       "c",                          /* short option */
@@ -237,7 +237,7 @@ int _doSetData(GWEN_DB_NODE *dbArgs)
 	return 3;
       }
       else {
-	fprintf(stdout, "Data added.\n");
+	fprintf(stdout, "Value set.\n");
 	break;
       }
     }
diff --git a/apps/aqhome-tool/data/watch.c b/apps/aqhome-tool/data/watch.c
index ab16437..6dcbbba 100644
--- a/apps/aqhome-tool/data/watch.c
+++ b/apps/aqhome-tool/data/watch.c
@@ -82,7 +82,7 @@ int AQH_Tool_Watch(GWEN_DB_NODE *dbGlobalArgs, int argc, char **argv)
     {
       GWEN_ARGS_FLAGS_HAS_ARGUMENT, /* flags */
       GWEN_ArgsType_Char,           /* type */
-      "clientId",                   /* name */
+      "brokerClientId",             /* name */
       0,                            /* minnum */
       1,                            /* maxnum */
       "c",                          /* short option */