diff --git a/LibOneM2M/OneM2M_Pixits.ttcn b/LibOneM2M/OneM2M_Pixits.ttcn
index 92e13bda6d0fd4aa8b3ca7aff8ed5a4653575c37..7ac08fe32dc51df803be1e4e03654c80af55e66f 100644
--- a/LibOneM2M/OneM2M_Pixits.ttcn
+++ b/LibOneM2M/OneM2M_Pixits.ttcn
@@ -77,7 +77,7 @@ module OneM2M_Pixits {
 			
 			modulepar charstring PX_XML_NAMESPACE 			:= "m2m=""http://www.onem2m.org/xml/protocols""";
 			
-			modulepar ListOfURIs PX_ACOR 					:= {"*"};
+			modulepar ListOfURIs PX_ACOR 					:= {"all"};
 						
 		}
 		
diff --git a/LibOneM2M/OneM2M_Templates.ttcn b/LibOneM2M/OneM2M_Templates.ttcn
index 5e49add586cbbdd255a0f049f92eeef11415c226..e4cce4b077de65e8daa00fbbfc29d870a75d4c12 100644
--- a/LibOneM2M/OneM2M_Templates.ttcn
+++ b/LibOneM2M/OneM2M_Templates.ttcn
@@ -1330,7 +1330,7 @@ module OneM2M_Templates {
 				accessControlRule_list := {valueof(m_createAcr(p_acor, p_allowedOperations))}
 			},//M
 			selfPrivileges := {
-				accessControlRule_list := {valueof(m_createAcr({"*"}, int63))}
+				accessControlRule_list := {valueof(m_createAcr({"all"}, int63))}
 			},//M
 			choice := omit //NP
 		};
diff --git a/OneM2M_Testcases_CSE.ttcn b/OneM2M_Testcases_CSE.ttcn
index 74335510af96b8fd60135b72640941c3ca6d394d..aa4b8b7a85b816384a51885f996d5248165cbbe1 100644
--- a/OneM2M_Testcases_CSE.ttcn
+++ b/OneM2M_Testcases_CSE.ttcn
@@ -21702,7 +21702,7 @@ module OneM2M_Testcases_CSE {
 							}
 	
 							//Postamble
-							v_accessControlRule_1 := valueof(m_createAcr({"*"}, int63));
+							v_accessControlRule_1 := valueof(m_createAcr({"all"}, int63));
 							v_setOfArcs.accessControlRule_list := {v_accessControlRule_1};
 							v_updateRequest := valueof(m_updateAcpPrivileges(v_setOfArcs, v_setOfArcs));
 							v_updateRequest := f_getUpdateRequestPrimitive(int1, v_acpIndex, v_updateRequest);