diff --git a/CMakeLists.txt b/CMakeLists.txt
index 80b4fb7..e3a6b1b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,8 +31,8 @@ set(PACKAGE "windvane")
 set(VERSION_MAJOR "1")
 set(VERSION_MINOR "0")
 set(VERSION_PATCH "17")
-set(VERSION_TWEAK "0")
-set(VERSION_DATE "12/06/2020")
+set(VERSION_TWEAK "2")
+set(VERSION_DATE "14/06/2020")
 set(OCPN_MIN_VERSION "ov50")
 set(OCPN_API_VERSION_MAJOR "1")
 set(OCPN_API_VERSION_MINOR "16")
diff --git a/cmake/PluginConfigure.cmake b/cmake/PluginConfigure.cmake
index 20b00e8..d05aa29 100644
--- a/cmake/PluginConfigure.cmake
+++ b/cmake/PluginConfigure.cmake
@@ -111,7 +111,7 @@ else()
 endif()
 message(STATUS "${CMLOC}PKG_TARGET_GTK: ${PKG_TARGET_GTK}")
 
-if(UNIX)
+if(UNIX AND NOT APPLE)
     # Handle gtk3 build variant
     string(STRIP "${PKG_TARGET}" PKG_TARGET)
     string(TOLOWER "${PKG_TARGET}" PKG_TARGET)
diff --git a/cmake/PluginSetup.cmake b/cmake/PluginSetup.cmake
index fa3bcad..ada40d4 100644
--- a/cmake/PluginSetup.cmake
+++ b/cmake/PluginSetup.cmake
@@ -164,13 +164,13 @@ set(PKG_TARGET_NVR ${PKG_TARGET}-${PKG_TARGET_VERSION})
 message(STATUS "${CMLOC}PluginSetup: PKG_TARGET: ${PKG_TARGET}, PKG_TARGET_VERSION: ${PKG_TARGET_VERSION}")
 
 if(DEFINED ENV{OCPN_TARGET})
-    set(PACKAGING_NAME "${PKG_NVR}_${PKG_TARGET}-${ARCH}_${PKG_TARGET_VERSION}-$ENV{OCPN_TARGET}")
+    set(PACKAGING_NAME "${PKG_NVR}-${PKG_TARGET}-${ARCH}-${PKG_TARGET_VERSION}-$ENV{OCPN_TARGET}")
 else(DEFINED ENV{OCPN_TARGET})
-    set(PACKAGING_NAME "${PKG_NVR}_${PKG_TARGET}-${ARCH}_${PKG_TARGET_VERSION}")
+    set(PACKAGING_NAME "${PKG_NVR}-${PKG_TARGET}-${ARCH}-${PKG_TARGET_VERSION}")
 endif(DEFINED ENV{OCPN_TARGET})
 message(STATUS "${CMLOC}PACKAGING_NAME: ${PACKAGING_NAME}")
 
-set(PLUGIN_NAME ${PACKAGE}-plugin-${PKG_TARGET}-${ARCH}_${PKG_TARGET_VERSION})
+set(PLUGIN_NAME ${PACKAGE}-plugin-${PKG_TARGET}-${ARCH}-${PKG_TARGET_VERSION})
 
 if(Plugin_CXX11)
     message(STATUS "${CMLOC}Attempting to use c++11")
diff --git a/cmake/in-files/cloudsmith-upload.sh.in b/cmake/in-files/cloudsmith-upload.sh.in
index c5ba01f..33557df 100644
--- a/cmake/in-files/cloudsmith-upload.sh.in
+++ b/cmake/in-files/cloudsmith-upload.sh.in
@@ -104,9 +104,9 @@ echo $tarball_basename
 
 source $BUILD_DIR/pkg_version.sh
 if [ -n "${OCPN_TARGET}" ]; then
-    tarball_name=@PACKAGE_NAME@-@PACKAGE_VERSION@-${PKG_TARGET}-@ARCH@_${PKG_TARGET_VERSION}-${OCPN_TARGET}-tarball
+    tarball_name=@PACKAGE_NAME@-@PACKAGE_VERSION@-${PKG_TARGET}-@ARCH@-${PKG_TARGET_VERSION}-${OCPN_TARGET}-tarball
 else
-    tarball_name=@PACKAGE_NAME@-@PACKAGE_VERSION@-${PKG_TARGET}-@ARCH@_${PKG_TARGET_VERSION}-tarball
+    tarball_name=@PACKAGE_NAME@-@PACKAGE_VERSION@-${PKG_TARGET}-@ARCH@-${PKG_TARGET_VERSION}-tarball
 fi
 
 if [ "$(ls $BUILD_DIR/*.${PKG_EXT})" ]; then
@@ -207,7 +207,7 @@ ls -la
 
 if [ $LOCAL_BUILD = false ]; then
     cloudsmith push raw --republish --no-wait-for-sync \
-        --name @PACKAGE_NAME@-@PACKAGE_VERSION@-@PKG_TARGET@-@ARCH@_@PKG_TARGET_VERSION@-${OCPN_TARGET}-metadata \
+        --name @PACKAGE_NAME@-@PACKAGE_VERSION@-@PKG_TARGET@-@ARCH@-@PKG_TARGET_VERSION@-${OCPN_TARGET}-metadata \
         --version ${VERSION} \
         --summary "@PACKAGE@ opencpn plugin metadata for automatic installation" \
         $REPO $xml
@@ -220,7 +220,7 @@ if [ $LOCAL_BUILD = false ]; then
 
     if [ "${PKG_EXT}" != "gz" ] && [ "$pkg" != "" ]; then
         cloudsmith push raw --republish --no-wait-for-sync \
-            --name opencpn-package-@PACKAGE@-@PACKAGE_VERSION@-@PKG_TARGET@-@ARCH@_@PKG_TARGET_VERSION@-${OCPN_TARGET}.${PKG_EXT} \
+            --name opencpn-package-@PACKAGE@-@PACKAGE_VERSION@-@PKG_TARGET@-@ARCH@-@PKG_TARGET_VERSION@-${OCPN_TARGET}.${PKG_EXT} \
             --version ${VERSION} \
             --summary "@PACKAGE@ .${PKG_EXT} installation package" \
             $REPO $pkg