diff --git a/CMakeLists.txt b/CMakeLists.txt
index 72f0aaa35..30767fa97 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -587,10 +587,10 @@ set (wsjt_FSRCS
   lib/fst4/get_crc24.f90
   lib/fst4/fst4_baseline.f90
   lib/77bit/hash22calc.f90
-  lib/superfox/gen_sfox.f90
-  lib/superfox/sync_sf.f90
-  lib/superfox/hard_symbols.f90
-  lib/superfox/gen_sf_clo.f90
+  lib/superfox/sfox_gen.f90
+  lib/superfox/sfox_sync.f90
+  lib/superfox/sfox_hard.f90
+  lib/superfox/sfox_clo.f90
   lib/superfox/ran1.f90
   )
 
diff --git a/lib/superfox/gen_sf_clo.f90 b/lib/superfox/sfox_clo.f90
similarity index 89%
rename from lib/superfox/gen_sf_clo.f90
rename to lib/superfox/sfox_clo.f90
index 637320f2b..ade15f95b 100644
--- a/lib/superfox/gen_sf_clo.f90
+++ b/lib/superfox/sfox_clo.f90
@@ -1,4 +1,4 @@
-subroutine gen_sf_clo(fsample,syncwidth,clo)
+subroutine sfox_clo(fsample,syncwidth,clo)
 
 ! Generate complex LO for the SuperFox sync signal
   
@@ -23,4 +23,4 @@ subroutine gen_sf_clo(fsample,syncwidth,clo)
   enddo
 
   return
-end subroutine gen_sf_clo
+end subroutine sfox_clo
diff --git a/lib/superfox/gen_sfox.f90 b/lib/superfox/sfox_gen.f90
similarity index 93%
rename from lib/superfox/gen_sfox.f90
rename to lib/superfox/sfox_gen.f90
index d632e9830..c2cfea961 100644
--- a/lib/superfox/gen_sfox.f90
+++ b/lib/superfox/sfox_gen.f90
@@ -1,4 +1,4 @@
-subroutine gen_sfox(idat,f0,fsample,syncwidth,cdat)
+subroutine sfox_gen(idat,f0,fsample,syncwidth,cdat)
 
   use sfox_mod
 !  include "sfox_params.f90"
@@ -53,4 +53,4 @@ subroutine gen_sfox(idat,f0,fsample,syncwidth,cdat)
   enddo
 
   return
-end subroutine gen_sfox
+end subroutine sfox_gen
diff --git a/lib/superfox/hard_symbols.f90 b/lib/superfox/sfox_hard.f90
similarity index 93%
rename from lib/superfox/hard_symbols.f90
rename to lib/superfox/sfox_hard.f90
index dd619658b..ecb067536 100644
--- a/lib/superfox/hard_symbols.f90
+++ b/lib/superfox/sfox_hard.f90
@@ -1,4 +1,4 @@
-subroutine hard_symbols(crcvd,f,t,chansym)
+subroutine sfox_hard(crcvd,f,t,chansym)
 
   use sfox_mod
 !  include "sfox_params.f90"
@@ -32,4 +32,4 @@ subroutine hard_symbols(crcvd,f,t,chansym)
   enddo
 
   return
-end subroutine hard_symbols
+end subroutine sfox_hard
diff --git a/lib/superfox/sync_sf.f90 b/lib/superfox/sfox_sync.f90
similarity index 90%
rename from lib/superfox/sync_sf.f90
rename to lib/superfox/sfox_sync.f90
index 6aff85ae2..2574e7a16 100644
--- a/lib/superfox/sync_sf.f90
+++ b/lib/superfox/sfox_sync.f90
@@ -1,4 +1,4 @@
-subroutine sync_sf(crcvd,clo,nv,f,t)
+subroutine sfox_sync(crcvd,clo,nv,f,t)
 
   use sfox_mod
   parameter (MMAX=150,JMAX=300)
@@ -46,8 +46,6 @@ subroutine sync_sf(crcvd,clo,nv,f,t)
   t=ipk(1)/120.0
   dfreq=ipk(2)*df
   f=1500.0+dfreq
-!  write(*,3001) ipk,t,dfreq,f
-!3001 format('B',2i5,f7.3,2f7.1)
 
   return
-end subroutine sync_sf
+end subroutine sfox_sync
diff --git a/lib/superfox/sfoxtest.f90 b/lib/superfox/sfoxtest.f90
index e46318452..e9e0c52b4 100644
--- a/lib/superfox/sfoxtest.f90
+++ b/lib/superfox/sfoxtest.f90
@@ -101,10 +101,10 @@ program sfoxtest
   chansym0(kk+1:nn)=parsym(1:nn-kk)
 
 ! Generate clo, the LO for sync detection
-  call gen_sf_clo(fsample,syncwidth,clo)
+  call sfox_clo(fsample,syncwidth,clo)
   
 ! Generate cdat, the SuperFox waveform
-  call gen_sfox(chansym0,f0,fsample,syncwidth,cdat)
+  call sfox_gen(chansym0,f0,fsample,syncwidth,cdat)
 
   do isnr=0,-20,-1
      snr=isnr
@@ -134,7 +134,7 @@ program sfoxtest
         if(f0.eq.0.0) then
            f1=1500.0 + 200.0*(ran1(idummy)-0.5)
            xdt=2.0*(ran1(idummy)-0.5)
-           call gen_sfox(chansym0,f1,fsample,syncwidth,cdat,clo)
+           call sfox_gen(chansym0,f1,fsample,syncwidth,cdat,clo)
         endif
         
         crcvd=0.
@@ -149,7 +149,7 @@ program sfoxtest
              delay,fspread)
 
 ! Find signal freq and DT
-        call sync_sf(crcvd,clo,nv,f,t)
+        call sfox_sync(crcvd,clo,nv,f,t)
         ferr=f-f1
         terr=t-xdt
         if(abs(ferr).lt.baud/2.0 .and. abs(terr).lt.tsym/8.0) then
@@ -162,7 +162,7 @@ program sfoxtest
         a(1)=1500.0-f
         call twkfreq(crcvd,crcvd,NMAX,12000.0,a)
         f=1500.0
-        call hard_symbols(crcvd,f,t,chansym)           !Get hard symbol values
+        call sfox_hard(crcvd,f,t,chansym)           !Get hard symbol values
 
         nera=0
         chansym=mod(chansym,nq)                        !Enforce 0 to nq-1