diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9b816b809..19de564e0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1424,9 +1424,9 @@ endif (${OPENMP_FOUND} OR APPLE)
 
 if (WIN32)
   find_package (Portaudio REQUIRED)
-# build map65 OR q65w
+# build map65 OR qmap
 #  add_subdirectory (map65)
-  add_subdirectory (q65w)
+  add_subdirectory (qmap)
 endif ()
 
 # build the main application
diff --git a/q65w/.gitignore b/qmap/.gitignore
similarity index 100%
rename from q65w/.gitignore
rename to qmap/.gitignore
diff --git a/q65w/CMakeLists.txt b/qmap/CMakeLists.txt
similarity index 98%
rename from q65w/CMakeLists.txt
rename to qmap/CMakeLists.txt
index 84bcfcc09..3494f54ba 100644
--- a/q65w/CMakeLists.txt
+++ b/qmap/CMakeLists.txt
@@ -33,7 +33,7 @@ set_property (SOURCE ${qmap_C_and_CXXSRCS} APPEND_STRING PROPERTY COMPILE_FLAGS
 set_property (SOURCE ${qmap_C_and_CXXSRCS} APPEND PROPERTY OBJECT_DEPENDS ${CMAKE_BINARY_DIR}/wsjtx_config.h)
 
 # build the subdirectories
-add_subdirectory (libq65)
+add_subdirectory (libqmap)
 
 # UI generation
 qt5_wrap_ui (qmap_GENUISRCS ${qmap_UISRCS})
diff --git a/q65w/LICENSE_WHEATLEY.TXT b/qmap/LICENSE_WHEATLEY.TXT
similarity index 100%
rename from q65w/LICENSE_WHEATLEY.TXT
rename to qmap/LICENSE_WHEATLEY.TXT
diff --git a/q65w/MAP65_Beta_Release.docx b/qmap/MAP65_Beta_Release.docx
similarity index 100%
rename from q65w/MAP65_Beta_Release.docx
rename to qmap/MAP65_Beta_Release.docx
diff --git a/q65w/about.cpp b/qmap/about.cpp
similarity index 100%
rename from q65w/about.cpp
rename to qmap/about.cpp
diff --git a/q65w/about.h b/qmap/about.h
similarity index 100%
rename from q65w/about.h
rename to qmap/about.h
diff --git a/q65w/about.ui b/qmap/about.ui
similarity index 100%
rename from q65w/about.ui
rename to qmap/about.ui
diff --git a/q65w/afmhot.dat b/qmap/afmhot.dat
similarity index 100%
rename from q65w/afmhot.dat
rename to qmap/afmhot.dat
diff --git a/q65w/astro.cpp b/qmap/astro.cpp
similarity index 100%
rename from q65w/astro.cpp
rename to qmap/astro.cpp
diff --git a/q65w/astro.h b/qmap/astro.h
similarity index 100%
rename from q65w/astro.h
rename to qmap/astro.h
diff --git a/q65w/astro.ui b/qmap/astro.ui
similarity index 100%
rename from q65w/astro.ui
rename to qmap/astro.ui
diff --git a/q65w/blue.dat b/qmap/blue.dat
similarity index 100%
rename from q65w/blue.dat
rename to qmap/blue.dat
diff --git a/q65w/commons.h b/qmap/commons.h
similarity index 100%
rename from q65w/commons.h
rename to qmap/commons.h
diff --git a/q65w/devsetup.cpp b/qmap/devsetup.cpp
similarity index 100%
rename from q65w/devsetup.cpp
rename to qmap/devsetup.cpp
diff --git a/q65w/devsetup.h b/qmap/devsetup.h
similarity index 100%
rename from q65w/devsetup.h
rename to qmap/devsetup.h
diff --git a/q65w/devsetup.ui b/qmap/devsetup.ui
similarity index 100%
rename from q65w/devsetup.ui
rename to qmap/devsetup.ui
diff --git a/q65w/displaytext.cpp b/qmap/displaytext.cpp
similarity index 100%
rename from q65w/displaytext.cpp
rename to qmap/displaytext.cpp
diff --git a/q65w/displaytext.h b/qmap/displaytext.h
similarity index 100%
rename from q65w/displaytext.h
rename to qmap/displaytext.h
diff --git a/q65w/ffft.f b/qmap/ffft.f
similarity index 100%
rename from q65w/ffft.f
rename to qmap/ffft.f
diff --git a/q65w/ft2000_freq.sh b/qmap/ft2000_freq.sh
similarity index 100%
rename from q65w/ft2000_freq.sh
rename to qmap/ft2000_freq.sh
diff --git a/q65w/getfile.cpp b/qmap/getfile.cpp
similarity index 100%
rename from q65w/getfile.cpp
rename to qmap/getfile.cpp
diff --git a/q65w/getfile.h b/qmap/getfile.h
similarity index 100%
rename from q65w/getfile.h
rename to qmap/getfile.h
diff --git a/q65w/getsvn.cmake b/qmap/getsvn.cmake
similarity index 100%
rename from q65w/getsvn.cmake
rename to qmap/getsvn.cmake
diff --git a/q65w/in.dat b/qmap/in.dat
similarity index 100%
rename from q65w/in.dat
rename to qmap/in.dat
diff --git a/q65w/libq65/CMakeLists.txt b/qmap/libqmap/CMakeLists.txt
similarity index 100%
rename from q65w/libq65/CMakeLists.txt
rename to qmap/libqmap/CMakeLists.txt
diff --git a/q65w/libq65/astro.f90 b/qmap/libqmap/astro.f90
similarity index 100%
rename from q65w/libq65/astro.f90
rename to qmap/libqmap/astro.f90
diff --git a/q65w/libq65/astro0.f90 b/qmap/libqmap/astro0.f90
similarity index 100%
rename from q65w/libq65/astro0.f90
rename to qmap/libqmap/astro0.f90
diff --git a/q65w/libq65/astrosub.f90 b/qmap/libqmap/astrosub.f90
similarity index 100%
rename from q65w/libq65/astrosub.f90
rename to qmap/libqmap/astrosub.f90
diff --git a/q65w/libq65/dcoord.f90 b/qmap/libqmap/dcoord.f90
similarity index 100%
rename from q65w/libq65/dcoord.f90
rename to qmap/libqmap/dcoord.f90
diff --git a/q65w/libq65/decode0.f90 b/qmap/libqmap/decode0.f90
similarity index 100%
rename from q65w/libq65/decode0.f90
rename to qmap/libqmap/decode0.f90
diff --git a/q65w/libq65/dot.f90 b/qmap/libqmap/dot.f90
similarity index 100%
rename from q65w/libq65/dot.f90
rename to qmap/libqmap/dot.f90
diff --git a/q65w/libq65/f77_wisdom.f b/qmap/libqmap/f77_wisdom.f
similarity index 100%
rename from q65w/libq65/f77_wisdom.f
rename to qmap/libqmap/f77_wisdom.f
diff --git a/q65w/libq65/fchisq0.f90 b/qmap/libqmap/fchisq0.f90
similarity index 100%
rename from q65w/libq65/fchisq0.f90
rename to qmap/libqmap/fchisq0.f90
diff --git a/q65w/libq65/fftw3.f b/qmap/libqmap/fftw3.f
similarity index 100%
rename from q65w/libq65/fftw3.f
rename to qmap/libqmap/fftw3.f
diff --git a/q65w/libq65/fftw3.f90 b/qmap/libqmap/fftw3.f90
similarity index 100%
rename from q65w/libq65/fftw3.f90
rename to qmap/libqmap/fftw3.f90
diff --git a/q65w/libq65/filbig.f90 b/qmap/libqmap/filbig.f90
similarity index 100%
rename from q65w/libq65/filbig.f90
rename to qmap/libqmap/filbig.f90
diff --git a/q65w/libq65/four2a.f90 b/qmap/libqmap/four2a.f90
similarity index 100%
rename from q65w/libq65/four2a.f90
rename to qmap/libqmap/four2a.f90
diff --git a/q65w/libq65/ftninit.f90 b/qmap/libqmap/ftninit.f90
similarity index 100%
rename from q65w/libq65/ftninit.f90
rename to qmap/libqmap/ftninit.f90
diff --git a/q65w/libq65/ftnquit.f90 b/qmap/libqmap/ftnquit.f90
similarity index 100%
rename from q65w/libq65/ftnquit.f90
rename to qmap/libqmap/ftnquit.f90
diff --git a/q65w/libq65/geocentric.f90 b/qmap/libqmap/geocentric.f90
similarity index 100%
rename from q65w/libq65/geocentric.f90
rename to qmap/libqmap/geocentric.f90
diff --git a/q65w/libq65/getcand2.f90 b/qmap/libqmap/getcand2.f90
similarity index 100%
rename from q65w/libq65/getcand2.f90
rename to qmap/libqmap/getcand2.f90
diff --git a/q65w/libq65/getdphi.f90 b/qmap/libqmap/getdphi.f90
similarity index 100%
rename from q65w/libq65/getdphi.f90
rename to qmap/libqmap/getdphi.f90
diff --git a/q65w/libq65/grid2deg.f90 b/qmap/libqmap/grid2deg.f90
similarity index 100%
rename from q65w/libq65/grid2deg.f90
rename to qmap/libqmap/grid2deg.f90
diff --git a/q65w/libq65/indexx.f90 b/qmap/libqmap/indexx.f90
similarity index 100%
rename from q65w/libq65/indexx.f90
rename to qmap/libqmap/indexx.f90
diff --git a/q65w/libq65/lorentzian.f90 b/qmap/libqmap/lorentzian.f90
similarity index 100%
rename from q65w/libq65/lorentzian.f90
rename to qmap/libqmap/lorentzian.f90
diff --git a/q65w/libq65/moon2.f90 b/qmap/libqmap/moon2.f90
similarity index 100%
rename from q65w/libq65/moon2.f90
rename to qmap/libqmap/moon2.f90
diff --git a/q65w/libq65/moondop.f90 b/qmap/libqmap/moondop.f90
similarity index 100%
rename from q65w/libq65/moondop.f90
rename to qmap/libqmap/moondop.f90
diff --git a/q65w/libq65/msgs.txt b/qmap/libqmap/msgs.txt
similarity index 100%
rename from q65w/libq65/msgs.txt
rename to qmap/libqmap/msgs.txt
diff --git a/q65w/libq65/njunk.f90 b/qmap/libqmap/njunk.f90
similarity index 100%
rename from q65w/libq65/njunk.f90
rename to qmap/libqmap/njunk.f90
diff --git a/q65w/libq65/pfx.f90 b/qmap/libqmap/pfx.f90
similarity index 100%
rename from q65w/libq65/pfx.f90
rename to qmap/libqmap/pfx.f90
diff --git a/q65w/libq65/q65_sync.f90 b/qmap/libqmap/q65_sync.f90
similarity index 100%
rename from q65w/libq65/q65_sync.f90
rename to qmap/libqmap/q65_sync.f90
diff --git a/q65w/libq65/q65b.f90 b/qmap/libqmap/q65b.f90
similarity index 96%
rename from q65w/libq65/q65b.f90
rename to qmap/libqmap/q65b.f90
index 61004492b..b5f3ee2e3 100644
--- a/q65w/libq65/q65b.f90
+++ b/qmap/libqmap/q65b.f90
@@ -2,8 +2,8 @@ subroutine q65b(nutc,nqd,fcenter,nfcal,nfsample,ikhz,mousedf,ntol,          &
      mycall0,hiscall0,hisgrid,mode_q65,f0,fqso,nkhz_center, newdat,nagain,  &
      max_drift,ndepth,datetime,ndop00,idec)
 
-! This routine provides an interface between Q65W and the Q65 decoder
-! in WSJT-X.  All arguments are input data obtained from the Q65W GUI.
+! This routine provides an interface between QMAP and the Q65 decoder
+! in WSJT-X.  All arguments are input data obtained from the QMAP GUI.
 ! Raw Rx data are available as the 96 kHz complex spectrum ca(MAXFFT1)
 ! in common/cacb.  Decoded messages are sent back to the GUI.
 
diff --git a/q65w/libq65/q65c.f90 b/qmap/libqmap/q65c.f90
similarity index 100%
rename from q65w/libq65/q65c.f90
rename to qmap/libqmap/q65c.f90
diff --git a/q65w/libq65/qmapa.f90 b/qmap/libqmap/qmapa.f90
similarity index 100%
rename from q65w/libq65/qmapa.f90
rename to qmap/libqmap/qmapa.f90
diff --git a/q65w/libq65/recvpkt.f90 b/qmap/libqmap/recvpkt.f90
similarity index 100%
rename from q65w/libq65/recvpkt.f90
rename to qmap/libqmap/recvpkt.f90
diff --git a/q65w/libq65/rfile3a.f90 b/qmap/libqmap/rfile3a.f90
similarity index 100%
rename from q65w/libq65/rfile3a.f90
rename to qmap/libqmap/rfile3a.f90
diff --git a/q65w/libq65/set.f90 b/qmap/libqmap/set.f90
similarity index 100%
rename from q65w/libq65/set.f90
rename to qmap/libqmap/set.f90
diff --git a/q65w/libq65/shell.f90 b/qmap/libqmap/shell.f90
similarity index 100%
rename from q65w/libq65/shell.f90
rename to qmap/libqmap/shell.f90
diff --git a/q65w/libq65/sleep_msec.f90 b/qmap/libqmap/sleep_msec.f90
similarity index 100%
rename from q65w/libq65/sleep_msec.f90
rename to qmap/libqmap/sleep_msec.f90
diff --git a/q65w/libq65/smo.f90 b/qmap/libqmap/smo.f90
similarity index 100%
rename from q65w/libq65/smo.f90
rename to qmap/libqmap/smo.f90
diff --git a/q65w/libq65/sort.f90 b/qmap/libqmap/sort.f90
similarity index 100%
rename from q65w/libq65/sort.f90
rename to qmap/libqmap/sort.f90
diff --git a/q65w/libq65/ssort.f b/qmap/libqmap/ssort.f
similarity index 100%
rename from q65w/libq65/ssort.f
rename to qmap/libqmap/ssort.f
diff --git a/q65w/libq65/sun.f90 b/qmap/libqmap/sun.f90
similarity index 100%
rename from q65w/libq65/sun.f90
rename to qmap/libqmap/sun.f90
diff --git a/q65w/libq65/symspec.f90 b/qmap/libqmap/symspec.f90
similarity index 100%
rename from q65w/libq65/symspec.f90
rename to qmap/libqmap/symspec.f90
diff --git a/q65w/libq65/synctst.f90 b/qmap/libqmap/synctst.f90
similarity index 100%
rename from q65w/libq65/synctst.f90
rename to qmap/libqmap/synctst.f90
diff --git a/q65w/libq65/synctst2.f90 b/qmap/libqmap/synctst2.f90
similarity index 100%
rename from q65w/libq65/synctst2.f90
rename to qmap/libqmap/synctst2.f90
diff --git a/q65w/libq65/tastro.f90 b/qmap/libqmap/tastro.f90
similarity index 100%
rename from q65w/libq65/tastro.f90
rename to qmap/libqmap/tastro.f90
diff --git a/q65w/libq65/timf2.f90 b/qmap/libqmap/timf2.f90
similarity index 100%
rename from q65w/libq65/timf2.f90
rename to qmap/libqmap/timf2.f90
diff --git a/q65w/libq65/tm2.f90 b/qmap/libqmap/tm2.f90
similarity index 100%
rename from q65w/libq65/tm2.f90
rename to qmap/libqmap/tm2.f90
diff --git a/q65w/libq65/toxyz.f90 b/qmap/libqmap/toxyz.f90
similarity index 100%
rename from q65w/libq65/toxyz.f90
rename to qmap/libqmap/toxyz.f90
diff --git a/q65w/libq65/twkfreq.f90 b/qmap/libqmap/twkfreq.f90
similarity index 100%
rename from q65w/libq65/twkfreq.f90
rename to qmap/libqmap/twkfreq.f90
diff --git a/q65w/libq65/twkfreq_xy.f90 b/qmap/libqmap/twkfreq_xy.f90
similarity index 100%
rename from q65w/libq65/twkfreq_xy.f90
rename to qmap/libqmap/twkfreq_xy.f90
diff --git a/q65w/libq65/zplot.f90 b/qmap/libqmap/zplot.f90
similarity index 100%
rename from q65w/libq65/zplot.f90
rename to qmap/libqmap/zplot.f90
diff --git a/q65w/main.cpp b/qmap/main.cpp
similarity index 100%
rename from q65w/main.cpp
rename to qmap/main.cpp
diff --git a/q65w/mainwindow.cpp b/qmap/mainwindow.cpp
similarity index 100%
rename from q65w/mainwindow.cpp
rename to qmap/mainwindow.cpp
diff --git a/q65w/mainwindow.h b/qmap/mainwindow.h
similarity index 100%
rename from q65w/mainwindow.h
rename to qmap/mainwindow.h
diff --git a/q65w/mainwindow.ui b/qmap/mainwindow.ui
similarity index 100%
rename from q65w/mainwindow.ui
rename to qmap/mainwindow.ui
diff --git a/q65w/map65_config.h.in b/qmap/map65_config.h.in
similarity index 100%
rename from q65w/map65_config.h.in
rename to qmap/map65_config.h.in
diff --git a/q65w/meterwidget.cpp b/qmap/meterwidget.cpp
similarity index 100%
rename from q65w/meterwidget.cpp
rename to qmap/meterwidget.cpp
diff --git a/q65w/meterwidget.h b/qmap/meterwidget.h
similarity index 100%
rename from q65w/meterwidget.h
rename to qmap/meterwidget.h
diff --git a/q65w/plotter.cpp b/qmap/plotter.cpp
similarity index 100%
rename from q65w/plotter.cpp
rename to qmap/plotter.cpp
diff --git a/q65w/plotter.h b/qmap/plotter.h
similarity index 100%
rename from q65w/plotter.h
rename to qmap/plotter.h
diff --git a/q65w/qmap.pro b/qmap/qmap.pro
similarity index 100%
rename from q65w/qmap.pro
rename to qmap/qmap.pro
diff --git a/q65w/qmap.rc b/qmap/qmap.rc
similarity index 100%
rename from q65w/qmap.rc
rename to qmap/qmap.rc
diff --git a/q65w/resources/CALL3.TXT b/qmap/resources/CALL3.TXT
similarity index 100%
rename from q65w/resources/CALL3.TXT
rename to qmap/resources/CALL3.TXT
diff --git a/q65w/resources/README.qthid.txt b/qmap/resources/README.qthid.txt
similarity index 100%
rename from q65w/resources/README.qthid.txt
rename to qmap/resources/README.qthid.txt
diff --git a/q65w/resources/qt.conf b/qmap/resources/qt.conf
similarity index 100%
rename from q65w/resources/qt.conf
rename to qmap/resources/qt.conf
diff --git a/q65w/resources/qthid/AUTHORS.qthid.4.1.txt b/qmap/resources/qthid/AUTHORS.qthid.4.1.txt
similarity index 100%
rename from q65w/resources/qthid/AUTHORS.qthid.4.1.txt
rename to qmap/resources/qthid/AUTHORS.qthid.4.1.txt
diff --git a/q65w/resources/qthid/AUTHORS.qthid4.0.txt b/qmap/resources/qthid/AUTHORS.qthid4.0.txt
similarity index 100%
rename from q65w/resources/qthid/AUTHORS.qthid4.0.txt
rename to qmap/resources/qthid/AUTHORS.qthid4.0.txt
diff --git a/q65w/resources/qthid/LICENSE.txt b/qmap/resources/qthid/LICENSE.txt
similarity index 100%
rename from q65w/resources/qthid/LICENSE.txt
rename to qmap/resources/qthid/LICENSE.txt
diff --git a/q65w/resources/qthid/NEWS.qhid-4.0.txt b/qmap/resources/qthid/NEWS.qhid-4.0.txt
similarity index 100%
rename from q65w/resources/qthid/NEWS.qhid-4.0.txt
rename to qmap/resources/qthid/NEWS.qhid-4.0.txt
diff --git a/q65w/resources/qthid/NEWS.qthid-4.1.txt b/qmap/resources/qthid/NEWS.qthid-4.1.txt
similarity index 100%
rename from q65w/resources/qthid/NEWS.qthid-4.1.txt
rename to qmap/resources/qthid/NEWS.qthid-4.1.txt
diff --git a/q65w/resources/qthid/README-qthid-4.1.txt b/qmap/resources/qthid/README-qthid-4.1.txt
similarity index 100%
rename from q65w/resources/qthid/README-qthid-4.1.txt
rename to qmap/resources/qthid/README-qthid-4.1.txt
diff --git a/q65w/resources/qthid/README.qthid-4.0.txt b/qmap/resources/qthid/README.qthid-4.0.txt
similarity index 100%
rename from q65w/resources/qthid/README.qthid-4.0.txt
rename to qmap/resources/qthid/README.qthid-4.0.txt
diff --git a/q65w/resources/wisdom1.bat b/qmap/resources/wisdom1.bat
similarity index 100%
rename from q65w/resources/wisdom1.bat
rename to qmap/resources/wisdom1.bat
diff --git a/q65w/resources/wisdom2.bat b/qmap/resources/wisdom2.bat
similarity index 100%
rename from q65w/resources/wisdom2.bat
rename to qmap/resources/wisdom2.bat
diff --git a/q65w/signalmeter.cpp b/qmap/signalmeter.cpp
similarity index 100%
rename from q65w/signalmeter.cpp
rename to qmap/signalmeter.cpp
diff --git a/q65w/signalmeter.h b/qmap/signalmeter.h
similarity index 100%
rename from q65w/signalmeter.h
rename to qmap/signalmeter.h
diff --git a/q65w/sleep.h b/qmap/sleep.h
similarity index 100%
rename from q65w/sleep.h
rename to qmap/sleep.h
diff --git a/q65w/soundin.cpp b/qmap/soundin.cpp
similarity index 100%
rename from q65w/soundin.cpp
rename to qmap/soundin.cpp
diff --git a/q65w/soundin.h b/qmap/soundin.h
similarity index 100%
rename from q65w/soundin.h
rename to qmap/soundin.h
diff --git a/q65w/ss.bat b/qmap/ss.bat
similarity index 100%
rename from q65w/ss.bat
rename to qmap/ss.bat
diff --git a/q65w/sss.bat b/qmap/sss.bat
similarity index 100%
rename from q65w/sss.bat
rename to qmap/sss.bat
diff --git a/q65w/widegraph.cpp b/qmap/widegraph.cpp
similarity index 100%
rename from q65w/widegraph.cpp
rename to qmap/widegraph.cpp
diff --git a/q65w/widegraph.h b/qmap/widegraph.h
similarity index 100%
rename from q65w/widegraph.h
rename to qmap/widegraph.h
diff --git a/q65w/widegraph.ui b/qmap/widegraph.ui
similarity index 100%
rename from q65w/widegraph.ui
rename to qmap/widegraph.ui
diff --git a/q65w/wsjt.ico b/qmap/wsjt.ico
similarity index 100%
rename from q65w/wsjt.ico
rename to qmap/wsjt.ico