diff --git a/OneM2M_Types.ttcn b/OneM2M_Types.ttcn
index 1ec32ddb1842c8ea90ffb22db467aa6f4a6de4d1..ef2dd9e88c62796d58cbdd6befed64150146aecd 100644
--- a/OneM2M_Types.ttcn
+++ b/OneM2M_Types.ttcn
@@ -10035,8 +10035,14 @@ with {
   variant (choice.choice_list[-]) "untagged";
 };
 
+type TimeSeriesNotificationType TimeSeriesNotification
+with {
+  variant "name as uncapitalized";
+  variant "element";
+};
+
 
-type record TimeSeriesNotification
+type record TimeSeriesNotificationType
 {
 	MissingDataList missingDataList,
 	XSD.NonNegativeInteger missingDataCurrentNr
@@ -10380,7 +10386,14 @@ with {
 };
 
 
-type record TriggerPayload
+
+type TriggerPayloadType TriggerPayload
+with {
+  variant "name as uncapitalized";
+  variant "element";
+};
+
+type record TriggerPayloadType
 {
 	TriggerPurpose triggerPurpose,
 	XSD.AnyURI triggerInfoAddress optional,