diff --git a/LibOneM2M/OneM2M_Templates.ttcn b/LibOneM2M/OneM2M_Templates.ttcn
index 51ed03a0f93e2e0a202270dd27c7d2754a23ee06..c53155a2fe2446431ed822db96b2353eca1cfc3e 100644
--- a/LibOneM2M/OneM2M_Templates.ttcn
+++ b/LibOneM2M/OneM2M_Templates.ttcn
@@ -3671,8 +3671,8 @@ module OneM2M_Templates {
     	  iPEDiscoveryRequest := omit,
 		  aERegistrationPointChange := omit,
 		  aEReferenceIDChange := omit,
-		  trackingID1 := "trackingID1",
-		  trackingID2 := "trackingID2"
+		  trackingID1 := omit,
+		  trackingID2 := omit
     	};
     			
 		/**
@@ -6588,8 +6588,8 @@ module OneM2M_Templates {
 			iPEDiscoveryRequest := omit,
 			aERegistrationPointChange := omit,
 			aEReferenceIDChange := omit,
-			trackingID1 := "trackingID1",
-			trackingID2 := "trackingID2"
+			trackingID1 := omit,
+			trackingID2 := omit
 		};
 		
 		template (value) Notification m_contentNotification_subscriptionVerification(XSD.ID p_creator) modifies m_contentNotification_allOmit:= {
@@ -6610,8 +6610,8 @@ module OneM2M_Templates {
 			iPEDiscoveryRequest := *,
 			aERegistrationPointChange := *,
 			aEReferenceIDChange := *,
-			trackingID1 := ?,
-			trackingID2 := ?
+			trackingID1 := *,
+			trackingID2 := *
 		};
 
 		template Notification mw_contentNotificationBase := {
@@ -6627,8 +6627,8 @@ module OneM2M_Templates {
 			iPEDiscoveryRequest := *,//O
 			aERegistrationPointChange := *,//O
 			aEReferenceIDChange := *,//O
-			trackingID1 := ?,//M
-			trackingID2 := ?//M
+			trackingID1 := *,//O
+			trackingID2 := *//O
 		};
 		
 		template Notification mw_contentNotificationVerification modifies mw_contentNotificationBase := {
diff --git a/LibOneM2M/OneM2M_Types.ttcn b/LibOneM2M/OneM2M_Types.ttcn
index e2363783042b2d6b74d501e136f9aa57f1f737e7..68e40eb22466ef18b161a6b702c8672a876e38dd 100644
--- a/LibOneM2M/OneM2M_Types.ttcn
+++ b/LibOneM2M/OneM2M_Types.ttcn
@@ -6208,8 +6208,8 @@ type record Notification_1
 	} iPEDiscoveryRequest optional,
 	XSD.Boolean aERegistrationPointChange optional,
 	XSD.Boolean aEReferenceIDChange optional,
-	XSD.ID trackingID1,
-	XSD.ID trackingID2
+	XSD.ID trackingID1 optional,
+	XSD.ID trackingID2 optional
 }
 with {
   variant "name as 'notification'";