diff --git a/libs/freetdm/mod_freetdm/mod_freetdm.c b/libs/freetdm/mod_freetdm/mod_freetdm.c
index ff72eb2ec4..ffd2d7747a 100755
--- a/libs/freetdm/mod_freetdm/mod_freetdm.c
+++ b/libs/freetdm/mod_freetdm/mod_freetdm.c
@@ -1369,7 +1369,7 @@ static switch_call_cause_t channel_outgoing_channel(switch_core_session_t *sessi
 
 		sipvar = switch_channel_get_variable(channel, "sip_h_X-FreeTDM-CPC");
 		if (sipvar) {
-			ftdm_usrmsg_add_var(&usrmsg, "ss7_cpc", sipvar);
+			ftdm_set_calling_party_category(var, (uint8_t *)&caller_data.cpc);
 		}
 	}
 
@@ -1677,7 +1677,7 @@ ftdm_status_t ftdm_channel_from_event(ftdm_sigmsg_t *sigmsg, switch_core_session
 			}
 		} /* End - var_value = ftdm_sigmsg_get_var(sigmsg, "ss7_gn_digits"); */
 
-		var_value = ftdm_sigmsg_get_var(sigmsg, "ss7_cpc");
+		var_value = ftdm_sigmsg_get_var(sigmsg, "freetdm_calling_party_category");
 		if (!ftdm_strlen_zero(var_value)) {
 			switch_channel_set_variable_printf(channel, "sip_h_X-FreeTDM-CPC", "%d", var_value);
 		}
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c
index b6e4d28745..24813f4a0c 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c
@@ -467,7 +467,7 @@ ftdm_status_t copy_cgPtyCat_to_sngss7(ftdm_channel_t *ftdmchan, SiCgPtyCat *cgPt
 	cgPtyCat->eh.pres 			= PRSNT_NODEF;
 	cgPtyCat->cgPtyCat.pres 	= PRSNT_NODEF;
 	
-	val = ftdm_usrmsg_get_var(ftdmchan->usrmsg, "ss7_cpc");
+	val = ftdm_usrmsg_get_var(ftdmchan->usrmsg, "calling_party_category");
 	if (!ftdm_strlen_zero(val)) {
 		cgPtyCat->cgPtyCat.val = get_trillium_val(cpc_codes, ftdm_str2ftdm_calling_party_category(val), CAT_ORD);
 	} else {
@@ -482,7 +482,7 @@ ftdm_status_t copy_cgPtyCat_from_sngss7(ftdm_channel_t *ftdmchan, SiCgPtyCat *cg
 	if (cgPtyCat->eh.pres == PRSNT_NODEF &&
 		cgPtyCat->cgPtyCat.pres 	== PRSNT_NODEF) {
 
-		sngss7_add_var((sngss7_chan_data_t*)ftdmchan->call_data, "ss7_cpc",
+		sngss7_add_var((sngss7_chan_data_t*)ftdmchan->call_data, "calling_party_category",
 							ftdm_calling_party_category2str(get_ftdm_val(cpc_codes, cgPtyCat->cgPtyCat.val, FTDM_CPC_UNKNOWN)));
 		ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "Calling Party Category:0x%x\n", cgPtyCat->cgPtyCat.val);
 	}