diff --git a/R/src/Makevars b/R/src/Makevars
index 752472caf..a2763eb56 100644
--- a/R/src/Makevars
+++ b/R/src/Makevars
@@ -39,7 +39,7 @@ OBJECTS = \
    $(NATIVEDIR)/RandomStream.o \
    $(NATIVEDIR)/sampling.o \
    $(NATIVEDIR)/SamplingSet.o \
-   $(NATIVEDIR)/SegmentedTensor.o \
+   $(NATIVEDIR)/CompressibleTensor.o \
    $(NATIVEDIR)/SumHistogramBuckets.o \
    $(NATIVEDIR)/TensorTotalsBuild.o \
    $(NATIVEDIR)/common_c/common_c.o \
diff --git a/R/src/Makevars.interpret b/R/src/Makevars.interpret
index 986c104fa..0a0a7b1bb 100644
--- a/R/src/Makevars.interpret
+++ b/R/src/Makevars.interpret
@@ -39,7 +39,7 @@ OBJECTS = \
    $(NATIVEDIR)/RandomStream.o \
    $(NATIVEDIR)/sampling.o \
    $(NATIVEDIR)/SamplingSet.o \
-   $(NATIVEDIR)/SegmentedTensor.o \
+   $(NATIVEDIR)/CompressibleTensor.o \
    $(NATIVEDIR)/SumHistogramBuckets.o \
    $(NATIVEDIR)/TensorTotalsBuild.o \
    $(NATIVEDIR)/common_c/common_c.o \
diff --git a/shared/ebm_native/BoosterCore.cpp b/shared/ebm_native/BoosterCore.cpp
index f74ba89c0..8944363bd 100644
--- a/shared/ebm_native/BoosterCore.cpp
+++ b/shared/ebm_native/BoosterCore.cpp
@@ -19,7 +19,7 @@
 #include "compute_accessors.hpp"
 
 #include "RandomStream.hpp"
-#include "SegmentedTensor.hpp"
+#include "CompressibleTensor.hpp"
 #include "ebm_stats.hpp"
 // feature includes
 #include "Feature.hpp"
diff --git a/shared/ebm_native/BoosterCore.hpp b/shared/ebm_native/BoosterCore.hpp
index 47029c3b1..1a38a1691 100644
--- a/shared/ebm_native/BoosterCore.hpp
+++ b/shared/ebm_native/BoosterCore.hpp
@@ -17,7 +17,7 @@
 #include "ebm_internal.hpp"
 
 #include "RandomStream.hpp"
-#include "SegmentedTensor.hpp"
+#include "CompressibleTensor.hpp"
 // feature includes
 #include "Feature.hpp"
 // FeatureGroup.h depends on FeatureInternal.h
diff --git a/shared/ebm_native/BoosterShell.cpp b/shared/ebm_native/BoosterShell.cpp
index 370965e73..417c5cabd 100644
--- a/shared/ebm_native/BoosterShell.cpp
+++ b/shared/ebm_native/BoosterShell.cpp
@@ -13,7 +13,7 @@
 
 #include "ebm_internal.hpp"
 
-#include "SegmentedTensor.hpp"
+#include "CompressibleTensor.hpp"
 
 #include "HistogramTargetEntry.hpp"
 
diff --git a/shared/ebm_native/CompressibleTensor.cpp b/shared/ebm_native/CompressibleTensor.cpp
index d15b0f4b1..cd51b79eb 100644
--- a/shared/ebm_native/CompressibleTensor.cpp
+++ b/shared/ebm_native/CompressibleTensor.cpp
@@ -15,7 +15,7 @@
 
 #include "ebm_internal.hpp"
 
-#include "SegmentedTensor.hpp"
+#include "CompressibleTensor.hpp"
 
 namespace DEFINED_ZONE_NAME {
 #ifndef DEFINED_ZONE_NAME
diff --git a/shared/ebm_native/CompressibleTensor.hpp b/shared/ebm_native/CompressibleTensor.hpp
index 4d18c024a..d06aeadea 100644
--- a/shared/ebm_native/CompressibleTensor.hpp
+++ b/shared/ebm_native/CompressibleTensor.hpp
@@ -2,8 +2,8 @@
 // Licensed under the MIT license.
 // Author: Paul Koch <code@koch.ninja>
 
-#ifndef SLICEABLE_TENSOR_HPP
-#define SLICEABLE_TENSOR_HPP
+#ifndef COMPRESSIBLE_TENSOR_HPP
+#define COMPRESSIBLE_TENSOR_HPP
 
 #include <type_traits> // std::is_standard_layout
 #include <stdlib.h> // malloc, realloc, free
@@ -237,4 +237,4 @@ static_assert(std::is_pod<CompressibleTensor>::value,
 
 } // DEFINED_ZONE_NAME
 
-#endif // SLICEABLE_TENSOR_HPP
+#endif // COMPRESSIBLE_TENSOR_HPP
diff --git a/shared/ebm_native/GenerateModelUpdate.cpp b/shared/ebm_native/GenerateModelUpdate.cpp
index 953d52d2b..9bd2a5e87 100644
--- a/shared/ebm_native/GenerateModelUpdate.cpp
+++ b/shared/ebm_native/GenerateModelUpdate.cpp
@@ -14,7 +14,7 @@
 
 #include "ebm_internal.hpp"
 
-#include "SegmentedTensor.hpp"
+#include "CompressibleTensor.hpp"
 #include "ebm_stats.hpp"
 // feature includes
 #include "Feature.hpp"
diff --git a/shared/ebm_native/PartitionOneDimensionalBoosting.cpp b/shared/ebm_native/PartitionOneDimensionalBoosting.cpp
index c7a16def0..6c1cf22ca 100644
--- a/shared/ebm_native/PartitionOneDimensionalBoosting.cpp
+++ b/shared/ebm_native/PartitionOneDimensionalBoosting.cpp
@@ -16,7 +16,7 @@
 
 #include "ebm_internal.hpp"
 
-#include "SegmentedTensor.hpp"
+#include "CompressibleTensor.hpp"
 #include "ebm_stats.hpp"
 #include "BoosterShell.hpp"
 
diff --git a/shared/ebm_native/PartitionRandomBoosting.cpp b/shared/ebm_native/PartitionRandomBoosting.cpp
index 55fa01fd9..ba33eae19 100644
--- a/shared/ebm_native/PartitionRandomBoosting.cpp
+++ b/shared/ebm_native/PartitionRandomBoosting.cpp
@@ -13,7 +13,7 @@
 
 #include "ebm_internal.hpp"
 
-#include "SegmentedTensor.hpp"
+#include "CompressibleTensor.hpp"
 #include "ebm_stats.hpp"
 
 #include "Feature.hpp"
diff --git a/shared/ebm_native/PartitionTwoDimensionalBoosting.cpp b/shared/ebm_native/PartitionTwoDimensionalBoosting.cpp
index 4d0860cba..7f04f9b40 100644
--- a/shared/ebm_native/PartitionTwoDimensionalBoosting.cpp
+++ b/shared/ebm_native/PartitionTwoDimensionalBoosting.cpp
@@ -12,7 +12,7 @@
 
 #include "ebm_internal.hpp"
 
-#include "SegmentedTensor.hpp"
+#include "CompressibleTensor.hpp"
 #include "ebm_stats.hpp"
 
 #include "Feature.hpp"