diff --git a/src/dsd_ncurses.c b/src/dsd_ncurses.c
index 501124e..ffc76ee 100644
--- a/src/dsd_ncurses.c
+++ b/src/dsd_ncurses.c
@@ -3423,7 +3423,7 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
       {
         attron (COLOR_PAIR(3)); 
         if (state->ea_mode == 1) printw (" TG [%5lld] SRC [%8lld]", call_matrix[i][2], call_matrix[i][3] );
-        else printw (" AFS [%3llX][%02d-%03d]", call_matrix[i][3], a, fs );
+        else printw (" AFS [%d][%02d-%03d]", call_matrix[i][3], a, fs );
         for (int k = 0; k < state->group_tally; k++)
         {
           if (state->group_array[k].groupNumber == call_matrix[i][2])
@@ -3439,7 +3439,7 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
       {
         attron (COLOR_PAIR(2)); 
         if (state->ea_mode == 1) printw (" TG [%5lld] SRC [%8lld]", call_matrix[i][2], call_matrix[i][3] );
-        else printw (" AFS [%3llX][%02d-%03d]", call_matrix[i][3], a, fs );
+        else printw (" AFS [%d][%02d-%03d]", call_matrix[i][3], a, fs );
         for (int k = 0; k < state->group_tally; k++)
         {
           if (state->group_array[k].groupNumber == call_matrix[i][2])
diff --git a/src/edacs-fme.c b/src/edacs-fme.c
index 89f82b5..47f4d7c 100644
--- a/src/edacs-fme.c
+++ b/src/edacs-fme.c
@@ -222,7 +222,7 @@ void edacs_analog(dsd_opts * opts, dsd_state * state, int afs, unsigned char lcn
 
     fprintf (stderr, " Analog RMS: %04ld SQL: %ld", rms, sql);
     if (afs != 0)
-      fprintf (stderr, " AFS [0x%03X] [%02d-%03d] LCN [%02d]", afs, afs >> 7, afs & 0x7F, lcn);
+      fprintf (stderr, " AFS [%d] [%02d-%03d] LCN [%02d]", afs, afs >> 7, afs & 0x7F, lcn);
 
     fprintf (stderr, "%s", KNRM);
 
@@ -506,7 +506,7 @@ void edacs(dsd_opts * opts, dsd_state * state)
             //openwav file and do per call right here, should probably check as well to make sure we have a valid trunking method active (rigctl, rtl)
             if (opts->dmr_stereo_wav == 1 && (opts->use_rigctl == 1 || opts->audio_in_type == 3))
             {
-              sprintf (opts->wav_out_file, "./WAV/%s %s pV Site %lld TG %d SRC %d.wav", getDateE(), getTimeE(), state->edacs_site_id, group, source);
+              sprintf (opts->wav_out_file, "./WAV/%s %s EDACS Site %lld TG %d SRC %d.wav", getDateE(), getTimeE(), state->edacs_site_id, group, source);
               openWavOutFile (opts, state);
               // openWavOutFile48k (opts, state); //debug for testing analog wav only
             }
@@ -612,7 +612,7 @@ void edacs(dsd_opts * opts, dsd_state * state)
         UNUSED(status);
         if (afs > 0) state->lastsrc = afs; 
         fprintf (stderr, "%s", KGRN);
-        fprintf (stderr, " AFS [0x%03X] [%02d-%03d] LCN [%02d]", afs, a, fs, lcn);
+        fprintf (stderr, " AFS [%d] [%02d-%03d] LCN [%02d]", afs, a, fs, lcn);
 
         char mode[8]; //allow, block, digital enc
         sprintf (mode, "%s", "");
@@ -665,7 +665,7 @@ void edacs(dsd_opts * opts, dsd_state * state)
             //openwav file and do per call right here
             if (opts->dmr_stereo_wav == 1 && (opts->use_rigctl == 1 || opts->audio_in_type == 3))
             {
-              sprintf (opts->wav_out_file, "./WAV/%s %s pV Site %lld AFS %02d-%03d - %X.wav", getDateE(), getTimeE(), state->edacs_site_id, a, fs, afs);
+              sprintf (opts->wav_out_file, "./WAV/%s %s EDACS Site %lld AFS %02d-%03d - %d.wav", getDateE(), getTimeE(), state->edacs_site_id, a, fs, afs);
               if (command == 0xEF) openWavOutFile (opts, state); //digital
               if (command == 0xEE) openWavOutFile48k (opts, state); //analog at 48k
             }