diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a755fde64e..503bd0298e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -394,7 +394,7 @@ set(bro_SRCS
     Timer.cc
     Traverse.cc
     Trigger.cc
-    TunnelHandler.cc
+    Tunnels.cc
     Type.cc
     UDP.cc
     Val.cc
diff --git a/src/Conn.cc b/src/Conn.cc
index 80c026e781..55cfb3b3cb 100644
--- a/src/Conn.cc
+++ b/src/Conn.cc
@@ -13,7 +13,7 @@
 #include "Timer.h"
 #include "PIA.h"
 #include "binpac.h"
-#include "TunnelHandler.h"
+#include "Tunnels.h"
 
 void ConnectionTimer::Init(Connection* arg_conn, timer_func arg_timer,
 				int arg_do_expire)
diff --git a/src/Conn.h b/src/Conn.h
index 9cdb746b7c..67300601ce 100644
--- a/src/Conn.h
+++ b/src/Conn.h
@@ -13,7 +13,7 @@
 #include "RuleMatcher.h"
 #include "AnalyzerTags.h"
 #include "IPAddr.h"
-#include "TunnelHandler.h"
+#include "Tunnels.h"
 
 class Connection;
 class ConnectionTimer;
diff --git a/src/Sessions.cc b/src/Sessions.cc
index 769bd68f52..326306c2fd 100644
--- a/src/Sessions.cc
+++ b/src/Sessions.cc
@@ -30,7 +30,7 @@
 #include "DPM.h"
 
 #include "PacketSort.h"
-#include "TunnelHandler.h"
+#include "Tunnels.h"
 
 // These represent NetBIOS services on ephemeral ports.  They're numbered
 // so that we can use a single int to hold either an actual TCP/UDP server
diff --git a/src/TunnelHandler.cc b/src/Tunnels.cc
similarity index 97%
rename from src/TunnelHandler.cc
rename to src/Tunnels.cc
index 4923b36f3d..950e94628e 100644
--- a/src/TunnelHandler.cc
+++ b/src/Tunnels.cc
@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "TunnelHandler.h"
+#include "Tunnels.h"
 
 RecordVal* EncapsulatingConn::GetRecordVal() const
 	{
diff --git a/src/TunnelHandler.h b/src/Tunnels.h
similarity index 98%
rename from src/TunnelHandler.h
rename to src/Tunnels.h
index 21e491cdc9..d4dfee8f97 100644
--- a/src/TunnelHandler.h
+++ b/src/Tunnels.h
@@ -1,7 +1,7 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#ifndef tunnelhandler_h
-#define tunnelhandler_h
+#ifndef TUNNELS_H
+#define TUNNELS_H
 
 #include "config.h"
 #include "NetVar.h"