diff --git a/src/lib_ccx/ccx_common_constants.h b/src/lib_ccx/ccx_common_constants.h
index d2f5646e..ab03bfe4 100644
--- a/src/lib_ccx/ccx_common_constants.h
+++ b/src/lib_ccx/ccx_common_constants.h
@@ -222,7 +222,7 @@ typedef enum {
 	UNDEF = 0xff
 } bool_t;
 
-enum cxx_code_type
+enum ccx_code_type
 {
 	CCX_CODEC_ANY,
 	CCX_CODEC_TELETEXT,
diff --git a/src/lib_ccx/general_loop.c b/src/lib_ccx/general_loop.c
index 380e241d..2c7003ce 100644
--- a/src/lib_ccx/general_loop.c
+++ b/src/lib_ccx/general_loop.c
@@ -36,7 +36,7 @@ unsigned char *filebuffer;
 LLONG filebuffer_start; // Position of buffer start relative to file
 int filebuffer_pos; // Position of pointer relative to buffer start
 int bytesinbuffer; // Number of bytes we actually have on buffer
-extern void *cxx_dvb_context;
+extern void *ccx_dvb_context;
 
 LLONG process_raw_with_field (struct cc_subtitle *sub);
 
@@ -602,7 +602,7 @@ void general_loop(void *enc_ctx)
 		}
 		else if(ccx_bufferdatatype == CCX_DVB_SUBTITLE)
 		{
-			dvbsub_decode(cxx_dvb_context, buffer + 2, inbuf, &dec_sub);
+			dvbsub_decode(ccx_dvb_context, buffer + 2, inbuf, &dec_sub);
 			set_fts();
 			got = inbuf;
 		}
diff --git a/src/lib_ccx/lib_ccx.h b/src/lib_ccx/lib_ccx.h
index 6b5a9f22..b615dd41 100644
--- a/src/lib_ccx/lib_ccx.h
+++ b/src/lib_ccx/lib_ccx.h
@@ -47,8 +47,8 @@ struct ccx_s_options // Options from user parameters
 	ccx_decoder_608_settings settings_608; //  Contains the settings for the 608 decoder.
 
 	/* subtitle codec type */
-	enum cxx_code_type codec;
-	enum cxx_code_type nocodec;
+	enum ccx_code_type codec;
+	enum ccx_code_type nocodec;
 	/* Credit stuff */
 	char *start_credits_text;
 	char *end_credits_text;
diff --git a/src/lib_ccx/ts_functions.c b/src/lib_ccx/ts_functions.c
index 8b9a2a55..c600a09b 100644
--- a/src/lib_ccx/ts_functions.c
+++ b/src/lib_ccx/ts_functions.c
@@ -17,7 +17,7 @@ static long haup_capbuflen = 0; // Bytes read in haup_capbuf
 unsigned TS_program_number = 0; // Identifier for current program
 unsigned pmtpid = 0; // PID for Program Map Table
 unsigned cap_stream_type=CCX_STREAM_TYPE_UNKNOWNSTREAM; // Stream type for cappid
-extern void *cxx_dvb_context;
+extern void *ccx_dvb_context;
 
 // Descriptions for ts ccx_stream_type
 const char *desc[256];
@@ -373,7 +373,7 @@ long ts_readstream(void)
 		 * if dvb subtitle is selected then start time taken from first PTS
 		 * of any stream
 		 */
-		if ( cap_stream_type == CCX_STREAM_TYPE_PRIVATE_MPEG2 && cxx_dvb_context && !pts_set)
+		if ( cap_stream_type == CCX_STREAM_TYPE_PRIVATE_MPEG2 && ccx_dvb_context && !pts_set)
 		{
 			if(read_pts_pes(payload.start,payload.length) == 0)
 				set_fts();
@@ -480,7 +480,7 @@ LLONG ts_getmoredata(void)
 			ccx_bufferdatatype = CCX_H264;
 			tstr = "H.264";
 		}
-		else if ( cap_stream_type == CCX_STREAM_TYPE_PRIVATE_MPEG2 && cxx_dvb_context )
+		else if ( cap_stream_type == CCX_STREAM_TYPE_PRIVATE_MPEG2 && ccx_dvb_context )
 		{
 			ccx_bufferdatatype = CCX_DVB_SUBTITLE;
 			tstr = "DVB subtitle";
diff --git a/src/lib_ccx/ts_tables.c b/src/lib_ccx/ts_tables.c
index e3eee85f..c74f599b 100644
--- a/src/lib_ccx/ts_tables.c
+++ b/src/lib_ccx/ts_tables.c
@@ -9,7 +9,7 @@
 #include "dvb_subtitle_decoder.h"
 #include "utility.h"
 static unsigned pmt_warning_shown=0; // Only display warning once
-void *cxx_dvb_context = NULL;
+void *ccx_dvb_context = NULL;
 
 // PMTs table
 struct PAT_entry pmt_array[TS_PMT_MAP_SIZE] = {{ 0 }};
@@ -281,8 +281,8 @@ int parse_PMT (unsigned char *buf,int len, int pos)
 					ret = parse_dvb_description(&cnf,es_info,desc_len);
 					if(ret < 0)
 						break;
-					cxx_dvb_context = dvbsub_init_decoder(&cnf);
-					if (cxx_dvb_context == NULL)
+					ccx_dvb_context = dvbsub_init_decoder(&cnf);
+					if (ccx_dvb_context == NULL)
 						break;
 					ccx_options.ts_cappid = newcappid = elementary_PID;
 					cap_stream_type = newcap_stream_type = ccx_stream_type;