diff --git a/flight/modules/UAVOMavlinkBridge/UAVOMavlinkBridge.c b/flight/modules/UAVOMavlinkBridge/UAVOMavlinkBridge.c
index eeb9cda9e..bca1ab6fa 100644
--- a/flight/modules/UAVOMavlinkBridge/UAVOMavlinkBridge.c
+++ b/flight/modules/UAVOMavlinkBridge/UAVOMavlinkBridge.c
@@ -1,12 +1,12 @@
 /**
  ******************************************************************************
- * @addtogroup TauLabsModules TauLabs Modules
+ * @addtogroup OpenPilotModules OpenPilot Modules
  * @{
  * @addtogroup UAVOMavlinkBridge UAVO to Mavlink Bridge Module
  * @{
  *
  * @file       UAVOMavlinkBridge.c
- * @author     The OpenPilot Team, http://www.openpilot.org Copyright (C) 2016.
+ * @author     The LibrePilot Project, http://www.librepilot.org Copyright (C) 2016.
  *             dRonin, http://dRonin.org/, Copyright (C) 2015-2016
  *             Tau Labs, http://taulabs.org, Copyright (C) 2013-2014
  * @brief      Bridges selected UAVObjects to Mavlink
@@ -56,11 +56,6 @@
 #include "receiverstatus.h"
 #include "manualcontrolsettings.h"
 
-// #include "pios_thread.h"
-// #include "pios_modules.h"
-
-// #include <pios_hal.h>
-
 #include "custom_types.h"
 
 #define OPLINK_LOW_RSSI  -110
diff --git a/flight/targets/boards/revoproto/firmware/pios_board.c b/flight/targets/boards/revoproto/firmware/pios_board.c
index 2ab6bf788..58c21e533 100644
--- a/flight/targets/boards/revoproto/firmware/pios_board.c
+++ b/flight/targets/boards/revoproto/firmware/pios_board.c
@@ -330,7 +330,7 @@ uint32_t pios_rcvr_group_map[MANUALCONTROLSETTINGS_CHANNELGROUPS_NONE];
 #define PIOS_COM_MSP_TX_BUF_LEN       128
 #define PIOS_COM_MSP_RX_BUF_LEN       64
 
-#define PIOS_COM_MAVLINK_TX_BUF_LEN      128
+#define PIOS_COM_MAVLINK_TX_BUF_LEN   128
 
 uint32_t pios_com_aux_id       = 0;
 uint32_t pios_com_gps_id       = 0;
diff --git a/shared/uavobjectdefinition/hwsettings.xml b/shared/uavobjectdefinition/hwsettings.xml
index 1651cb407..bbbbd5200 100644
--- a/shared/uavobjectdefinition/hwsettings.xml
+++ b/shared/uavobjectdefinition/hwsettings.xml
@@ -26,7 +26,7 @@
 		<field name="GPSSpeed" units="bps" type="enum" elements="1" options="2400,4800,9600,19200,38400,57600,115200,230400" defaultvalue="57600"/>
 		<field name="ComUsbBridgeSpeed" units="bps" type="enum" elements="1" options="2400,4800,9600,19200,38400,57600,115200" defaultvalue="57600"/>
 		<field name="MSPSpeed" units="bps" type="enum" elements="1" options="2400,4800,9600,19200,38400,57600,115200" defaultvalue="115200"/>
-        <field name="MAVLinkSpeed" units="bps" type="enum" elements="1" options="2400,4800,9600,19200,38400,57600,115200" defaultvalue="57600"/>
+		<field name="MAVLinkSpeed" units="bps" type="enum" elements="1" options="2400,4800,9600,19200,38400,57600,115200" defaultvalue="57600"/>
 		<field name="USB_HIDPort" units="function" type="enum" elements="1" options="USBTelemetry,RCTransmitter,Disabled" defaultvalue="USBTelemetry"/>
 		<field name="USB_VCPPort" units="function" type="enum" elements="1" options="USBTelemetry,ComBridge,DebugConsole,Disabled" defaultvalue="Disabled"/>
 
diff --git a/shared/uavobjectdefinition/taskinfo.xml b/shared/uavobjectdefinition/taskinfo.xml
index e16ac8d32..1d7a2f4f1 100644
--- a/shared/uavobjectdefinition/taskinfo.xml
+++ b/shared/uavobjectdefinition/taskinfo.xml
@@ -33,7 +33,7 @@
 			<elementname>OSDGen</elementname>
 			<elementname>UAVOMSPBridge</elementname>
 			<elementname>AutoTune</elementname>
-			<elementname>UAVOMavlinkBridge</elementname>
+			<elementname>UAVOMAVLinkBridge</elementname>
 		</elementnames>
 	</field> 
 	<field name="Running" units="bool" type="enum">
@@ -68,7 +68,7 @@
 			<elementname>OSDGen</elementname>
 			<elementname>UAVOMSPBridge</elementname>
 			<elementname>AutoTune</elementname>
-			<elementname>UAVOMavlinkBridge</elementname>
+			<elementname>UAVOMAVLinkBridge</elementname>
 		</elementnames>
 		<options>
 			<option>False</option>
@@ -107,7 +107,7 @@
 			<elementname>OSDGen</elementname>
 			<elementname>UAVOMSPBridge</elementname>
 			<elementname>AutoTune</elementname>
-			<elementname>UAVOMavlinkBridge</elementname>
+			<elementname>UAVOMAVLinkBridge</elementname>
 		</elementnames>
 	</field> 
         <access gcs="readonly" flight="readwrite"/>