diff --git a/companion/src/CMakeLists.txt b/companion/src/CMakeLists.txt
index 687f795ef..15446999e 100644
--- a/companion/src/CMakeLists.txt
+++ b/companion/src/CMakeLists.txt
@@ -3,7 +3,7 @@ PROJECT( companion )
 SET( C9X_VERSION_MAJOR "2" )
 SET( C9X_VERSION_MINOR "1" )
 SET( C9X_VERSION_REVISION "1" )
-SET( C9X_VERSION_SHORT ${C9X_VERSION_MAJOR}.${C9X_VERSION_MINOR} )
+SET( C9X_VERSION_SUFFIX ${C9X_VERSION_MAJOR}${C9X_VERSION_MINOR} )
 SET( C9X_VERSION ${C9X_VERSION_MAJOR}.${C9X_VERSION_MINOR}.${C9X_VERSION_REVISION} )
 
 CMAKE_MINIMUM_REQUIRED( VERSION 2.8 )
@@ -11,9 +11,9 @@ CMAKE_MINIMUM_REQUIRED( VERSION 2.8 )
 SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 
 IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-  SET(COMPANION_NAME "companion${C9X_VERSION_SHORT}")
-  SET(SIMULATOR_NAME "simulator${C9X_VERSION_SHORT}")
-  SET( SIMULATOR_LIB_PATH ${CMAKE_INSTALL_PREFIX}/lib/companion${C9X_VERSION_SHORT} )
+  SET(COMPANION_NAME "companion${C9X_VERSION_SUFFIX}")
+  SET(SIMULATOR_NAME "simulator${C9X_VERSION_SUFFIX}")
+  SET( SIMULATOR_LIB_PATH ${CMAKE_INSTALL_PREFIX}/lib/companion${C9X_VERSION_SUFFIX} )
 ELSE(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
   SET(COMPANION_NAME "companion")
   SET(SIMULATOR_NAME "simulator")
@@ -333,18 +333,18 @@ target_link_libraries(${SIMULATOR_NAME} simulation common ${QT_LIBRARIES} ${QT_Q
 IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
     INSTALL( TARGETS ${COMPANION_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin )
     INSTALL( TARGETS ${SIMULATOR_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin )
-    INSTALL( FILES ${CMAKE_CURRENT_BINARY_DIR}/companion.desktop DESTINATION share/applications RENAME companion${C9X_VERSION_SHORT}.desktop)
-    INSTALL( FILES ${CMAKE_CURRENT_BINARY_DIR}/simulator.desktop DESTINATION share/applications RENAME simulator${C9X_VERSION_SHORT}.desktop)
-    INSTALL( FILES images/linuxicons/16x16/companion.png    DESTINATION /usr/share/icons/hicolor/16x16/apps    RENAME companion${C9X_VERSION_SHORT}.png )
-    INSTALL( FILES images/linuxicons/22x22/companion.png    DESTINATION /usr/share/icons/hicolor/22x22/apps    RENAME companion${C9X_VERSION_SHORT}.png )
-    INSTALL( FILES images/linuxicons/24x24/companion.png    DESTINATION /usr/share/icons/hicolor/24x24/apps    RENAME companion${C9X_VERSION_SHORT}.png )
-    INSTALL( FILES images/linuxicons/32x32/companion.png    DESTINATION /usr/share/icons/hicolor/32x32/apps    RENAME companion${C9X_VERSION_SHORT}.png )
-    INSTALL( FILES images/linuxicons/48x48/companion.png    DESTINATION /usr/share/icons/hicolor/48x48/apps    RENAME companion${C9X_VERSION_SHORT}.png )
-    INSTALL( FILES images/linuxicons/128x128/companion.png  DESTINATION /usr/share/icons/hicolor/128x128/apps  RENAME companion${C9X_VERSION_SHORT}.png )
-    INSTALL( FILES images/linuxicons/256x256/companion.png  DESTINATION /usr/share/icons/hicolor/256x256/apps  RENAME companion${C9X_VERSION_SHORT}.png )
-    INSTALL( FILES images/linuxicons/512x512/companion.png  DESTINATION /usr/share/icons/hicolor/512x512/apps  RENAME companion${C9X_VERSION_SHORT}.png )
-    INSTALL( FILES images/linuxicons/scalable/companion.svg DESTINATION /usr/share/icons/hicolor/scalable/apps RENAME companion${C9X_VERSION_SHORT}.svg )
-    INSTALL( FILES ../targets/linux/45-companion-taranis.rules DESTINATION /lib/udev/rules.d RENAME 45-companion${C9X_VERSION_SHORT}-taranis.rules)
+    INSTALL( FILES ${CMAKE_CURRENT_BINARY_DIR}/companion.desktop DESTINATION share/applications RENAME companion${C9X_VERSION_SUFFIX}.desktop)
+    INSTALL( FILES ${CMAKE_CURRENT_BINARY_DIR}/simulator.desktop DESTINATION share/applications RENAME simulator${C9X_VERSION_SUFFIX}.desktop)
+    INSTALL( FILES images/linuxicons/16x16/companion.png    DESTINATION /usr/share/icons/hicolor/16x16/apps    RENAME companion${C9X_VERSION_SUFFIX}.png )
+    INSTALL( FILES images/linuxicons/22x22/companion.png    DESTINATION /usr/share/icons/hicolor/22x22/apps    RENAME companion${C9X_VERSION_SUFFIX}.png )
+    INSTALL( FILES images/linuxicons/24x24/companion.png    DESTINATION /usr/share/icons/hicolor/24x24/apps    RENAME companion${C9X_VERSION_SUFFIX}.png )
+    INSTALL( FILES images/linuxicons/32x32/companion.png    DESTINATION /usr/share/icons/hicolor/32x32/apps    RENAME companion${C9X_VERSION_SUFFIX}.png )
+    INSTALL( FILES images/linuxicons/48x48/companion.png    DESTINATION /usr/share/icons/hicolor/48x48/apps    RENAME companion${C9X_VERSION_SUFFIX}.png )
+    INSTALL( FILES images/linuxicons/128x128/companion.png  DESTINATION /usr/share/icons/hicolor/128x128/apps  RENAME companion${C9X_VERSION_SUFFIX}.png )
+    INSTALL( FILES images/linuxicons/256x256/companion.png  DESTINATION /usr/share/icons/hicolor/256x256/apps  RENAME companion${C9X_VERSION_SUFFIX}.png )
+    INSTALL( FILES images/linuxicons/512x512/companion.png  DESTINATION /usr/share/icons/hicolor/512x512/apps  RENAME companion${C9X_VERSION_SUFFIX}.png )
+    INSTALL( FILES images/linuxicons/scalable/companion.svg DESTINATION /usr/share/icons/hicolor/scalable/apps RENAME companion${C9X_VERSION_SUFFIX}.svg )
+    INSTALL( FILES ../targets/linux/45-companion-taranis.rules DESTINATION /lib/udev/rules.d RENAME 45-companion${C9X_VERSION_SUFFIX}-taranis.rules)
     # Linux specific code
     SET(OperatingSystem "Linux")
 ELSE (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
@@ -432,7 +432,7 @@ ELSE()
   )
 ENDIF()
 
-SET(CPACK_PACKAGE_NAME "companion${C9X_VERSION_SHORT}")
+SET(CPACK_PACKAGE_NAME "companion${C9X_VERSION_SUFFIX}")
 SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Models and settings editor for the OpenTx open source firmware")
 string(TOLOWER "${CPACK_PACKAGE_NAME}" CPACK_PACKAGE_NAME_LOWERCASE)
 SET( CPACK_STRIP_FILES TRUE )
diff --git a/companion/src/companion.desktop.in b/companion/src/companion.desktop.in
index 6d8207d74..007244755 100644
--- a/companion/src/companion.desktop.in
+++ b/companion/src/companion.desktop.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Encoding=UTF-8
-Name=Companion @C9X_VERSION_SHORT@
+Name=Companion @C9X_VERSION@
 GenericName=Transmitter Companion App
 Comment=The Ultimate Transmitter Companion
 Icon=@COMPANION_NAME@
diff --git a/companion/src/simulator.desktop.in b/companion/src/simulator.desktop.in
index 43873ac53..d87e3c404 100644
--- a/companion/src/simulator.desktop.in
+++ b/companion/src/simulator.desktop.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Encoding=UTF-8
-Name=Simulator @C9X_VERSION_SHORT@
+Name=Simulator @C9X_VERSION@
 GenericName=Transmitter Simulator App
 Comment=The Ultimate Transmitter Simulator
 Icon=@COMPANION_NAME@