diff --git a/CMakeLists.txt b/CMakeLists.txt
index 33cacaaed..ae47fb37a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -289,8 +289,8 @@ if (WIN32)
     src/common/sockettcp.c
     src/common/vscpbase64.h
     src/common/vscpbase64.c
-    src/common/vscp_aes.h
-    src/common/vscp_aes.c
+    src/common/vscp-aes.h
+    src/common/vscp-aes.c
     src/common/crc.h
     src/common/crc.c
     src/common/crc8.h
@@ -338,8 +338,8 @@ else()
     src/common/sockettcp.c
     src/common/vscpbase64.h
     src/common/vscpbase64.c
-    src/common/vscp_aes.h
-    src/common/vscp_aes.c
+    src/common/vscp-aes.h
+    src/common/vscp-aes.c
     src/common/crc.h
     src/common/crc.c
     src/common/crc8.h
diff --git a/src/common/com_linux.cpp b/src/common/com-linux.cpp
similarity index 100%
rename from src/common/com_linux.cpp
rename to src/common/com-linux.cpp
diff --git a/src/common/com_linux.h b/src/common/com-linux.h
similarity index 100%
rename from src/common/com_linux.h
rename to src/common/com-linux.h
diff --git a/src/common/com_win32.cpp b/src/common/com-win32.cpp
similarity index 100%
rename from src/common/com_win32.cpp
rename to src/common/com-win32.cpp
diff --git a/src/common/com_win32.h b/src/common/com-win32.h
similarity index 100%
rename from src/common/com_win32.h
rename to src/common/com-win32.h
diff --git a/src/common/vscp_aes.c b/src/common/vscp-aes.c
similarity index 99%
rename from src/common/vscp_aes.c
rename to src/common/vscp-aes.c
index bd2a73912..5d6686699 100644
--- a/src/common/vscp_aes.c
+++ b/src/common/vscp-aes.c
@@ -45,7 +45,7 @@ NOTE:   String length must be evenly divisible by 16byte (str_len % 16 == 0)
 #include <stdio.h>  // file /dev/urandom
 #include <string.h> // CBC mode, for memset
 #include <stdlib.h> // malloc
-#include "vscp_aes.h"
+#include "vscp-aes.h"
 
 /*****************************************************************************/
 /* Defines:                                                                  */
diff --git a/src/common/vscp_aes.h b/src/common/vscp-aes.h
similarity index 100%
rename from src/common/vscp_aes.h
rename to src/common/vscp-aes.h
diff --git a/src/vscp/common/vscphelper.cpp b/src/vscp/common/vscphelper.cpp
index 27a8eb019..639edfa5e 100644
--- a/src/vscp/common/vscphelper.cpp
+++ b/src/vscp/common/vscphelper.cpp
@@ -63,7 +63,7 @@
 #include <canal-macro.h>
 #include <crc.h>
 #include <crc8.h>
-#include <vscp_aes.h>
+#include <vscp-aes.h>
 #include <vscpbase64.h>
 #include <vscpmd5.h>