diff --git a/src/probabilistic/CMakeLists.txt b/src/probabilistic/CMakeLists.txt
index 7d8b7c7803..b845ecc7a2 100644
--- a/src/probabilistic/CMakeLists.txt
+++ b/src/probabilistic/CMakeLists.txt
@@ -9,13 +9,13 @@ include_directories(BEFORE
 set(probabilistic_SRCS
     BitVector.cc
     BloomFilter.cc
+    CardinalityCounter.cc
     CounterVector.cc
     Hasher.cc
-    HyperLogLog.cc
     Topk.cc)
 
 bif_target(bloom-filter.bif)
-bif_target(hyper-loglog.bif)
+bif_target(cardinality-counter.bif)
 bif_target(top-k.bif)
 bro_add_subdir_library(probabilistic ${probabilistic_SRCS})
 
diff --git a/src/probabilistic/HyperLogLog.cc b/src/probabilistic/CardinalityCounter.cc
similarity index 99%
rename from src/probabilistic/HyperLogLog.cc
rename to src/probabilistic/CardinalityCounter.cc
index 888d8273df..5f6b60d0a7 100644
--- a/src/probabilistic/HyperLogLog.cc
+++ b/src/probabilistic/CardinalityCounter.cc
@@ -3,7 +3,8 @@
 #include <math.h>
 #include <stdint.h>
 #include <iostream>
-#include "HyperLogLog.h"
+
+#include "CardinalityCounter.h"
 #include "Reporter.h"
 #include "Serializer.h"
 
diff --git a/src/probabilistic/HyperLogLog.h b/src/probabilistic/CardinalityCounter.h
similarity index 98%
rename from src/probabilistic/HyperLogLog.h
rename to src/probabilistic/CardinalityCounter.h
index b30f8841a4..909de7a153 100644
--- a/src/probabilistic/HyperLogLog.h
+++ b/src/probabilistic/CardinalityCounter.h
@@ -1,7 +1,7 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#ifndef hyperloglog_h
-#define hyperloglog_h
+#ifndef PROBABILISTIC_CARDINALITYCOUNTER_H
+#define PROBABILISTIC_CARDINALITYCOUNTER_H
 
 #include <stdint.h>
 #include <OpaqueVal.h>
diff --git a/src/probabilistic/hyper-loglog.bif b/src/probabilistic/cardinality-counter.bif
similarity index 98%
rename from src/probabilistic/hyper-loglog.bif
rename to src/probabilistic/cardinality-counter.bif
index e23de3957e..28f886ff6c 100644
--- a/src/probabilistic/hyper-loglog.bif
+++ b/src/probabilistic/cardinality-counter.bif
@@ -6,7 +6,7 @@
 
 
 %%{
-#include "probabilistic/HyperLogLog.h"
+#include "probabilistic/CardinalityCounter.h"
 
 using namespace probabilistic;
 %%}