Renaming array_view and string_view, as per WG21 discussions.

4 files changed, 320 insertions, 320 deletions

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 5e4c395..3435a7f 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -43,8 +43,8 @@ function(add_gsl_test name)
     )
 endfunction()
 
-add_gsl_test(array_view_tests)
-add_gsl_test(string_view_tests)
+add_gsl_test(span_tests)
+add_gsl_test(string_span_tests)
 add_gsl_test(at_tests)
 add_gsl_test(bounds_tests)
 add_gsl_test(notnull_tests)
diff --git a/tests/bounds_tests.cpp b/tests/bounds_tests.cpp
index aacf3d8..53c44d1 100644
--- a/tests/bounds_tests.cpp
+++ b/tests/bounds_tests.cpp
@@ -15,7 +15,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 #include <UnitTest++/UnitTest++.h> 
-#include <array_view.h>
+#include <span.h>
 #include <vector>
 
 using namespace std;
@@ -55,7 +55,7 @@ SUITE(bounds_test)
 		auto itr = bounds.begin();
 	
 #ifdef CONFIRM_COMPILATION_ERRORS
-		array_view<int, 4, dynamic_range, 2> av(nullptr, bounds);
+		span<int, 4, dynamic_range, 2> av(nullptr, bounds);
 	
 		auto itr2 = av.cbegin();
 	
diff --git a/tests/array_view_tests.cpp b/tests/span_tests.cpp
index dd2067f..4c21116 100644
--- a/tests/array_view_tests.cpp
+++ b/tests/span_tests.cpp
@@ -15,7 +15,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 #include <UnitTest++/UnitTest++.h> 
-#include <array_view.h>
+#include <span.h>
 
 #include <string>
 #include <vector>
@@ -32,11 +32,11 @@ namespace
 	struct DerivedClass : BaseClass {};
 }
 
-SUITE(array_view_tests)
+SUITE(span_tests)
 {
 	TEST(basics)
 	{
-		auto ptr = as_array_view(new int[10], 10);
+		auto ptr = as_span(new int[10], 10);
 		fill(ptr.begin(), ptr.end(), 99);
 		for (int num : ptr)
 		{
@@ -49,45 +49,45 @@ SUITE(array_view_tests)
 		static_bounds<4, dynamic_range, 2> bounds{ 3 };
 	
 #ifdef CONFIRM_COMPILATION_ERRORS
-		array_view<int, 4, dynamic_range, 2> av(nullptr, bounds);
+		span<int, 4, dynamic_range, 2> av(nullptr, bounds);
 		av.extent();
 		av.extent<2>();
 		av[8][4][3];
 #endif
 	}
 
-	TEST (array_view_convertible)
+	TEST (span_convertible)
 	{
 #ifdef CONFIRM_COMPILATION_ERRORS
-		array_view<int, 7, 4, 2> av1(nullptr, b1);
+		span<int, 7, 4, 2> av1(nullptr, b1);
 #endif
 	
-		auto f = [&]() { array_view<int, 7, 4, 2> av1(nullptr); };
+		auto f = [&]() { span<int, 7, 4, 2> av1(nullptr); };
 		CHECK_THROW(f(), fail_fast); 
 		
-		array_view<int, 7, dynamic_range, 2> av1(nullptr);
+		span<int, 7, dynamic_range, 2> av1(nullptr);
 
 #ifdef CONFIRM_COMPILATION_ERRORS
 		static_bounds<size_t, 7, dynamic_range, 2> b12(b11);
 		b12 = b11;
 		b11 = b12;
 	
-		array_view<int, dynamic_range> av1 = nullptr;
-		array_view<int, 7, dynamic_range, 2> av2(av1);
-		array_view<int, 7, 4, 2> av2(av1);
+		span<int, dynamic_range> av1 = nullptr;
+		span<int, 7, dynamic_range, 2> av2(av1);
+		span<int, 7, 4, 2> av2(av1);
 #endif
 
-		array_view<DerivedClass> avd;
+		span<DerivedClass> avd;
 #ifdef CONFIRM_COMPILATION_ERRORS
-		array_view<BaseClass> avb = avd;
+		span<BaseClass> avb = avd;
 #endif
-		array_view<const DerivedClass> avcd = avd;
+		span<const DerivedClass> avcd = avd;
 	}
 
 	TEST(boundary_checks)
 	{
 		int arr[10][2];
-		auto av = as_array_view(arr);
+		auto av = as_span(arr);
 
 		fill(begin(av), end(av), 0);
 
@@ -102,32 +102,32 @@ SUITE(array_view_tests)
 		CHECK_THROW((av[{10,2}]), fail_fast);
 	}
 
-	void overloaded_func(array_view<const int, dynamic_range, 3, 5> exp, int expected_value) {
+	void overloaded_func(span<const int, dynamic_range, 3, 5> exp, int expected_value) {
 		for (auto val : exp)
 		{
 			CHECK(val == expected_value);
 		}
 	}
 
-	void overloaded_func(array_view<const char, dynamic_range, 3, 5> exp, char expected_value) {
+	void overloaded_func(span<const char, dynamic_range, 3, 5> exp, char expected_value) {
 		for (auto val : exp)
 		{
 			CHECK(val == expected_value);
 		}
 	}
 
-	void fixed_func(array_view<int, 3, 3, 5> exp, int expected_value) {
+	void fixed_func(span<int, 3, 3, 5> exp, int expected_value) {
 		for (auto val : exp)
 		{
 			CHECK(val == expected_value);
 		}
 	}
 
-	TEST(array_view_parameter_test)
+	TEST(span_parameter_test)
 	{
 		auto data = new int[4][3][5];
 
-		auto av = as_array_view(data, 4);
+		auto av = as_span(data, 4);
 
 		CHECK(av.size() == 60);
 
@@ -138,7 +138,7 @@ SUITE(array_view_tests)
 		CHECK(count == 34 * 60);
 		overloaded_func(av, 34);
 
-		overloaded_func(av.as_array_view(dim<>(4), dim<>(3), dim<>(5)), 34);
+		overloaded_func(av.as_span(dim<>(4), dim<>(3), dim<>(5)), 34);
 
 		//fixed_func(av, 34);
 		delete[] data;
@@ -153,7 +153,7 @@ SUITE(array_view_tests)
 		auto image_ptr = new int[imgSize][3];
 
 		// size check will be done
-		auto image_view = as_array_view(image_ptr, imgSize).as_array_view(dim<>(height), dim<>(width), dim<3>());
+		auto image_view = as_span(image_ptr, imgSize).as_span(dim<>(height), dim<>(width), dim<3>());
 
 		iota(image_view.begin(), image_view.end(), 1);
 
@@ -178,12 +178,12 @@ SUITE(array_view_tests)
 		}
 	}
 
-	TEST(array_view_factory_test)
+	TEST(span_factory_test)
 	{
 		{
 			int * arr = new int[150];
 
-			auto av = as_array_view(arr, dim<10>(), dim<>(3), dim<5>());
+			auto av = as_span(arr, dim<10>(), dim<>(3), dim<5>());
 
 			fill(av.begin(), av.end(), 24);
 			overloaded_func(av, 24);
@@ -192,54 +192,54 @@ SUITE(array_view_tests)
 
 
 			array<int, 15> stdarr{ 0 };
-			auto av2 = as_array_view(stdarr);
-			overloaded_func(av2.as_array_view(dim<>(1), dim<3>(), dim<5>()), 0);
+			auto av2 = as_span(stdarr);
+			overloaded_func(av2.as_span(dim<>(1), dim<3>(), dim<5>()), 0);
 
 
 			string str = "ttttttttttttttt"; // size = 15
 			auto t = str.data();
-			auto av3 = as_array_view(str);
-			overloaded_func(av3.as_array_view(dim<>(1), dim<3>(), dim<5>()), 't');
+			auto av3 = as_span(str);
+			overloaded_func(av3.as_span(dim<>(1), dim<3>(), dim<5>()), 't');
 		}
 
 		{
 			int a[3][4][5];
-			auto av = as_array_view(a);
+			auto av = as_span(a);
 			const int (*b)[4][5];
 			b = a;
-			auto bv = as_array_view(b, 3);
+			auto bv = as_span(b, 3);
 
 			CHECK(av == bv);
 
 			const std::array<double, 3> arr = {0.0, 0.0, 0.0};
-			auto cv = as_array_view(arr);
+			auto cv = as_span(arr);
 
 			vector<float> vec(3);
-			auto dv = as_array_view(vec);
+			auto dv = as_span(vec);
 			
 #ifdef CONFIRM_COMPILATION_ERRORS
-			auto dv2 = as_array_view(std::move(vec));
+			auto dv2 = as_span(std::move(vec));
 #endif
 		}
 	}
 	
 	template <class Bounds> void fn(const Bounds& b) { static_assert(Bounds::static_size == 60, "static bounds is wrong size"); }
-	TEST (array_view_reshape_test)
+	TEST (span_reshape_test)
 	{
 		int a[3][4][5];
-		auto av = as_array_view(a);
+		auto av = as_span(a);
         	fn(av.bounds());
-		auto av2 = av.as_array_view(dim<60>());
-		auto av3 = av2.as_array_view(dim<3>(), dim<4>(), dim<5>());
-		auto av4 = av3.as_array_view(dim<4>(), dim<>(3), dim<5>());
-		auto av5 = av4.as_array_view(dim<3>(), dim<4>(), dim<5>());
-		auto av6 = av5.as_array_view(dim<12>(), dim<>(5));
+		auto av2 = av.as_span(dim<60>());
+		auto av3 = av2.as_span(dim<3>(), dim<4>(), dim<5>());
+		auto av4 = av3.as_span(dim<4>(), dim<>(3), dim<5>());
+		auto av5 = av4.as_span(dim<3>(), dim<4>(), dim<5>());
+		auto av6 = av5.as_span(dim<12>(), dim<>(5));
 		
 		fill(av6.begin(), av6.end(), 1);
 		
 		auto av7 = av6.as_bytes();
 		
-		auto av8 = av7.as_array_view<int>();
+		auto av8 = av7.as_span<int>();
 
 		CHECK(av8.size() == av6.size());
 		for (auto i = 0; i < av8.size(); i++)
@@ -249,97 +249,97 @@ SUITE(array_view_tests)
 
 #ifdef CONFIRM_COMPILATION_ERRORS
 		struct Foo {char c[11];};
-		auto av9 = av7.as_array_view<Foo>();
+		auto av9 = av7.as_span<Foo>();
 #endif
 	}
 
 
-	TEST (array_view_section_test)
+	TEST (span_section_test)
 	{
 		int a[30][4][5];
 		
-		auto av = as_array_view(a);
+		auto av = as_span(a);
 		auto sub = av.section({15, 0, 0}, gsl::index<3>{2, 2, 2});
 		auto subsub = sub.section({1, 0, 0}, gsl::index<3>{1, 1, 1});
 	}
 
-	TEST(array_view_section)
+	TEST(span_section)
 	{
 		std::vector<int> data(5 * 10);
 		std::iota(begin(data), end(data), 0);
-		const array_view<int, 5, 10> av = as_array_view(data).as_array_view(dim<5>(), dim<10>());
+		const span<int, 5, 10> av = as_span(data).as_span(dim<5>(), dim<10>());
 
-		strided_array_view<int, 2> av_section_1 = av.section({ 1, 2 }, { 3, 4 });
+		strided_span<int, 2> av_section_1 = av.section({ 1, 2 }, { 3, 4 });
 		CHECK((av_section_1[{0, 0}] == 12));
 		CHECK((av_section_1[{0, 1}] == 13));
 		CHECK((av_section_1[{1, 0}] == 22));
 		CHECK((av_section_1[{2, 3}] == 35));
 
-		strided_array_view<int, 2> av_section_2 = av_section_1.section({ 1, 2 }, { 2,2 });
+		strided_span<int, 2> av_section_2 = av_section_1.section({ 1, 2 }, { 2,2 });
 		CHECK((av_section_2[{0, 0}] == 24));
 		CHECK((av_section_2[{0, 1}] == 25));
 		CHECK((av_section_2[{1, 0}] == 34));
 	}
  
-	TEST(strided_array_view_constructors)
+	TEST(strided_span_constructors)
 	{
 		// Check stride constructor
 		{
 			int arr[] = { 1, 2, 3, 4, 5, 6, 7, 8, 9 };
 			const int carr[] = { 1, 2, 3, 4, 5, 6, 7, 8, 9 };
 
-			strided_array_view<int, 1> sav1{ arr, {{9}, {1}} }; // T -> T
+			strided_span<int, 1> sav1{ arr, {{9}, {1}} }; // T -> T
 			CHECK(sav1.bounds().index_bounds() == index<1>{ 9 });
 			CHECK(sav1.bounds().stride() == 1);
 			CHECK(sav1[0] == 1 && sav1[8] == 9);
 
 
-			strided_array_view<const int, 1> sav2{ carr, {{ 4 }, { 2 }} }; // const T -> const T
+			strided_span<const int, 1> sav2{ carr, {{ 4 }, { 2 }} }; // const T -> const T
 			CHECK(sav2.bounds().index_bounds() == index<1>{ 4 });
 			CHECK(sav2.bounds().strides() == index<1>{2});
 			CHECK(sav2[0] == 1 && sav2[3] == 7);
 
-			strided_array_view<int, 2> sav3{ arr, {{ 2, 2 },{ 6, 2 }} }; // T -> const T
+			strided_span<int, 2> sav3{ arr, {{ 2, 2 },{ 6, 2 }} }; // T -> const T
 			CHECK((sav3.bounds().index_bounds() == index<2>{ 2, 2 }));
 			CHECK((sav3.bounds().strides() == index<2>{ 6, 2 }));
 			CHECK((sav3[{0, 0}] == 1 && sav3[{0, 1}] == 3 && sav3[{1, 0}] == 7));
 		}
 
-		// Check array_view constructor
+		// Check span constructor
 		{
 			int arr[] = { 1, 2 };
 
 			// From non-cv-qualified source
 			{
-				const array_view<int> src = arr;
+				const span<int> src = arr;
 
-				strided_array_view<int, 1> sav{ src, {2, 1} };
+				strided_span<int, 1> sav{ src, {2, 1} };
 				CHECK(sav.bounds().index_bounds() == index<1>{ 2 });
 				CHECK(sav.bounds().strides() == index<1>{ 1 });
 				CHECK(sav[1] == 2);
 
 #if _MSC_VER > 1800
-				strided_array_view<const int, 1> sav_c{ {src}, {2, 1} };
+				strided_span<const int, 1> sav_c{ {src}, {2, 1} };
 #else                
-				strided_array_view<const int, 1> sav_c{ array_view<const int>{src}, strided_bounds<1>{2, 1} };
+				strided_span<const int, 1> sav_c{ span<const int>{src}, strided_bounds<1>{2, 1} };
 #endif                
 				CHECK(sav_c.bounds().index_bounds() == index<1>{ 2 });
 				CHECK(sav_c.bounds().strides() == index<1>{ 1 });
 				CHECK(sav_c[1] == 2);
 
 #if _MSC_VER > 1800
-				strided_array_view<volatile int, 1> sav_v{ {src}, {2, 1} };
+				strided_span<volatile int, 1> sav_v{ {src}, {2, 1} };
 #else                
-				strided_array_view<volatile int, 1> sav_v{ array_view<volatile int>{src}, strided_bounds<1>{2, 1} };
+				strided_span<volatile int, 1> sav_v{ span<volatile int>{src}, strided_bounds<1>{2, 1} };
 #endif                
 				CHECK(sav_v.bounds().index_bounds() == index<1>{ 2 });
 				CHECK(sav_v.bounds().strides() == index<1>{ 1 });
 				CHECK(sav_v[1] == 2);
 
 #if _MSC_VER > 1800
-				strided_array_view<const volatile int, 1> sav_cv{ {src}, {2, 1} };
+				strided_span<const volatile int, 1> sav_cv{ {src}, {2, 1} };
 #else                
-				strided_array_view<const volatile int, 1> sav_cv{ array_view<const volatile int>{src}, strided_bounds<1>{2, 1} };
+				strided_span<const volatile int, 1> sav_cv{ span<const volatile int>{src}, strided_bounds<1>{2, 1} };
 #endif                
 				CHECK(sav_cv.bounds().index_bounds() == index<1>{ 2 });
 				CHECK(sav_cv.bounds().strides() == index<1>{ 1 });
@@ -348,17 +348,17 @@ SUITE(array_view_tests)
 
 			// From const-qualified source
 			{
-				const array_view<const int> src{ arr };
+				const span<const int> src{ arr };
 
-				strided_array_view<const int, 1> sav_c{ src, {2, 1} };
+				strided_span<const int, 1> sav_c{ src, {2, 1} };
 				CHECK(sav_c.bounds().index_bounds() == index<1>{ 2 });
 				CHECK(sav_c.bounds().strides() == index<1>{ 1 });
 				CHECK(sav_c[1] == 2);
 
 #if _MSC_VER > 1800
-				strided_array_view<const volatile int, 1> sav_cv{ {src}, {2, 1} };
+				strided_span<const volatile int, 1> sav_cv{ {src}, {2, 1} };
 #else
-				strided_array_view<const volatile int, 1> sav_cv{ array_view<const volatile int>{src}, strided_bounds<1>{2, 1} };
+				strided_span<const volatile int, 1> sav_cv{ span<const volatile int>{src}, strided_bounds<1>{2, 1} };
 #endif                
 				
 				CHECK(sav_cv.bounds().index_bounds() == index<1>{ 2 });
@@ -368,17 +368,17 @@ SUITE(array_view_tests)
 
 			// From volatile-qualified source
 			{
-				const array_view<volatile int> src{ arr };
+				const span<volatile int> src{ arr };
 
-				strided_array_view<volatile int, 1> sav_v{ src, {2, 1} };
+				strided_span<volatile int, 1> sav_v{ src, {2, 1} };
 				CHECK(sav_v.bounds().index_bounds() == index<1>{ 2 });
 				CHECK(sav_v.bounds().strides() == index<1>{ 1 });
 				CHECK(sav_v[1] == 2);
 
 #if _MSC_VER > 1800
-				strided_array_view<const volatile int, 1> sav_cv{ {src}, {2, 1} };
+				strided_span<const volatile int, 1> sav_cv{ {src}, {2, 1} };
 #else
-				strided_array_view<const volatile int, 1> sav_cv{ array_view<const volatile int>{src}, strided_bounds<1>{2, 1} };
+				strided_span<const volatile int, 1> sav_cv{ span<const volatile int>{src}, strided_bounds<1>{2, 1} };
 #endif                
 				CHECK(sav_cv.bounds().index_bounds() == index<1>{ 2 });
 				CHECK(sav_cv.bounds().strides() == index<1>{ 1 });
@@ -387,9 +387,9 @@ SUITE(array_view_tests)
 
 			// From cv-qualified source
 			{
-				const array_view<const volatile int> src{ arr };
+				const span<const volatile int> src{ arr };
 
-				strided_array_view<const volatile int, 1> sav_cv{ src, {2, 1} };
+				strided_span<const volatile int, 1> sav_cv{ src, {2, 1} };
 				CHECK(sav_cv.bounds().index_bounds() == index<1>{ 2 });
 				CHECK(sav_cv.bounds().strides() == index<1>{ 1 });
 				CHECK(sav_cv[1] == 2);
@@ -400,34 +400,34 @@ SUITE(array_view_tests)
 		{
 			int arr[2] = { 4, 5 };
 
-			const array_view<int, 2> av(arr, 2);
-			array_view<const int, 2> av2{ av };
+			const span<int, 2> av(arr, 2);
+			span<const int, 2> av2{ av };
 			CHECK(av2[1] == 5);
 
-			static_assert(std::is_convertible<const array_view<int, 2>, array_view<const int, 2>>::value, "ctor is not implicit!");
+			static_assert(std::is_convertible<const span<int, 2>, span<const int, 2>>::value, "ctor is not implicit!");
 		
-			const strided_array_view<int, 1> src{ arr, {2, 1} };
-			strided_array_view<const int, 1> sav{ src };
+			const strided_span<int, 1> src{ arr, {2, 1} };
+			strided_span<const int, 1> sav{ src };
 			CHECK(sav.bounds().index_bounds() == index<1>{ 2 });
 			CHECK(sav.bounds().stride() == 1);
 			CHECK(sav[1] == 5);
 			
-			static_assert(std::is_convertible<const strided_array_view<int, 1>, strided_array_view<const int, 1>>::value, "ctor is not implicit!");
+			static_assert(std::is_convertible<const strided_span<int, 1>, strided_span<const int, 1>>::value, "ctor is not implicit!");
 		}
 
 		// Check copy constructor
 		{
 			int arr1[2] = { 3, 4 };
-			const strided_array_view<int, 1> src1{ arr1, {2, 1} };
-			strided_array_view<int, 1> sav1{ src1 };
+			const strided_span<int, 1> src1{ arr1, {2, 1} };
+			strided_span<int, 1> sav1{ src1 };
  
 			CHECK(sav1.bounds().index_bounds() == index<1>{ 2 });
 			CHECK(sav1.bounds().stride() == 1);
 			CHECK(sav1[0] == 3);
 
 			int arr2[6] = { 1, 2, 3, 4, 5, 6 };
-			const strided_array_view<const int, 2> src2{ arr2, {{ 3, 2 }, { 2, 1 }} };
-			strided_array_view<const int, 2> sav2{ src2 };
+			const strided_span<const int, 2> src2{ arr2, {{ 3, 2 }, { 2, 1 }} };
+			strided_span<const int, 2> sav2{ src2 };
 			CHECK((sav2.bounds().index_bounds() == index<2>{ 3, 2 }));
 			CHECK((sav2.bounds().strides() == index<2>{ 2, 1 }));
 			CHECK((sav2[{0, 0}] == 1 && sav2[{2, 0}] == 5));
@@ -438,9 +438,9 @@ SUITE(array_view_tests)
 			int arr1[2] = { 1, 2 };
 			int arr2[6] = { 3, 4, 5, 6, 7, 8 };
 
-			const strided_array_view<int, 1> src{ arr1, {{2}, {1}} };
-			strided_array_view<const int, 1> sav{ arr2, {{3}, {2}} };
-			strided_array_view<const int, 1>& sav_ref = (sav = src);
+			const strided_span<int, 1> src{ arr1, {{2}, {1}} };
+			strided_span<const int, 1> sav{ arr2, {{3}, {2}} };
+			strided_span<const int, 1>& sav_ref = (sav = src);
 			CHECK(sav.bounds().index_bounds() == index<1>{ 2 });
 			CHECK(sav.bounds().strides() == index<1>{ 1 });
 			CHECK(sav[0] == 1);
@@ -451,9 +451,9 @@ SUITE(array_view_tests)
 		{
 			int arr1[2] = { 3, 4 };
 			int arr1b[1] = { 0 };
-			const strided_array_view<int, 1> src1{ arr1, {2, 1} };
-			strided_array_view<int, 1> sav1{ arr1b, {1, 1} };
-			strided_array_view<int, 1>& sav1_ref = (sav1 = src1);
+			const strided_span<int, 1> src1{ arr1, {2, 1} };
+			strided_span<int, 1> sav1{ arr1b, {1, 1} };
+			strided_span<int, 1>& sav1_ref = (sav1 = src1);
 			CHECK(sav1.bounds().index_bounds() == index<1>{ 2 });
 			CHECK(sav1.bounds().strides() == index<1>{ 1 });
 			CHECK(sav1[0] == 3);
@@ -461,9 +461,9 @@ SUITE(array_view_tests)
 
 			const int arr2[6] = { 1, 2, 3, 4, 5, 6 };
 			const int arr2b[1] = { 0 };
-			const strided_array_view<const int, 2> src2{ arr2, {{ 3, 2 },{ 2, 1 }} };
-			strided_array_view<const int, 2> sav2{ arr2b, {{ 1, 1 },{ 1, 1 }} };
-			strided_array_view<const int, 2>& sav2_ref = (sav2 = src2);
+			const strided_span<const int, 2> src2{ arr2, {{ 3, 2 },{ 2, 1 }} };
+			strided_span<const int, 2> sav2{ arr2b, {{ 1, 1 },{ 1, 1 }} };
+			strided_span<const int, 2>& sav2_ref = (sav2 = src2);
 			CHECK((sav2.bounds().index_bounds() == index<2>{ 3, 2 }));
 			CHECK((sav2.bounds().strides() == index<2>{ 2, 1 }));
 			CHECK((sav2[{0, 0}] == 1 && sav2[{2, 0}] == 5));
@@ -471,23 +471,23 @@ SUITE(array_view_tests)
 		}
 	}
 
-	TEST(strided_array_view_slice)
+	TEST(strided_span_slice)
 	{
 		std::vector<int> data(5 * 10);
 		std::iota(begin(data), end(data), 0);
-		const array_view<int, 5, 10> src = as_array_view(data).as_array_view(dim<5>(), dim<10>());
+		const span<int, 5, 10> src = as_span(data).as_span(dim<5>(), dim<10>());
 
-		const strided_array_view<int, 2> sav{ src, {{5, 10}, {10, 1}} };
+		const strided_span<int, 2> sav{ src, {{5, 10}, {10, 1}} };
 #ifdef CONFIRM_COMPILATION_ERRORS
-		const strided_array_view<const int, 2> csav{ {src},{ { 5, 10 },{ 10, 1 } } };
+		const strided_span<const int, 2> csav{ {src},{ { 5, 10 },{ 10, 1 } } };
 #endif
-		const strided_array_view<const int, 2> csav{ array_view<const int, 5, 10>{ src }, { { 5, 10 },{ 10, 1 } } };
+		const strided_span<const int, 2> csav{ span<const int, 5, 10>{ src }, { { 5, 10 },{ 10, 1 } } };
 
-		strided_array_view<int, 1> sav_sl = sav[2];
+		strided_span<int, 1> sav_sl = sav[2];
 		CHECK(sav_sl[0] == 20);
 		CHECK(sav_sl[9] == 29);
 
-		strided_array_view<const int, 1> csav_sl = sav[3];
+		strided_span<const int, 1> csav_sl = sav[3];
 		CHECK(csav_sl[0] == 30);
 		CHECK(csav_sl[9] == 39);
 
@@ -495,9 +495,9 @@ SUITE(array_view_tests)
 		CHECK(sav[4][9] == 49);
 	}
 
-	TEST(strided_array_view_column_major)
+	TEST(strided_span_column_major)
 	{
-		// strided_array_view may be used to accomodate more peculiar
+		// strided_span may be used to accomodate more peculiar
 		// use cases, such as column-major multidimensional array
 		// (aka. "FORTRAN" layout).
 
@@ -506,7 +506,7 @@ SUITE(array_view_tests)
 			2, 5, 8, 11, 14,
 			3, 6, 9, 12, 15
 		};
-		strided_array_view<int, 2> cm_sav{ cm_array, {{ 5, 3 },{ 1, 5 }} };
+		strided_span<int, 2> cm_sav{ cm_array, {{ 5, 3 },{ 1, 5 }} };
 
 		// Accessing elements
 		CHECK((cm_sav[{0, 0}] == 1));
@@ -515,14 +515,14 @@ SUITE(array_view_tests)
 		CHECK((cm_sav[{4, 2}] == 15));
 
 		// Slice
-		strided_array_view<int, 1> cm_sl = cm_sav[3];
+		strided_span<int, 1> cm_sl = cm_sav[3];
 
 		CHECK(cm_sl[0] == 10);
 		CHECK(cm_sl[1] == 11);
 		CHECK(cm_sl[2] == 12);
 
 		// Section 
-		strided_array_view<int, 2> cm_sec = cm_sav.section( { 2, 1 }, { 3, 2 });
+		strided_span<int, 2> cm_sec = cm_sav.section( { 2, 1 }, { 3, 2 });
 
 		CHECK((cm_sec.bounds().index_bounds() == index<2>{3, 2}));
 		CHECK((cm_sec[{0, 0}] == 8));
@@ -531,10 +531,10 @@ SUITE(array_view_tests)
 		CHECK((cm_sec[{2, 1}] == 15));
 	}
 
-	TEST(strided_array_view_bounds)
+	TEST(strided_span_bounds)
 	{
 		int arr[] = { 0, 1, 2, 3 };
-		array_view<int> av(arr);
+		span<int> av(arr);
 
 		{
 			// incorrect sections
@@ -552,7 +552,7 @@ SUITE(array_view_tests)
 
 		{
 			// zero stride
-			strided_array_view<int, 1> sav{ av,{ { 4 },{} } };
+			strided_span<int, 1> sav{ av,{ { 4 },{} } };
 			CHECK(sav[0] == 0);
 			CHECK(sav[3] == 0);
 			CHECK_THROW(sav[4], fail_fast);
@@ -560,19 +560,19 @@ SUITE(array_view_tests)
 
 		{
 			// zero extent
-			strided_array_view<int, 1> sav{ av,{ {},{ 1 } } };
+			strided_span<int, 1> sav{ av,{ {},{ 1 } } };
 			CHECK_THROW(sav[0], fail_fast);
 		}
 
 		{
 			// zero extent and stride
-			strided_array_view<int, 1> sav{ av,{ {},{} } };
+			strided_span<int, 1> sav{ av,{ {},{} } };
 			CHECK_THROW(sav[0], fail_fast);
 		}
 
 		{
 			// strided array ctor with matching strided bounds 
-			strided_array_view<int, 1> sav{ arr,{ 4, 1 } };
+			strided_span<int, 1> sav{ arr,{ 4, 1 } };
 			CHECK(sav.bounds().index_bounds() == index<1>{ 4 });
 			CHECK(sav[3] == 3);
 			CHECK_THROW(sav[4], fail_fast);
@@ -580,7 +580,7 @@ SUITE(array_view_tests)
 
 		{
 			// strided array ctor with smaller strided bounds 
-			strided_array_view<int, 1> sav{ arr,{ 2, 1 } };
+			strided_span<int, 1> sav{ arr,{ 2, 1 } };
 			CHECK(sav.bounds().index_bounds() == index<1>{ 2 });
 			CHECK(sav[1] == 1);
 			CHECK_THROW(sav[2], fail_fast);
@@ -588,7 +588,7 @@ SUITE(array_view_tests)
 
 		{
 			// strided array ctor with fitting irregular bounds 
-			strided_array_view<int, 1> sav{ arr,{ 2, 3 } };
+			strided_span<int, 1> sav{ arr,{ 2, 3 } };
 			CHECK(sav.bounds().index_bounds() == index<1>{ 2 });
 			CHECK(sav[0] == 0);
 			CHECK(sav[1] == 3);
@@ -597,92 +597,92 @@ SUITE(array_view_tests)
 
 		{
 			// bounds cross data boundaries - from static arrays
-			CHECK_THROW((strided_array_view<int, 1> { arr, { 3, 2 } }), fail_fast);
-			CHECK_THROW((strided_array_view<int, 1> { arr, { 3, 3 } }), fail_fast);
-			CHECK_THROW((strided_array_view<int, 1> { arr, { 4, 5 } }), fail_fast);
-			CHECK_THROW((strided_array_view<int, 1> { arr, { 5, 1 } }), fail_fast);
-			CHECK_THROW((strided_array_view<int, 1> { arr, { 5, 5 } }), fail_fast);
+			CHECK_THROW((strided_span<int, 1> { arr, { 3, 2 } }), fail_fast);
+			CHECK_THROW((strided_span<int, 1> { arr, { 3, 3 } }), fail_fast);
+			CHECK_THROW((strided_span<int, 1> { arr, { 4, 5 } }), fail_fast);
+			CHECK_THROW((strided_span<int, 1> { arr, { 5, 1 } }), fail_fast);
+			CHECK_THROW((strided_span<int, 1> { arr, { 5, 5 } }), fail_fast);
 		}
 
 		{
 			// bounds cross data boundaries - from array view
-			CHECK_THROW((strided_array_view<int, 1> { av, { 3, 2 } }), fail_fast);
-			CHECK_THROW((strided_array_view<int, 1> { av, { 3, 3 } }), fail_fast);
-			CHECK_THROW((strided_array_view<int, 1> { av, { 4, 5 } }), fail_fast);
-			CHECK_THROW((strided_array_view<int, 1> { av, { 5, 1 } }), fail_fast);
-			CHECK_THROW((strided_array_view<int, 1> { av, { 5, 5 } }), fail_fast);
+			CHECK_THROW((strided_span<int, 1> { av, { 3, 2 } }), fail_fast);
+			CHECK_THROW((strided_span<int, 1> { av, { 3, 3 } }), fail_fast);
+			CHECK_THROW((strided_span<int, 1> { av, { 4, 5 } }), fail_fast);
+			CHECK_THROW((strided_span<int, 1> { av, { 5, 1 } }), fail_fast);
+			CHECK_THROW((strided_span<int, 1> { av, { 5, 5 } }), fail_fast);
 		}
 
 		{
 			// bounds cross data boundaries - from dynamic arrays
-			CHECK_THROW((strided_array_view<int, 1> { av.data(), 4, { 3, 2 } }), fail_fast);
-			CHECK_THROW((strided_array_view<int, 1> { av.data(), 4, { 3, 3 } }), fail_fast);
-			CHECK_THROW((strided_array_view<int, 1> { av.data(), 4, { 4, 5 } }), fail_fast);
-			CHECK_THROW((strided_array_view<int, 1> { av.data(), 4, { 5, 1 } }), fail_fast);
-			CHECK_THROW((strided_array_view<int, 1> { av.data(), 4, { 5, 5 } }), fail_fast);
-			CHECK_THROW((strided_array_view<int, 1> { av.data(), 2, { 2, 2 } }), fail_fast);
+			CHECK_THROW((strided_span<int, 1> { av.data(), 4, { 3, 2 } }), fail_fast);
+			CHECK_THROW((strided_span<int, 1> { av.data(), 4, { 3, 3 } }), fail_fast);
+			CHECK_THROW((strided_span<int, 1> { av.data(), 4, { 4, 5 } }), fail_fast);
+			CHECK_THROW((strided_span<int, 1> { av.data(), 4, { 5, 1 } }), fail_fast);
+			CHECK_THROW((strided_span<int, 1> { av.data(), 4, { 5, 5 } }), fail_fast);
+			CHECK_THROW((strided_span<int, 1> { av.data(), 2, { 2, 2 } }), fail_fast);
 		}
 
 #ifdef CONFIRM_COMPILATION_ERRORS
 		{
-			strided_array_view<int, 1> sav0{ av.data(), { 3, 2 } };
-			strided_array_view<int, 1> sav1{ arr, { 1 } };
-			strided_array_view<int, 1> sav2{ arr, { 1,1,1 } };
-			strided_array_view<int, 1> sav3{ av, { 1 } };
-			strided_array_view<int, 1> sav4{ av, { 1,1,1 } };
-			strided_array_view<int, 2> sav5{ av.as_array_view(dim<2>(), dim<2>()), { 1 } };
-			strided_array_view<int, 2> sav6{ av.as_array_view(dim<2>(), dim<2>()), { 1,1,1 } };
-			strided_array_view<int, 2> sav7{ av.as_array_view(dim<2>(), dim<2>()), { { 1,1 },{ 1,1 },{ 1,1 } } };
+			strided_span<int, 1> sav0{ av.data(), { 3, 2 } };
+			strided_span<int, 1> sav1{ arr, { 1 } };
+			strided_span<int, 1> sav2{ arr, { 1,1,1 } };
+			strided_span<int, 1> sav3{ av, { 1 } };
+			strided_span<int, 1> sav4{ av, { 1,1,1 } };
+			strided_span<int, 2> sav5{ av.as_span(dim<2>(), dim<2>()), { 1 } };
+			strided_span<int, 2> sav6{ av.as_span(dim<2>(), dim<2>()), { 1,1,1 } };
+			strided_span<int, 2> sav7{ av.as_span(dim<2>(), dim<2>()), { { 1,1 },{ 1,1 },{ 1,1 } } };
 
 			index<1> index{ 0, 1 };
-			strided_array_view<int, 1> sav8{ arr,{ 1,{ 1,1 } } };
-			strided_array_view<int, 1> sav9{ arr,{ { 1,1 },{ 1,1 } } };
-			strided_array_view<int, 1> sav10{ av,{ 1,{ 1,1 } } };
-			strided_array_view<int, 1> sav11{ av,{ { 1,1 },{ 1,1 } } };
-			strided_array_view<int, 2> sav12{ av.as_array_view(dim<2>(), dim<2>()),{ { 1 },{ 1 } } };
-			strided_array_view<int, 2> sav13{ av.as_array_view(dim<2>(), dim<2>()),{ { 1 },{ 1,1,1 } } };
-			strided_array_view<int, 2> sav14{ av.as_array_view(dim<2>(), dim<2>()),{ { 1,1,1 },{ 1 } } };
+			strided_span<int, 1> sav8{ arr,{ 1,{ 1,1 } } };
+			strided_span<int, 1> sav9{ arr,{ { 1,1 },{ 1,1 } } };
+			strided_span<int, 1> sav10{ av,{ 1,{ 1,1 } } };
+			strided_span<int, 1> sav11{ av,{ { 1,1 },{ 1,1 } } };
+			strided_span<int, 2> sav12{ av.as_span(dim<2>(), dim<2>()),{ { 1 },{ 1 } } };
+			strided_span<int, 2> sav13{ av.as_span(dim<2>(), dim<2>()),{ { 1 },{ 1,1,1 } } };
+			strided_span<int, 2> sav14{ av.as_span(dim<2>(), dim<2>()),{ { 1,1,1 },{ 1 } } };
 		}
 #endif
 	}
 
-	TEST(strided_array_view_type_conversion)
+	TEST(strided_span_type_conversion)
 	{
 		int arr[] = { 0, 1, 2, 3 };
-		array_view<int> av(arr);
+		span<int> av(arr);
 
 		{
-			strided_array_view<int, 1> sav{ av.data(), av.size(), { av.size() / 2, 2 } };
+			strided_span<int, 1> sav{ av.data(), av.size(), { av.size() / 2, 2 } };
 #ifdef CONFIRM_COMPILATION_ERRORS
-			strided_array_view<long, 1> lsav1 = sav.as_strided_array_view<long, 1>();
+			strided_span<long, 1> lsav1 = sav.as_strided_span<long, 1>();
 #endif
 		}
 		{
-			strided_array_view<int, 1> sav{ av, { av.size() / 2, 2 } };
+			strided_span<int, 1> sav{ av, { av.size() / 2, 2 } };
 #ifdef CONFIRM_COMPILATION_ERRORS
-			strided_array_view<long, 1> lsav1 = sav.as_strided_array_view<long, 1>();
+			strided_span<long, 1> lsav1 = sav.as_strided_span<long, 1>();
 #endif
 		}
 
-		array_view<const byte, dynamic_range> bytes = av.as_bytes();
+		span<const byte, dynamic_range> bytes = av.as_bytes();
 
 		// retype strided array with regular strides - from raw data
 		{
 			strided_bounds<2> bounds{ { 2, bytes.size() / 4 }, { bytes.size() / 2, 1 } };
-			strided_array_view<const byte, 2> sav2{ bytes.data(), bytes.size(), bounds };
-			strided_array_view<const int, 2> sav3 = sav2.as_strided_array_view<const int>();
+			strided_span<const byte, 2> sav2{ bytes.data(), bytes.size(), bounds };
+			strided_span<const int, 2> sav3 = sav2.as_strided_span<const int>();
 			CHECK(sav3[0][0] == 0);
 			CHECK(sav3[1][0] == 2);
 			CHECK_THROW(sav3[1][1], fail_fast);
 			CHECK_THROW(sav3[0][1], fail_fast);
 		}
 
-		// retype strided array with regular strides - from array_view
+		// retype strided array with regular strides - from span
 		{
 			strided_bounds<2> bounds{ { 2, bytes.size() / 4 }, { bytes.size() / 2, 1 } };
-			array_view<const byte, 2, dynamic_range> bytes2 = bytes.as_array_view(dim<2>(), dim<>(bytes.size() / 2));
-			strided_array_view<const byte, 2> sav2{ bytes2, bounds };
-			strided_array_view<int, 2> sav3 = sav2.as_strided_array_view<int>();
+			span<const byte, 2, dynamic_range> bytes2 = bytes.as_span(dim<2>(), dim<>(bytes.size() / 2));
+			strided_span<const byte, 2> sav2{ bytes2, bounds };
+			strided_span<int, 2> sav3 = sav2.as_strided_span<int>();
 			CHECK(sav3[0][0] == 0);
 			CHECK(sav3[1][0] == 2);
 			CHECK_THROW(sav3[1][1], fail_fast);
@@ -692,47 +692,47 @@ SUITE(array_view_tests)
 		// retype strided array with not enough elements - last dimension of the array is too small
 		{
 			strided_bounds<2> bounds{ { 4,2 },{ 4, 1 } };
-			array_view<const byte, 2, dynamic_range> bytes2 = bytes.as_array_view(dim<2>(), dim<>(bytes.size() / 2));
-			strided_array_view<const byte, 2> sav2{ bytes2, bounds };
-			CHECK_THROW(sav2.as_strided_array_view<int>(), fail_fast);
+			span<const byte, 2, dynamic_range> bytes2 = bytes.as_span(dim<2>(), dim<>(bytes.size() / 2));
+			strided_span<const byte, 2> sav2{ bytes2, bounds };
+			CHECK_THROW(sav2.as_strided_span<int>(), fail_fast);
 		}
 
 		// retype strided array with not enough elements - strides are too small
 		{
 			strided_bounds<2> bounds{ { 4,2 },{ 2, 1 } };
-			array_view<const byte, 2, dynamic_range> bytes2 = bytes.as_array_view(dim<2>(), dim<>(bytes.size() / 2));
-			strided_array_view<const byte, 2> sav2{ bytes2, bounds };
-			CHECK_THROW(sav2.as_strided_array_view<int>(), fail_fast);
+			span<const byte, 2, dynamic_range> bytes2 = bytes.as_span(dim<2>(), dim<>(bytes.size() / 2));
+			strided_span<const byte, 2> sav2{ bytes2, bounds };
+			CHECK_THROW(sav2.as_strided_span<int>(), fail_fast);
 		}
 
 		// retype strided array with not enough elements - last dimension does not divide by the new typesize
 		{
 			strided_bounds<2> bounds{ { 2,6 },{ 4, 1 } };
-			array_view<const byte, 2, dynamic_range> bytes2 = bytes.as_array_view(dim<2>(), dim<>(bytes.size() / 2));
-			strided_array_view<const byte, 2> sav2{ bytes2, bounds };
-			CHECK_THROW(sav2.as_strided_array_view<int>(), fail_fast);
+			span<const byte, 2, dynamic_range> bytes2 = bytes.as_span(dim<2>(), dim<>(bytes.size() / 2));
+			strided_span<const byte, 2> sav2{ bytes2, bounds };
+			CHECK_THROW(sav2.as_strided_span<int>(), fail_fast);
 		}
 
 		// retype strided array with not enough elements - strides does not divide by the new typesize
 		{
 			strided_bounds<2> bounds{ { 2, 1 },{ 6, 1 } };
-			array_view<const byte, 2, dynamic_range> bytes2 = bytes.as_array_view(dim<2>(), dim<>(bytes.size() / 2));
-			strided_array_view<const byte, 2> sav2{ bytes2, bounds };
-			CHECK_THROW(sav2.as_strided_array_view<int>(), fail_fast);
+			span<const byte, 2, dynamic_range> bytes2 = bytes.as_span(dim<2>(), dim<>(bytes.size() / 2));
+			strided_span<const byte, 2> sav2{ bytes2, bounds };
+			CHECK_THROW(sav2.as_strided_span<int>(), fail_fast);
 		}
 
 		// retype strided array with irregular strides - from raw data
 		{
 			strided_bounds<1> bounds{ bytes.size() / 2, 2 };
-			strided_array_view<const byte, 1> sav2{ bytes.data(), bytes.size(), bounds };
-			CHECK_THROW(sav2.as_strided_array_view<int>(), fail_fast);
+			strided_span<const byte, 1> sav2{ bytes.data(), bytes.size(), bounds };
+			CHECK_THROW(sav2.as_strided_span<int>(), fail_fast);
 		}
 
-		// retype strided array with irregular strides - from array_view
+		// retype strided array with irregular strides - from span
 		{
 			strided_bounds<1> bounds{ bytes.size() / 2, 2 };
-			strided_array_view<const byte, 1> sav2{ bytes, bounds };
-			CHECK_THROW(sav2.as_strided_array_view<int>(), fail_fast);
+			strided_span<const byte, 1> sav2{ bytes, bounds };
+			CHECK_THROW(sav2.as_strided_span<int>(), fail_fast);
 		}
 	}
 
@@ -740,14 +740,14 @@ SUITE(array_view_tests)
 	{
 #ifdef CONFIRM_COMPILATION_ERRORS
 		{
-			array_view<int, 1> empty;
-			strided_array_view<int, 2> empty2;
-			strided_array_view<int, 1> empty3{ nullptr,{ 0, 1 } };
+			span<int, 1> empty;
+			strided_span<int, 2> empty2;
+			strided_span<int, 1> empty3{ nullptr,{ 0, 1 } };
 		}
 #endif
 
 		{
-			array_view<int, 0> empty_av(nullptr);
+			span<int, 0> empty_av(nullptr);
 
 			CHECK(empty_av.bounds().index_bounds() == index<1>{ 0 });
 			CHECK_THROW(empty_av[0], fail_fast);
@@ -760,7 +760,7 @@ SUITE(array_view_tests)
 		}
 
 		{
-			array_view<int> empty_av = {};
+			span<int> empty_av = {};
 			CHECK(empty_av.bounds().index_bounds() == index<1>{ 0 });
 			CHECK_THROW(empty_av[0], fail_fast);
 			CHECK_THROW(empty_av.begin()[0], fail_fast);
@@ -772,8 +772,8 @@ SUITE(array_view_tests)
 		}
 
 		{
-			array_view<int, 0> empty_av(nullptr);
-			strided_array_view<int, 1> empty_sav{ empty_av, { 0, 1 } };
+			span<int, 0> empty_av(nullptr);
+			strided_span<int, 1> empty_sav{ empty_av, { 0, 1 } };
 
 			CHECK(empty_sav.bounds().index_bounds() == index<1>{ 0 });
 			CHECK_THROW(empty_sav[0], fail_fast);
@@ -787,7 +787,7 @@ SUITE(array_view_tests)
 		}
 
 		{
-			strided_array_view<int, 1> empty_sav{ nullptr, 0, { 0, 1 } };
+			strided_span<int, 1> empty_sav{ nullptr, 0, { 0, 1 } };
 
 			CHECK(empty_sav.bounds().index_bounds() == index<1>{ 0 });
 			CHECK_THROW(empty_sav[0], fail_fast);
@@ -810,14 +810,14 @@ SUITE(array_view_tests)
 			arr[2 * i + 1] = i;
 		}
 
-		array_view<int, dynamic_range> av(arr, 8);
+		span<int, dynamic_range> av(arr, 8);
 
 		ptrdiff_t a[1] = { 0 };
 		index<1> i = a;
 
 		CHECK(av[i] == 4);
 
-		auto av2 = av.as_array_view(dim<4>(), dim<>(2));
+		auto av2 = av.as_span(dim<4>(), dim<>(2));
         ptrdiff_t a2[2] = { 0, 1 };
 		index<2> i2 = a2;
 
@@ -955,7 +955,7 @@ SUITE(array_view_tests)
 
 	}
 
-	void iterate_second_column(array_view<int, dynamic_range, dynamic_range> av)
+	void iterate_second_column(span<int, dynamic_range, dynamic_range> av)
 	{
 		auto length = av.size() / 2;
 
@@ -1017,33 +1017,33 @@ SUITE(array_view_tests)
 		}
 	}
 
-	TEST(array_view_section_iteration)
+	TEST(span_section_iteration)
 	{
 		int arr[4][2] = { { 4,0 },{ 5,1 },{ 6,2 },{ 7,3 } };
 
 		// static bounds
 		{
-			array_view<int, 4, 2> av = arr;
+			span<int, 4, 2> av = arr;
 			iterate_second_column(av);
 		}
 		// first bound is dynamic
 		{
-			array_view<int, dynamic_range, 2> av  = arr;
+			span<int, dynamic_range, 2> av  = arr;
 			iterate_second_column(av);
 		}
 		// second bound is dynamic
 		{
-			array_view<int, 4, dynamic_range> av = arr;
+			span<int, 4, dynamic_range> av = arr;
 			iterate_second_column(av);
 		}
 		// both bounds are dynamic
 		{
-			array_view<int, dynamic_range, dynamic_range> av = arr;
+			span<int, dynamic_range, dynamic_range> av = arr;
 			iterate_second_column(av);
 		}
 	}
 
-	TEST(dynamic_array_view_section_iteration)
+	TEST(dynamic_span_section_iteration)
 	{
 		auto height = 4, width = 2;
 		auto size = height * width;
@@ -1054,28 +1054,28 @@ SUITE(array_view_tests)
 			arr[i] = i;
 		}
 
-		auto av = as_array_view(arr, size);
+		auto av = as_span(arr, size);
 
 		// first bound is dynamic
 		{
-			array_view<int, dynamic_range, 2> av2 = av.as_array_view(dim<>(height), dim<>(width));
+			span<int, dynamic_range, 2> av2 = av.as_span(dim<>(height), dim<>(width));
 			iterate_second_column(av2);
 		}
 		// second bound is dynamic
 		{
-			array_view<int, 4, dynamic_range> av2 = av.as_array_view(dim<>(height), dim<>(width));
+			span<int, 4, dynamic_range> av2 = av.as_span(dim<>(height), dim<>(width));
 			iterate_second_column(av2);
 		}
 		// both bounds are dynamic
 		{
-			array_view<int, dynamic_range, dynamic_range> av2 = av.as_array_view(dim<>(height), dim<>(width));
+			span<int, dynamic_range, dynamic_range> av2 = av.as_span(dim<>(height), dim<>(width));
 			iterate_second_column(av2);
 		}
 
 		delete[] arr;
 	}
 
-	void iterate_every_other_element(array_view<int, dynamic_range> av)
+	void iterate_every_other_element(span<int, dynamic_range> av)
 	{
 		// pick every other element
 
@@ -1085,7 +1085,7 @@ SUITE(array_view_tests)
 #else
 		auto bounds = strided_bounds<1>(index<1>{ length }, index<1>{ 2 });
 #endif
-		strided_array_view<int, 1> strided(&av.data()[1], av.size() - 1, bounds);
+		strided_span<int, 1> strided(&av.data()[1], av.size() - 1, bounds);
 
 		CHECK(strided.size() == length);
 		CHECK(strided.bounds().index_bounds()[0] == length);
@@ -1102,24 +1102,24 @@ SUITE(array_view_tests)
 		}
 	}
 
-	TEST(strided_array_view_section_iteration)
+	TEST(strided_span_section_iteration)
 	{
 		int arr[8] = {4,0,5,1,6,2,7,3};
 
 		// static bounds
 		{
-			array_view<int, 8> av(arr, 8);
+			span<int, 8> av(arr, 8);
 			iterate_every_other_element(av);
 		}
 
 		// dynamic bounds
 		{
-			array_view<int, dynamic_range> av(arr, 8);
+			span<int, dynamic_range> av(arr, 8);
 			iterate_every_other_element(av);
 		}
 	}
 
-	TEST(dynamic_strided_array_view_section_iteration)
+	TEST(dynamic_strided_span_section_iteration)
 	{
 		auto arr = new int[8];
 		for (int i = 0; i < 4; ++i)
@@ -1128,13 +1128,13 @@ SUITE(array_view_tests)
 			arr[2 * i + 1] = i;
 		}
 		
-		auto av = as_array_view(arr, 8);
+		auto av = as_span(arr, 8);
 		iterate_every_other_element(av);
 
 		delete[] arr;
 	}
 
-	void iterate_second_slice(array_view<int, dynamic_range, dynamic_range, dynamic_range> av)
+	void iterate_second_slice(span<int, dynamic_range, dynamic_range, dynamic_range> av)
 	{
 		int expected[6] = { 2,3,10,11,18,19 };
 		auto section = av.section({ 0,1,0 }, { 3,1,2 });
@@ -1164,7 +1164,7 @@ SUITE(array_view_tests)
 		}
 	}
 
-	TEST(strided_array_view_section_iteration_3d)
+	TEST(strided_span_section_iteration_3d)
 	{
 		int arr[3][4][2];
 		for (auto i = 0; i < 3; ++i)
@@ -1175,12 +1175,12 @@ SUITE(array_view_tests)
 		}
 
 		{
-			array_view<int, 3, 4, 2> av = arr;
+			span<int, 3, 4, 2> av = arr;
 			iterate_second_slice(av);
 		}
 	}
 
-	TEST(dynamic_strided_array_view_section_iteration_3d)
+	TEST(dynamic_strided_span_section_iteration_3d)
 	{
 		auto height = 12, width = 2;
 		auto size = height * width;
@@ -1192,30 +1192,30 @@ SUITE(array_view_tests)
 		}
 
 		{
-			auto av = as_array_view(arr, 24).as_array_view(dim<3>(),dim<4>(),dim<2>());
+			auto av = as_span(arr, 24).as_span(dim<3>(),dim<4>(),dim<2>());
 			iterate_second_slice(av);
 		}
 
 		{
-			auto av = as_array_view(arr, 24).as_array_view(dim<>(3), dim<4>(), dim<2>());
+			auto av = as_span(arr, 24).as_span(dim<>(3), dim<4>(), dim<2>());
 			iterate_second_slice(av);
 		}
 
 		{
-			auto av = as_array_view(arr, 24).as_array_view(dim<3>(), dim<>(4), dim<2>());
+			auto av = as_span(arr, 24).as_span(dim<3>(), dim<>(4), dim<2>());
 			iterate_second_slice(av);
 		}
 
 		{
-			auto av = as_array_view(arr, 24).as_array_view(dim<3>(), dim<4>(), dim<>(2));
+			auto av = as_span(arr, 24).as_span(dim<3>(), dim<4>(), dim<>(2));
 			iterate_second_slice(av);
 		}
 		delete[] arr;
 	}
 
-	TEST(strided_array_view_conversion)
+	TEST(strided_span_conversion)
 	{
-		// get an array_view of 'c' values from the list of X's
+		// get an span of 'c' values from the list of X's
 
 		struct X { int a; int b; int c; };
 
@@ -1226,7 +1226,7 @@ SUITE(array_view_tests)
 		auto d1 = sizeof(int) * 12 / d2;
 
 		// convert to 4x12 array of bytes
-		auto av = as_array_view(arr, 4).as_bytes().as_array_view(dim<>(d1), dim<>(d2));
+		auto av = as_span(arr, 4).as_bytes().as_span(dim<>(d1), dim<>(d2));
 
 		CHECK(av.bounds().index_bounds()[0] == 4);
 		CHECK(av.bounds().index_bounds()[1] == 12);
@@ -1235,7 +1235,7 @@ SUITE(array_view_tests)
 		auto section = av.section({ 0, 2 * s }, { 4, s }); // { { arr[0].c[0], arr[0].c[1], arr[0].c[2], arr[0].c[3] } , { arr[1].c[0], ... } , ... }
 
 		// convert to array 4x1 array of integers
-		auto cs = section.as_strided_array_view<int>(); // { { arr[0].c }, {arr[1].c } , ... } 
+		auto cs = section.as_strided_span<int>(); // { { arr[0].c }, {arr[1].c } , ... } 
 
 		CHECK(cs.bounds().index_bounds()[0] == 4);
 		CHECK(cs.bounds().index_bounds()[1] == 1);
@@ -1246,10 +1246,10 @@ SUITE(array_view_tests)
 			{ cs.bounds().strides()[1], cs.bounds().strides()[0] }
 		};
 
-		strided_array_view<int, 2> transposed{ cs.data(), cs.bounds().total_size(), reverse_bounds };
+		strided_span<int, 2> transposed{ cs.data(), cs.bounds().total_size(), reverse_bounds };
 		
 		// slice to get a one-dimensional array of c's
-		strided_array_view<int, 1> result = transposed[0];
+		strided_span<int, 1> result = transposed[0];
 
 		CHECK(result.bounds().index_bounds()[0] == 4);
 		CHECK_THROW(result.bounds().index_bounds()[1], fail_fast);
@@ -1265,80 +1265,80 @@ SUITE(array_view_tests)
 
 	TEST(constructors)
 	{
-		array_view<int, dynamic_range> av(nullptr);
+		span<int, dynamic_range> av(nullptr);
 		CHECK(av.length() == 0);
 
-		array_view<int, dynamic_range> av2;
+		span<int, dynamic_range> av2;
 		CHECK(av2.length() == 0);
 
-		array_view<int, dynamic_range> av3(nullptr, 0);
+		span<int, dynamic_range> av3(nullptr, 0);
 		CHECK(av3.length() == 0);
 
 		// Constructing from a nullptr + length is specifically disallowed
-		auto f = [&]() {array_view<int, dynamic_range> av4(nullptr, 2);};
+		auto f = [&]() {span<int, dynamic_range> av4(nullptr, 2);};
 		CHECK_THROW(f(), fail_fast);
 
 		int arr1[2][3];
-		array_view<int, 2, dynamic_range> av5(arr1);
+		span<int, 2, dynamic_range> av5(arr1);
 
 		array<int, 15> arr2;
-		array_view<int, 15> av6(arr2);
+		span<int, 15> av6(arr2);
 
 		vector<int> vec1(19);
-		array_view<int> av7(vec1);
+		span<int> av7(vec1);
 		CHECK(av7.length() == 19);
 
 
-		array_view<int> av8;
+		span<int> av8;
 		CHECK(av8.length() == 0);
-		array_view<int> av9(arr2);
+		span<int> av9(arr2);
 		CHECK(av9.length() == 15);
 
 
 #ifdef CONFIRM_COMPILATION_ERRORS
-		array_view<int, 4> av10;
+		span<int, 4> av10;
 		DerivedClass *p = nullptr;
-		array_view<BaseClass> av11(p, 0);
+		span<BaseClass> av11(p, 0);
 #endif
 	}
 
 	TEST(copyandassignment)
 	{
-		array_view<int, dynamic_range> av1;
+		span<int, dynamic_range> av1;
 
 		int arr[] = {3, 4, 5};
 		av1 = arr;
-		array_view<const int, dynamic_range> av2;
+		span<const int, dynamic_range> av2;
 		av2 = av1;
 	}
 
-	TEST(array_view_first)
+	TEST(span_first)
 	{
 		int arr[5] = { 1, 2, 3, 4, 5 };
 
 		{
-			array_view<int, 5> av = arr;
+			span<int, 5> av = arr;
 			CHECK((av.first<2>().bounds() == static_bounds<2>()));
 			CHECK(av.first<2>().length() == 2);
 			CHECK(av.first(2).length() == 2);
 		}
 
 		{
-			array_view<int, 5> av = arr;
+			span<int, 5> av = arr;
 			CHECK((av.first<0>().bounds() == static_bounds<0>()));
 			CHECK(av.first<0>().length() == 0);
 			CHECK(av.first(0).length() == 0);
 		}
 
 		{
-			array_view<int, 5> av = arr;
+			span<int, 5> av = arr;
 			CHECK((av.first<5>().bounds() == static_bounds<5>()));
 			CHECK(av.first<5>().length() == 5);
 			CHECK(av.first(5).length() == 5);
 		}
 
 		{
-			array_view<int, 5> av = arr;
+			span<int, 5> av = arr;
 #ifdef CONFIRM_COMPILATION_ERRORS
 			CHECK(av.first<6>().bounds() == static_bounds<6>());
 			CHECK(av.first<6>().length() == 6);
@@ -1347,33 +1347,33 @@ SUITE(array_view_tests)
 		}
 
 		{
-			array_view<int, dynamic_range> av;
+			span<int, dynamic_range> av;
 			CHECK((av.first<0>().bounds() == static_bounds<0>()));
 			CHECK(av.first<0>().length() == 0);
 			CHECK(av.first(0).length() == 0);
 		}
 	}
 
-	TEST(array_view_last)
+	TEST(span_last)
 	{
 		int arr[5] = { 1, 2, 3, 4, 5 };
 
 		{
-			array_view<int, 5> av = arr;
+			span<int, 5> av = arr;
 			CHECK((av.last<2>().bounds() == static_bounds<2>()));
 			CHECK(av.last<2>().length() == 2);
 			CHECK(av.last(2).length() == 2);
 		}
 
 		{
-			array_view<int, 5> av = arr;
+			span<int, 5> av = arr;
 			CHECK((av.last<0>().bounds() == static_bounds<0>()));
 			CHECK(av.last<0>().length() == 0);
 			CHECK(av.last(0).length() == 0);
 		}
 
 		{
-			array_view<int, 5> av = arr;
+			span<int, 5> av = arr;
 			CHECK((av.last<5>().bounds() == static_bounds<5>()));
 			CHECK(av.last<5>().length() == 5);
 			CHECK(av.last(5).length() == 5);
@@ -1381,7 +1381,7 @@ SUITE(array_view_tests)
 
 		
 		{
-			array_view<int, 5> av = arr;
+			span<int, 5> av = arr;
 #ifdef CONFIRM_COMPILATION_ERRORS
 			CHECK((av.last<6>().bounds() == static_bounds<6>()));
 			CHECK(av.last<6>().length() == 6);
@@ -1390,17 +1390,17 @@ SUITE(array_view_tests)
 		}
 
 		{
-			array_view<int, dynamic_range> av;
+			span<int, dynamic_range> av;
 			CHECK((av.last<0>().bounds() == static_bounds<0>()));
 			CHECK(av.last<0>().length() == 0);
 			CHECK(av.last(0).length() == 0);
 		}
 	}
 
-	TEST(custmized_array_view_size)
+	TEST(custmized_span_size)
 	{
 		double (*arr)[3][4] = new double[100][3][4];
-		array_view<double, dynamic_range, 3, 4> av1(arr, 10);
+		span<double, dynamic_range, 3, 4> av1(arr, 10);
 
 		struct EffectiveStructure
 		{
@@ -1411,16 +1411,16 @@ SUITE(array_view_tests)
 
 		CHECK_THROW(av1[10][3][4], fail_fast);
 
-		array_view<const double, dynamic_range, 6, 4> av2 = av1.as_array_view(dim<>(5), dim<6>(), dim<4>());
+		span<const double, dynamic_range, 6, 4> av2 = av1.as_span(dim<>(5), dim<6>(), dim<4>());
 		
 	}
 
-	TEST(array_view_sub)
+	TEST(span_sub)
 	{
 		int arr[5] = { 1, 2, 3, 4, 5 };
 
 		{
-			array_view<int, 5> av = arr;
+			span<int, 5> av = arr;
 			CHECK((av.sub<2,2>().bounds() == static_bounds<2>()));
 			CHECK((av.sub<2,2>().length() == 2));
 			CHECK(av.sub(2,2).length() == 2);
@@ -1429,14 +1429,14 @@ SUITE(array_view_tests)
 
 
 		{
-			array_view<int, 5> av = arr;
+			span<int, 5> av = arr;
 			CHECK((av.sub<0,0>().bounds() == static_bounds<0>()));
 			CHECK((av.sub<0,0>().length() == 0));
 			CHECK(av.sub(0,0).length() == 0);
 		}
 
 		{
-			array_view<int, 5> av = arr;
+			span<int, 5> av = arr;
 			CHECK((av.sub<0,5>().bounds() == static_bounds<5>()));
 			CHECK((av.sub<0,5>().length() == 5));
 			CHECK(av.sub(0,5).length() == 5);
@@ -1445,7 +1445,7 @@ SUITE(array_view_tests)
 		}
 
 		{
-			array_view<int, 5> av = arr;
+			span<int, 5> av = arr;
 			CHECK((av.sub<5,0>().bounds() == static_bounds<0>()));
             CHECK((av.sub<5, 0>().length() == 0));
             CHECK(av.sub(5,0).length() == 0);
@@ -1453,7 +1453,7 @@ SUITE(array_view_tests)
 		}
 
 		{
-			array_view<int, dynamic_range> av;
+			span<int, dynamic_range> av;
 			CHECK((av.sub<0,0>().bounds() == static_bounds<0>()));
 			CHECK((av.sub<0,0>().length() == 0));
 			CHECK(av.sub(0,0).length() == 0);
@@ -1461,13 +1461,13 @@ SUITE(array_view_tests)
 		}
 
         {
-            array_view<int> av;
+            span<int> av;
             CHECK(av.sub(0).length() == 0);
             CHECK_THROW(av.sub(1).length(), fail_fast);
         }
 
         {
-            array_view<int> av = arr;
+            span<int> av = arr;
             CHECK(av.sub(0).length() == 5);
             CHECK(av.sub(1).length() == 4);
             CHECK(av.sub(4).length() == 1);
@@ -1479,7 +1479,7 @@ SUITE(array_view_tests)
         }
         
         {
-            array_view<int,5> av = arr;
+            span<int,5> av = arr;
             CHECK(av.sub(0).length() == 5);
             CHECK(av.sub(1).length() == 4);
             CHECK(av.sub(4).length() == 1);
@@ -1491,7 +1491,7 @@ SUITE(array_view_tests)
         }
     }
 
-	void AssertNullEmptyProperties(array_view<int, dynamic_range>& av)
+	void AssertNullEmptyProperties(span<int, dynamic_range>& av)
 	{
 		CHECK(av.length() == 0);
 		CHECK(av.data() == nullptr);
@@ -1508,10 +1508,10 @@ SUITE(array_view_tests)
 
 	TEST(TestNullConstruction)
 	{
-		array_view<int, dynamic_range> av;
+		span<int, dynamic_range> av;
 		AssertNullEmptyProperties(av);
 
-		array_view<int, dynamic_range> av2(nullptr);
+		span<int, dynamic_range> av2(nullptr);
 		AssertNullEmptyProperties(av2);
 	}
 
@@ -1519,13 +1519,13 @@ SUITE(array_view_tests)
 	{
 		int a[] = { 1, 2, 3, 4 };
 
-		array_view<int, dynamic_range> av = { &a[1], 3 };
+		span<int, dynamic_range> av = { &a[1], 3 };
 		CHECK(av.length() == 3);
 
-		array_view<int, dynamic_range> av3 = { a, 2 };
+		span<int, dynamic_range> av3 = { a, 2 };
 		CHECK(av3.length() == 2);
 
-		array_view<int, dynamic_range> av2 = a;
+		span<int, dynamic_range> av2 = a;
 		CHECK(av2.length() == 4);
 	}
 
@@ -1534,11 +1534,11 @@ SUITE(array_view_tests)
 		int a[] = { 1, 2, 3, 4 };
 
 #ifdef CONFIRM_COMPILATION_ERRORS
-		array_view<const int, dynamic_range> cav = a;
-		array_view<int, dynamic_range> av = cav;
+		span<const int, dynamic_range> cav = a;
+		span<int, dynamic_range> av = cav;
 #else
-		array_view<int, dynamic_range> av = a;
-		array_view<const int, dynamic_range> cav = av;			 
+		span<int, dynamic_range> av = a;
+		span<const int, dynamic_range> cav = av;			 
 #endif
 		AssertContentsMatch(av, cav);
 	}
@@ -1547,43 +1547,43 @@ SUITE(array_view_tests)
 	{			
 		int arr[] = { 1, 2, 3, 4 };
 	
-		// converting to an array_view from an equal size array is ok
-		array_view<int, 4> av4 = arr;
+		// converting to an span from an equal size array is ok
+		span<int, 4> av4 = arr;
 		CHECK(av4.length() == 4);
 
 		// converting to dynamic_range a_v is always ok
 		{
-			array_view<int, dynamic_range> av = av4;
+			span<int, dynamic_range> av = av4;
 		}
 		{
-			array_view<int, dynamic_range> av = arr;
+			span<int, dynamic_range> av = arr;
 		}
 
-		// initialization or assignment to static array_view that REDUCES size is NOT ok
+		// initialization or assignment to static span that REDUCES size is NOT ok
 #ifdef CONFIRM_COMPILATION_ERRORS
 		{
-			array_view<int, 2> av2 = arr;
+			span<int, 2> av2 = arr;
 		}
 		{
-			array_view<int, 2> av2 = av4;
+			span<int, 2> av2 = av4;
 		}
 #endif
 
 		{
-			array_view<int, dynamic_range> av = arr;
-			array_view<int, 2> av2 = av;
+			span<int, dynamic_range> av = arr;
+			span<int, 2> av2 = av;
 		}
 
 #ifdef CONFIRM_COMPILATION_ERRORS
 		{
-			array_view<int, dynamic_range> av = arr;
-			array_view<int, 2, 1> av2 = av.as_array_view(dim<2>(), dim<2>());
+			span<int, dynamic_range> av = arr;
+			span<int, 2, 1> av2 = av.as_span(dim<2>(), dim<2>());
 		}
 #endif
 
 		{
-			array_view<int, dynamic_range> av = arr;
-			auto f = [&]() {array_view<int, 2, 1> av2 = av.as_array_view(dim<>(2), dim<>(2));};
+			span<int, dynamic_range> av = arr;
+			auto f = [&]() {span<int, 2, 1> av2 = av.as_span(dim<>(2), dim<>(2));};
 			CHECK_THROW(f(), fail_fast);
 		}
 
@@ -1591,38 +1591,38 @@ SUITE(array_view_tests)
 			
 		// you can convert statically
 		{
-			array_view<int, 2> av2 = {arr, 2};
+			span<int, 2> av2 = {arr, 2};
 		}
 		{
-			array_view<int, 1> av2 = av4.first<1>();
+			span<int, 1> av2 = av4.first<1>();
 		}
 			
 		// ...or dynamically
 		{
-			// NB: implicit conversion to array_view<int,2> from array_view<int,dynamic_range>
-			array_view<int, 1> av2 = av4.first(1); 
+			// NB: implicit conversion to span<int,2> from span<int,dynamic_range>
+			span<int, 1> av2 = av4.first(1); 
 		}
 
-		// initialization or assignment to static array_view that requires size INCREASE is not ok.
+		// initialization or assignment to static span that requires size INCREASE is not ok.
 		int arr2[2]  = { 1, 2 };
 
 #ifdef CONFIRM_COMPILATION_ERRORS
 		{
-			array_view<int, 4> av4 = arr2;
+			span<int, 4> av4 = arr2;
 		}
 		{
-			array_view<int, 2> av2 = arr2;
-			array_view<int, 4> av4 = av2;
+			span<int, 2> av2 = arr2;
+			span<int, 4> av4 = av2;
 		}
 #endif
 		{
-			auto f = [&]() {array_view<int, 4> av4 = {arr2, 2};};
+			auto f = [&]() {span<int, 4> av4 = {arr2, 2};};
 			CHECK_THROW(f(), fail_fast);
 		}
 
 		// this should fail - we are trying to assign a small dynamic a_v to a fixed_size larger one
-		array_view<int, dynamic_range> av = arr2;
-		auto f = [&](){ array_view<int, 4> av2 = av; };
+		span<int, dynamic_range> av = arr2;
+		auto f = [&](){ span<int, 4> av2 = av; };
 		CHECK_THROW(f(), fail_fast);
 	}
 
@@ -1633,13 +1633,13 @@ SUITE(array_view_tests)
 		{
 #ifdef CONFIRM_COMPILATION_ERRORS
 			// you should not be able to get writeable bytes for const objects
-			array_view<const int, dynamic_range> av = a;
+			span<const int, dynamic_range> av = a;
 			auto wav = av.as_writeable_bytes();
 #endif
 		}
 
 		{
-			array_view<int, dynamic_range> av;
+			span<int, dynamic_range> av;
 			auto wav = av.as_writeable_bytes();
 			CHECK(wav.length() == av.length());
 			CHECK(wav.length() == 0);
@@ -1647,7 +1647,7 @@ SUITE(array_view_tests)
 		}
 
 		{
-			array_view<int, dynamic_range> av = a;
+			span<int, dynamic_range> av = a;
 			auto wav = av.as_writeable_bytes();
 			CHECK(wav.data() == (byte*)&a[0]);
 			CHECK(wav.length() == sizeof(a));
@@ -1659,7 +1659,7 @@ SUITE(array_view_tests)
 		int a[] = { 1, 2, 3, 4 };
 
 		{
-			array_view<int, dynamic_range> av = a;
+			span<int, dynamic_range> av = a;
 			auto wav = av.as_writeable_bytes();
 			for (auto& b : wav)
 			{
@@ -1672,7 +1672,7 @@ SUITE(array_view_tests)
 		}
 
 		{
-			array_view<int, dynamic_range> av = a;
+			span<int, dynamic_range> av = a;
 			for (auto& n : av)
 			{
 				n = 1;
@@ -1688,12 +1688,12 @@ SUITE(array_view_tests)
 	{
 		{
 			int arr[10][2];
-			auto av1 = as_array_view(arr);
-			array_view<const int, dynamic_range, 2> av2 = av1;
+			auto av1 = as_span(arr);
+			span<const int, dynamic_range, 2> av2 = av1;
 
 			CHECK(av1 == av2);
 
-			array_view<int, 20> av3 = av1.as_array_view(dim<>(20));
+			span<int, 20> av3 = av1.as_span(dim<>(20));
 			CHECK(av3 == av2 && av3 == av1);
 		}
 
@@ -1717,8 +1717,8 @@ SUITE(array_view_tests)
 		{
 			int arr[] = { 2, 1 }; // bigger
 
-			array_view<int> av1 = nullptr;
-			array_view<int> av2 = arr;
+			span<int> av1 = nullptr;
+			span<int> av2 = arr;
 
 			CHECK(av1 != av2);
 			CHECK(av2 != av1);
@@ -1737,8 +1737,8 @@ SUITE(array_view_tests)
 		{
 			int arr1[] = { 1, 2 };
 			int arr2[] = { 1, 2 };
-			array_view<int> av1 = arr1;
-			array_view<int> av2 = arr2;
+			span<int> av1 = arr1;
+			span<int> av2 = arr2;
 
 			CHECK(av1 == av2);
 			CHECK(!(av1 != av2));
@@ -1757,8 +1757,8 @@ SUITE(array_view_tests)
 		{
 			int arr[] = { 1, 2, 3 };
 
-			array_view<int> av1 = { &arr[0], 2 }; // shorter
-			array_view<int> av2 = arr;            // longer
+			span<int> av1 = { &arr[0], 2 }; // shorter
+			span<int> av2 = arr;            // longer
 
 			CHECK(av1 != av2);
 			CHECK(av2 != av1);
@@ -1778,8 +1778,8 @@ SUITE(array_view_tests)
 			int arr1[] = { 1, 2 }; // smaller
 			int arr2[] = { 2, 1 }; // bigger
 
-			array_view<int> av1 = arr1;
-			array_view<int> av2 = arr2;
+			span<int> av1 = arr1;
+			span<int> av2 = arr2;
 
 			CHECK(av1 != av2);
 			CHECK(av2 != av1);
diff --git a/tests/string_view_tests.cpp b/tests/string_span_tests.cpp
index e553ccd..dc3ccf5 100644
--- a/tests/string_view_tests.cpp
+++ b/tests/string_span_tests.cpp
@@ -15,38 +15,38 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 #include <UnitTest++/UnitTest++.h> 
-#include <string_view.h>
+#include <string_span.h>
 #include <vector>
 #include <cstdlib>
 
 using namespace std;
 using namespace gsl;
 
-SUITE(string_view_tests)
+SUITE(string_span_tests)
 {
 
     TEST(TestLiteralConstruction)
 	{
-        cwstring_view<> v = ensure_z(L"Hello");
+        cwstring_span<> v = ensure_z(L"Hello");
 
         CHECK(5 == v.length());
 
 #ifdef CONFIRM_COMPILATION_ERRORS
-        wstring_view<> v2 = ensure0(L"Hello");
+        wstring_span<> v2 = ensure0(L"Hello");
 #endif
 	}
 
     TEST(TestConstructFromStdString)
     {
         std::string s = "Hello there world";
-        cstring_view<> v = s;
+        cstring_span<> v = s;
         CHECK(v.length() == s.length());
     }
 
     TEST(TestConstructFromStdVector)
     {
         std::vector<char> vec(5, 'h');
-        string_view<> v = vec;
+        string_span<> v = vec;
         CHECK(v.length() == vec.size());
     }
 
@@ -55,25 +55,25 @@ SUITE(string_view_tests)
         wchar_t stack_string[] = L"Hello";
 
         {
-            cwstring_view<> v = ensure_z(stack_string);
+            cwstring_span<> v = ensure_z(stack_string);
             CHECK(v.length() == 5);
             CHECK(v.used_length() == v.length());
         }
 
         {
-            cwstring_view<> v = stack_string;
+            cwstring_span<> v = stack_string;
             CHECK(v.length() == 6);
             CHECK(v.used_length() == v.length());
         }
 
         {
-            wstring_view<> v = ensure_z(stack_string);
+            wstring_span<> v = ensure_z(stack_string);
             CHECK(v.length() == 5);
             CHECK(v.used_length() == v.length());
         }
 
         {
-            wstring_view<> v = stack_string;
+            wstring_span<> v = stack_string;
             CHECK(v.length() == 6);
             CHECK(v.used_length() == v.length());
         }
@@ -82,7 +82,7 @@ SUITE(string_view_tests)
     TEST(TestConstructFromConstCharPointer)
     {
         const char* s = "Hello";
-        cstring_view<> v = ensure_z(s);
+        cstring_span<> v = ensure_z(s);
         CHECK(v.length() == 5);
         CHECK(v.used_length() == v.length());
     }
@@ -90,18 +90,18 @@ SUITE(string_view_tests)
     TEST(TestConversionToConst)
     {
         char stack_string[] = "Hello";
-        string_view<> v = ensure_z(stack_string);
-        cstring_view<> v2 = v; 
+        string_span<> v = ensure_z(stack_string);
+        cstring_span<> v2 = v; 
         CHECK(v.length() == v2.length());
     }
 
     TEST(TestConversionFromConst)
     {
         char stack_string[] = "Hello";
-        cstring_view<> v = ensure_z(stack_string);
+        cstring_span<> v = ensure_z(stack_string);
 #ifdef CONFIRM_COMPILATION_ERRORS
-        string_view<> v2 = v;
-        string_view<> v3 = "Hello";
+        string_span<> v2 = v;
+        string_span<> v3 = "Hello";
 #endif
     }
 }