diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1afa5193cc..6620779de8 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -302,7 +302,7 @@ set(bro_SRCS
     Scope.cc
     SerializationFormat.cc
     Sessions.cc
-    StateAccess.cc
+    Notifier.cc
     Stats.cc
     Stmt.cc
     Tag.cc
diff --git a/src/ID.h b/src/ID.h
index 9c9a842c39..ee60d4e61c 100644
--- a/src/ID.h
+++ b/src/ID.h
@@ -5,7 +5,7 @@
 
 #include "Type.h"
 #include "Attr.h"
-#include "StateAccess.h"
+#include "Notifier.h"
 #include "TraverseTypes.h"
 #include <string>
 
diff --git a/src/StateAccess.cc b/src/Notifier.cc
similarity index 98%
rename from src/StateAccess.cc
rename to src/Notifier.cc
index dcf5ef8b21..15bc334af6 100644
--- a/src/StateAccess.cc
+++ b/src/Notifier.cc
@@ -1,7 +1,7 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "StateAccess.h"
 #include "DebugLogger.h"
+#include "Notifier.h"
 
 notifier::Registry notifier::registry;
 
diff --git a/src/StateAccess.h b/src/Notifier.h
similarity index 98%
rename from src/StateAccess.h
rename to src/Notifier.h
index 2361801ec4..0a399e526e 100644
--- a/src/StateAccess.h
+++ b/src/Notifier.h
@@ -5,8 +5,8 @@
 // from notifier::Receiver and register the interesting objects with the
 // notification::Registry.
 
-#ifndef STATEACESSS_H
-#define STATEACESSS_H
+#ifndef NOTIFIER_H
+#define NOTIFIER_H
 
 #include <set>
 #include <unordered_map>
diff --git a/src/Trigger.h b/src/Trigger.h
index 0de5499045..2e0c91865f 100644
--- a/src/Trigger.h
+++ b/src/Trigger.h
@@ -4,7 +4,7 @@
 #include <list>
 #include <map>
 
-#include "StateAccess.h"
+#include "Notifier.h"
 #include "Traverse.h"
 
 // Triggers are the heart of "when" statements: expressions that when
diff --git a/src/Val.h b/src/Val.h
index 8eb33d1f0e..959408da8c 100644
--- a/src/Val.h
+++ b/src/Val.h
@@ -18,7 +18,7 @@
 #include "Timer.h"
 #include "ID.h"
 #include "Scope.h"
-#include "StateAccess.h"
+#include "Notifier.h"
 #include "IPAddr.h"
 #include "DebugLogger.h"