diff --git a/common/JackClient.h b/common/JackClient.h
index af187362..4a421ac5 100644
--- a/common/JackClient.h
+++ b/common/JackClient.h
@@ -87,7 +87,7 @@ class SERVER_EXPORT JackClient : public JackClientInterface, public JackRunnable
         void* fThreadFunArg;
         void* fSessionArg;
         void* fLatencyArg;
-        char fServerName[JACK_SERVER_CONTROL_NAME_SIZE];
+        char fServerName[JACK_SERVER_NAME_SIZE];
 
         JackThread fThread;    /*! Thread to execute the Process function */
         detail::JackClientChannelInterface* fChannel;
diff --git a/common/JackConstants.h b/common/JackConstants.h
index 8ec8a8f7..17b4d296 100644
--- a/common/JackConstants.h
+++ b/common/JackConstants.h
@@ -31,7 +31,7 @@
 #define JACK_PORT_NAME_SIZE 256
 #define JACK_PORT_TYPE_SIZE 32
 
-#define JACK_SERVER_CONTROL_NAME_SIZE 64
+#define JACK_SERVER_NAME_SIZE 256
 #define JACK_CLIENT_NAME_SIZE 64
 #define JACK_MESSAGE_SIZE 256
 #define JACK_UUID_SIZE 32
@@ -77,7 +77,6 @@
 
 #define JACK_SERVER_FAILURE "JACK server has been closed"
 
-
 #define NO_PORT   0xFFFE
 
 #define EMPTY   0xFFFD
diff --git a/common/JackEngineControl.h b/common/JackEngineControl.h
index b6413a51..2a254b8f 100644
--- a/common/JackEngineControl.h
+++ b/common/JackEngineControl.h
@@ -63,7 +63,7 @@ struct SERVER_EXPORT JackEngineControl : public JackShmMem
     int fServerPriority;
     int fClientPriority;
     int fMaxClientPriority;
-    char fServerName[JACK_SERVER_CONTROL_NAME_SIZE];
+    char fServerName[JACK_SERVER_NAME_SIZE];
     JackTransportEngine fTransport;
     jack_timer_type_t fClockSource;
     int fDriverNum;
diff --git a/common/shm.h b/common/shm.h
index 43f420de..c539aa9f 100644
--- a/common/shm.h
+++ b/common/shm.h
@@ -38,6 +38,7 @@
 #include <sys/types.h>
 #include "types.h"
 #include "JackCompilerDeps.h"
+#include "JackConstants.h"
 
 #define TRUE 1
 #define FALSE 0
@@ -47,9 +48,8 @@ extern "C"
 {
 #endif
 
-#define MAX_SERVERS 8			/* maximum concurrent servers */
-#define MAX_SHM_ID 256			/* generally about 16 per server */
-#define JACK_SERVER_NAME_SIZE 256	/* maximum length of server name */
+#define MAX_SERVERS 8               /* maximum concurrent servers */
+#define MAX_SHM_ID 256              /* generally about 16 per server */
 #define JACK_SHM_MAGIC 0x4a41434b	/* shm magic number: "JACK" */
 #define JACK_SHM_NULL_INDEX -1		/* NULL SHM index */
 #define JACK_SHM_REGISTRY_INDEX -2	/* pseudo SHM index for registry */
@@ -62,7 +62,7 @@ extern "C"
 #ifdef USE_POSIX_SHM
 
 #ifndef NAME_MAX
-#define NAME_MAX            255
+#define NAME_MAX 255
 #endif
 
 #ifndef SHM_NAME_MAX
@@ -72,7 +72,7 @@ extern "C"
     typedef shm_name_t jack_shm_id_t;
 
 #elif WIN32  
-#define NAME_MAX            255
+#define NAME_MAX 255
 #ifndef SHM_NAME_MAX
 #define SHM_NAME_MAX NAME_MAX
 #endif
diff --git a/windows/JackWinNamedPipeServerChannel.h b/windows/JackWinNamedPipeServerChannel.h
index 891f0d5f..54858853 100644
--- a/windows/JackWinNamedPipeServerChannel.h
+++ b/windows/JackWinNamedPipeServerChannel.h
@@ -80,7 +80,7 @@ class JackWinNamedPipeServerChannel : public JackRunnableInterface
         JackWinNamedPipeServer fRequestListenPipe;	// Pipe to create request socket for the client
         JackServer*	fServer;
         JackThread fThread;                         // Thread to execute the event loop
-        char fServerName[JACK_SERVER_CONTROL_NAME_SIZE];
+        char fServerName[JACK_SERVER_NAME_SIZE];
 
         std::list<JackClientPipeThread*> fClientList;