diff --git a/src/dmr_bs.c b/src/dmr_bs.c
index 8a7a85d..1e001b3 100644
--- a/src/dmr_bs.c
+++ b/src/dmr_bs.c
@@ -371,7 +371,7 @@ void dmrBS (dsd_opts * opts, dsd_state * state)
         if (state->K > 0 && state->dmr_so & 0x40 && state->payload_keyid == 0 && state->dmr_fid == 0x10)
         {
           fprintf (stderr, "%s", KYEL);
-          fprintf(stderr, " BPK %lld", state->K);
+          fprintf(stderr, " PrK %lld", state->K);
           fprintf (stderr, "%s", KNRM);
         }
         if (state->H > 0 && state->dmr_so & 0x40 && state->payload_keyid == 0 && state->dmr_fid == 0x68)
@@ -388,7 +388,7 @@ void dmrBS (dsd_opts * opts, dsd_state * state)
         if (state->K > 0 && state->dmr_so & 0x40 && state->payload_keyid == 0 && state->dmr_fid == 0x10)
         {
           fprintf (stderr, "%s", KYEL);
-          fprintf(stderr, " BPK %lld", state->K);
+          fprintf(stderr, " PrK %lld", state->K);
           fprintf (stderr, "%s", KNRM);
         }
         if (state->H > 0 && state->dmr_so & 0x40 && state->payload_keyid == 0 && state->dmr_fid == 0x68)
@@ -410,7 +410,7 @@ void dmrBS (dsd_opts * opts, dsd_state * state)
         if (state->K > 0 && state->dmr_soR & 0x40 && state->payload_keyidR == 0 && state->dmr_fidR == 0x10)
         {
           fprintf (stderr, "%s", KYEL);
-          fprintf(stderr, " BPK %lld", state->K);
+          fprintf(stderr, " PrK %lld", state->K);
           fprintf (stderr, "%s", KNRM);
         }
         if (state->H > 0 && state->dmr_soR & 0x40 && state->payload_keyidR == 0 && state->dmr_fidR == 0x68)
@@ -427,7 +427,7 @@ void dmrBS (dsd_opts * opts, dsd_state * state)
         if (state->K > 0 && state->dmr_soR & 0x40 && state->payload_keyidR == 0 && state->dmr_fidR == 0x10)
         {
           fprintf (stderr, "%s", KYEL);
-          fprintf(stderr, " BPK %lld", state->K);
+          fprintf(stderr, " PrK %lld", state->K);
           fprintf (stderr, "%s", KNRM);
         }
         if (state->H > 0 && state->dmr_soR & 0x40 && state->payload_keyidR == 0 && state->dmr_fidR == 0x68)
@@ -714,7 +714,7 @@ void dmrBSBootstrap (dsd_opts * opts, dsd_state * state)
          (state->K > 0 && state->dmr_soR & 0x40 && state->payload_keyidR == 0 && state->dmr_fidR == 0x10) )
     {
       fprintf (stderr, "%s", KYEL);
-      fprintf(stderr, " BPK %lld", state->K);
+      fprintf(stderr, " PrK %lld", state->K);
       fprintf (stderr, "%s", KNRM);
 
     }
@@ -734,9 +734,9 @@ void dmrBSBootstrap (dsd_opts * opts, dsd_state * state)
          (state->K > 0 && state->dmr_soR & 0x40 && state->payload_keyidR == 0 && state->dmr_fidR == 0x10) )
     {
       fprintf (stderr, "%s", KYEL);
-      fprintf(stderr, " BPK %lld", state->K);
+      fprintf(stderr, " PrK %lld", state->K);
       fprintf (stderr, "%s", KNRM);
-      
+
     }
     if ( (state->H > 0 && state->dmr_so  & 0x40 && state->payload_keyid  == 0 && state->dmr_fid  == 0x68) ||
          (state->K > 0 && state->dmr_soR & 0x40 && state->payload_keyidR == 0 && state->dmr_fidR == 0x68) )
diff --git a/src/dmr_ms.c b/src/dmr_ms.c
index c4b83cb..b2f67e8 100644
--- a/src/dmr_ms.c
+++ b/src/dmr_ms.c
@@ -369,7 +369,7 @@ void dmrMS (dsd_opts * opts, dsd_state * state)
       if (state->K > 0 && state->dmr_so & 0x40 && state->payload_keyid == 0 && state->dmr_fid == 0x10)
       {
         fprintf (stderr, "%s", KYEL);
-        fprintf(stderr, " BPK %lld", state->K);
+        fprintf(stderr, " PrK %lld", state->K);
         fprintf (stderr, "%s", KNRM);
       }
       if (state->H > 0 && state->dmr_so & 0x40 && state->payload_keyid == 0 && state->dmr_fid == 0x68)
@@ -387,7 +387,7 @@ void dmrMS (dsd_opts * opts, dsd_state * state)
       if (state->K > 0 && state->dmr_so & 0x40 && state->payload_keyid == 0 && state->dmr_fid == 0x10)
       {
         fprintf (stderr, "%s", KYEL);
-        fprintf(stderr, " BPK %lld", state->K);
+        fprintf(stderr, " PrK %lld", state->K);
         fprintf (stderr, "%s", KNRM);
       }
       if (state->H > 0 && state->dmr_so & 0x40 && state->payload_keyid == 0 && state->dmr_fid == 0x68)
@@ -629,7 +629,7 @@ void dmrMSBootstrap (dsd_opts * opts, dsd_state * state)
          (state->K > 0 && state->dmr_soR & 0x40 && state->payload_keyidR == 0 && state->dmr_fid == 0x10)  )
     {
       fprintf (stderr, "%s", KYEL);
-      fprintf(stderr, " BPK %lld", state->K);
+      fprintf(stderr, " PrK %lld", state->K);
       fprintf (stderr, "%s", KNRM);
     }
     if ( (state->H > 0 && state->dmr_so & 0x40 && state->payload_keyid == 0 && state->dmr_fid == 0x68) ||
@@ -648,7 +648,7 @@ void dmrMSBootstrap (dsd_opts * opts, dsd_state * state)
          (state->K > 0 && state->dmr_soR & 0x40 && state->payload_keyidR == 0 && state->dmr_fid == 0x10) )
     {
       fprintf (stderr, "%s", KYEL);
-      fprintf(stderr, " BPK %lld", state->K);
+      fprintf(stderr, " PrK %lld", state->K);
       fprintf (stderr, "%s", KNRM);
     }
     if ( (state->H > 0 && state->dmr_so & 0x40 && state->payload_keyid == 0 && state->dmr_fid == 0x68) ||
diff --git a/src/dmr_process_voice.c b/src/dmr_process_voice.c
index 86810d1..b3fc351 100644
--- a/src/dmr_process_voice.c
+++ b/src/dmr_process_voice.c
@@ -36,7 +36,7 @@ void ProcessDMR (dsd_opts * opts, dsd_state * state)
   TSVoiceSupFrameL = &state->TS1SuperFrame;
   TSVoiceSupFrameR = &state->TS2SuperFrame;
 
-int BP[256] = {
+int Pr[256] = {
   0x0000, 0x1F00, 0xE300, 0xFC00, 0x2503, 0x3A03, 0xC603, 0xD903,
   0x4A05, 0x5505, 0xA905, 0xB605, 0x6F06, 0x7006, 0x8C06, 0x9306,
   0x2618, 0x3918, 0xC518, 0xDA18, 0x031B, 0x1C1B, 0xE01B, 0xFF1B,
@@ -75,9 +75,9 @@ int BP[256] = {
 if (state->currentslot == 0 && state->K > 0 && state->dmr_so & 0x40 && state->payload_keyid == 0 && state->dmr_fid == 0x10)
 {
   fprintf (stderr, "%s", KYEL);
-  fprintf(stderr, " BPK %lld", state->K);
+  fprintf(stderr, " PrK %lld", state->K);
   fprintf (stderr, "%s", KNRM);
-  k = BP[state->K];
+  k = Pr[state->K];
   k = ( ((k & 0xFF0F) << 32 ) + (k << 16) + k );
 
   for(Frame = 0; Frame < 6; Frame++)
@@ -96,9 +96,9 @@ if (state->currentslot == 0 && state->K > 0 && state->dmr_so & 0x40 && state->pa
 if (state->currentslot == 1 && state->K > 0 && state->dmr_soR & 0x40 && state->payload_keyidR == 0 && state->dmr_fidR == 0x10)
 {
   fprintf (stderr, "%s", KYEL);
-  fprintf(stderr, " BPK %lld", state->K);
+  fprintf(stderr, " PrK %lld", state->K);
   fprintf (stderr, "%s", KNRM);
-  k = BP[state->K];
+  k = Pr[state->K];
   k = ( ((k & 0xFF0F) << 32 ) + (k << 16) + k );
 
   for(Frame = 0; Frame < 6; Frame++)
diff --git a/src/dsd_frame_sync.c b/src/dsd_frame_sync.c
index c4497e8..dfe2ab3 100644
--- a/src/dsd_frame_sync.c
+++ b/src/dsd_frame_sync.c
@@ -1197,7 +1197,7 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
                           }
                           if (opts->errorbars == 1)
                             {
-                              printFrameSync (opts, state, " +NXDN96   ", synctest_pos + 1, modulation);
+                              printFrameSync (opts, state, "+NXDN96 ", synctest_pos + 1, modulation);
                             }
                         }
                       state->lastsynctype = 8;
diff --git a/src/dsd_main.c b/src/dsd_main.c
index af829b8..9b681ca 100644
--- a/src/dsd_main.c
+++ b/src/dsd_main.c
@@ -632,9 +632,9 @@ usage ()
   printf ("                 Use if skipping occurs, but may cause wonky audio due to loss of good sync\n");
   printf ("  -Z            Log MBE/Frame Payloads to console\n");
   printf ("\n");
-  printf ("  -K <dec>      Manually Enter DMRA BP Key (Decimal Value of Key Number)\n");
+  printf ("  -K <dec>      Manually Enter DMRA Privacy Key (Decimal Value of Key Number)\n");
   printf ("\n");
-  printf ("  -H <hex>      Manually Enter Terra 10 BP Key (40-Bit/10-Char Hex Value)\n");
+  printf ("  -H <hex>      Manually Enter 'Tera 10 Privacy Key (40-Bit/10-Char Hex Value)\n");
   printf ("\n");
   exit (0);
 }
diff --git a/src/dsd_mbe.c b/src/dsd_mbe.c
index 2ba4391..f97cff3 100644
--- a/src/dsd_mbe.c
+++ b/src/dsd_mbe.c
@@ -77,7 +77,7 @@ processMbeFrame (dsd_opts * opts, dsd_state * state, char imbe_fr[8][23], char a
 {
 
   //
-  int BP[256] = {
+  int Pr[256] = {
     0x0000, 0x1F00, 0xE300, 0xFC00, 0x2503, 0x3A03, 0xC603, 0xD903,
     0x4A05, 0x5505, 0xA905, 0xB605, 0x6F06, 0x7006, 0x8C06, 0x9306,
     0x2618, 0x3918, 0xC518, 0xDA18, 0x031B, 0x1C1B, 0xE01B, 0xFF1B,
@@ -230,7 +230,7 @@ processMbeFrame (dsd_opts * opts, dsd_state * state, char imbe_fr[8][23], char a
 
 		    if (state->K > 0 && state->dmr_so & 0x40 && state->payload_keyid == 0 && state->dmr_fid == 0x10)
         {
-          k = BP[state->K];
+          k = Pr[state->K];
           k = ( ((k & 0xFF0F) << 32 ) + (k << 16) + k );
           for (short int j = 0; j < 48; j++) //49
           {
@@ -292,7 +292,7 @@ processMbeFrame (dsd_opts * opts, dsd_state * state, char imbe_fr[8][23], char a
 
         if (state->K > 0 && state->dmr_soR & 0x40 && state->payload_keyidR == 0 && state->dmr_fid == 0x10)
         {
-          k = BP[state->K];
+          k = Pr[state->K];
           k = ( ((k & 0xFF0F) << 32 ) + (k << 16) + k );
           for (short int j = 0; j < 48; j++)
           {
diff --git a/src/dsd_ncurses.c b/src/dsd_ncurses.c
index 8102daf..a8b2d5c 100644
--- a/src/dsd_ncurses.c
+++ b/src/dsd_ncurses.c
@@ -809,8 +809,8 @@ void ncursesMenu (dsd_opts * opts, dsd_state * state)
       box (entry_win, 0, 0);
       mvwprintw(entry_win, 2, 2, "Key Type Selection");
       mvwprintw(entry_win, 3, 2, " ");
-      mvwprintw(entry_win, 4, 2, "1 -  DMRA BP ");
-      mvwprintw(entry_win, 5, 2, "2 - Terra BP ");
+      mvwprintw(entry_win, 4, 2, "1 -  DMRA Privacy ");
+      mvwprintw(entry_win, 5, 2, "2 - 'Tera Privacy ");
       mvwprintw(entry_win, 6, 3, " ");
       echo();
       refresh();
@@ -822,7 +822,7 @@ void ncursesMenu (dsd_opts * opts, dsd_state * state)
       {
         entry_win = newwin(6, WIDTH+6, starty+10, startx+10);
         box (entry_win, 0, 0);
-        mvwprintw(entry_win, 2, 2, "DMRA BP Key Number (DEC):");
+        mvwprintw(entry_win, 2, 2, "DMRA Privacy Key Number (DEC):");
         mvwprintw(entry_win, 3, 3, " ");
         echo();
         refresh();
@@ -837,7 +837,7 @@ void ncursesMenu (dsd_opts * opts, dsd_state * state)
       {
         entry_win = newwin(6, WIDTH+6, starty+10, startx+10);
         box (entry_win, 0, 0);
-        mvwprintw(entry_win, 2, 2, "**Terra 10 Key Value (HEX):");
+        mvwprintw(entry_win, 2, 2, "'Tera 10 Key Value (HEX):");
         mvwprintw(entry_win, 3, 3, " ");
         echo();
         refresh();
@@ -1839,7 +1839,7 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
     if(state->dmrburstL == 16 && state->payload_algid == 0 && (state->dmr_so & 0xCF) == 0x40) //4F or CF mask? & 0xCF currently
     {
       attron(COLOR_PAIR(5));
-      printw (" **BP** ");
+      printw (" **Pr** ");
       attroff(COLOR_PAIR(5));
       attron(COLOR_PAIR(3));
     }
@@ -1847,8 +1847,7 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
     if(state->dmrburstL == 16 && state->payload_algid == 0 && state->K > 0 && state->dmr_fid == 0x10 && (state->dmr_so & 0xCF) == 0x40)
     {
       attron(COLOR_PAIR(1));
-      //printw ("BPK [%3lld] ", state->K);
-      printw ("DMRA BP Key [%3lld] ", state->K);
+      printw ("DMRA P Key [%3lld] ", state->K);
       attroff(COLOR_PAIR(1));
       attron(COLOR_PAIR(3));
     }
@@ -1856,7 +1855,7 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
     if(state->dmrburstL == 16 && state->payload_algid == 0 && state->H > 0 && state->dmr_fid == 0x68 && ((state->dmr_so & 0xCF) == 0x40) )
     {
       attron(COLOR_PAIR(1));
-      printw ("**Terra BP Key [%010llX] ", state->H);
+      printw ("**'Tera P Key [%010llX] ", state->H);
       attroff(COLOR_PAIR(1));
       attron(COLOR_PAIR(3));
     }
@@ -1949,7 +1948,7 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
     if(state->dmrburstR == 16 && state->payload_algidR == 0 && (state->dmr_soR & 0xCF) == 0x40) //4F or CF mask?
     {
       attron(COLOR_PAIR(5));
-      printw (" **BP** ");
+      printw (" **Pr** ");
       attroff(COLOR_PAIR(5));
       attron(COLOR_PAIR(3));
     }
@@ -1957,14 +1956,14 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
     if(state->dmrburstR == 16 && state->payload_algidR == 0 && state->K > 0 && ((state->dmr_soR & 0xCF) == 0x40) && state->dmr_fidR == 0x10)
     {
       attron(COLOR_PAIR(1));
-      printw ("DMRA BP Key [%3lld] ", state->K);
+      printw ("DMRA Pr Key [%3lld] ", state->K);
       attroff(COLOR_PAIR(1));
       attron(COLOR_PAIR(3));
     }
     if(state->dmrburstR == 16 && state->payload_algidR == 0 && state->H > 0 && ((state->dmr_soR & 0xCF) == 0x40) && state->dmr_fidR == 0x68)
     {
       attron(COLOR_PAIR(1));
-      printw ("**Terra BP Key [%010llX] ", state->H);
+      printw ("**'Tera Pr Key [%010llX] ", state->H);
       attroff(COLOR_PAIR(1));
       attron(COLOR_PAIR(3));
     }