diff --git a/.gitignore b/.gitignore
index a235713fa..519a8a088 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,10 +3,10 @@
 /tools
 /build
 /3rdparty
-
-# Ignore user config
-config
-
+
+# Ignore user config
+config
+
 
 # Exclude temporary and system files
 Thumbs.db
@@ -16,7 +16,7 @@ GRTAGS
 GSYMS
 GTAGS
 core
-*~
+*~
 
 # flight
 /flight/*.pnproj
@@ -29,29 +29,24 @@ core
 /flight/Project/OpenPilotOSX/OpenPilotOSX.xcodeproj/*.pbxuser
 
 # ground
-openpilotgcs-build-desktop
-ground/openpilotgcs/.cproject
-ground/openpilotgcs/.project
-ground/openpilotgcs/.settings
+gcs-build-desktop
+ground/gcs/.cproject
+ground/gcs/.project
+ground/gcs/.settings
 
-# Ignore some of the .pro.user files
+# Ignore .pro.user files
 *.pro.user
-/ground/openpilotgcs/openpilotgcs.pro.user
-/ground/uavobjgenerator/uavobjgenerator.pro.user
-/ground/uavobjects/uavobjects.pro.user
-/ground/ground.pro.user
-/ground/openpilotgcs/src/libs/sdlgamepad.pro.user
+
 
 # Misc artifacts
-/ground/openpilotgcs/share/openpilotgcs/sounds/normalize.exe
-/ground/openpilotgcs/share/openpilotgcs/sounds/default/normalize.exe
-/ground/openpilotgcs/share/openpilotgcs/translations/extract-mimetypes.xq
-/ground/openpilotgcs/src/experimental/tools/DocumentationHelper/ui_mainwindow.h
-/ground/openpilotgcs/src/libs/qextserialport/.hg
-/ground/openpilotgcs/src/libs/qextserialport/.hgtags
-/ground/openpilotgcs/src/libs/qwt/qwt.prf
-/ground/openpilotgcs/src/libs/qwt/designer
-/ground/openpilotgcs/src/plugins/ipconnection/ui_ipconnectionoptionspage.h
+*.exe
+/ground/gcs/share/translations/extract-mimetypes.xq
+/ground/gcs/src/experimental/tools/DocumentationHelper/ui_mainwindow.h
+/ground/gcs/src/libs/qextserialport/.hg
+/ground/gcs/src/libs/qextserialport/.hgtags
+/ground/gcs/src/libs/qwt/qwt.prf
+/ground/gcs/src/libs/qwt/designer
+/ground/gcs/src/plugins/ipconnection/ui_ipconnectionoptionspage.h
 
 # Ignore intermediate files generated by command-line android builds
 # Couldn't figure out how to force these files into the ./build directory
diff --git a/Makefile b/Makefile
index 8fc1ace6d..ca590b8f5 100644
--- a/Makefile
+++ b/Makefile
@@ -203,7 +203,7 @@ export OPMODULEDIR   := $(ROOT_DIR)/flight/modules
 export OPUAVOBJ      := $(ROOT_DIR)/flight/uavobjects
 export OPUAVTALK     := $(ROOT_DIR)/flight/uavtalk
 export OPUAVSYNTHDIR := $(BUILD_DIR)/uavobject-synthetics/flight
-export OPGCSSYNTHDIR := $(BUILD_DIR)/openpilotgcs-synthetics
+export OPGCSSYNTHDIR := $(BUILD_DIR)/gcs-synthetics
 
 DIRS += $(OPGCSSYNTHDIR)
 
diff --git a/ground/gcs/src/app/Info.plist b/ground/gcs/src/app/Info.plist
index 1ada02aee..8a6276dc1 100644
--- a/ground/gcs/src/app/Info.plist
+++ b/ground/gcs/src/app/Info.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>CFBundleGetInfoString</key>
-	<string>OpenPilot GCS; Copyright OpenPilot</string>
+	<string>LibrePilot GCS; Copyright LibrePilot</string>
 	<key>CFBundleIconFile</key>
 	<string>@ICON@</string>
 	<key>CFBundlePackageType</key>
@@ -13,7 +13,7 @@
 	<key>CFBundleExecutable</key>
 	<string>@EXECUTABLE@</string>
 	<key>CFBundleIdentifier</key>
-	<string>org.openpilot.openpilotgcs</string>
+	<string>org.librepilot.gcs</string>
 	<key>CFBundleVersion</key>
 	<string>1.3.1</string>
 	<key>CFBundleShortVersionString</key>
diff --git a/ground/gcs/src/app/main.cpp b/ground/gcs/src/app/main.cpp
index 5368f7eed..a8b3be84a 100644
--- a/ground/gcs/src/app/main.cpp
+++ b/ground/gcs/src/app/main.cpp
@@ -421,7 +421,7 @@ void loadTranslators(QString language, QTranslator &translator, QTranslator &qtT
 {
     const QString &creatorTrPath = Utils::GetDataPath() + QLatin1String("translations");
 
-    if (translator.load(QLatin1String("openpilotgcs_") + language, creatorTrPath)) {
+    if (translator.load(QLatin1String("gcs_") + language, creatorTrPath)) {
         const QString &qtTrPath = QLibraryInfo::location(QLibraryInfo::TranslationsPath);
         const QString &qtTrFile = QLatin1String("qt_") + language;
         // Binary installer puts Qt tr files into creatorTrPath
diff --git a/ground/gcs/src/library.pri b/ground/gcs/src/library.pri
index 3959e9bcb..3120d28ce 100644
--- a/ground/gcs/src/library.pri
+++ b/ground/gcs/src/library.pri
@@ -21,7 +21,7 @@ macx {
         QMAKE_RPATHDIR += $$shell_quote(\$$ORIGIN/$$relative_path($$GCS_QT_LIBRARY_PATH, $$GCS_LIBRARY_PATH))
         include(rpath.pri)
 
-        target.path = /$$GCS_LIBRARY_BASENAME/openpilotgcs
+        target.path = /$$GCS_LIBRARY_BASENAME/gcs
     }
     INSTALLS += target
 }
diff --git a/ground/gcs/src/libs/version_info/version_info.cpp b/ground/gcs/src/libs/version_info/version_info.cpp
index 97e4dfbf6..c446e58b0 100644
--- a/ground/gcs/src/libs/version_info/version_info.cpp
+++ b/ground/gcs/src/libs/version_info/version_info.cpp
@@ -24,4 +24,4 @@
  */
 
 #include "version_info.h"
-#include "../../../../build/openpilotgcs-synthetics/version_info.cpp"
+#include "../../../../build/gcs-synthetics/version_info.cpp"
diff --git a/ground/gcs/src/libs/version_info/version_info.cpp.template b/ground/gcs/src/libs/version_info/version_info.cpp.template
index 6486eb9a3..620148919 100644
--- a/ground/gcs/src/libs/version_info/version_info.cpp.template
+++ b/ground/gcs/src/libs/version_info/version_info.cpp.template
@@ -5,7 +5,7 @@
  * @addtogroup VersionInfo
  * @{
  * @brief      The template file used to generate the real source file called
- *             build/openpilotgcs-synthetics/version_info.cpp
+ *             build/gcs-synthetics/version_info.cpp
  *****************************************************************************/
 /*
  * This program is free software; you can redistribute it and/or modify
diff --git a/ground/gcs/src/libs/version_info/version_info.pro b/ground/gcs/src/libs/version_info/version_info.pro
index 2ac21ff84..91b58913f 100644
--- a/ground/gcs/src/libs/version_info/version_info.pro
+++ b/ground/gcs/src/libs/version_info/version_info.pro
@@ -17,7 +17,7 @@ SOURCES = version_info.cpp
 # Since debug_and_release option is set, we need this
 !debug_and_release|build_pass {
     # Define other variables
-    VERSION_INFO_DIR      = $$GCS_BUILD_TREE/../openpilotgcs-synthetics
+    VERSION_INFO_DIR      = $$GCS_BUILD_TREE/../gcs-synthetics
     VERSION_INFO_SCRIPT   = $$ROOT_DIR/make/scripts/version-info.py
     VERSION_INFO_COMMAND  = $$PYTHON \"$$VERSION_INFO_SCRIPT\"
     VERSION_INFO_TEMPLATE = $$GCS_SOURCE_TREE/src/libs/version_info/version_info.cpp.template
diff --git a/ground/gcs/src/plugin.pri b/ground/gcs/src/plugin.pri
index 6bcf39ade..ea4764a9e 100644
--- a/ground/gcs/src/plugin.pri
+++ b/ground/gcs/src/plugin.pri
@@ -1,8 +1,6 @@
 include(../gcs.pri)
 
-isEmpty(PROVIDER) {
-    PROVIDER = OpenPilot
-}
+isEmpty(PROVIDER):PROVIDER = "$$ORG_BIG_NAME"
 
 DESTDIR = $$GCS_PLUGIN_PATH/$$PROVIDER
 LIBS += -L$$DESTDIR
@@ -42,8 +40,8 @@ contains(QT_CONFIG, reduce_exports):CONFIG += hGCS_symbols
 CONFIG += plugin plugin_with_soname
 
 !macx {
-    target.path = /$$GCS_LIBRARY_BASENAME/openpilotgcs/plugins/$$PROVIDER
+    target.path = /$$GCS_LIBRARY_BASENAME/gcs/plugins/$$PROVIDER
     pluginspec.files += $${TARGET}.pluginspec
-    pluginspec.path = /$$GCS_LIBRARY_BASENAME/openpilotgcs/plugins/$$PROVIDER
+    pluginspec.path = /$$GCS_LIBRARY_BASENAME/gcs/plugins/$$PROVIDER
     INSTALLS += target pluginspec
 }
diff --git a/ground/gcs/src/plugins/coreplugin/authorsdialog.pri b/ground/gcs/src/plugins/coreplugin/authorsdialog.pri
index 3a002f114..d694315ac 100644
--- a/ground/gcs/src/plugins/coreplugin/authorsdialog.pri
+++ b/ground/gcs/src/plugins/coreplugin/authorsdialog.pri
@@ -15,7 +15,7 @@ include(../../python.pri)
     AUTHORS_COMMAND  = $$PYTHON \"$$AUTHORS_SCRIPT\"
     AUTHORS_SOURCE   = $$ROOT_DIR/CREDITS.txt
     AUTHORS_TEMPLATE = $$GCS_SOURCE_TREE/src/plugins/coreplugin/qml/AuthorsModel.qml.template
-    AUTHORS_DIR      = $$GCS_BUILD_TREE/../openpilotgcs-synthetics
+    AUTHORS_DIR      = $$GCS_BUILD_TREE/../gcs-synthetics
     AUTHORS_FILE     = $$AUTHORS_DIR/AuthorsModel.qml
 
     # Create custom authors target which generates a real file
diff --git a/ground/gcs/src/plugins/coreplugin/core.qrc b/ground/gcs/src/plugins/coreplugin/core.qrc
index ba20a4433..35744c4dc 100644
--- a/ground/gcs/src/plugins/coreplugin/core.qrc
+++ b/ground/gcs/src/plugins/coreplugin/core.qrc
@@ -63,7 +63,7 @@
         <file>images/cpu.png</file>
         <file>qml/images/tab.png</file>
         <file>qml/AboutDialog.qml</file>
-        <file alias="qml/AuthorsModel.qml">../../../../../build/openpilotgcs-synthetics/AuthorsModel.qml</file>
+        <file alias="qml/AuthorsModel.qml">../../../../../build/gcs-synthetics/AuthorsModel.qml</file>
         <file>images/opie_90x120.gif</file>
     </qresource>
 </RCC>
diff --git a/ground/gcs/src/plugins/coreplugin/generalsettings.cpp b/ground/gcs/src/plugins/coreplugin/generalsettings.cpp
index f76de6a16..74e4e2c6c 100644
--- a/ground/gcs/src/plugins/coreplugin/generalsettings.cpp
+++ b/ground/gcs/src/plugins/coreplugin/generalsettings.cpp
@@ -95,7 +95,7 @@ void GeneralSettings::fillLanguageBox() const
     }
 
     const QString creatorTrPath     = Core::ICore::instance()->resourcePath() + QLatin1String("/translations");
-    const QStringList languageFiles = QDir(creatorTrPath).entryList(QStringList(QLatin1String("openpilotgcs*.qm")));
+    const QStringList languageFiles = QDir(creatorTrPath).entryList(QStringList(QLatin1String("gcs*.qm")));
 
     foreach(QString languageFile, languageFiles) {
         int start = languageFile.indexOf(QLatin1Char('_')) + 1;
diff --git a/ground/gcs/src/plugins/uploader/uploader.pro b/ground/gcs/src/plugins/uploader/uploader.pro
index 5f775e96e..fb70976ff 100644
--- a/ground/gcs/src/plugins/uploader/uploader.pro
+++ b/ground/gcs/src/plugins/uploader/uploader.pro
@@ -60,8 +60,8 @@ FORMS += \
 
 RESOURCES += uploader.qrc
 
-exists( ../../../../../build/openpilotgcs-synthetics/opfw_resource.qrc ) {
-    RESOURCES += ../../../../../build/openpilotgcs-synthetics/opfw_resource.qrc
+exists( ../../../../../build/gcs-synthetics/opfw_resource.qrc ) {
+    RESOURCES += ../../../../../build/gcs-synthetics/opfw_resource.qrc
 } else {
     message("opfw_resource.qrc is not available, automatic firmware upgrades are disabled")
 }
diff --git a/ground/gcs/src/share/translations/openpilotgcs_de.ts b/ground/gcs/src/share/translations/gcs_de.ts
similarity index 100%
rename from ground/gcs/src/share/translations/openpilotgcs_de.ts
rename to ground/gcs/src/share/translations/gcs_de.ts
diff --git a/ground/gcs/src/share/translations/openpilotgcs_es.ts b/ground/gcs/src/share/translations/gcs_es.ts
similarity index 100%
rename from ground/gcs/src/share/translations/openpilotgcs_es.ts
rename to ground/gcs/src/share/translations/gcs_es.ts
diff --git a/ground/gcs/src/share/translations/openpilotgcs_fr.ts b/ground/gcs/src/share/translations/gcs_fr.ts
similarity index 100%
rename from ground/gcs/src/share/translations/openpilotgcs_fr.ts
rename to ground/gcs/src/share/translations/gcs_fr.ts
diff --git a/ground/gcs/src/share/translations/openpilotgcs_ru.ts b/ground/gcs/src/share/translations/gcs_ru.ts
similarity index 100%
rename from ground/gcs/src/share/translations/openpilotgcs_ru.ts
rename to ground/gcs/src/share/translations/gcs_ru.ts
diff --git a/ground/gcs/src/share/translations/openpilotgcs_zh_CN.ts b/ground/gcs/src/share/translations/gcs_zh_CN.ts
similarity index 100%
rename from ground/gcs/src/share/translations/openpilotgcs_zh_CN.ts
rename to ground/gcs/src/share/translations/gcs_zh_CN.ts
diff --git a/ground/gcs/src/share/translations/translations.pro b/ground/gcs/src/share/translations/translations.pro
index de8de2ae7..45d5ebf53 100644
--- a/ground/gcs/src/share/translations/translations.pro
+++ b/ground/gcs/src/share/translations/translations.pro
@@ -16,7 +16,7 @@ LUPDATE = $$[QT_INSTALL_BINS]/lupdate -locations relative -no-ui-lines -no-sort
 LRELEASE = $$[QT_INSTALL_BINS]/lrelease
 LCONVERT = $$[QT_INSTALL_BINS]/lconvert
 
-TRANSLATIONS = $$prependAll(LANGUAGES, $$PWD/openpilotgcs_,.ts)
+TRANSLATIONS = $$prependAll(LANGUAGES, $$PWD/gcs_,.ts)
 
 MIME_TR_H = $$PWD/mime_tr.h
 
@@ -48,8 +48,8 @@ QMAKE_LINK = @: IGNORE THIS LINE
 OBJECTS_DIR =
 win32:CONFIG -= embed_manifest_exe
 
-qmfiles.files = $$prependAll(LANGUAGES, $$OUT_PWD/openpilotgcs_,.qm)
-qmfiles.path = /share/openpilotgcs/translations
+qmfiles.files = $$prependAll(LANGUAGES, $$OUT_PWD/gcs_,.qm)
+qmfiles.path = /share/gcs/translations
 qmfiles.CONFIG += no_check_exist
 INSTALLS += qmfiles
 
diff --git a/ground/ground.pro b/ground/ground.pro
index 8e2a2781e..6e1f6b2df 100644
--- a/ground/ground.pro
+++ b/ground/ground.pro
@@ -36,6 +36,6 @@ SUBDIRS = \
 # uavobjgenerator
 sub_uavobjgenerator.subdir = uavobjgenerator
 
-# openpilotgcs
-sub_openpilotgcs.subdir  = gcs
-sub_openpilotgcs.depends = sub_uavobjgenerator
+# GCS
+sub_gcs.subdir  = gcs
+sub_gcs.depends = sub_uavobjgenerator
diff --git a/package/Windows.mk b/package/Windows.mk
index d21f1e1dc..705fb186a 100644
--- a/package/Windows.mk
+++ b/package/Windows.mk
@@ -10,9 +10,9 @@ VERSION_CMD   := $(VERSION_INFO)
 
 NSIS_OPTS     := /V3
 NSIS_WINX86   := $(ROOT_DIR)/package/winx86
-NSIS_SCRIPT   := $(NSIS_WINX86)/openpilotgcs.nsi
-NSIS_TEMPLATE := $(NSIS_WINX86)/openpilotgcs.tpl
-NSIS_HEADER   := $(OPGCSSYNTHDIR)/openpilotgcs.nsh
+NSIS_SCRIPT   := $(NSIS_WINX86)/gcs.nsi
+NSIS_TEMPLATE := $(NSIS_WINX86)/gcs.tpl
+NSIS_HEADER   := $(OPGCSSYNTHDIR)/gcs.nsh
 
 .PHONY: package
 package: gcs uavobjects_matlab | $(PACKAGE_DIR)
diff --git a/package/linux/rpmspec.in b/package/linux/rpmspec.in
index 396905360..0981915fb 100644
--- a/package/linux/rpmspec.in
+++ b/package/linux/rpmspec.in
@@ -105,8 +105,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/librepilot.desktop
 %{_datadir}/librepilot-gcs/*
 %{_datadir}/pixmaps/librepilot.png
-%{_libdir}/librepilot-gcs/plugins/OpenPilot/*.pluginspec
-%{_libdir}/librepilot-gcs/plugins/OpenPilot/*.so
+%{_libdir}/librepilot-gcs/plugins/LibrePilot/*.pluginspec
+%{_libdir}/librepilot-gcs/plugins/LibrePilot/*.so
 #
 %{_libdir}/librepilot-gcs/libAggregation.so.1*
 %{_libdir}/librepilot-gcs/libExtensionSystem.so.1*
diff --git a/package/winx86/openpilotgcs.nsi b/package/winx86/gcs.nsi
similarity index 96%
rename from package/winx86/openpilotgcs.nsi
rename to package/winx86/gcs.nsi
index d2b7eea22..b53e03f4c 100644
--- a/package/winx86/openpilotgcs.nsi
+++ b/package/winx86/gcs.nsi
@@ -29,7 +29,7 @@
 ; Includes
 
 !include "x64.nsh"
-!include "..\..\build\openpilotgcs-synthetics\openpilotgcs.nsh"
+!include "..\..\build\gcs-synthetics\gcs.nsh"
 
 ;--------------------------------
 ; Paths
diff --git a/package/winx86/openpilotgcs.tpl b/package/winx86/gcs.tpl
similarity index 100%
rename from package/winx86/openpilotgcs.tpl
rename to package/winx86/gcs.tpl