diff --git a/portlist.cc b/portlist.cc
index 5bc155638..84b7dd5b1 100644
--- a/portlist.cc
+++ b/portlist.cc
@@ -67,6 +67,7 @@
 #include "services.h"
 #include "protocols.h"
 #include "tcpip.h"
+#include "string_pool.h"
 #include "libnetutil/netutil.h"
 
 #if HAVE_STRINGS_H
@@ -347,7 +348,7 @@ void PortList::setServiceProbeResults(u16 portno, int protocol,
   port->service->service_tunnel = tunnel;
 
   if (sname)
-    port->service->name = sname;
+    port->service->name = string_pool_insert(sname);
   else
     port->service->name = NULL;
 
diff --git a/services.cc b/services.cc
index 493a8475b..d0cee1350 100644
--- a/services.cc
+++ b/services.cc
@@ -64,7 +64,7 @@
 #include "services.h"
 #include "protocols.h"
 #include "NmapOps.h"
-#include "charpool.h"
+#include "string_pool.h"
 #include "nmap_error.h"
 #include "utils.h"
 
@@ -231,7 +231,7 @@ static int nmap_services_init() {
       sn.s_name = NULL;
     }
     else {
-      sn.s_name = cp_strdup(servicename);
+      sn.s_name = string_pool_insert(servicename);
     }
     sn.s_port = portno;
     sn.s_proto = npe->p_name;