diff --git a/library/DIAMETER_Templates.ttcn b/library/DIAMETER_Templates.ttcn
index 557d2fe82..4bddea87f 100644
--- a/library/DIAMETER_Templates.ttcn
+++ b/library/DIAMETER_Templates.ttcn
@@ -345,41 +345,6 @@ template (present) GenericAVP tr_AVP_AuthAppId(template (present) OCTET4 auth_ap
 	}
 }
 
-template (value) GenericAVP ts_AVP_CcReqType(template (value) DCC_NONE_CC_Request_Type r) := {
-	avp := {
-		avp_header := ts_DIA_Hdr(c_AVP_Code_DCC_NONE_CC_Request_Type),
-		avp_data := {
-			avp_DCC_NONE_CC_Request_Type := r
-		}
-	}
-}
-template (present) GenericAVP tr_AVP_CcReqType(template (present) DCC_NONE_CC_Request_Type r := ?) := {
-	avp := {
-		avp_header := tr_DIA_Hdr(c_AVP_Code_DCC_NONE_CC_Request_Type),
-		avp_data := {
-			avp_DCC_NONE_CC_Request_Type := r
-		}
-	}
-}
-
-template (value) GenericAVP ts_AVP_CcReqNum(template (value) AVP_Unsigned32 n) := {
-	avp := {
-		avp_header := ts_DIA_Hdr(c_AVP_Code_DCC_NONE_CC_Request_Number),
-		avp_data := {
-			avp_DCC_NONE_CC_Request_Number := n
-		}
-	}
-}
-template (present) GenericAVP tr_AVP_CcReqNum(template (present) AVP_Unsigned32 n := ?) := {
-	avp := {
-		avp_header := tr_DIA_Hdr(c_AVP_Code_DCC_NONE_CC_Request_Number),
-		avp_data := {
-			avp_DCC_NONE_CC_Request_Number := n
-		}
-	}
-}
-
-
 
 
 template (value) GenericAVP ts_AVP_SuppVendorIdRaw(uint32_t vendor_id) := {
@@ -1229,7 +1194,7 @@ tr_DIA_CCR(template (present) DCC_NONE_CC_Request_Type req_type := INITIAL_REQUE
 		tr_AVP_DestinationRealm,
 		tr_AVP_AuthAppId(int2oct(c_DIAMETER_3GPP_Gx_AID, 4)),
 		tr_AVP_CcReqType(req_type),
-		tr_AVP_CcReqNum(?)
+		tr_AVP_CcReqNum(?),
 		tr_AVP_SubscriptionId(END_USER_IMSI, ?),
 		/* Supported-Features */
 		/* Network-Request-Support: NETWORK_REQUEST SUPPORTED */
@@ -1247,7 +1212,7 @@ tr_DIA_CCR(template (present) DCC_NONE_CC_Request_Type req_type := INITIAL_REQUE
 /* RFC 4006 3.2.  Credit-Control-Answer (CCA) Command */
 template (present) PDU_DIAMETER
 tr_DIA_CCA := tr_DIAMETER('01000000'B, cmd_code:=Credit_Control,
-			    app_id:=int2oct(c_DIAMETER_3GPP_GX_AID, 4),
+			    app_id:=int2oct(c_DIAMETER_3GPP_Gx_AID, 4),
 	avps := superset(
 		tr_AVP_SessionId,
 		/* AuthAppId */