diff --git a/apps/setmod2.c b/apps/setmod2.c
index efd1e61..5d83ff7 100644
--- a/apps/setmod2.c
+++ b/apps/setmod2.c
@@ -39,9 +39,9 @@ int main()
 
 	fd = open("/dev/dvb/adapter0/mod0", O_RDONLY);
 
-	set_property(fd, MOD_MODULATION, QAM_256);
-	set_property(fd, MOD_SYMBOL_RATE, 6900000);
-	set_property(fd, MOD_FREQUENCY, 114000000);
+	set_property(fd, MODULATOR_MODULATION, QAM_256);
+	set_property(fd, MODULATOR_SYMBOL_RATE, 6900000);
+	set_property(fd, MODULATOR_FREQUENCY, 114000000);
 	close(fd);
 }
 
diff --git a/ddbridge/ddbridge-mod.c b/ddbridge/ddbridge-mod.c
index 15dc613..f4ee368 100644
--- a/ddbridge/ddbridge-mod.c
+++ b/ddbridge/ddbridge-mod.c
@@ -1478,19 +1478,19 @@ static int mod_prop_proc(struct ddb_mod *mod, struct dtv_property *tvp)
 	struct ddb *dev = mod->port->dev;
 
 	switch(tvp->cmd) {
-	case MOD_SYMBOL_RATE:
+	case MODULATOR_SYMBOL_RATE:
 		return mod_set_symbolrate(mod, tvp->u.data);
 
-	case MOD_MODULATION:
+	case MODULATOR_MODULATION:
 		return mod_set_modulation(mod, tvp->u.data);
 
-	case MOD_FREQUENCY:
+	case MODULATOR_FREQUENCY:
 		return mod_set_frequency(mod, tvp->u.data);
 
-	case MOD_ATTENUATOR:
+	case MODULATOR_ATTENUATOR:
 		return mod_set_attenuator(mod->port->dev, tvp->u.data);
 
-	case MOD_INPUT_BITRATE:
+	case MODULATOR_INPUT_BITRATE:
 		return mod_set_ibitrate(mod, tvp->u.data);
 	}
 	return 0;
diff --git a/include/linux/dvb/mod.h b/include/linux/dvb/mod.h
index a1b04ea..ce706e0 100644
--- a/include/linux/dvb/mod.h
+++ b/include/linux/dvb/mod.h
@@ -19,15 +19,15 @@ struct dvb_mod_channel_params {
 #define DVB_MOD_SET              _IOW('o', 208, struct dvb_mod_params)
 #define DVB_MOD_CHANNEL_SET      _IOW('o', 209, struct dvb_mod_channel_params)
 
-#define MOD_UNDEFINED		0
-#define MOD_START		1
-#define MOD_STOP		2
-#define MOD_FREQUENCY		3
-#define MOD_MODULATION		4   
-#define MOD_SYMBOL_RATE		5   /* Hz */
-#define MOD_ATTENUATOR          32  
-#define MOD_INPUT_BITRATE       33  /* Hz */
-#define MOD_PCR_MODE            34  /* 1=pcr correction enabled */
+#define MODULATOR_UNDEFINED	  0
+#define MODULATOR_START		  1
+#define MODULATOR_STOP		  2
+#define MODULATOR_FREQUENCY	  3
+#define MODULATOR_MODULATION	  4   
+#define MODULATOR_SYMBOL_RATE	  5   /* Hz */
+#define MODULATOR_ATTENUATOR     32  
+#define MODULATOR_INPUT_BITRATE  33  /* Hz */
+#define MODULATOR_PCR_MODE       34  /* 1=pcr correction enabled */
 
 
 #endif /*_UAPI_DVBMOD_H_*/