diff --git a/plugins/synapticsmst/synapticsmst-common.h b/plugins/synapticsmst/synapticsmst-common.h
index 28e7f803e..12ed352bb 100644
--- a/plugins/synapticsmst/synapticsmst-common.h
+++ b/plugins/synapticsmst/synapticsmst-common.h
@@ -42,34 +42,34 @@
 #define REG_FIRMWARE_VERSION	0x50A
 
 typedef enum {
-	DPCD_SUCCESS = 0,
+	DPCD_SUCCESS			= 0,
 	DPCD_SEEK_FAIL,
 	DPCD_ACCESS_FAIL,
-}dpcd_return;
+} SynapticsMstDpcdRc;
 
 typedef enum {
-	UPDC_COMMAND_SUCCESS = 0,
+	UPDC_COMMAND_SUCCESS		= 0,
 	UPDC_COMMAND_INVALID,
 	UPDC_COMMAND_UNSUPPORT,
 	UPDC_COMMAND_FAILED,
 	UPDC_COMMAND_DISABLED,
-}RC_STATUS;
+} SynapticsMstUpdcRc;
 
 typedef enum {
-	UPDC_ENABLE_RC = 1,
+	UPDC_ENABLE_RC			= 1,
 	UPDC_DISABLE_RC,
 	UPDC_GET_ID,
 	UPDC_GET_VERSION,
-	UPDC_ENABLE_FLASH_CHIP_ERASE = 8,
-	UPDC_CAL_EEPROM_CHECKSUM = 0X11,
-	UPDC_FLASH_ERASE = 0X14,
-	UPDC_CAL_EEPROM_CHECK_CRC8 = 0X16,
+	UPDC_ENABLE_FLASH_CHIP_ERASE	= 8,
+	UPDC_CAL_EEPROM_CHECKSUM	= 0X11,
+	UPDC_FLASH_ERASE		= 0X14,
+	UPDC_CAL_EEPROM_CHECK_CRC8	= 0X16,
 	UPDC_CAL_EEPROM_CHECK_CRC16,
-	UPDC_WRITE_TO_EEPROM = 0X20,
-	UPDC_WRITE_TO_TX_DPCD = 0x22,
-	UPDC_READ_FROM_EEPROM = 0x30,
-	UPDC_READ_FROM_TX_DPCD = 0x32,
-}RC_COMMAND;
+	UPDC_WRITE_TO_EEPROM		= 0X20,
+	UPDC_WRITE_TO_TX_DPCD		= 0x22,
+	UPDC_READ_FROM_EEPROM		= 0x30,
+	UPDC_READ_FROM_TX_DPCD		= 0x32,
+} SynapticsMstUpdcCmd;
 
 gint		 synapticsmst_common_open_aux_node 		(const gchar *filename);