1 files changed, 18 insertions, 14 deletions
diff --git a/src/message.h b/src/message.h
index ea1c444..bb56932 100644
--- a/src/message.h
+++ b/src/message.h
@@ -35,14 +35,14 @@
 namespace cmd
 {
 typedef enum {
-	observe,
-	unobserve,
-	update,
-	move,
-	create,
-	remove,
 	login,
 	logout,
+	subscribe,
+	unsubscribe,
+	create,
+	remove,
+	move,
+	update,
 	error,
 } cmd_t;
 };
@@ -55,13 +55,17 @@ typedef struct
 
 typedef struct
 {
+} logout_t;
+
+typedef struct
+{
 	taskid_t id;
-} observe_t;
+} subscribe_t;
 
 typedef struct
 {
 	taskid_t id;
-} unobserve_t;
+} unsubscribe_t;
 
 typedef struct
 {
@@ -83,26 +87,26 @@ typedef struct
 typedef struct
 {
 	taskid_t id;
-	std::string name;
+	std::string attribute;
 	std::string value;
 } update_t;
 
-
 typedef struct
 {
 	cmd::cmd_t cmd;
 
-	observe_t observe;
-	unobserve_t unobserve;
+	login_t login;
+	logout_t logout;
+	subscribe_t subscribe;
+	unsubscribe_t unsubscribe;
 	create_t create;
 	remove_t remove;
 	move_t move;
 	update_t update;
-	login_t login;
 
 	TaskIdList nodes;
 
-	// tagret node id (observed task id) used for transmissions only.
+	// target node id (subscription node id) used for transmissions only.
 	taskid_t tid;
 
 } message_t;