diff --git a/ground/src/plugins/map2/Map2Gadget.pluginspec b/ground/src/plugins/opmap/OPMapGadget.pluginspec
similarity index 72%
rename from ground/src/plugins/map2/Map2Gadget.pluginspec
rename to ground/src/plugins/opmap/OPMapGadget.pluginspec
index 243b4c68b..11863c31b 100644
--- a/ground/src/plugins/map2/Map2Gadget.pluginspec
+++ b/ground/src/plugins/opmap/OPMapGadget.pluginspec
@@ -1,8 +1,8 @@
-<plugin name="Map2Gadget" version="1.0.0" compatVersion="1.0.0">
+<plugin name="OPMapGadget" version="1.0.0" compatVersion="1.0.0">
     <vendor>The OpenPilot Project</vendor>
     <copyright>(C) 2010 OpenPilot Project</copyright>
     <license>The GNU Public License (GPL) Version 3</license>
-    <description>A new map gadget!</description>
+    <description>OPMap gadget!</description>
     <url>http://www.openpilot.org</url>
     <dependencyList>
         <dependency name="Core" version="1.0.0"/>
diff --git a/ground/src/plugins/map2/images/gcs.png b/ground/src/plugins/opmap/images/gcs.png
similarity index 100%
rename from ground/src/plugins/map2/images/gcs.png
rename to ground/src/plugins/opmap/images/gcs.png
diff --git a/ground/src/plugins/map2/images/uav.png b/ground/src/plugins/opmap/images/uav.png
similarity index 100%
rename from ground/src/plugins/map2/images/uav.png
rename to ground/src/plugins/opmap/images/uav.png
diff --git a/ground/src/plugins/map2/images/waypoint.png b/ground/src/plugins/opmap/images/waypoint.png
similarity index 100%
rename from ground/src/plugins/map2/images/waypoint.png
rename to ground/src/plugins/opmap/images/waypoint.png
diff --git a/ground/src/plugins/map2/map2.pro b/ground/src/plugins/opmap/opmap.pro
similarity index 52%
rename from ground/src/plugins/map2/map2.pro
rename to ground/src/plugins/opmap/opmap.pro
index f8c919160..ce5a15cfa 100644
--- a/ground/src/plugins/map2/map2.pro
+++ b/ground/src/plugins/opmap/opmap.pro
@@ -1,11 +1,11 @@
 TEMPLATE = lib
-TARGET = Map2Gadget
+TARGET = OPMapGadget
 include(../../openpilotgcsplugin.pri)
 include(../../plugins/coreplugin/coreplugin.pri)
 include(../../libs/opmapcontrol/opmapcontrol.pri)
 include(../../plugins/uavobjects/uavobjects.pri)
-HEADERS += map2plugin.h
-SOURCES += map2plugin.cpp
-OTHER_FILES += Map2Gadget.pluginspec
-FORMS += map2gadgetoptionspage.ui
-RESOURCES += map2.qrc
+HEADERS += opmapplugin.h
+SOURCES += opmapplugin.cpp
+OTHER_FILES += OPMapGadget.pluginspec
+FORMS += opmapgadgetoptionspage.ui
+RESOURCES += opmap.qrc
diff --git a/ground/src/plugins/map2/map2.qrc b/ground/src/plugins/opmap/opmap.qrc
similarity index 100%
rename from ground/src/plugins/map2/map2.qrc
rename to ground/src/plugins/opmap/opmap.qrc
diff --git a/ground/src/plugins/map2/map2gadgetoptionspage.ui b/ground/src/plugins/opmap/opmapgadgetoptionspage.ui
similarity index 93%
rename from ground/src/plugins/map2/map2gadgetoptionspage.ui
rename to ground/src/plugins/opmap/opmapgadgetoptionspage.ui
index ee91b339d..10f1cb258 100644
--- a/ground/src/plugins/map2/map2gadgetoptionspage.ui
+++ b/ground/src/plugins/opmap/opmapgadgetoptionspage.ui
@@ -1,130 +1,130 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>MapGadgetOptionsPage</class>
- <widget class="QWidget" name="MapGadgetOptionsPage">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>400</width>
-    <height>300</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
-  <layout class="QGridLayout" name="gridLayout">
-   <property name="margin">
-    <number>0</number>
-   </property>
-   <item row="0" column="0">
-    <widget class="QLabel" name="label">
-     <property name="text">
-      <string>Map provider:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="1">
-    <widget class="QComboBox" name="providerComboBox">
-     <item>
-      <property name="text">
-       <string>OpenStreetMap</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>Google</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>Google Sat</string>
-      </property>
-     </item>
-    </widget>
-   </item>
-   <item row="1" column="0">
-    <widget class="QLabel" name="label_2">
-     <property name="text">
-      <string>Default zoom:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="1">
-    <widget class="QSpinBox" name="zoomSpinBox">
-     <property name="maximum">
-      <number>18</number>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="0">
-    <widget class="QLabel" name="label_3">
-     <property name="text">
-      <string>Default latitude:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="1">
-    <widget class="QDoubleSpinBox" name="latitudeSpinBox">
-     <property name="decimals">
-      <number>8</number>
-     </property>
-     <property name="minimum">
-      <double>-90.000000000000000</double>
-     </property>
-     <property name="maximum">
-      <double>90.000000000000000</double>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="0">
-    <widget class="QLabel" name="label_4">
-     <property name="text">
-      <string>Default longitude:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="1">
-    <widget class="QDoubleSpinBox" name="longitudeSpinBox">
-     <property name="decimals">
-      <number>8</number>
-     </property>
-     <property name="minimum">
-      <double>-180.000000000000000</double>
-     </property>
-     <property name="maximum">
-      <double>180.000000000000000</double>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="1">
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="3" column="2">
-    <spacer name="horizontalSpacer">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>40</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Map2GadgetOptionsPage</class>
+ <widget class="QWidget" name="Map2GadgetOptionsPage">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <property name="margin">
+    <number>0</number>
+   </property>
+   <item row="0" column="0">
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string>Map provider:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1">
+    <widget class="QComboBox" name="providerComboBox">
+     <item>
+      <property name="text">
+       <string>OpenStreetMap</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>Google</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>Google Sat</string>
+      </property>
+     </item>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <widget class="QLabel" name="label_2">
+     <property name="text">
+      <string>Default zoom:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1">
+    <widget class="QSpinBox" name="zoomSpinBox">
+     <property name="maximum">
+      <number>18</number>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0">
+    <widget class="QLabel" name="label_3">
+     <property name="text">
+      <string>Default latitude:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="1">
+    <widget class="QDoubleSpinBox" name="latitudeSpinBox">
+     <property name="decimals">
+      <number>8</number>
+     </property>
+     <property name="minimum">
+      <double>-90.000000000000000</double>
+     </property>
+     <property name="maximum">
+      <double>90.000000000000000</double>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="0">
+    <widget class="QLabel" name="label_4">
+     <property name="text">
+      <string>Default longitude:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="1">
+    <widget class="QDoubleSpinBox" name="longitudeSpinBox">
+     <property name="decimals">
+      <number>8</number>
+     </property>
+     <property name="minimum">
+      <double>-180.000000000000000</double>
+     </property>
+     <property name="maximum">
+      <double>180.000000000000000</double>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="1">
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="3" column="2">
+    <spacer name="horizontalSpacer">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>40</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/ground/src/plugins/map2/map2plugin.cpp b/ground/src/plugins/opmap/opmapplugin.cpp
similarity index 74%
rename from ground/src/plugins/map2/map2plugin.cpp
rename to ground/src/plugins/opmap/opmapplugin.cpp
index 354222dcb..26d1293cc 100644
--- a/ground/src/plugins/map2/map2plugin.cpp
+++ b/ground/src/plugins/opmap/opmapplugin.cpp
@@ -1,11 +1,11 @@
 /**
  ******************************************************************************
  *
- * @file       map2plugin.cpp
+ * @file       opmapplugin.cpp
  * @author     The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
  * @brief
  * @see        The GNU Public License (GPL) Version 3
- * @defgroup   map2
+ * @defgroup   opmap
  * @{
  *
  *****************************************************************************/
@@ -24,40 +24,40 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-#include "map2plugin.h"
-//#include "map2gadgetfactory.h"
+#include "opmapplugin.h"
+//#include "opmapgadgetfactory.h"
 #include <QtPlugin>
 #include <QStringList>
 #include <extensionsystem/pluginmanager.h>
 
-Map2Plugin::Map2Plugin()
+OPMapPlugin::OPMapPlugin()
 {
    // Do nothing
 }
 
-Map2Plugin::~Map2Plugin()
+OPMapPlugin::~OPMapPlugin()
 {
    // Do nothing
 }
 
-bool Map2Plugin::initialize(const QStringList& args, QString *errMsg)
+bool OPMapPlugin::initialize(const QStringList& args, QString *errMsg)
 {
    Q_UNUSED(args);
    Q_UNUSED(errMsg);
 
-//   mf = new Map2GadgetFactory(this);
+//   mf = new OPMapGadgetFactory(this);
 //   addAutoReleasedObject(mf);
 
    return true;
 }
 
-void Map2Plugin::extensionsInitialized()
+void OPMapPlugin::extensionsInitialized()
 {
    // Do nothing
 }
 
-void Map2Plugin::shutdown()
+void OPMapPlugin::shutdown()
 {
    // Do nothing
 }
-Q_EXPORT_PLUGIN(Map2Plugin)
+Q_EXPORT_PLUGIN(OPMapPlugin)
diff --git a/ground/src/plugins/map2/map2plugin.h b/ground/src/plugins/opmap/opmapplugin.h
similarity index 79%
rename from ground/src/plugins/map2/map2plugin.h
rename to ground/src/plugins/opmap/opmapplugin.h
index cb7c77032..df34d4e55 100644
--- a/ground/src/plugins/map2/map2plugin.h
+++ b/ground/src/plugins/opmap/opmapplugin.h
@@ -1,11 +1,11 @@
 /**
  ******************************************************************************
  *
- * @file       map2plugin.h
+ * @file       opmapplugin.h
  * @author     The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
  * @brief
  * @see        The GNU Public License (GPL) Version 3
- * @defgroup   map2
+ * @defgroup   opmap
  * @{
  *
  *****************************************************************************/
@@ -25,23 +25,23 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#ifndef MAP2_PLUGIN_H_
-#define MAP2_PLUGIN_H_
+#ifndef OPMAP_PLUGIN_H_
+#define OPMAP_PLUGIN_H_
 
 #include <extensionsystem/iplugin.h>
 
-//class Map2GadgetFactory;
+//class OPMapGadgetFactory;
 
-class Map2Plugin : public ExtensionSystem::IPlugin
+class OPMapPlugin : public ExtensionSystem::IPlugin
 {
 public:
-    Map2Plugin();
-    ~Map2Plugin();
+    OPMapPlugin();
+    ~OPMapPlugin();
 
    void extensionsInitialized();
    bool initialize(const QStringList & arguments, QString * errorString);
    void shutdown();
 private:
-//   Map2GadgetFactory *mf;
+//   OPMapGadgetFactory *mf;
 };
-#endif /* MAP2_PLUGIN_H_ */
+#endif /* OPMAP_PLUGIN_H_ */
diff --git a/ground/src/plugins/plugins.pro b/ground/src/plugins/plugins.pro
index 52599b34e..d32917777 100644
--- a/ground/src/plugins/plugins.pro
+++ b/ground/src/plugins/plugins.pro
@@ -50,11 +50,11 @@ plugin_map.depends = plugin_coreplugin
 plugin_map.depends = plugin_uavobjects
 SUBDIRS += plugin_map
 
-# Map2 UAVGadget
-plugin_map2.subdir = map2
-plugin_map2.depends = plugin_coreplugin
-plugin_map2.depends = plugin_uavobjects
-SUBDIRS += plugin_map2
+# OPMap UAVGadget
+plugin_opmap.subdir = opmap
+plugin_opmap.depends = plugin_coreplugin
+plugin_opmap.depends = plugin_uavobjects
+SUBDIRS += plugin_opmap
 
 # Scope UAVGadget
 plugin_scope.subdir = scope