diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8a417fb3..3eda105e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,7 +24,7 @@ option(WITH_NVML            "Enable NVML (NVIDIA Management Library) support (on
 option(WITH_ADL             "Enable ADL (AMD Display Library) or sysfs support (only if OpenCL backend enabled)" ON)
 option(WITH_STRICT_CACHE    "Enable strict checks for OpenCL cache" ON)
 option(WITH_INTERLEAVE_DEBUG_LOG "Enable debug log for threads interleave" OFF)
-option(WITH_BENCHMARK       "Enable Benchmark module and algo-perf feature (for MoneroOcean)" ON)
+option(WITH_MO_BENCHMARK    "Enable Benchmark module and algo-perf feature (for MoneroOcean)" ON)
 option(WITH_PROFILING       "Enable profiling for developers" OFF)
 option(WITH_SSE4_1          "Enable SSE 4.1 for Blake2" ON)
 option(WITH_BENCHMARK       "Enable builtin RandomX benchmark and stress test" ON)
@@ -124,11 +124,11 @@ set(SOURCES_CRYPTO
     src/crypto/common/VirtualMemory.cpp
    )
 
-if (WITH_BENCHMARK)
+if (WITH_MO_BENCHMARK)
     list(APPEND SOURCES
         src/core/MoBenchmark.cpp
         )
-    add_definitions(/DXMRIG_FEATURE_BENCHMARK)
+    add_definitions(/DXMRIG_FEATURE_MO_BENCHMARK)
 endif()
 
 if (WITH_HWLOC)
diff --git a/src/App.cpp b/src/App.cpp
index 46a0f1b5..41cef0aa 100644
--- a/src/App.cpp
+++ b/src/App.cpp
@@ -89,7 +89,7 @@ int xmrig::App::exec()
         return 0;
     }
 
-#   ifdef XMRIG_FEATURE_BENCHMARK
+#   ifdef XMRIG_FEATURE_MO_BENCHMARK
     m_controller->pre_start();
     m_controller->config()->benchmark().set_controller(m_controller);
 
diff --git a/src/backend/common/Tags.h b/src/backend/common/Tags.h
index 03cee729..b7789179 100644
--- a/src/backend/common/Tags.h
+++ b/src/backend/common/Tags.h
@@ -46,7 +46,7 @@ const char *ocl_tag();
 const char *cuda_tag();
 #endif
 
-#ifdef XMRIG_FEATURE_BENCHMARK
+#ifdef XMRIG_FEATURE_MO_BENCHMARK
 const char *bm_tag();
 #endif
 
diff --git a/src/base/io/log/Tags.cpp b/src/base/io/log/Tags.cpp
index 42a0b4db..3854ee5b 100644
--- a/src/base/io/log/Tags.cpp
+++ b/src/base/io/log/Tags.cpp
@@ -113,7 +113,7 @@ const char *xmrig::Tags::opencl()
 #endif
 
 
-#ifdef XMRIG_FEATURE_BENCHMARK
+#ifdef XMRIG_FEATURE_MO_BENCHMARK
 const char *xmrig::Tags::benchmark()
 {
     static const char *tag = BRIGHT_BLACK_BG(CYAN_BOLD_S " benchmk ");
diff --git a/src/base/io/log/Tags.h b/src/base/io/log/Tags.h
index 980f7f37..0238f4de 100644
--- a/src/base/io/log/Tags.h
+++ b/src/base/io/log/Tags.h
@@ -57,7 +57,7 @@ public:
     static const char *opencl();
 #   endif
 
-#   ifdef XMRIG_FEATURE_BENCHMARK
+#   ifdef XMRIG_FEATURE_MO_BENCHMARK
     static const char *benchmark();
 #   endif
 
diff --git a/src/base/kernel/config/BaseConfig.cpp b/src/base/kernel/config/BaseConfig.cpp
index cb0e4f90..db74aed1 100644
--- a/src/base/kernel/config/BaseConfig.cpp
+++ b/src/base/kernel/config/BaseConfig.cpp
@@ -52,7 +52,7 @@
 namespace xmrig {
 
 
-#ifdef XMRIG_FEATURE_BENCHMARK
+#ifdef XMRIG_FEATURE_MO_BENCHMARK
 const char *BaseConfig::kAlgoPerf       = "algo-perf";
 #endif
 const char *BaseConfig::kApi            = "api";
@@ -60,7 +60,7 @@ const char *BaseConfig::kApiId          = "id";
 const char *BaseConfig::kApiWorkerId    = "worker-id";
 const char *BaseConfig::kAutosave       = "autosave";
 const char *BaseConfig::kBackground     = "background";
-#ifdef XMRIG_FEATURE_BENCHMARK
+#ifdef XMRIG_FEATURE_MO_BENCHMARK
 const char *BaseConfig::kBenchAlgoTime  = "bench-algo-time";
 #endif
 const char *BaseConfig::kColors         = "colors";
@@ -69,16 +69,13 @@ const char *BaseConfig::kHttp           = "http";
 const char *BaseConfig::kLogFile        = "log-file";
 const char *BaseConfig::kPauseOnBattery = "pause-on-battery";
 const char *BaseConfig::kPrintTime      = "print-time";
-#ifdef XMRIG_FEATURE_BENCHMARK
+#ifdef XMRIG_FEATURE_MO_BENCHMARK
 const char *BaseConfig::kRebenchAlgo    = "rebench-algo";
 #endif
 const char *BaseConfig::kSyslog         = "syslog";
 const char *BaseConfig::kTitle          = "title";
 const char *BaseConfig::kUserAgent      = "user-agent";
 const char *BaseConfig::kVerbose        = "verbose";
-#ifdef XMRIG_FEATURE_BENCHMARK
-const char *BaseConfig::kVersion        = "version";
-#endif
 const char *BaseConfig::kWatch          = "watch";
 
 
@@ -101,7 +98,7 @@ bool xmrig::BaseConfig::read(const IJsonReader &reader, const char *fileName)
     m_autoSave          = reader.getBool(kAutosave, m_autoSave);
     m_background        = reader.getBool(kBackground, m_background);
     m_dryRun            = reader.getBool(kDryRun, m_dryRun);
-#   ifdef XMRIG_FEATURE_BENCHMARK
+#   ifdef XMRIG_FEATURE_MO_BENCHMARK
     m_rebenchAlgo  = reader.getBool(kRebenchAlgo, m_rebenchAlgo);
 #   endif
     m_syslog            = reader.getBool(kSyslog, m_syslog);
@@ -117,8 +114,7 @@ bool xmrig::BaseConfig::read(const IJsonReader &reader, const char *fileName)
 #   endif
 
     Log::setColors(reader.getBool(kColors, Log::isColors()));
-#   ifdef XMRIG_FEATURE_BENCHMARK
-    m_version       = reader.getUint(kVersion);
+#   ifdef XMRIG_FEATURE_MO_BENCHMARK
     m_benchAlgoTime = reader.getInt(kBenchAlgoTime, m_benchAlgoTime);
 #   endif
     setVerbose(reader.getValue(kVerbose));
diff --git a/src/base/kernel/config/BaseConfig.h b/src/base/kernel/config/BaseConfig.h
index 3db08000..1bd86a82 100644
--- a/src/base/kernel/config/BaseConfig.h
+++ b/src/base/kernel/config/BaseConfig.h
@@ -46,7 +46,7 @@ class IJsonReader;
 class BaseConfig : public IConfig
 {
 public:
-#   ifdef XMRIG_FEATURE_BENCHMARK
+#   ifdef XMRIG_FEATURE_MO_BENCHMARK
     static const char *kAlgoPerf;
 #   endif
     static const char *kApi;
@@ -54,7 +54,7 @@ public:
     static const char *kApiWorkerId;
     static const char *kAutosave;
     static const char *kBackground;
-#   ifdef XMRIG_FEATURE_BENCHMARK
+#   ifdef XMRIG_FEATURE_MO_BENCHMARK
     static const char *kBenchAlgoTime;
 #   endif
     static const char *kColors;
@@ -63,16 +63,13 @@ public:
     static const char *kLogFile;
     static const char *kPauseOnBattery;
     static const char *kPrintTime;
-#   ifdef XMRIG_FEATURE_BENCHMARK
+#   ifdef XMRIG_FEATURE_MO_BENCHMARK
     static const char *kRebenchAlgo;
 #   endif
     static const char *kSyslog;
     static const char *kTitle;
     static const char *kUserAgent;
     static const char *kVerbose;
-#   ifdef XMRIG_FEATURE_BENCHMARK
-    static const char *kVersion;
-#   endif
     static const char *kWatch;
 
 #   ifdef XMRIG_FEATURE_TLS
@@ -95,7 +92,7 @@ public:
     inline const Title &title() const                       { return m_title; }
     inline uint32_t printTime() const                       { return m_printTime; }
 
-#   ifdef XMRIG_FEATURE_BENCHMARK
+#   ifdef XMRIG_FEATURE_MO_BENCHMARK
     inline bool isRebenchAlgo() const                       { return m_rebenchAlgo; }
     inline int  benchAlgoTime() const                       { return m_benchAlgoTime; }
 #   endif
@@ -131,8 +128,7 @@ protected:
     Title m_title;
     uint32_t m_printTime = 60;
 
-#   ifdef XMRIG_FEATURE_BENCHMARK
-    uint32_t m_version   = 0;
+#   ifdef XMRIG_FEATURE_MO_BENCHMARK
     bool m_rebenchAlgo   = false;
     int  m_benchAlgoTime = 10;
 #   endif
diff --git a/src/base/kernel/config/BaseTransform.cpp b/src/base/kernel/config/BaseTransform.cpp
index 8bf3c1f8..c8ca9e7d 100644
--- a/src/base/kernel/config/BaseTransform.cpp
+++ b/src/base/kernel/config/BaseTransform.cpp
@@ -253,7 +253,7 @@ void xmrig::BaseTransform::transform(rapidjson::Document &doc, int key, const ch
 #   ifdef XMRIG_FEATURE_HTTP
     case IConfig::DaemonPollKey:  /* --daemon-poll-interval */
 #   endif
-#   ifdef XMRIG_FEATURE_BENCHMARK
+#   ifdef XMRIG_FEATURE_MO_BENCHMARK
     case IConfig::BenchAlgoTimeKey: /* --bench-algo-time */
 #   endif
         return transformUint64(doc, key, static_cast<uint64_t>(strtol(arg, nullptr, 10)));
@@ -271,7 +271,7 @@ void xmrig::BaseTransform::transform(rapidjson::Document &doc, int key, const ch
     case IConfig::DaemonKey:      /* --daemon */
 #   endif
     case IConfig::VerboseKey:     /* --verbose */
-#   ifdef XMRIG_FEATURE_BENCHMARK
+#   ifdef XMRIG_FEATURE_MO_BENCHMARK
     case IConfig::RebenchAlgoKey: /* --rebench-algo */
 #   endif
     case IConfig::PauseOnBatteryKey: /* --pause-on-battery */
@@ -333,7 +333,7 @@ void xmrig::BaseTransform::transformBoolean(rapidjson::Document &doc, int key, b
     case IConfig::NoTitleKey: /* --no-title */
         return set(doc, BaseConfig::kTitle, enable);
 
-#   ifdef XMRIG_FEATURE_BENCHMARK
+#   ifdef XMRIG_FEATURE_MO_BENCHMARK
     case IConfig::RebenchAlgoKey: /* --rebench-algo */
         return set(doc, BaseConfig::kRebenchAlgo, enable);
 #   endif
@@ -374,7 +374,7 @@ void xmrig::BaseTransform::transformUint64(rapidjson::Document &doc, int key, ui
         return add(doc, Pools::kPools, Pool::kDaemonPollInterval, arg);
 #   endif
 
-#   ifdef XMRIG_FEATURE_BENCHMARK
+#   ifdef XMRIG_FEATURE_MO_BENCHMARK
     case IConfig::BenchAlgoTimeKey: /* --bench-algo-time */
         return set(doc, BaseConfig::kBenchAlgoTime, arg);
 #   endif
diff --git a/src/base/kernel/interfaces/IConfig.h b/src/base/kernel/interfaces/IConfig.h
index b17603c3..cd101ea2 100644
--- a/src/base/kernel/interfaces/IConfig.h
+++ b/src/base/kernel/interfaces/IConfig.h
@@ -85,7 +85,7 @@ public:
         NicehashKey          = 1006,
         PrintTimeKey         = 1007,
 
-#       ifdef XMRIG_FEATURE_BENCHMARK
+#       ifdef XMRIG_FEATURE_MO_BENCHMARK
         RebenchAlgoKey       = 10001,
         BenchAlgoTimeKey     = 10002,
 #       endif
diff --git a/src/core/Controller.cpp b/src/core/Controller.cpp
index c1f28f80..475c3eb2 100644
--- a/src/core/Controller.cpp
+++ b/src/core/Controller.cpp
@@ -59,7 +59,7 @@ int xmrig::Controller::init()
     return 0;
 }
 
-#ifdef XMRIG_FEATURE_BENCHMARK
+#ifdef XMRIG_FEATURE_MO_BENCHMARK
 void xmrig::Controller::pre_start()
 {
     m_miner = new Miner(this);
diff --git a/src/core/Controller.h b/src/core/Controller.h
index 9fe34116..5c53af04 100644
--- a/src/core/Controller.h
+++ b/src/core/Controller.h
@@ -47,7 +47,7 @@ public:
     ~Controller() override;
 
     int init() override;
-#   ifdef XMRIG_FEATURE_BENCHMARK
+#   ifdef XMRIG_FEATURE_MO_BENCHMARK
     void pre_start();
 #   endif
     void start() override;
diff --git a/src/net/Network.cpp b/src/net/Network.cpp
index 714a7118..7bbc9f1d 100644
--- a/src/net/Network.cpp
+++ b/src/net/Network.cpp
@@ -210,7 +210,7 @@ void xmrig::Network::onLogin(IStrategy *, IClient *client, rapidjson::Document &
 
     params.AddMember("algo", algo, allocator);
 
-#   ifdef XMRIG_FEATURE_BENCHMARK
+#   ifdef XMRIG_FEATURE_MO_BENCHMARK
     Value algo_perf(kObjectType);
 
     for (const auto &a : algorithms) {