diff --git a/Makefile b/Makefile
index 766ff8d57..5488f06cb 100644
--- a/Makefile
+++ b/Makefile
@@ -59,10 +59,10 @@ SPACE             := $(EMPTY) $(EMPTY)
 smallify = $(subst $(SPACE),-,$(call lc,$1))
 
 # Naming for binaries and packaging etc,.
-OP_BIG_NAME := LibrePilot
-GCS_BIG_NAME := ${OP_BIG_NAME} GCS
+ORG_BIG_NAME := LibrePilot
+GCS_BIG_NAME := ${ORG_BIG_NAME} GCS
 # These should be lowercase with no spaces
-OP_SMALL_NAME := $(call smallify,$(OP_BIG_NAME))
+ORG_SMALL_NAME := $(call smallify,$(ORG_BIG_NAME))
 GCS_SMALL_NAME := $(call smallify,$(GCS_BIG_NAME))
 
 # Set up default build configurations (debug | release)
@@ -732,7 +732,7 @@ endif
 
 # Define some variables
 PACKAGE_LBL       := $(shell $(VERSION_INFO) --format=\$${LABEL})
-PACKAGE_NAME      := $(subst $(SPACE),,$(OP_BIG_NAME))
+PACKAGE_NAME      := $(subst $(SPACE),,$(ORG_BIG_NAME))
 PACKAGE_SEP       := -
 PACKAGE_FULL_NAME := $(PACKAGE_NAME)$(PACKAGE_SEP)$(PACKAGE_LBL)
 
diff --git a/package/Linux.mk b/package/Linux.mk
index 7e88aab5b..8891f5ea2 100644
--- a/package/Linux.mk
+++ b/package/Linux.mk
@@ -16,7 +16,7 @@ DEB_REV              := 1
 ifeq ($(DEB_DIST), trusty)
 DEB_REV              := $(DEB_REV)$(DEB_DIST)1
 endif
-DEB_NAME             := $(OP_SMALL_NAME)
+DEB_NAME             := $(ORG_SMALL_NAME)
 DEB_ORIG_SRC         := $(PACKAGE_DIR)/$(DEB_NAME)_$(UPSTREAM_VER).orig.tar.gz
 DEB_PACKAGE_DIR      := $(PACKAGE_DIR)/$(DEB_NAME)-$(UPSTREAM_VER)
 DEB_ARCH             := $(shell dpkg --print-architecture)
@@ -102,8 +102,8 @@ install:
 	$(V1) $(INSTALL) $(BUILD_DIR)/$(GCS_SMALL_NAME)_$(GCS_BUILD_CONF)/bin/$(GCS_SMALL_NAME) $(DESTDIR)$(bindir)
 	$(V1) $(INSTALL) $(BUILD_DIR)/$(GCS_SMALL_NAME)_$(GCS_BUILD_CONF)/lib/$(GCS_SMALL_NAME) $(DESTDIR)$(libdir)
 	$(V1) $(INSTALL) $(BUILD_DIR)/$(GCS_SMALL_NAME)_$(GCS_BUILD_CONF)/share/$(GCS_SMALL_NAME) $(DESTDIR)$(datadir)
-	$(V1) $(INSTALL) -T $(ROOT_DIR)/package/linux/openpilot.desktop $(DESTDIR)$(datadir)/applications/$(OP_SMALL_NAME).desktop
-	$(V1) sed -i -e 's/openpilotgcs/$(GCS_SMALL_NAME)/g;s/OpenPilot GCS/$(GCS_BIG_NAME)/g' $(DESTDIR)$(datadir)/applications/$(OP_SMALL_NAME).desktop
-	$(V1) $(INSTALL) -T $(ROOT_DIR)/package/linux/openpilot.png $(DESTDIR)$(datadir)/pixmaps/$(OP_SMALL_NAME).png
+	$(V1) $(INSTALL) -T $(ROOT_DIR)/package/linux/openpilot.desktop $(DESTDIR)$(datadir)/applications/$(ORG_SMALL_NAME).desktop
+	$(V1) sed -i -e 's/openpilotgcs/$(GCS_SMALL_NAME)/g;s/OpenPilot GCS/$(GCS_BIG_NAME)/g' $(DESTDIR)$(datadir)/applications/$(ORG_SMALL_NAME).desktop
+	$(V1) $(INSTALL) -T $(ROOT_DIR)/package/linux/openpilot.png $(DESTDIR)$(datadir)/pixmaps/$(ORG_SMALL_NAME).png
 
 
diff --git a/package/Windows.mk b/package/Windows.mk
index 9b2cce46c..da90a6ae1 100644
--- a/package/Windows.mk
+++ b/package/Windows.mk
@@ -24,7 +24,7 @@ endif
 	$(VERSION_CMD) \
 		--template='$(NSIS_TEMPLATE)' \
 		--outfile='$(NSIS_HEADER)' \
-	        OP_BIG_NAME='$(OP_BIG_NAME)' \
+	        ORG_BIG_NAME='$(ORG_BIG_NAME)' \
 	        GCS_BIG_NAME='$(GCS_BIG_NAME)' \
 	        GCS_SMALL_NAME='$(GCS_SMALL_NAME)' \
 		PACKAGE_LBL='$(PACKAGE_LBL)' \
diff --git a/package/winx86/openpilotgcs.nsi b/package/winx86/openpilotgcs.nsi
index 5d0147a4d..416fe9dd0 100644
--- a/package/winx86/openpilotgcs.nsi
+++ b/package/winx86/openpilotgcs.nsi
@@ -42,10 +42,10 @@
   !define AEROSIMRC_TREE "${GCS_BUILD_TREE}\misc\AeroSIM-RC"
 
   ; Default installation folder
-  InstallDir "$PROGRAMFILES\${OP_BIG_NAME}"
+  InstallDir "$PROGRAMFILES\${ORG_BIG_NAME}"
 
   ; Get installation folder from registry if available
-  InstallDirRegKey HKLM "Software\${OP_BIG_NAME}" "Install Location"
+  InstallDirRegKey HKLM "Software\${ORG_BIG_NAME}" "Install Location"
 
 ;--------------------------------
 ; Version information
@@ -114,7 +114,7 @@
 
   ; Remember the installer language
   !define MUI_LANGDLL_REGISTRY_ROOT "HKCU" 
-  !define MUI_LANGDLL_REGISTRY_KEY "Software\${OP_BIG_NAME}" 
+  !define MUI_LANGDLL_REGISTRY_KEY "Software\${ORG_BIG_NAME}" 
   !define MUI_LANGDLL_REGISTRY_VALUENAME "Installer Language"
   !define MUI_LANGDLL_ALWAYSSHOW
 
@@ -255,28 +255,28 @@ SectionEnd
 Section "Shortcuts" InSecShortcuts
   ; Create desktop and start menu shortcuts
   SetOutPath "$INSTDIR"
-  CreateDirectory "$SMPROGRAMS\${OP_BIG_NAME}"
-  CreateShortCut "$SMPROGRAMS\${OP_BIG_NAME}\${GCS_BIG_NAME}.lnk" "$INSTDIR\bin\${GCS_SMALL_NAME}.exe" \
+  CreateDirectory "$SMPROGRAMS\${ORG_BIG_NAME}"
+  CreateShortCut "$SMPROGRAMS\${ORG_BIG_NAME}\${GCS_BIG_NAME}.lnk" "$INSTDIR\bin\${GCS_SMALL_NAME}.exe" \
 	"" "$INSTDIR\bin\${GCS_SMALL_NAME}.exe" 0 "" "" "${PRODUCT_NAME} ${PRODUCT_VERSION}. ${BUILD_DESCRIPTION}"
-  CreateShortCut "$SMPROGRAMS\${OP_BIG_NAME}\${GCS_BIG_NAME} (clean configuration).lnk" "$INSTDIR\bin\${GCS_SMALL_NAME}.exe" \
+  CreateShortCut "$SMPROGRAMS\${ORG_BIG_NAME}\${GCS_BIG_NAME} (clean configuration).lnk" "$INSTDIR\bin\${GCS_SMALL_NAME}.exe" \
 	"-reset" "$INSTDIR\bin\${GCS_SMALL_NAME}.exe" 0 "" "" "${PRODUCT_NAME} ${PRODUCT_VERSION}. ${BUILD_DESCRIPTION}"
-  CreateShortCut "$SMPROGRAMS\${OP_BIG_NAME}\OpenPilot License.lnk" "$INSTDIR\LICENSE.txt" \
+  CreateShortCut "$SMPROGRAMS\${ORG_BIG_NAME}\OpenPilot License.lnk" "$INSTDIR\LICENSE.txt" \
 	"" "$INSTDIR\bin\${GCS_SMALL_NAME}.exe" 0
-  CreateShortCut "$SMPROGRAMS\${OP_BIG_NAME}\OpenPilot ReadMe.lnk" "$INSTDIR\README.txt" \
+  CreateShortCut "$SMPROGRAMS\${ORG_BIG_NAME}\OpenPilot ReadMe.lnk" "$INSTDIR\README.txt" \
 	"" "$INSTDIR\bin\${GCS_SMALL_NAME}.exe" 0
-  CreateShortCut "$SMPROGRAMS\${OP_BIG_NAME}\OpenPilot ReleaseNotes.lnk" "$INSTDIR\WHATSNEW.txt" \
+  CreateShortCut "$SMPROGRAMS\${ORG_BIG_NAME}\OpenPilot ReleaseNotes.lnk" "$INSTDIR\WHATSNEW.txt" \
 	"" "$INSTDIR\bin\${GCS_SMALL_NAME}.exe" 0
-  CreateShortCut "$SMPROGRAMS\${OP_BIG_NAME}\OpenPilot Milestones.lnk" "$INSTDIR\MILESTONES.txt" \
+  CreateShortCut "$SMPROGRAMS\${ORG_BIG_NAME}\OpenPilot Milestones.lnk" "$INSTDIR\MILESTONES.txt" \
 	"" "$INSTDIR\bin\${GCS_SMALL_NAME}.exe" 0
-  CreateShortCut "$SMPROGRAMS\${OP_BIG_NAME}\OpenPilot Website.lnk" "http://www.librepilot.org" \
+  CreateShortCut "$SMPROGRAMS\${ORG_BIG_NAME}\OpenPilot Website.lnk" "http://www.librepilot.org" \
 	"" "$INSTDIR\bin\${GCS_SMALL_NAME}.exe" 0
-  CreateShortCut "$SMPROGRAMS\${OP_BIG_NAME}\OpenPilot Wiki.lnk" "http://wiki.openpilot.org" \
+  CreateShortCut "$SMPROGRAMS\${ORG_BIG_NAME}\OpenPilot Wiki.lnk" "http://wiki.openpilot.org" \
 	"" "$INSTDIR\bin\${GCS_SMALL_NAME}.exe" 0
-  CreateShortCut "$SMPROGRAMS\${OP_BIG_NAME}\OpenPilot Forums.lnk" "http://forums.librepilot.org" \
+  CreateShortCut "$SMPROGRAMS\${ORG_BIG_NAME}\OpenPilot Forums.lnk" "http://forums.librepilot.org" \
 	"" "$INSTDIR\bin\${GCS_SMALL_NAME}.exe" 0
   CreateShortCut "$DESKTOP\${GCS_BIG_NAME}.lnk" "$INSTDIR\bin\${GCS_SMALL_NAME}.exe" \
   	"" "$INSTDIR\bin\${GCS_SMALL_NAME}.exe" 0 "" "" "${PRODUCT_NAME} ${PRODUCT_VERSION}. ${BUILD_DESCRIPTION}"
-  CreateShortCut "$SMPROGRAMS\${OP_BIG_NAME}\Uninstall.lnk" "$INSTDIR\Uninstall.exe" "" "$INSTDIR\Uninstall.exe" 0
+  CreateShortCut "$SMPROGRAMS\${ORG_BIG_NAME}\Uninstall.lnk" "$INSTDIR\Uninstall.exe" "" "$INSTDIR\Uninstall.exe" 0
 SectionEnd
 
 Section ; create uninstall info
@@ -284,15 +284,15 @@ Section ; create uninstall info
   WriteRegStr HKCU "Software\OpenPilot" "Install Location" $INSTDIR
 
    ; Write the uninstall keys for Windows
-  WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${OP_BIG_NAME}" "DisplayName" "${GCS_BIG_NAME}"
-  WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${OP_BIG_NAME}" "UninstallString" '"$INSTDIR\Uninstall.exe"'
-  WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${OP_BIG_NAME}" "DisplayIcon" '"$INSTDIR\bin\${GCS_SMALL_NAME}.exe"'
-  WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${OP_BIG_NAME}" "Publisher" "LibrePilot Team"
-  WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${OP_BIG_NAME}" "URLInfoAbout" "http://www.librepilot.org"
-  WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${OP_BIG_NAME}" "HelpLink" "http://wiki.openpilot.org"
-  WriteRegDWORD HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${OP_BIG_NAME}" "EstimatedSize" 100600
-  WriteRegDWORD HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${OP_BIG_NAME}" "NoModify" 1
-  WriteRegDWORD HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${OP_BIG_NAME}" "NoRepair" 1
+  WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${ORG_BIG_NAME}" "DisplayName" "${GCS_BIG_NAME}"
+  WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${ORG_BIG_NAME}" "UninstallString" '"$INSTDIR\Uninstall.exe"'
+  WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${ORG_BIG_NAME}" "DisplayIcon" '"$INSTDIR\bin\${GCS_SMALL_NAME}.exe"'
+  WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${ORG_BIG_NAME}" "Publisher" "LibrePilot Team"
+  WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${ORG_BIG_NAME}" "URLInfoAbout" "http://www.librepilot.org"
+  WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${ORG_BIG_NAME}" "HelpLink" "http://wiki.openpilot.org"
+  WriteRegDWORD HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${ORG_BIG_NAME}" "EstimatedSize" 100600
+  WriteRegDWORD HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${ORG_BIG_NAME}" "NoModify" 1
+  WriteRegDWORD HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${ORG_BIG_NAME}" "NoRepair" 1
 
   ; Create uninstaller
   WriteUninstaller "$INSTDIR\Uninstall.exe"
@@ -344,14 +344,14 @@ Section "un.${GCS_BIG_NAME}" UnSecProgram
   RMDir /rebootok "$INSTDIR"
 
   ; Remove registry keys
-  DeleteRegKey HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${OP_BIG_NAME}"
-  DeleteRegKey HKCU "Software\${OP_BIG_NAME}"
+  DeleteRegKey HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${ORG_BIG_NAME}"
+  DeleteRegKey HKCU "Software\${ORG_BIG_NAME}"
 
   ; Remove shortcuts, if any
   SetShellVarContext all
   Delete /rebootok "$DESKTOP\${GCS_BIG_NAME}.lnk"
-  Delete /rebootok "$SMPROGRAMS\${OP_BIG_NAME}\*"
-  RMDir /rebootok "$SMPROGRAMS\${OP_BIG_NAME}"
+  Delete /rebootok "$SMPROGRAMS\${ORG_BIG_NAME}\*"
+  RMDir /rebootok "$SMPROGRAMS\${ORG_BIG_NAME}"
 SectionEnd
 
 Section "un.Maps cache" UnSecCache
diff --git a/package/winx86/openpilotgcs.tpl b/package/winx86/openpilotgcs.tpl
index 9957065cb..24067201b 100644
--- a/package/winx86/openpilotgcs.tpl
+++ b/package/winx86/openpilotgcs.tpl
@@ -12,7 +12,7 @@
 #
 
 ; Some names, paths and constants
-!define OP_BIG_NAME "${OP_BIG_NAME}"
+!define ORG_BIG_NAME "${ORG_BIG_NAME}"
 !define GCS_BIG_NAME "${GCS_BIG_NAME}"
 !define GCS_SMALL_NAME "${GCS_SMALL_NAME}"
 !define PACKAGE_LBL "${PACKAGE_LBL}"