diff --git a/include/gsl.h b/include/gsl.h
index ad064ba..03f8545 100644
--- a/include/gsl.h
+++ b/include/gsl.h
@@ -21,7 +21,8 @@
 
 #include "gsl_assert.h"  // Ensures/Expects
 #include "gsl_util.h"    // finally()/narrow()/narrow_cast()...
-#include "span.h"           // span, strided_span...
+//#include "span.h"           // span
+#include "multi_span.h"           // multi_span, strided_span...
 #include "string_span.h"    // zstring, string_span, zstring_builder...
 #include <memory>
 
diff --git a/include/span.h b/include/multi_span.h
similarity index 100%
rename from include/span.h
rename to include/multi_span.h
diff --git a/include/string_span.h b/include/string_span.h
index f585d3f..c58cef9 100644
--- a/include/string_span.h
+++ b/include/string_span.h
@@ -21,7 +21,7 @@
 
 #include "gsl_assert.h"
 #include "gsl_util.h"
-#include "span.h"
+#include "multi_span.h"
 #include <cstring>
 #include <string>
 
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 7990ec3..87999dc 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -33,7 +33,7 @@ if (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/unittest-cpp)
 endif()
 
 function(add_gsl_test name)
-    add_executable(${name} ${name}.cpp ../include/gsl.h ../include/gsl_assert.h ../include/gsl_util.h ../include/span.h ../include/string_span.h)
+    add_executable(${name} ${name}.cpp ../include/gsl.h ../include/gsl_assert.h ../include/gsl_util.h ../include/multi_span.h ../include/string_span.h)
     target_link_libraries(${name} UnitTest++)
     install(TARGETS ${name}
         RUNTIME DESTINATION bin
@@ -44,7 +44,7 @@ function(add_gsl_test name)
     )
 endfunction()
 
-add_gsl_test(span_tests)
+add_gsl_test(multi_span_tests)
 add_gsl_test(strided_span_tests)
 add_gsl_test(string_span_tests)
 add_gsl_test(at_tests)
diff --git a/tests/bounds_tests.cpp b/tests/bounds_tests.cpp
index ab8c5bd..736a85c 100644
--- a/tests/bounds_tests.cpp
+++ b/tests/bounds_tests.cpp
@@ -15,7 +15,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 #include <UnitTest++/UnitTest++.h> 
-#include <span.h>
+#include <multi_span.h>
 #include <vector>
 
 using namespace std;
diff --git a/tests/span_tests.cpp b/tests/multi_span_tests.cpp
similarity index 99%
rename from tests/span_tests.cpp
rename to tests/multi_span_tests.cpp
index 0d1170d..207428d 100644
--- a/tests/span_tests.cpp
+++ b/tests/multi_span_tests.cpp
@@ -15,7 +15,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 #include <UnitTest++/UnitTest++.h>
-#include <span.h>
+#include <multi_span.h>
 
 #include <iostream>
 #include <list>
@@ -37,7 +37,7 @@ struct DerivedClass : BaseClass
 };
 }
 
-SUITE(span_tests)
+SUITE(multi_span_tests)
 {
 
     TEST(default_constructor)
diff --git a/tests/strided_span_tests.cpp b/tests/strided_span_tests.cpp
index 8b96ddf..9fcdfeb 100644
--- a/tests/strided_span_tests.cpp
+++ b/tests/strided_span_tests.cpp
@@ -15,7 +15,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 #include <UnitTest++/UnitTest++.h> 
-#include <span.h>
+#include <multi_span.h>
 
 #include <string>
 #include <vector>