diff --git a/common/rfb/CConnection.cxx b/common/rfb/CConnection.cxx
index 36778f0..692fac4 100644
--- a/common/rfb/CConnection.cxx
+++ b/common/rfb/CConnection.cxx
@@ -21,7 +21,7 @@
 #include <rfb/CMsgReaderV3.h>
 #include <rfb/CMsgWriterV3.h>
 #include <rfb/CSecurity.h>
-#include <rfb/secTypes.h>
+#include <rfb/Security.h>
 #include <rfb/CConnection.h>
 #include <rfb/util.h>
 
diff --git a/common/rfb/CSecurityVncAuth.h b/common/rfb/CSecurityVncAuth.h
index 8d38d87..820222f 100644
--- a/common/rfb/CSecurityVncAuth.h
+++ b/common/rfb/CSecurityVncAuth.h
@@ -19,7 +19,7 @@
 #define __RFB_CSECURITYVNCAUTH_H__
 
 #include <rfb/CSecurity.h>
-#include <rfb/secTypes.h>
+#include <rfb/Security.h>
 
 namespace rfb {
 
diff --git a/common/rfb/Makefile.am b/common/rfb/Makefile.am
index 5421376..93189b9 100644
--- a/common/rfb/Makefile.am
+++ b/common/rfb/Makefile.am
@@ -13,7 +13,7 @@
 	PixelFormat.h PixelFormat.inl Pixel.h RawDecoder.h RawEncoder.h \
 	Rect.h Region.h rreDecode.h RREDecoder.h rreEncode.h RREEncoder.h \
 	ScaledPixelBuffer.h ScaleFilters.h SConnection.h ScreenSet.h \
-	screenTypes.h SDesktop.h secTypes.h ServerCore.h SMsgHandler.h \
+	screenTypes.h SDesktop.h Security.h ServerCore.h SMsgHandler.h \
 	SMsgReader.h SMsgReaderV3.h SMsgWriter.h SMsgWriterV3.h \
 	SSecurityFactoryStandard.h SSecurity.h SSecurityNone.h \
 	SSecurityVncAuth.h Threading.h tightDecode.h TightDecoder.h \
@@ -39,7 +39,7 @@
 	TightEncoder.cxx TightPalette.cxx TransImageGetter.cxx \
 	UpdateTracker.cxx VNCSConnectionST.cxx \
 	VNCServerST.cxx ZRLEEncoder.cxx ZRLEDecoder.cxx encodings.cxx \
-	secTypes.cxx util.cxx
+	Security.cxx util.cxx
 
 librfb_la_CPPFLAGS = -I$(top_srcdir)/common -I$(top_srcdir)/win
 librfb_la_LIBADD =
diff --git a/common/rfb/SConnection.cxx b/common/rfb/SConnection.cxx
index 30def29..83e1599 100644
--- a/common/rfb/SConnection.cxx
+++ b/common/rfb/SConnection.cxx
@@ -18,7 +18,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <rfb/Exception.h>
-#include <rfb/secTypes.h>
+#include <rfb/Security.h>
 #include <rfb/msgTypes.h>
 #include <rfb/CapsList.h>
 #include <rfb/SMsgReaderV3.h>
diff --git a/common/rfb/SSecurityFactoryStandard.cxx b/common/rfb/SSecurityFactoryStandard.cxx
index a072698..01f77bf 100644
--- a/common/rfb/SSecurityFactoryStandard.cxx
+++ b/common/rfb/SSecurityFactoryStandard.cxx
@@ -19,7 +19,7 @@
 // SSecurityFactoryStandard
 //
 
-#include <rfb/secTypes.h>
+#include <rfb/Security.h>
 #include <rfb/SSecurityNone.h>
 #include <rfb/Configuration.h>
 #include <rfb/LogWriter.h>
diff --git a/common/rfb/SSecurityVncAuth.h b/common/rfb/SSecurityVncAuth.h
index 1d0a82d..1f7e6ec 100644
--- a/common/rfb/SSecurityVncAuth.h
+++ b/common/rfb/SSecurityVncAuth.h
@@ -25,7 +25,7 @@
 #define __RFB_SSECURITYVNCAUTH_H__
 
 #include <rfb/SSecurity.h>
-#include <rfb/secTypes.h>
+#include <rfb/Security.h>
 #include <rdr/types.h>
 
 namespace rfb {
diff --git a/common/rfb/secTypes.cxx b/common/rfb/Security.cxx
similarity index 100%
rename from common/rfb/secTypes.cxx
rename to common/rfb/Security.cxx
diff --git a/common/rfb/secTypes.h b/common/rfb/Security.h
similarity index 100%
rename from common/rfb/secTypes.h
rename to common/rfb/Security.h
diff --git a/common/rfb/VNCSConnectionST.cxx b/common/rfb/VNCSConnectionST.cxx
index 0579632..29ce5e5 100644
--- a/common/rfb/VNCSConnectionST.cxx
+++ b/common/rfb/VNCSConnectionST.cxx
@@ -19,7 +19,7 @@
 
 #include <rfb/VNCSConnectionST.h>
 #include <rfb/LogWriter.h>
-#include <rfb/secTypes.h>
+#include <rfb/Security.h>
 #include <rfb/screenTypes.h>
 #include <rfb/ServerCore.h>
 #include <rfb/ComparingUpdateTracker.h>