diff --git a/src/ImageCommand.cc b/src/ImageCommand.cc
index 5a7f0e7d..9262c3b0 100644
--- a/src/ImageCommand.cc
+++ b/src/ImageCommand.cc
@@ -36,9 +36,9 @@
 
 using namespace VDMS;
 
-#define VDMS_IM_TAG           "AT:IMAGE"
-#define VDMS_IM_PATH_PROP     "imgPath"
-#define VDMS_IM_EDGE          "AT:IMG_LINK"
+#define VDMS_IM_TAG           "VDMS:IMG"
+#define VDMS_IM_EDGE          "VDMS:IMGLINK"
+#define VDMS_IM_PATH_PROP     "VDMS:imgPath"
 
 //========= AddImage definitions =========
 
diff --git a/src/RSCommand.cc b/src/RSCommand.cc
index 8bd9a74d..0daf142f 100644
--- a/src/RSCommand.cc
+++ b/src/RSCommand.cc
@@ -41,9 +41,8 @@
 
 using namespace VDMS;
 
-#define VDMS_GENERIC_LINK   "AT:edge"
-#define VDMS_BLOB_PATH_PROP "blobPath"
-
+#define VDMS_GENERIC_LINK   "VDMS:LINK"
+#define VDMS_BLOB_PATH_PROP "VDMS:blobPath"
 
 RSCommand::RSCommand(const std::string& cmd_name):
     _cmd_name(cmd_name)
diff --git a/tests/python/TestImages.py b/tests/python/TestImages.py
index bd0e66c4..681c95fc 100644
--- a/tests/python/TestImages.py
+++ b/tests/python/TestImages.py
@@ -134,7 +134,7 @@ def test_findEntityImage(self):
             img_params = {}
             img_params["constraints"] = constraints
             img_params["results"] = results
-            img_params["class"] = "AT:IMAGE"
+            img_params["class"] = "VDMS:IMG"
 
             query = {}
             query["FindEntity"] = img_params