diff --git a/proxy/Plugin.cc b/proxy/Plugin.cc
index 3094743ef5f..2a604d8bb7a 100644
--- a/proxy/Plugin.cc
+++ b/proxy/Plugin.cc
@@ -34,23 +34,25 @@
 
 #define MAX_PLUGIN_ARGS 64
 
-static PluginDynamicReloadMode plugin_dynamic_reload_mode = REMAP_PLUGIN_DYNAMIC_RELOAD_ON;
+static PluginDynamicReloadMode plugin_dynamic_reload_mode = PluginDynamicReloadMode::RELOAD_ON;
 
 bool
 isPluginDynamicReloadEnabled()
 {
-  return plugin_dynamic_reload_mode == REMAP_PLUGIN_DYNAMIC_RELOAD_ON;
+  return PluginDynamicReloadMode::RELOAD_ON == plugin_dynamic_reload_mode;
 }
 
 void
 parsePluginDynamicReloadConfig()
 {
   int int_plugin_dynamic_reload_mode;
+
   REC_ReadConfigInteger(int_plugin_dynamic_reload_mode, "proxy.config.plugin.dynamic_reload_mode");
-  plugin_dynamic_reload_mode = (PluginDynamicReloadMode)int_plugin_dynamic_reload_mode;
-  if (plugin_dynamic_reload_mode < PLUGIN_DYNAMIC_RELOAD_MODE_MIN || plugin_dynamic_reload_mode > PLUGIN_DYNAMIC_RELOAD_MODE_MAX) {
+  plugin_dynamic_reload_mode = static_cast<PluginDynamicReloadMode>(int_plugin_dynamic_reload_mode);
+
+  if (plugin_dynamic_reload_mode < 0 || plugin_dynamic_reload_mode >= PluginDynamicReloadMode::RELOAD_COUNT) {
     Warning("proxy.config.plugin.dynamic_reload_mode out of range. using default value.");
-    plugin_dynamic_reload_mode = REMAP_PLUGIN_DYNAMIC_RELOAD_ON;
+    plugin_dynamic_reload_mode = PluginDynamicReloadMode::RELOAD_ON;
   }
   Note("Initialized plugin_dynamic_reload_mode: %d", plugin_dynamic_reload_mode);
 }
diff --git a/proxy/Plugin.h b/proxy/Plugin.h
index 8bca36407d5..86691a535f2 100644
--- a/proxy/Plugin.h
+++ b/proxy/Plugin.h
@@ -26,12 +26,7 @@
 #include <string>
 #include "tscore/List.h"
 
-enum PluginDynamicReloadMode {
-  PLUGIN_DYNAMIC_RELOAD_MODE_MIN = 0,
-  PLUGIN_DYNAMIC_RELOAD_OFF      = 0,
-  REMAP_PLUGIN_DYNAMIC_RELOAD_ON = 1,
-  PLUGIN_DYNAMIC_RELOAD_MODE_MAX = 1
-};
+typedef enum { RELOAD_OFF, RELOAD_ON, RELOAD_COUNT } PluginDynamicReloadMode;
 
 // read records.config to parse plugin related configs
 void parsePluginConfig();
diff --git a/proxy/http/remap/unit-tests/plugin_testing_common.cc b/proxy/http/remap/unit-tests/plugin_testing_common.cc
index c2d329546fb..07a44e15f29 100644
--- a/proxy/http/remap/unit-tests/plugin_testing_common.cc
+++ b/proxy/http/remap/unit-tests/plugin_testing_common.cc
@@ -52,22 +52,22 @@ getTemporaryDir()
 }
 
 // implement functions to support unit-testing of option to enable/disable dynamic reload of plugins
-static PluginDynamicReloadMode plugin_dynamic_reload_mode = REMAP_PLUGIN_DYNAMIC_RELOAD_ON;
+static PluginDynamicReloadMode plugin_dynamic_reload_mode = PluginDynamicReloadMode::RELOAD_ON;
 
 bool
 isPluginDynamicReloadEnabled()
 {
-  return plugin_dynamic_reload_mode == REMAP_PLUGIN_DYNAMIC_RELOAD_ON;
+  return PluginDynamicReloadMode::RELOAD_ON == plugin_dynamic_reload_mode;
 }
 
 void
 enablePluginDynamicReload()
 {
-  plugin_dynamic_reload_mode = REMAP_PLUGIN_DYNAMIC_RELOAD_ON;
+  plugin_dynamic_reload_mode = PluginDynamicReloadMode::RELOAD_ON;
 }
 
 void
 disablePluginDynamicReload()
 {
-  plugin_dynamic_reload_mode = PLUGIN_DYNAMIC_RELOAD_OFF;
+  plugin_dynamic_reload_mode = PluginDynamicReloadMode::RELOAD_OFF;
 }