diff --git a/CMakeLists.txt b/CMakeLists.txt
index e2fc3a227..9f199135f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -188,7 +188,7 @@ include_directories(server/modules/include)
 include_directories(${CMAKE_BINARY_DIR}/include)
 include_directories(${CURL_INCLUDE_DIRS})
 
-if (BUILD_AVRO)
+if (BUILD_CDC)
   include_directories(avro)
   add_subdirectory(avro)
 endif()
diff --git a/Documentation/Routers/Avrorouter.md b/Documentation/Routers/Avrorouter.md
index 24174e356..f41dc7216 100644
--- a/Documentation/Routers/Avrorouter.md
+++ b/Documentation/Routers/Avrorouter.md
@@ -257,7 +257,7 @@ For more information on how to use these scripts, see the output of `cdc.py -h`
 
 To build the avrorouter from source, you will need the [Avro C](https://avro.apache.org/docs/current/api/c/)
 library, liblzma, [the Jansson library](http://www.digip.org/jansson/) and sqlite3 development headers. When
-configuring MaxScale with CMake, you will need to add `-DBUILD_AVRO=Y
+configuring MaxScale with CMake, you will need to add `-DBUILD_CDC=Y
 -DBUILD_CDC=Y` to build the avrorouter and the CDC protocol module.
 
 For more details about building MaxScale from source, please refer to the
diff --git a/cmake/defaults.cmake b/cmake/defaults.cmake
index 907bd099a..5bb62fa3f 100644
--- a/cmake/defaults.cmake
+++ b/cmake/defaults.cmake
@@ -22,7 +22,7 @@ set(BUILD_RABBITMQ TRUE CACHE BOOL "Build RabbitMQ components")
 set(BUILD_BINLOG TRUE CACHE BOOL "Build binlog router")
 
 # Build the Avro router
-set(BUILD_AVRO TRUE CACHE BOOL "Build Avro router")
+set(BUILD_CDC TRUE CACHE BOOL "Build Avro router")
 
 # Build the multimaster monitor
 set(BUILD_MMMON TRUE CACHE BOOL "Build multimaster monitor")
diff --git a/server/modules/authenticator/CDCPlainAuth/CMakeLists.txt b/server/modules/authenticator/CDCPlainAuth/CMakeLists.txt
index af8e187cf..f729f9979 100644
--- a/server/modules/authenticator/CDCPlainAuth/CMakeLists.txt
+++ b/server/modules/authenticator/CDCPlainAuth/CMakeLists.txt
@@ -1,6 +1,4 @@
-if(BUILD_CDC)
-  add_library(CDCPlainAuth SHARED cdc_plain_auth.c)
-  target_link_libraries(CDCPlainAuth maxscale-common)
-  set_target_properties(CDCPlainAuth PROPERTIES VERSION "1.0.0")
-  install_module(CDCPlainAuth core)
-endif()
+add_library(CDCPlainAuth SHARED cdc_plain_auth.c)
+target_link_libraries(CDCPlainAuth maxscale-common)
+set_target_properties(CDCPlainAuth PROPERTIES VERSION "1.0.0")
+install_module(CDCPlainAuth core)
diff --git a/server/modules/authenticator/CMakeLists.txt b/server/modules/authenticator/CMakeLists.txt
index f18e73a0d..26e6f8ec1 100644
--- a/server/modules/authenticator/CMakeLists.txt
+++ b/server/modules/authenticator/CMakeLists.txt
@@ -1,4 +1,7 @@
-add_subdirectory(CDCPlainAuth)
+if(BUILD_CDC)
+  add_subdirectory(CDCPlainAuth)
+endif()
+
 add_subdirectory(GSSAPI)
 add_subdirectory(HTTPAuth)
 add_subdirectory(MaxAdminAuth)
@@ -7,10 +10,3 @@ add_subdirectory(MySQLBackendAuth)
 add_subdirectory(NullAuthAllow)
 add_subdirectory(NullAuthDeny)
 
-# if(BUILD_TESTS)
-#   add_library(testprotocol SHARED testprotocol.c)
-#   set_target_properties(testprotocol PROPERTIES VERSION "1.0.0")
-#   target_link_libraries(testprotocol maxscale-common)
-#   install_module(testprotocol core)
-# endif()
-
diff --git a/server/modules/protocol/CMakeLists.txt b/server/modules/protocol/CMakeLists.txt
index 3972c1509..49a2610f8 100644
--- a/server/modules/protocol/CMakeLists.txt
+++ b/server/modules/protocol/CMakeLists.txt
@@ -1,4 +1,4 @@
-if(BUILD_AVRO)
+if(BUILD_CDC)
   add_subdirectory(CDC)
   add_subdirectory(examples)
 endif()
diff --git a/server/modules/routing/CMakeLists.txt b/server/modules/routing/CMakeLists.txt
index 5f989da22..74d00e3ee 100644
--- a/server/modules/routing/CMakeLists.txt
+++ b/server/modules/routing/CMakeLists.txt
@@ -1,4 +1,4 @@
-if(BUILD_AVRO)
+if(BUILD_CDC)
   add_subdirectory(avrorouter)
 endif()
 if(BUILD_BINLOG)