diff --git a/src/source-nfq.c b/src/source-nfq.c
index c802302b32..9e8f7b8d31 100644
--- a/src/source-nfq.c
+++ b/src/source-nfq.c
@@ -844,7 +844,7 @@ int NFQRegisterQueue(const uint16_t number)
 {
     NFQThreadVars *ntv = NULL;
     NFQQueueVars *nq = NULL;
-    char queue[8] = { 0 };
+    char queue[10] = { 0 };
     static bool many_queues_warned = false;
     uint16_t num_cpus = UtilCpuGetNumProcessorsOnline();
 
@@ -876,7 +876,7 @@ int NFQRegisterQueue(const uint16_t number)
     nq->queue_num = number;
     receive_queue_num++;
     SCMutexUnlock(&nfq_init_lock);
-    snprintf(queue, sizeof(queue) - 1, "%hu", number);
+    snprintf(queue, sizeof(queue) - 1, "NFQ#%hu", number);
     LiveRegisterDevice(queue);
 
     ntv->livedev = LiveGetDevice(queue);
diff --git a/src/util-runmodes.c b/src/util-runmodes.c
index fae864f864..a075a36073 100644
--- a/src/util-runmodes.c
+++ b/src/util-runmodes.c
@@ -481,7 +481,7 @@ int RunModeSetIPSAutoFp(ConfigIPSParserFunc ConfigParser,
             exit(EXIT_FAILURE);
         }
         memset(tname, 0, sizeof(tname));
-        snprintf(tname, sizeof(tname), "%s-Q%s", thread_name_autofp, cur_queue);
+        snprintf(tname, sizeof(tname), "%s-%s", thread_name_autofp, cur_queue);
 
         ThreadVars *tv_receive =
             TmThreadCreatePacketHandler(tname,
@@ -608,7 +608,7 @@ int RunModeSetIPSWorker(ConfigIPSParserFunc ConfigParser,
             exit(EXIT_FAILURE);
         }
         memset(tname, 0, sizeof(tname));
-        snprintf(tname, sizeof(tname), "%s-Q%s", thread_name_workers, cur_queue);
+        snprintf(tname, sizeof(tname), "%s-%s", thread_name_workers, cur_queue);
 
         tv = TmThreadCreatePacketHandler(tname,
                 "packetpool", "packetpool",