diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3b216c556..60d9238cf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -65,7 +65,7 @@ if(NOT DEFINED BUILD_SHARED_LIBS)
 endif()
 
 if(NOT BUILD_SHARED_LIBS AND WITH_MONOLITHIC_BUILD)
-	set(WITH_STATIC_PLUGINS ON)
+	set(STATIC_CHANNELS ON)
 endif()
 
 # Configure MSVC Runtime
diff --git a/channels/disk/client/CMakeLists.txt b/channels/disk/client/CMakeLists.txt
index 7ba321f94..eabcf0014 100644
--- a/channels/disk/client/CMakeLists.txt
+++ b/channels/disk/client/CMakeLists.txt
@@ -30,11 +30,11 @@ if(WIN32)
 		dirent.h)
 endif()
 
-if(MSVC AND (NOT WITH_STATIC_PLUGINS))
+if(MSVC AND (NOT STATIC_CHANNELS))
 	set(${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS} module.def)
 endif()
 
-if(NOT WITH_STATIC_PLUGINS)
+if(NOT STATIC_CHANNELS)
 	add_library(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
 else()
 	set(${MODULE_PREFIX}_STATIC ON PARENT_SCOPE)
diff --git a/channels/disk/client/disk_main.c b/channels/disk/client/disk_main.c
index 088652f4f..fee279fa9 100644
--- a/channels/disk/client/disk_main.c
+++ b/channels/disk/client/disk_main.c
@@ -693,7 +693,7 @@ void disk_register_disk_path(PDEVICE_SERVICE_ENTRY_POINTS pEntryPoints, char* na
 	}
 }
 
-#ifdef WITH_STATIC_PLUGINS
+#ifdef STATIC_CHANNELS
 #define DeviceServiceEntry	disk_DeviceServiceEntry
 #endif
 
diff --git a/channels/printer/client/printer_main.c b/channels/printer/client/printer_main.c
index 7686db182..275c5c7a3 100644
--- a/channels/printer/client/printer_main.c
+++ b/channels/printer/client/printer_main.c
@@ -300,7 +300,7 @@ void printer_register(PDEVICE_SERVICE_ENTRY_POINTS pEntryPoints, rdpPrinter* pri
 	freerdp_thread_start(printer_dev->thread, printer_thread_func, printer_dev);
 }
 
-#ifdef WITH_STATIC_PLUGINS
+#ifdef STATIC_CHANNELS
 int printer_entry(PDEVICE_SERVICE_ENTRY_POINTS pEntryPoints)
 #else
 int DeviceServiceEntry(PDEVICE_SERVICE_ENTRY_POINTS pEntryPoints)
diff --git a/client/Windows/CMakeLists.txt b/client/Windows/CMakeLists.txt
index ae8f5b298..853c76169 100644
--- a/client/Windows/CMakeLists.txt
+++ b/client/Windows/CMakeLists.txt
@@ -39,7 +39,7 @@ add_executable(${MODULE_NAME} WIN32 ${${MODULE_PREFIX}_SRCS})
 if(WITH_MONOLITHIC_BUILD)
 	set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} freerdp)
 
-	if(WITH_RDPDR AND WITH_STATIC_PLUGINS)
+	if(WITH_RDPDR AND STATIC_CHANNELS)
 		set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} rdpdr disk printer)
 	endif()
 else()
diff --git a/config.h.in b/config.h.in
index d9c4d367a..2803b468b 100644
--- a/config.h.in
+++ b/config.h.in
@@ -37,7 +37,7 @@
 #cmakedefine WITH_WIN8
 
 /* Plugins */
-#cmakedefine WITH_STATIC_PLUGINS
+#cmakedefine STATIC_CHANNELS
 #cmakedefine WITH_RDPDR
 
 
diff --git a/include/freerdp/utils/svc_plugin.h b/include/freerdp/utils/svc_plugin.h
index 7c2a06131..185da84b8 100644
--- a/include/freerdp/utils/svc_plugin.h
+++ b/include/freerdp/utils/svc_plugin.h
@@ -60,7 +60,7 @@ FREERDP_API int svc_plugin_send_event(rdpSvcPlugin* plugin, RDP_EVENT* event);
 #define DEBUG_SVC(fmt, ...) DEBUG_NULL(fmt, ## __VA_ARGS__)
 #endif
 
-#ifdef WITH_STATIC_PLUGINS
+#ifdef STATIC_CHANNELS
 #define DEFINE_SVC_PLUGIN_ENTRY(_prefix) int _prefix##_entry(PCHANNEL_ENTRY_POINTS pEntryPoints)
 #define DEFINE_DEV_PLUGIN_ENTRY(_prefix) int _prefix##_entry(PCHANNEL_ENTRY_POINTS pEntryPoints)
 #define REGISTER_SVC_PLUGIN_ENTRY(_prefix)  freerdp_register_static_plugin(#_prefix, "VirtualChannelEntry", _prefix##_entry) 
diff --git a/libfreerdp/channels/CMakeLists.txt b/libfreerdp/channels/CMakeLists.txt
index 29c5af9b9..c68b0d171 100644
--- a/libfreerdp/channels/CMakeLists.txt
+++ b/libfreerdp/channels/CMakeLists.txt
@@ -32,7 +32,7 @@ endif()
 
 set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION_FULL} SOVERSION ${FREERDP_VERSION} PREFIX "lib")
 
-if(WITH_STATIC_PLUGINS)
+if(STATIC_CHANNELS)
 	set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} freerdp-channels-client)
 endif()