diff --git a/ttcn/DENM/LibItsDenm_Templates.ttcn b/ttcn/DENM/LibItsDenm_Templates.ttcn
index 40e89fac63c5cea7703dc963d3899d317e5c72f0..b7738b93c0c25e53533f1319aa260c30d59bae82 100644
--- a/ttcn/DENM/LibItsDenm_Templates.ttcn
+++ b/ttcn/DENM/LibItsDenm_Templates.ttcn
@@ -33,7 +33,7 @@ module LibItsDenm_Templates {
     group denmPduTemplates {
         
         template ItsPduHeader m_itsPduHeader := {
-            protocolVersion := c_protocolVersion_DENM,
+            protocolVersion := c_protocolVersionDenm,
 			messageID := c_messageId,
             generationTime := 0 //TODO document: 0 indicates that the lower layer should add the time while sending
         }
@@ -54,7 +54,7 @@ module LibItsDenm_Templates {
                 
     } // end denmPduTemplates
         
-    group DecentralizedEnvironmentalNotificationMessageTemplates {
+    group decentralizedEnvironmentalNotificationMessageTemplates {
         
         template DecentralizedEnvironmentalNotificationMessage m_denm(
             template (value) DecentralizedSituationManagement p_mgmt,
@@ -99,9 +99,9 @@ module LibItsDenm_Templates {
             management := m_denmMgmtCon_IsNeg(p_dataVersion, p_stationId, p_isNeg)
         }
     
-    } // end group DecentralizedEnvironmentalNotificationMessageTemplates
+    } // end group decentralizedEnvironmentalNotificationMessageTemplates
     
-    group DecentralizedSituationManagementTemplates {
+    group decentralizedSituationManagementTemplates {
         
         template DecentralizedSituationManagement m_denmMgmtCon(
             template (value) DataVersion p_dataVersion,
@@ -156,9 +156,9 @@ module LibItsDenm_Templates {
             expiryTime := p_expiryTime
         }
         
-    } // end group DecentralizedSituationManagementTemplates
+    } // end group decentralizedSituationManagementTemplates
     
-    group DecentralizedSituationTemplates {
+    group decentralizedSituationTemplates {
         
         template DecentralizedSituation m_denmSitCon(
             template (value) Situation p_sit,
@@ -210,7 +210,7 @@ module LibItsDenm_Templates {
                 eventCharact := p_ec
         }
         
-        group SituationTemplates {
+        group situationTemplates {
             
             template Situation m_situation(
                 template (value) DENM_PDU_Descriptions.CauseCode p_cause, 
@@ -228,9 +228,9 @@ module LibItsDenm_Templates {
                 subCause := p_subCause
             }
             
-        } // end group SituationTemplates
+        } // end group situationTemplates
         
-        group EventCharactTemplates {
+        group eventCharactTemplates {
             
             //TODO check if depending on kind of ITS station
             template DecentralizedSituation.eventCharact m_eventCharact := {
@@ -240,11 +240,11 @@ module LibItsDenm_Templates {
                 timeCritacality := false
             }
             
-        }
+        } // end eventCharactTemplates
         
-    } // end group DecentralizedSituationTemplates
+    } // end group decentralizedSituationTemplates
     
-    group DecentralizedSituationLocationTemplates {
+    group decentralizedSituationLocationTemplates {
         
         template DecentralizedSituationLocation m_denmSitLoc(
             template (value) DecentralizedSituationLocation.eventPosition p_eventPosition,
@@ -273,6 +273,6 @@ module LibItsDenm_Templates {
             
         } // end group locationRefTemplates
         
-    } // end group DecentralizedSituationLocationTemplates
+    } // end group decentralizedSituationLocationTemplates
     
 } // end LibItsDenmTemplates
\ No newline at end of file
diff --git a/ttcn/DENM/LibItsDenm_TypesAndValues.ttcn b/ttcn/DENM/LibItsDenm_TypesAndValues.ttcn
index 485752db716df6755659b2ef4c610071b1d550b8..bf3284011e8adb9343997db20824b57259aacd20 100644
--- a/ttcn/DENM/LibItsDenm_TypesAndValues.ttcn
+++ b/ttcn/DENM/LibItsDenm_TypesAndValues.ttcn
@@ -22,7 +22,7 @@ module LibItsDenm_TypesAndValues {
     
     group denmConstants {
         
-        const ItsPduHeader.protocolVersion c_protocolVersion_DENM := 0;
+        const ItsPduHeader.protocolVersion c_protocolVersionDenm := 0;
         
         const ItsPduHeader.messageID c_messageId := 1;