diff --git a/wizard-server/src/main/java/org/cobbzilla/wizard/server/RestServerBase.java b/wizard-server/src/main/java/org/cobbzilla/wizard/server/RestServerBase.java
index 13a1152..9353faf 100644
--- a/wizard-server/src/main/java/org/cobbzilla/wizard/server/RestServerBase.java
+++ b/wizard-server/src/main/java/org/cobbzilla/wizard/server/RestServerBase.java
@@ -451,14 +451,16 @@ public abstract class RestServerBase<C extends RestServerConfiguration> implemen
 
         final String serverName = server.getConfiguration().getServerName();
 
-        Runtime.getRuntime().addShutdownHook(new Thread(() -> {
-            log.info("stopping "+serverName);
+        final Thread serverShutdownThread = new Thread(() -> {
+            log.info("stopping " + serverName);
             server.stopServer();
             synchronized (mainThreadLock) {
                 mainThread.interrupt();
                 mainThreadLock.notify();
             }
-        }));
+        });
+        serverShutdownThread.setName(server.getClass().getSimpleName()+"_shutdownHook");
+        Runtime.getRuntime().addShutdownHook(serverShutdownThread);
 
         log.info(serverName+" running, base URI is " + server.getBaseUri().toString());
         try {