diff --git a/aux/bro-aux b/aux/bro-aux
index ae14da422b..7068100754 160000
--- a/aux/bro-aux
+++ b/aux/bro-aux
@@ -1 +1 @@
-Subproject commit ae14da422bfb252c8a53bd00d3e5fd7da8bc112e
+Subproject commit 70681007546aad6e5648494e882b71adb9165105
diff --git a/aux/broctl b/aux/broctl
index 3e3ada3c2e..2b35d03313 160000
--- a/aux/broctl
+++ b/aux/broctl
@@ -1 +1 @@
-Subproject commit 3e3ada3c2efebeda1278b8897859dd7c7d61e671
+Subproject commit 2b35d0331366865fbf0119919cc9692d55c4538c
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 318a014a19..b635360ac9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -451,7 +451,7 @@ set(bro_SRCS
     plugin/Plugin.cc
 
     analyzer/Analyzer.cc
-    analyzer/BuiltinAnalyzers.cc
+    analyzer/BuiltInAnalyzers.cc
     analyzer/Manager.cc
     analyzer/PluginComponent.cc
     analyzer/Tag.cc
diff --git a/src/RuleAction.h b/src/RuleAction.h
index f4c2ae4cfa..ec7e5c3735 100644
--- a/src/RuleAction.h
+++ b/src/RuleAction.h
@@ -5,7 +5,7 @@
 #include "List.h"
 #include "util.h"
 
-#include "analyzer/tag.h"
+#include "analyzer/Tag.h"
 
 class Rule;
 class RuleEndpointState;
diff --git a/src/analyzer/Analyzer.h b/src/analyzer/Analyzer.h
index db65670ad6..bc20d208b8 100644
--- a/src/analyzer/Analyzer.h
+++ b/src/analyzer/Analyzer.h
@@ -258,10 +258,10 @@ public:
 	void Weird(const char* name, const char* addl = "");
 
 protected:
-	friend class Connection;
 	friend class AnalyzerTimer;
-	friend class TCP_ApplicationAnalyzer;
 	friend class Manager;
+	friend class ::Connection;
+	friend class ::TCP_ApplicationAnalyzer;
 
 	// Associates a connection with this analyzer.  Must be called if
 	// we're using the default ctor.
diff --git a/src/analyzer/BuiltinAnalyzers.cc b/src/analyzer/BuiltInAnalyzers.cc
similarity index 100%
rename from src/analyzer/BuiltinAnalyzers.cc
rename to src/analyzer/BuiltInAnalyzers.cc
diff --git a/src/analyzer/BuiltinAnalyzers.h b/src/analyzer/BuiltInAnalyzers.h
similarity index 100%
rename from src/analyzer/BuiltinAnalyzers.h
rename to src/analyzer/BuiltInAnalyzers.h
diff --git a/src/analyzer/Manager.h b/src/analyzer/Manager.h
index e6143cada6..47a70df716 100644
--- a/src/analyzer/Manager.h
+++ b/src/analyzer/Manager.h
@@ -5,10 +5,10 @@
 
 #include <queue>
 
-#include "Tag.h"
-#include "PluginComponent.h"
-
 #include "Analyzer.h"
+#include "PluginComponent.h"
+#include "Tag.h"
+
 #include "../Dict.h"
 #include "../net_util.h"
 #include "../IP.h"
@@ -112,7 +112,7 @@ public:
 	// as a wildcard for orig.  (Cookie is currently unused. Eventually,
 	// we may pass it on to the analyzer).
 	void ExpectConnection(const IPAddr& orig, const IPAddr& resp, uint16 resp_p,
-				TransportProto proto, Tag::Tag analyzer,
+				TransportProto proto, Tag analyzer,
 				double timeout, void* cookie);
 
 	void ExpectConnection(const IPAddr& orig, const IPAddr& resp, uint16 resp_p,
diff --git a/src/main.cc b/src/main.cc
index 08756c1bf3..8bfc9300c4 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -56,8 +56,9 @@ extern "C" void OPENSSL_add_all_algorithms_conf(void);
 #include "input/Manager.h"
 #include "logging/Manager.h"
 #include "logging/writers/Ascii.h"
-#include "analyzer/BuiltinAnalyzers.h"
+#include "analyzer/BuiltInAnalyzers.h"
 #include "analyzer/Manager.h"
+#include "analyzer/Tag.h"
 #include "plugin/Manager.h"
 
 #include "binpac_bro.h"
diff --git a/src/scan.l b/src/scan.l
index 6a649fb93b..faa831ea93 100644
--- a/src/scan.l
+++ b/src/scan.l
@@ -26,7 +26,7 @@
 #include "RE.h"
 #include "Net.h"
 
-#include "analyzer/analyzer.h"
+#include "analyzer/Analyzer.h"
 
 extern YYLTYPE yylloc;	// holds start line and column of token
 extern int print_loaded_scripts;