diff --git a/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.cpp b/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.cpp
index 8695eb4c0..2234f89a5 100644
--- a/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.cpp
+++ b/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.cpp
@@ -2,12 +2,12 @@
  ******************************************************************************
  *
  * @file       configtaskwidget.cpp
- * @author     E. Lafargue & The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
+ * @author     The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
  * @addtogroup GCSPlugins GCS Plugins
  * @{
- * @addtogroup ConfigPlugin Config Plugin
+ * @addtogroup UAVObjectWidgetUtils Plugin
  * @{
- * @brief The Configuration Gadget used to update settings in the firmware
+ * @brief Utility plugin for UAVObject to Widget relation management
  *****************************************************************************/
 /*
  * This program is free software; you can redistribute it and/or modify
diff --git a/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.h b/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.h
index 00ad4e8b1..e0d5c65ec 100644
--- a/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.h
+++ b/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.h
@@ -5,9 +5,9 @@
  * @author     The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
  * @addtogroup GCSPlugins GCS Plugins
  * @{
- * @addtogroup ConfigPlugin Config Plugin
+ * @addtogroup UAVObjectWidgetUtils Plugin
  * @{
- * @brief The Configuration Gadget used to update settings in the firmware (task widget)
+ * @brief Utility plugin for UAVObject to Widget relation management
  *****************************************************************************/
 /*
  * This program is free software; you can redistribute it and/or modify
diff --git a/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/mixercurveline.cpp b/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/mixercurveline.cpp
index 8a49a3d18..4846f62e3 100644
--- a/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/mixercurveline.cpp
+++ b/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/mixercurveline.cpp
@@ -2,13 +2,12 @@
  ******************************************************************************
  *
  * @file       mixercurveline.h
- * @author     Edouard Lafargue Copyright (C) 2010.
- *             Parts by Nokia Corporation (qt-info@nokia.com) Copyright (C) 2010.
+ * @author     The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
  * @addtogroup GCSPlugins GCS Plugins
  * @{
- * @addtogroup ConfigPlugin Configuration Plugin
+ * @addtogroup UAVObjectWidgetUtils Plugin
  * @{
- * @brief A line connecting two mixer points
+ * @brief Utility plugin for UAVObject to Widget relation management
  *****************************************************************************/
 /*
  * This program is free software; you can redistribute it and/or modify
diff --git a/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/mixercurveline.h b/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/mixercurveline.h
index 540a36457..80fb50e0c 100644
--- a/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/mixercurveline.h
+++ b/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/mixercurveline.h
@@ -2,13 +2,12 @@
  ******************************************************************************
  *
  * @file       mixercurveline.h
- * @author     Edouard Lafargue Copyright (C) 2010.
- *             Parts by Nokia Corporation (qt-info@nokia.com) Copyright (C) 2010.
+ * @author     The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
  * @addtogroup GCSPlugins GCS Plugins
  * @{
- * @addtogroup ConfigPlugin Configuration Plugin
+ * @addtogroup UAVObjectWidgetUtils Plugin
  * @{
- * @brief A line connecting two mixer points
+ * @brief Utility plugin for UAVObject to Widget relation management
  *****************************************************************************/
 /*
  * This program is free software; you can redistribute it and/or modify
diff --git a/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/mixercurvepoint.cpp b/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/mixercurvepoint.cpp
index d7702b7e6..6eaa8f5ed 100644
--- a/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/mixercurvepoint.cpp
+++ b/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/mixercurvepoint.cpp
@@ -2,13 +2,12 @@
  ******************************************************************************
  *
  * @file       mixercurvepoint.h
- * @author     Edouard Lafargue Copyright (C) 2010.
- *             Parts by Nokia Corporation (qt-info@nokia.com) Copyright (C) 2010.
+ * @author     The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
  * @addtogroup GCSPlugins GCS Plugins
  * @{
- * @addtogroup ConfigPlugin Configuration Plugin
+ * @addtogroup UAVObjectWidgetUtils Plugin
  * @{
- * @brief A point on the mixer curve
+ * @brief Utility plugin for UAVObject to Widget relation management
  *****************************************************************************/
 /*
  * This program is free software; you can redistribute it and/or modify
diff --git a/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/mixercurvepoint.h b/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/mixercurvepoint.h
index e59622fee..987875e32 100644
--- a/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/mixercurvepoint.h
+++ b/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/mixercurvepoint.h
@@ -2,13 +2,12 @@
  ******************************************************************************
  *
  * @file       mixercurvepoint.h
- * @author     Edouard Lafargue Copyright (C) 2010.
- *             Parts by Nokia Corporation (qt-info@nokia.com) Copyright (C) 2010.
+ * @author     The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
  * @addtogroup GCSPlugins GCS Plugins
  * @{
- * @addtogroup ConfigPlugin Configuration Plugin
+ * @addtogroup UAVObjectWidgetUtils Plugin
  * @{
- * @brief A point on the mixer curve
+ * @brief Utility plugin for UAVObject to Widget relation management
  *****************************************************************************/
 /*
  * This program is free software; you can redistribute it and/or modify
diff --git a/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/mixercurvewidget.cpp b/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/mixercurvewidget.cpp
index 6e031d8d7..f21d782f6 100644
--- a/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/mixercurvewidget.cpp
+++ b/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/mixercurvewidget.cpp
@@ -2,12 +2,12 @@
  ******************************************************************************
  *
  * @file       mixercurvewidget.cpp
- * @author     Edouard Lafargue Copyright (C) 2010.
+ * @author     The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
  * @addtogroup GCSPlugins GCS Plugins
  * @{
- * @addtogroup ConfigPlugin Config Plugin
+ * @addtogroup UAVObjectWidgetUtils Plugin
  * @{
- * @brief A widget which displays an adjustable mixer curve
+ * @brief Utility plugin for UAVObject to Widget relation management
  *****************************************************************************/
 /*
  * This program is free software; you can redistribute it and/or modify
diff --git a/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/mixercurvewidget.h b/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/mixercurvewidget.h
index d087bc8c2..9a14123a7 100644
--- a/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/mixercurvewidget.h
+++ b/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/mixercurvewidget.h
@@ -2,12 +2,12 @@
  ******************************************************************************
  *
  * @file       mixercurvewidget.h
- * @author     Edouard Lafargue Copyright (C) 2010.
+ * @author     The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
  * @addtogroup GCSPlugins GCS Plugins
  * @{
- * @addtogroup ConfigPlugin Configuration Plugin
+ * @addtogroup UAVObjectWidgetUtils Plugin
  * @{
- * @brief A widget which displays a mixer curve
+ * @brief Utility plugin for UAVObject to Widget relation management
  *****************************************************************************/
 /*
  * This program is free software; you can redistribute it and/or modify
diff --git a/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/smartsavebutton.cpp b/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/smartsavebutton.cpp
index e1e55b7ff..b5ff7db7a 100644
--- a/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/smartsavebutton.cpp
+++ b/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/smartsavebutton.cpp
@@ -1,3 +1,29 @@
+/**
+ ******************************************************************************
+ *
+ * @file       smartsavebutton.cpp
+ * @author     The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
+ * @addtogroup GCSPlugins GCS Plugins
+ * @{
+ * @addtogroup UAVObjectWidgetUtils Plugin
+ * @{
+ * @brief Utility plugin for UAVObject to Widget relation management
+ *****************************************************************************/
+/*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
 #include "smartsavebutton.h"
 
 smartSaveButton::smartSaveButton(QPushButton * update, QPushButton * save):bupdate(update),bsave(save)
diff --git a/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/smartsavebutton.h b/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/smartsavebutton.h
index 869575427..b10f5cdb6 100644
--- a/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/smartsavebutton.h
+++ b/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/smartsavebutton.h
@@ -1,3 +1,29 @@
+/**
+ ******************************************************************************
+ *
+ * @file       smartsavebutton.h
+ * @author     The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
+ * @addtogroup GCSPlugins GCS Plugins
+ * @{
+ * @addtogroup UAVObjectWidgetUtils Plugin
+ * @{
+ * @brief Utility plugin for UAVObject to Widget relation management
+ *****************************************************************************/
+/*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
 #ifndef SMARTSAVEBUTTON_H
 #define SMARTSAVEBUTTON_H
 
diff --git a/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/uavobjectwidgetutils_global.h b/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/uavobjectwidgetutils_global.h
index 9f7a6a533..918ec07b4 100644
--- a/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/uavobjectwidgetutils_global.h
+++ b/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/uavobjectwidgetutils_global.h
@@ -3,12 +3,11 @@
  *
  * @file       uavobjectwidgetutils_global.h
  * @author     The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
- * @see        The GNU Public License (GPL) Version 3
  * @addtogroup GCSPlugins GCS Plugins
  * @{
- * @addtogroup UAVObjectWidgetUtilsPlugin 
+ * @addtogroup UAVObjectWidgetUtils Plugin
  * @{
- * @brief The UAVUObjectWidgetUtils GCS plugin
+ * @brief Utility plugin for UAVObject to Widget relation management
  *****************************************************************************/
 /*
  * This program is free software; you can redistribute it and/or modify
diff --git a/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/uavobjectwidgetutilsplugin.cpp b/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/uavobjectwidgetutilsplugin.cpp
index 74339f0f8..ec0150a53 100644
--- a/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/uavobjectwidgetutilsplugin.cpp
+++ b/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/uavobjectwidgetutilsplugin.cpp
@@ -3,12 +3,11 @@
  *
  * @file       uavobjectutilplugin.cpp
  * @author     The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
- * @see        The GNU Public License (GPL) Version 3
  * @addtogroup GCSPlugins GCS Plugins
  * @{
- * @addtogroup UAVObjectUtilPlugin UAVObjectUtil Plugin
+ * @addtogroup UAVObjectWidgetUtils Plugin
  * @{
- * @brief      The UAVUObjectUtil GCS plugin
+ * @brief Utility plugin for UAVObject to Widget relation management
  *****************************************************************************/
 /*
  * This program is free software; you can redistribute it and/or modify 
diff --git a/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/uavobjectwidgetutilsplugin.h b/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/uavobjectwidgetutilsplugin.h
index 332657aa0..59291c210 100644
--- a/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/uavobjectwidgetutilsplugin.h
+++ b/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/uavobjectwidgetutilsplugin.h
@@ -1,14 +1,13 @@
 /**
  ******************************************************************************
  *
- * @file       uavobjectutilplugin.h
+ * @file       uavobjectwidgetutilsplugin.h
  * @author     The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
- * @see        The GNU Public License (GPL) Version 3
  * @addtogroup GCSPlugins GCS Plugins
  * @{
- * @addtogroup UAVObjectUtilPlugin UAVObjectUtil Plugin
+ * @addtogroup UAVObjectWidgetUtils Plugin
  * @{
- * @brief The UAVUObjectUtil GCS plugin
+ * @brief Utility plugin for UAVObject to Widget relation management
  *****************************************************************************/
 /*
  * This program is free software; you can redistribute it and/or modify