diff --git a/flight/CopterControl/System/pios_board.c b/flight/CopterControl/System/pios_board.c
index 89422fa11..eec563c24 100644
--- a/flight/CopterControl/System/pios_board.c
+++ b/flight/CopterControl/System/pios_board.c
@@ -1333,7 +1333,7 @@ void PIOS_Board_Init(void) {
 #endif	/* PIOS_INCLUDE_PWM */
 		break;
 	case HWSETTINGS_CC_RCVRPORT_PPM:
-	case HWSETTINGS_CC_RCVRPORT_PPM_SERVO:
+	case HWSETTINGS_CC_RCVRPORT_PPMSERVO:
 #if defined(PIOS_INCLUDE_PPM)
 		{
 			uint32_t pios_ppm_id;
@@ -1369,7 +1369,7 @@ void PIOS_Board_Init(void) {
 		case HWSETTINGS_CC_RCVRPORT_PPM:
 			PIOS_Servo_Init(&pios_servo_cfg);
 			break;
-		case HWSETTINGS_CC_RCVRPORT_PPM_SERVO:
+		case HWSETTINGS_CC_RCVRPORT_PPMSERVO:
 		case HWSETTINGS_CC_RCVRPORT_SERVO:
 			PIOS_Servo_Init(&pios_servo_rcvr_cfg);
 			break;
diff --git a/shared/uavobjectdefinition/hwsettings.xml b/shared/uavobjectdefinition/hwsettings.xml
index 0f5769098..714cc9d4f 100644
--- a/shared/uavobjectdefinition/hwsettings.xml
+++ b/shared/uavobjectdefinition/hwsettings.xml
@@ -3,7 +3,7 @@
 		<description>Selection of optional hardware configurations.</description>
 		<field name="CC_FlexiPort" units="function" type="enum" elements="1" options="Disabled,Telemetry,GPS,Spektrum1,Spektrum2,ComAux,I2C" defaultvalue="Disabled"/>
 		<field name="CC_MainPort" units="function" type="enum" elements="1" options="Disabled,Telemetry,S.Bus,GPS,Spektrum1,Spektrum2,ComAux" defaultvalue="Telemetry"/>
-		<field name="CC_RcvrPort" units="function" type="enum" elements="1" options="Disabled,PWM,PPM,PPM_SERVO,SERVO" defaultvalue="PWM"/>
+		<field name="CC_RcvrPort" units="function" type="enum" elements="1" options="Disabled,PWM,PPM,PPM+Servo,Servo" defaultvalue="PWM"/>
 
 		<field name="OP_FlexiPort" units="function" type="enum" elements="1" options="Disabled,GPS" defaultvalue="GPS"/>
 		<field name="OP_MainPort" units="function" type="enum" elements="1" options="Disabled,Telemetry" defaultvalue="Telemetry"/>