diff --git a/cpp/data/eigerfan/include/EigerFanConfig.h b/cpp/data/eigerfan/include/EigerFanConfig.h
index 2546890..eade452 100644
--- a/cpp/data/eigerfan/include/EigerFanConfig.h
+++ b/cpp/data/eigerfan/include/EigerFanConfig.h
@@ -27,7 +27,7 @@ class EigerFanConfig
 public:
 
   EigerFanConfig() :
-    num_zmq_threads(EigerFanDefaults::DEFAULT_NUM_THREADS),
+    num_threads(EigerFanDefaults::DEFAULT_NUM_THREADS),
     num_consumers(EigerFanDefaults::DEFAULT_NUM_CONSUMERS),
     ctrl_channel_port(EigerFanDefaults::DEFAULT_CONTROL_PORT_NUMBER),
     eiger_channel_address(EigerFanDefaults::DEFAULT_STREAM_ADDRESS),
@@ -51,8 +51,8 @@ class EigerFanConfig
     num_consumers = numConsumers;
   }
 
-  void setNum0MQThreads(int numZmqThreads) {
-    num_zmq_threads = numZmqThreads;
+  void setNumThreads(int numThreads) {
+    num_threads = numThreads;
   }
 
   void setFanChannelPortStart(int fanChannelPortStart) {
@@ -83,8 +83,8 @@ class EigerFanConfig
     return num_consumers;
   }
 
-  int getNum0MQThreads() const {
-    return num_zmq_threads;
+  int getNumThreads() const {
+    return num_threads;
   }
 
   int getFanChannelPortStart() const {
@@ -105,7 +105,7 @@ class EigerFanConfig
 
 private:
 
-  int                   num_zmq_threads;    // Number of 0MQ threads
+  int                   num_threads;    // Number of 0MQ threads
   int                   num_consumers;    // Expected number of consumers
   std::string           ctrl_channel_port;  // Port to bind to for the control channel
   std::string           eiger_channel_address;  // Address to connect to for the Eiger Stream
diff --git a/cpp/data/eigerfan/src/EigerFan.cpp b/cpp/data/eigerfan/src/EigerFan.cpp
index b2d8d01..93b4702 100644
--- a/cpp/data/eigerfan/src/EigerFan.cpp
+++ b/cpp/data/eigerfan/src/EigerFan.cpp
@@ -100,7 +100,7 @@ EigerFan::EigerFan(EigerFanConfig config_)
 : ctx_(config_.num_zmq_context_threads),
   controlSocket(ctx_, ZMQ_ROUTER),
   forwardSocket(ctx_, ZMQ_PUSH),
-  broker(BROKER_INPROC_ENDPOINT, config_.num_zmq_threads)
+  broker(BROKER_INPROC_ENDPOINT, config_.num_threads)
 {
   this->log = log4cxx::Logger::getLogger("ED.EigerFan");
   config = config_;
@@ -998,10 +998,10 @@ void EigerFan::HandleControlMessage(zmq::message_t &message, zmq::message_t &idM
       rapidjson::Document document;
       document.SetObject();
 
-      // Add Number of 0MQ threads
-      rapidjson::Value keyNumZMQThreads("num_zmq_threads", document.GetAllocator());
-      rapidjson::Value valueNumZMQThreads(config.num_zmq_threads);
-      document.AddMember(keyNumZMQThreads, valueNumZMQThreads, document.GetAllocator());
+      // Add Number of threads
+      rapidjson::Value keyNumThreads("num_threads", document.GetAllocator());
+      rapidjson::Value valueNumThreads(config.num_threads);
+      document.AddMember(keyNumThreads, valueNumThreads, document.GetAllocator());
 
       // Add Number of 0MQ context threads
       rapidjson::Value keyNumZMQContextThreads("num_zmq_context_threads", document.GetAllocator());
diff --git a/cpp/data/eigerfan/src/eigerfan_main.cpp b/cpp/data/eigerfan/src/eigerfan_main.cpp
index a8fb23a..916b1af 100644
--- a/cpp/data/eigerfan/src/eigerfan_main.cpp
+++ b/cpp/data/eigerfan/src/eigerfan_main.cpp
@@ -227,8 +227,8 @@ int parse_arguments(int argc, char** argv, EigerFanConfig &cfg)
 
     if (vm.count("threads"))
     {
-      cfg.setNum0MQThreads(vm["threads"].as<unsigned int>());
-      LOG4CXX_DEBUG(logger, "Setting number of ZeroMQ threads to " << cfg.getNum0MQThreads());
+      cfg.setNumThreads(vm["threads"].as<unsigned int>());
+      LOG4CXX_DEBUG(logger, "Setting number of threads to " << cfg.getNumThreads());
     }
 
     if (vm.count("consumers"))