diff --git a/hello_world/ta/user_ta_header_defines.h b/hello_world/ta/user_ta_header_defines.h
index fdfa6c4..3aad90e 100644
--- a/hello_world/ta/user_ta_header_defines.h
+++ b/hello_world/ta/user_ta_header_defines.h
@@ -49,10 +49,18 @@
 /* Provisioned heap size for TEE_Malloc() and friends */
 #define TA_DATA_SIZE			(32 * 1024)
 
-/* Extra properties (give a version id and a string name) */
+/* The gpd.ta.version property */
+#define TA_VERSION	"1.0"
+
+/* The gpd.ta.description property */
+#define TA_DESCRIPTION	"Example of OP-TEE Hello World Trusted Application"
+
+/* Extra properties */
 #define TA_CURRENT_TA_EXT_PROPERTIES \
-    { "gp.ta.description", USER_TA_PROP_TYPE_STRING, \
-        "Example of OP-TEE Hello World Trusted Application" }, \
-    { "gp.ta.version", USER_TA_PROP_TYPE_U32, &(const uint32_t){ 0x0010 } }
+    { "org.linaro.optee.examples.hello_world.property1", \
+	USER_TA_PROP_TYPE_STRING, \
+        "Some string" }, \
+    { "org.linaro.optee.examples.hello_world.property2", \
+	USER_TA_PROP_TYPE_U32, &(const uint32_t){ 0x0010 } }
 
 #endif /* USER_TA_HEADER_DEFINES_H */
diff --git a/hotp/ta/user_ta_header_defines.h b/hotp/ta/user_ta_header_defines.h
index 5018a69..130b5dd 100644
--- a/hotp/ta/user_ta_header_defines.h
+++ b/hotp/ta/user_ta_header_defines.h
@@ -22,10 +22,4 @@
 /* Provisioned heap size for TEE_Malloc() and friends */
 #define TA_DATA_SIZE	(32 * 1024)
 
-/* Extra properties (give a version id and a string name) */
-#define TA_CURRENT_TA_EXT_PROPERTIES \
-	{ "gp.ta.description", USER_TA_PROP_TYPE_STRING, \
-	  "HMAC-Based One-Time Password Algorithm (RFC4226)" }, \
-	{ "gp.ta.version", USER_TA_PROP_TYPE_U32, &(const uint32_t){ 0x0010 } }
-
 #endif
diff --git a/random/ta/user_ta_header_defines.h b/random/ta/user_ta_header_defines.h
index 37dacc1..c19b959 100644
--- a/random/ta/user_ta_header_defines.h
+++ b/random/ta/user_ta_header_defines.h
@@ -49,10 +49,4 @@
 /* Provisioned heap size for TEE_Malloc() and friends */
 #define TA_DATA_SIZE			(32 * 1024)
 
-/* Extra properties (give a version id and a string name) */
-#define TA_CURRENT_TA_EXT_PROPERTIES \
-    { "gp.ta.description", USER_TA_PROP_TYPE_STRING, \
-      "Example of a TA that returns the output from TEE_GenerateRandom" }, \
-    { "gp.ta.version", USER_TA_PROP_TYPE_U32, &(const uint32_t){ 0x0010 } }
-
 #endif /* USER_TA_HEADER_DEFINES_H */