diff --git a/slsDetectorSoftware/include/Detector.h b/slsDetectorSoftware/include/Detector.h
index 4091c662e..7ff422517 100644
--- a/slsDetectorSoftware/include/Detector.h
+++ b/slsDetectorSoftware/include/Detector.h
@@ -406,7 +406,7 @@ class Detector {
     Result<bool> getTenGiga(Positions pos = {}) const;
 
     /** [Eiger][CTB] */
-    void setTenGiga(bool enable, Positions pos = {});
+    void setTenGiga(bool value, Positions pos = {});
 
     /** [Eiger, Jungfrau] */
     Result<bool> getTenGigaFlowControl(Positions pos = {}) const;
@@ -525,7 +525,7 @@ class Detector {
 
     Result<std::string> getFilePath(Positions pos = {}) const;
 
-    void setFilePath(const std::string &fname, Positions pos = {});
+    void setFilePath(const std::string &fpath, Positions pos = {});
 
     Result<std::string> getFileNamePrefix(Positions pos = {}) const;
 
@@ -755,7 +755,7 @@ class Detector {
 
     /** [Eiger] Advanced
      * used for pulsing chips */
-    void setPartialReset(bool enable, Positions pos = {});
+    void setPartialReset(bool value, Positions pos = {});
 
     /** [Eiger] Advanced
      * Pulse Pixel n times at x and y coordinates */
diff --git a/slsDetectorSoftware/src/CmdProxy.cpp b/slsDetectorSoftware/src/CmdProxy.cpp
index a91398324..6c49eecd1 100644
--- a/slsDetectorSoftware/src/CmdProxy.cpp
+++ b/slsDetectorSoftware/src/CmdProxy.cpp
@@ -91,7 +91,7 @@ std::string CmdProxy::ListCommands(int action) {
         if (args[0] == "deprecated") {
             std::cout << "The following " << depreciated_functions.size()
                       << " commands are deprecated\n";
-            size_t field_width = 20;
+            const size_t field_width = 20;
             for (const auto &it : depreciated_functions) {
                 std::cout << std::right << std::setw(field_width) << it.first
                           << " -> " << it.second << '\n';
diff --git a/slsDetectorSoftware/src/Detector.cpp b/slsDetectorSoftware/src/Detector.cpp
index 795045780..8d8525afe 100644
--- a/slsDetectorSoftware/src/Detector.cpp
+++ b/slsDetectorSoftware/src/Detector.cpp
@@ -86,8 +86,8 @@ Result<std::string> Detector::getHostname(Positions pos) const {
     return pimpl->Parallel(&slsDetector::getHostname, pos);
 }
 
-void Detector::setHostname(const std::vector<std::string> &value) {
-    pimpl->setHostname(value);
+void Detector::setHostname(const std::vector<std::string> &hostname) {
+    pimpl->setHostname(hostname);
 }
 
 void Detector::setVirtualDetectorServers(int numServers, int startingPort) {
@@ -760,9 +760,9 @@ Result<bool> Detector::getRxZmqDataStream(Positions pos) const {
                            -1);
 }
 
-void Detector::setRxZmqDataStream(bool enable, Positions pos) {
+void Detector::setRxZmqDataStream(bool value, Positions pos) {
     pimpl->Parallel(&slsDetector::enableDataStreamingFromReceiver, pos,
-                    static_cast<int>(enable));
+                    static_cast<int>(value));
 }
 
 Result<int> Detector::getRxZmqFrequency(Positions pos) const {
@@ -887,8 +887,8 @@ void Detector::setSettingsPath(const std::string &value, Positions pos) {
     pimpl->Parallel(&slsDetector::setSettingsDir, pos, value);
 }
 
-void Detector::loadTrimbits(const std::string &value, Positions pos) {
-    pimpl->Parallel(&slsDetector::loadSettingsFile, pos, value);
+void Detector::loadTrimbits(const std::string &fname, Positions pos) {
+    pimpl->Parallel(&slsDetector::loadSettingsFile, pos, fname);
 }
 
 Result<bool> Detector::getRxAddGapPixels(Positions pos) const {
@@ -1030,12 +1030,12 @@ Result<bool> Detector::getQuad(Positions pos) const {
     return pimpl->Parallel(&slsDetector::getQuad, pos);
 }
 
-void Detector::setQuad(const bool value) {
-    if (value && size() > 1) {
+void Detector::setQuad(const bool enable) {
+    if (enable && size() > 1) {
         throw RuntimeError("Cannot set Quad type as it is available only for 1 "
                            "Eiger Quad Half module.");
     }
-    pimpl->Parallel(&slsDetector::setQuad, {}, value);
+    pimpl->Parallel(&slsDetector::setQuad, {}, enable);
 }
 
 // Jungfrau Specific