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 9aaa64f9548ecd622441774ae357ff8656c96f19..be180ba85ca709a6de26ca55822a0d4d41a8023b 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 fbd0d5e787642f3da6be4c160e70cca234a8e65d..81542a08d21cc5e268296f1dccbc780e6f6e15e2 100644
--- a/OneM2M_Testcases_CSE.ttcn
+++ b/OneM2M_Testcases_CSE.ttcn
@@ -21700,7 +21700,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);