diff --git a/bench/blast/math/simd/Ger.cpp b/bench/blast/math/simd/Ger.cpp
index 0fd210bb..dee889a7 100644
--- a/bench/blast/math/simd/Ger.cpp
+++ b/bench/blast/math/simd/Ger.cpp
@@ -3,7 +3,7 @@
 // license that can be found in the LICENSE file.
 
 #include <blast/math/DynamicPanelMatrix.hpp>
-#include <blast/math/register_matrix/RegisterMatrix.hpp>
+#include <blast/math/RegisterMatrix.hpp>
 
 #include <bench/Benchmark.hpp>
 
diff --git a/bench/blast/math/simd/PartialGemm.cpp b/bench/blast/math/simd/PartialGemm.cpp
index 6df1fed6..a62a69de 100644
--- a/bench/blast/math/simd/PartialGemm.cpp
+++ b/bench/blast/math/simd/PartialGemm.cpp
@@ -3,7 +3,7 @@
 // license that can be found in the LICENSE file.
 
 #include <blast/math/DynamicPanelMatrix.hpp>
-#include <blast/math/register_matrix/RegisterMatrix.hpp>
+#include <blast/math/RegisterMatrix.hpp>
 #include <blast/math/dense/StaticMatrixPointer.hpp>
 
 #include <bench/Benchmark.hpp>
diff --git a/bench/blast/math/simd/PartialLoad.cpp b/bench/blast/math/simd/PartialLoad.cpp
index 4333f213..48db98dd 100644
--- a/bench/blast/math/simd/PartialLoad.cpp
+++ b/bench/blast/math/simd/PartialLoad.cpp
@@ -3,7 +3,7 @@
 // license that can be found in the LICENSE file.
 
 #include <blast/math/DynamicPanelMatrix.hpp>
-#include <blast/math/register_matrix/RegisterMatrix.hpp>
+#include <blast/math/RegisterMatrix.hpp>
 #include <blast/math/dense/StaticMatrixPointer.hpp>
 
 #include <bench/Benchmark.hpp>
diff --git a/bench/blast/math/simd/PartialStore.cpp b/bench/blast/math/simd/PartialStore.cpp
index db0db8a9..7b5f3c4a 100644
--- a/bench/blast/math/simd/PartialStore.cpp
+++ b/bench/blast/math/simd/PartialStore.cpp
@@ -3,7 +3,7 @@
 // license that can be found in the LICENSE file.
 
 #include <blast/math/DynamicPanelMatrix.hpp>
-#include <blast/math/register_matrix/RegisterMatrix.hpp>
+#include <blast/math/RegisterMatrix.hpp>
 #include <blast/math/dense/StaticMatrixPointer.hpp>
 
 #include <bench/Benchmark.hpp>
diff --git a/bench/blast/math/simd/Potrf.cpp b/bench/blast/math/simd/Potrf.cpp
index fa91e81c..50672ae2 100644
--- a/bench/blast/math/simd/Potrf.cpp
+++ b/bench/blast/math/simd/Potrf.cpp
@@ -4,7 +4,7 @@
 
 #include <blast/math/StaticPanelMatrix.hpp>
 #include <blast/math/DynamicPanelMatrix.hpp>
-#include <blast/math/register_matrix/RegisterMatrix.hpp>
+#include <blast/math/RegisterMatrix.hpp>
 
 #include <bench/Benchmark.hpp>
 #include <bench/Complexity.hpp>
diff --git a/bench/blast/math/simd/Trmm.cpp b/bench/blast/math/simd/Trmm.cpp
index 8de44f48..9ab4a7c3 100644
--- a/bench/blast/math/simd/Trmm.cpp
+++ b/bench/blast/math/simd/Trmm.cpp
@@ -3,7 +3,7 @@
 // license that can be found in the LICENSE file.
 
 #include <blast/math/dense/StaticMatrixPointer.hpp>
-#include <blast/math/register_matrix/RegisterMatrix.hpp>
+#include <blast/math/RegisterMatrix.hpp>
 
 #include <bench/Benchmark.hpp>
 
diff --git a/bench/blast/math/simd/Trsm.cpp b/bench/blast/math/simd/Trsm.cpp
index 033aebd6..ec58fc2b 100644
--- a/bench/blast/math/simd/Trsm.cpp
+++ b/bench/blast/math/simd/Trsm.cpp
@@ -3,7 +3,7 @@
 // license that can be found in the LICENSE file.
 
 #include <blast/math/StaticPanelMatrix.hpp>
-#include <blast/math/register_matrix/RegisterMatrix.hpp>
+#include <blast/math/RegisterMatrix.hpp>
 
 #include <bench/Benchmark.hpp>
 #include <bench/Trsm.hpp>
diff --git a/include/blast/math/algorithm/Tile.hpp b/include/blast/math/algorithm/Tile.hpp
index a4931987..a10f35de 100644
--- a/include/blast/math/algorithm/Tile.hpp
+++ b/include/blast/math/algorithm/Tile.hpp
@@ -15,7 +15,7 @@
 #include <blast/system/Tile.hpp>
 #include <blast/system/Inline.hpp>
 #include <blast/math/StorageOrder.hpp>
-#include <blast/math/register_matrix/RegisterMatrix.hpp>
+#include <blast/math/RegisterMatrix.hpp>
 
 #include <cstdlib>
 
diff --git a/include/blast/math/dense/Ger.hpp b/include/blast/math/dense/Ger.hpp
index dc7c486d..807412c3 100644
--- a/include/blast/math/dense/Ger.hpp
+++ b/include/blast/math/dense/Ger.hpp
@@ -17,7 +17,7 @@
 #include <blast/util/Exception.hpp>
 
 #include <blast/system/Tile.hpp>
-#include <blast/math/register_matrix/RegisterMatrix.hpp>
+#include <blast/math/RegisterMatrix.hpp>
 #include <blast/math/typetraits/VectorPointer.hpp>
 #include <blast/math/dense/VectorPointer.hpp>
 #include <blast/math/dense/MatrixPointer.hpp>
diff --git a/include/blast/math/dense/Getrf.hpp b/include/blast/math/dense/Getrf.hpp
index 6ff77101..cc94faa0 100644
--- a/include/blast/math/dense/Getrf.hpp
+++ b/include/blast/math/dense/Getrf.hpp
@@ -10,7 +10,7 @@
 
 #include <blast/math/dense/DynamicMatrixPointer.hpp>
 #include <blast/math/dense/StaticMatrixPointer.hpp>
-#include <blast/math/register_matrix/RegisterMatrix.hpp>
+#include <blast/math/RegisterMatrix.hpp>
 #include <blast/math/dense/Getf2.hpp>
 #include <blast/math/dense/Trsm.hpp>
 #include <blast/math/dense/Gemm.hpp>
diff --git a/include/blast/math/dense/Potrf.hpp b/include/blast/math/dense/Potrf.hpp
index f8c2d7fd..50cfd56d 100644
--- a/include/blast/math/dense/Potrf.hpp
+++ b/include/blast/math/dense/Potrf.hpp
@@ -7,7 +7,7 @@
 
 #include <blast/math/dense/MatrixPointer.hpp>
 #include <blast/math/RowColumnVectorPointer.hpp>
-#include <blast/math/register_matrix/RegisterMatrix.hpp>
+#include <blast/math/RegisterMatrix.hpp>
 #include <blast/system/Tile.hpp>
 
 #include <blaze/util/Exception.h>
diff --git a/include/blast/math/dense/SyrkBackend.hpp b/include/blast/math/dense/SyrkBackend.hpp
index ef42f9db..abc09734 100644
--- a/include/blast/math/dense/SyrkBackend.hpp
+++ b/include/blast/math/dense/SyrkBackend.hpp
@@ -5,7 +5,7 @@
 #pragma once
 
 #include <blast/system/Tile.hpp>
-#include <blast/math/register_matrix/RegisterMatrix.hpp>
+#include <blast/math/RegisterMatrix.hpp>
 #include <blast/math/dense/DynamicMatrixPointer.hpp>
 #include <blast/math/dense/StaticMatrixPointer.hpp>
 
diff --git a/include/blast/math/dense/TrmmBackend.hpp b/include/blast/math/dense/TrmmBackend.hpp
index 4eab67a6..89b9dc98 100644
--- a/include/blast/math/dense/TrmmBackend.hpp
+++ b/include/blast/math/dense/TrmmBackend.hpp
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include <blast/math/register_matrix/RegisterMatrix.hpp>
+#include <blast/math/RegisterMatrix.hpp>
 #include <blast/math/dense/DynamicMatrixPointer.hpp>
 #include <blast/math/dense/StaticMatrixPointer.hpp>
 #include <blast/system/Tile.hpp>
diff --git a/include/blast/math/expressions/PanelMatrix.hpp b/include/blast/math/expressions/PanelMatrix.hpp
index c1cc08c9..64d3edbf 100644
--- a/include/blast/math/expressions/PanelMatrix.hpp
+++ b/include/blast/math/expressions/PanelMatrix.hpp
@@ -7,7 +7,7 @@
 #include <blast/math/typetraits/IsPanelMatrix.hpp>
 #include <blast/math/simd/Simd.hpp>
 #include <blast/math/panel/PanelSize.hpp>
-//#include <blast/math/register_matrix/RegisterMatrix.hpp>
+//#include <blast/math/RegisterMatrix.hpp>
 
 #include <blaze/math/ReductionFlag.h>
 #include <blaze/math/Matrix.h>
diff --git a/include/blast/math/panel/Gemm.hpp b/include/blast/math/panel/Gemm.hpp
index 4edca296..59df3d46 100644
--- a/include/blast/math/panel/Gemm.hpp
+++ b/include/blast/math/panel/Gemm.hpp
@@ -5,7 +5,7 @@
 #pragma once
 
 #include <blast/math/PanelMatrix.hpp>
-#include <blast/math/register_matrix/RegisterMatrix.hpp>
+#include <blast/math/RegisterMatrix.hpp>
 #include <blast/math/register_matrix/Gemm.hpp>
 #include <blast/math/panel/PanelSize.hpp>
 #include <blast/math/panel/MatrixPointer.hpp>
diff --git a/test/blast/math/simd/RegisterMatrixTest.cpp b/test/blast/math/simd/RegisterMatrixTest.cpp
index cfcfd87e..a09865f1 100644
--- a/test/blast/math/simd/RegisterMatrixTest.cpp
+++ b/test/blast/math/simd/RegisterMatrixTest.cpp
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-#include <blast/math/register_matrix/RegisterMatrix.hpp>
+#include <blast/math/RegisterMatrix.hpp>
 #include <blast/math/StaticPanelMatrix.hpp>
 #include <blast/math/panel/MatrixPointer.hpp>
 #include <blast/math/dense/MatrixPointer.hpp>