diff --git a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer
index 6aa8727ca..31b41c248 100755
Binary files a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer and b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer differ
diff --git a/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer b/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer
index 2be468993..0feebcefb 100755
Binary files a/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer and b/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer differ
diff --git a/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer b/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer
index 12df14554..3ed118b26 100755
Binary files a/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer and b/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer differ
diff --git a/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer b/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer
index bbc244f8f..750a303bf 100755
Binary files a/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer and b/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer differ
diff --git a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer
index e603c7ac0..a358b9e2f 100755
Binary files a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer and b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer differ
diff --git a/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer b/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer
index 3e453dce9..6adc29539 100755
Binary files a/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer and b/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer differ
diff --git a/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer b/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer
index 44c912a36..e8029cf00 100755
Binary files a/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer and b/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer differ
diff --git a/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c b/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c
index cb9102488..a72e05980 100644
--- a/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c
+++ b/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c
@@ -1503,7 +1503,7 @@ int set_module(int file_des) {
     ret = OK;
     memset(mess, 0, sizeof(mess));
 
-#if !(defined(MYTHEN3D) && defined(EIGERD))
+#if !(defined(MYTHEN3D) || defined(EIGERD))
     functionNotImplemented();
 #else
 
diff --git a/slsDetectorSoftware/src/DetectorImpl.cpp b/slsDetectorSoftware/src/DetectorImpl.cpp
index 7748654ef..f5a455992 100644
--- a/slsDetectorSoftware/src/DetectorImpl.cpp
+++ b/slsDetectorSoftware/src/DetectorImpl.cpp
@@ -75,8 +75,8 @@ void DetectorImpl::freeSharedMemory(int detectorIndex, int detPos) {
 
 void DetectorImpl::freeSharedMemory() {
     zmqSocket.clear();
-    for (auto &d : modules) {
-        d->freeSharedMemory();
+    for (auto &module : modules) {
+        module->freeSharedMemory();
     }
     modules.clear();
 
@@ -92,9 +92,10 @@ std::string DetectorImpl::getUserDetails() {
 
     std::ostringstream sstream;
     sstream << "\nHostname: ";
-    for (auto &d : modules) {
-        sstream << (d->isFixedPatternSharedMemoryCompatible() ? d->getHostname()
-                                                              : "Unknown")
+    for (auto &module : modules) {
+        sstream << (module->isFixedPatternSharedMemoryCompatible()
+                        ? module->getHostname()
+                        : "Unknown")
                 << "+";
     }
     sstream << "\nType: ";
@@ -104,9 +105,9 @@ std::string DetectorImpl::getUserDetails() {
     }
     // get type from module shm
     else {
-        for (auto &d : modules) {
-            sstream << (d->isFixedPatternSharedMemoryCompatible()
-                            ? ToString(d->getDetectorType())
+        for (auto &module : modules) {
+            sstream << (module->isFixedPatternSharedMemoryCompatible()
+                            ? ToString(module->getDetectorType())
                             : "Unknown")
                     << "+";
         }
@@ -255,8 +256,8 @@ void DetectorImpl::addModule(const std::string &hostname) {
     }
 
     if (host != "localhost") {
-        for (auto &d : modules) {
-            if (d->getHostname() == host) {
+        for (auto &module : modules) {
+            if (module->getHostname() == host) {
                 LOG(logWARNING)
                     << "Module " << host << "already part of the Detector!"
                     << std::endl
@@ -331,8 +332,8 @@ void DetectorImpl::updateDetectorSize() {
                   << "\n\tNumber of Channels in Y direction:"
                   << shm()->numberOfChannels.y;
 
-    for (auto &d : modules) {
-        d->updateNumberOfModule(shm()->numberOfModule);
+    for (auto &module : modules) {
+        module->updateNumberOfModule(shm()->numberOfModule);
     }
 }
 
diff --git a/slsDetectorSoftware/tests/test-Module.cpp b/slsDetectorSoftware/tests/test-Module.cpp
index 560d2b814..e80a1a449 100644
--- a/slsDetectorSoftware/tests/test-Module.cpp
+++ b/slsDetectorSoftware/tests/test-Module.cpp
@@ -29,7 +29,7 @@ TEST_CASE("Is shm fixed pattern shm compatible") {
     REQUIRE(m.isFixedPatternSharedMemoryCompatible() == true);
 
     // Set shm version to 0
-    sls::SharedMemory<sls::sharedSlsDetector> shm(0, 0);
+    sls::SharedMemory<sls::sharedModule> shm(0, 0);
     REQUIRE(shm.IsExisting() == true);
     shm.OpenSharedMemory();
     shm()->shmversion = 0;
diff --git a/slsSupportLib/include/sls/versionAPI.h b/slsSupportLib/include/sls/versionAPI.h
index 1fa5279d1..4e169318a 100644
--- a/slsSupportLib/include/sls/versionAPI.h
+++ b/slsSupportLib/include/sls/versionAPI.h
@@ -3,11 +3,11 @@
 #define APILIB 0x210831
 #define APIRECEIVER 0x210831
 #define APIGUI 0x210819
-
-#define APIEIGER 0x210916
-#define APICTB 0x210916
-#define APIGOTTHARD 0x210916
-#define APIGOTTHARD2 0x210916
-#define APIMYTHEN3 0x210916
+#define APICTB 0x210917
+#define APIGOTTHARD 0x210917
+#define APIGOTTHARD2 0x210917
+#define APIMYTHEN3 0x210917
 #define APIMOENCH 0x210916
+#define APIEIGER 0x210917
+
 #define APIJUNGFRAU 0x210917