diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index 87472dc96ed26c536ca22962ca1e8b19c1b5e79a..7684a3906ac511f57efe6b287e86a6843763d109 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -3749,7 +3749,8 @@ module OneM2M_Functions {
 			} 
 
 			if (p_resourceType == int15) {//pollingChannel
-				//TODO		
+				//TODO
+
 			}
 
 			if (p_resourceType == int23) {//subscription
diff --git a/LibOneM2M/OneM2M_Templates.ttcn b/LibOneM2M/OneM2M_Templates.ttcn
index 621e7e389ad0374f4d6d59a095e0fadf329a7437..4e524cfdf5ae5eb5d8b530539a2c73ef538f8d09 100644
--- a/LibOneM2M/OneM2M_Templates.ttcn
+++ b/LibOneM2M/OneM2M_Templates.ttcn
@@ -1535,6 +1535,7 @@ module OneM2M_Templates {
 				vendorInformation := omit
 			};
 			
+
 			/**
 			 * @desc Base NOTIFY request primitive
 			 */
@@ -4472,9 +4473,9 @@ module OneM2M_Templates {
 			iPEDiscoveryRequest := omit
 		};
 		
-		template Notification m_contentNotification_subscriptionVerification modifies m_contentNotification_allOmit:= {
+		template Notification m_contentNotification_subscriptionVerification(XSD.ID p_creator) modifies m_contentNotification_allOmit:= {
 			verificationRequest := true,
-			creator := "C-AE-ID"
+			creator := p_creator
 		};
 		
 		template Notification mw_contentNotification_any := {
diff --git a/OneM2M_Testcases_CSE_Release_2.ttcn b/OneM2M_Testcases_CSE_Release_2.ttcn
index 9309676a4df9c22f3027261a169a1596967eaf61..ce79c10547e581a3233b6cadb45305d4dfa9dcff 100644
--- a/OneM2M_Testcases_CSE_Release_2.ttcn
+++ b/OneM2M_Testcases_CSE_Release_2.ttcn
@@ -12579,7 +12579,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 				v_req1 := valueof(m_retrievePollingRequest(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
 				mcaPort.send(f_getMsgOutPrimitive(m_request(v_req1)));
 				
-				v_req2 := valueof(m_notifyNotification(f_getResourceAddress(v_aeIndex), m_contentNotification_subscriptionVerification));
+				v_req2 := valueof(m_notifyNotification(f_getResourceAddress(v_aeIndex), m_contentNotification_subscriptionVerification(PX_CSE1_ID)));
 				
 				vc_cse1.start(f_cse_notifyProcedure_notify(v_req2));
 				
@@ -12654,7 +12654,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 				
 				v_resourceIndex := f_cse_createResource(int15, m_createPollingChannelBase, v_aeIndex);
 				
-				v_requestNotify := valueof(m_notifyNotification(f_getResourceAddress(v_aeIndex), m_contentNotification_subscriptionVerification));
+				v_requestNotify := valueof(m_notifyNotification(f_getResourceAddress(v_aeIndex), m_contentNotification_subscriptionVerification(PX_CSE1_ID)));
 				
 				vc_cse1.start(f_cse_notifyProcedure_notify(v_requestNotify));