diff --git a/CMakeLists.txt b/CMakeLists.txt
index 649edfae..17efd25b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -91,7 +91,7 @@ set(SYSTEM_UDNS OFF)
 endif()
 
 option(SIMGEAR_HEADLESS "Set to ON to build SimGear without GUI/graphics support" OFF)
-option(ENABLE_DDS       "Set to ON to build FlightGear with DDS support" ON)
+option(ENABLE_CYCLONE   "Set to ON to build SimGear with Cyclone Data Distribution Service support" ON)
 option(ENABLE_RTI       "Set to ON to build SimGear with RTI support" OFF)
 option(ENABLE_GDAL      "Set to ON to build SimGear with GDAL support" OFF)
 option(ENABLE_TESTS     "Set to OFF to disable building SimGear's test applications" ON)
@@ -210,14 +210,16 @@ else()
     message(STATUS "RTI: DISABLED")
 endif(ENABLE_RTI)
 
-if(ENABLE_DDS)
+if(ENABLE_CYCLONE)
     if (NOT TARGET CycloneDDS::ddsc)
         find_package(CycloneDDS QUIET)
     endif()
     if (CycloneDDS_FOUND)
-        message(STATUS "DDS: ENABLED")
+        message(STATUS "Data Distribution Service support: CycloneDDS")
+    else(CycloneDDS_FOUND)
+        message(STATUS "Data Distribution Service support: DISBLED")
     endif(CycloneDDS_FOUND)
-endif(ENABLE_DDS)
+endif(ENABLE_CYCLONE)
 
 if(ENABLE_GDAL)
     find_package(GDAL 2.0.0 REQUIRED)
diff --git a/simgear/io/CMakeLists.txt b/simgear/io/CMakeLists.txt
index 111a8cac..54fdb963 100644
--- a/simgear/io/CMakeLists.txt
+++ b/simgear/io/CMakeLists.txt
@@ -48,10 +48,10 @@ set(SOURCES
 
 if (CycloneDDS_FOUND)
     set(HEADERS ${HEADERS}
-        sg_dds.hxx
+        SGDataDistributionService.hxx
         )
     set(SOURCES ${SOURCES}
-        sg_dds.cxx
+        SGDataDistributionService.cxx
         )
 endif (CycloneDDS_FOUND)
 
diff --git a/simgear/io/sg_dds.cxx b/simgear/io/SGDataDistributionService.cxx
similarity index 97%
rename from simgear/io/sg_dds.cxx
rename to simgear/io/SGDataDistributionService.cxx
index bc978431..2cb88e21 100644
--- a/simgear/io/sg_dds.cxx
+++ b/simgear/io/SGDataDistributionService.cxx
@@ -1,4 +1,4 @@
-// sg_dds.cxx -- Data Distribution Service (DDS) I/O routines
+// SGDataDistributionService.cxx -- Data Distribution Service (DDS) I/O routines
 //
 // Written by Erik Hofman, started March 2021.
 //
@@ -28,7 +28,7 @@
 
 #include <simgear/debug/logstream.hxx>
 
-#include "sg_dds.hxx"
+#include "SGDataDistributionService.hxx"
 
 
 #define FG_DDS_DOMAIN		DDS_DOMAIN_DEFAULT
diff --git a/simgear/io/sg_dds.hxx b/simgear/io/SGDataDistributionService.hxx
similarity index 98%
rename from simgear/io/sg_dds.hxx
rename to simgear/io/SGDataDistributionService.hxx
index c0fd024e..30b80cea 100644
--- a/simgear/io/sg_dds.hxx
+++ b/simgear/io/SGDataDistributionService.hxx
@@ -1,5 +1,5 @@
 /**
- * \file sg_dds.hxx
+ * \file SGDataDistributionService.hxx
  * Data Distribution Service (DDS) I/O routines
  */