diff --git a/Jamfile b/Jamfile
index ac0f4125..82cd053a 100644
--- a/Jamfile
+++ b/Jamfile
@@ -32,16 +32,16 @@ UBLAS_TESTSET ?=
             USE_UNBOUNDED_ARRAY USE_BOUNDED_VECTOR USE_MATRIX ;
 
 #  Sparse storage: USE_MAP_ARRAY USE_STD_MAP
-#  Sparse vectors: USE_SPARSE_VECTOR USE_COMPRESSED_VECTOR USE_COORDINATE_VECTOR
-#  Sparse matrices: USE_SPARSE_MATRIX USE_COMPRESSED_MATRIX USE_COORDINATE_MATRIX USE_SPARSE_VECTOR_OF_SPARSE_VECTOR USE_GENERALIZED_VECTOR_OF_VECTOR
+#  Sparse vectors: USE_MAPPED_VECTOR USE_COMPRESSED_VECTOR USE_COORDINATE_VECTOR
+#  Sparse matrices: USE_MAPPED_MATRIX USE_COMPRESSED_MATRIX USE_COORDINATE_MATRIX USE_MAPPED_VECTOR_OF_MAPPED_VECTOR USE_GENERALIZED_VECTOR_OF_VECTOR
 
 UBLAS_TESTSET_SPARSE ?= 
             USE_DOUBLE USE_STD_COMPLEX
 #            USE_RANGE USE_SLICE    Too complex for regression testing
             USE_UNBOUNDED_ARRAY
             USE_STD_MAP
-            USE_SPARSE_VECTOR USE_COMPRESSED_VECTOR USE_COORDINATE_VECTOR
-            USE_SPARSE_MATRIX USE_COMPRESSED_MATRIX USE_COORDINATE_MATRIX ;
+            USE_MAPPED_VECTOR USE_COMPRESSED_VECTOR USE_COORDINATE_VECTOR
+            USE_MAPPED_MATRIX USE_COMPRESSED_MATRIX USE_COORDINATE_MATRIX ;
 
 
 test-suite numeric/uBLAS
diff --git a/Jamfile.v2 b/Jamfile.v2
index 48c20cb7..9aea15f2 100644
--- a/Jamfile.v2
+++ b/Jamfile.v2
@@ -18,11 +18,12 @@ UBLAS_TESTSET = [ modules.peek : UBLAS_TESTSET ] ;
 UBLAS_TESTSET ?=
             USE_DOUBLE USE_STD_COMPLEX
             USE_RANGE USE_SLICE
-            USE_UNBOUNDED_ARRAY USE_STD_VECTOR USE_BOUNDED_VECTOR USE_MATRIX ;
+            USE_UNBOUNDED_ARRAY USE_STD_VECTOR USE_BOUNDED_VECTOR USE_MATRIX
+            ;
 
 #  Sparse storage: USE_MAP_ARRAY USE_STD_MAP
-#  Sparse vectors: USE_SPARSE_VECTOR USE_COMPRESSED_VECTOR USE_COORDINATE_VECTOR
-#  Sparse matrices: USE_SPARSE_MATRIX USE_COMPRESSED_MATRIX USE_COORDINATE_MATRIX USE_SPARSE_VECTOR_OF_SPARSE_VECTOR USE_GENERALIZED_VECTOR_OF_VECTOR
+#  Sparse vectors: USE_MAPPED_VECTOR USE_COMPRESSED_VECTOR USE_COORDINATE_VECTOR
+#  Sparse matrices: USE_MAPPED_MATRIX USE_COMPRESSED_MATRIX USE_COORDINATE_MATRIX USE_MAPPED_VECTOR_OF_MAPPED_VECTOR USE_GENERALIZED_VECTOR_OF_VECTOR
 
 UBLAS_TESTSET_SPARSE = [ modules.peek : UBLAS_TESTSET_SPARSE ] ;
 UBLAS_TESTSET_SPARSE ?= 
@@ -30,8 +31,10 @@ UBLAS_TESTSET_SPARSE ?=
             # USE_RANGE USE_SLICE	 # Too complex for regression testing
             USE_UNBOUNDED_ARRAY
 			USE_STD_MAP
-            USE_SPARSE_VECTOR USE_COMPRESSED_VECTOR USE_COORDINATE_VECTOR
-            USE_SPARSE_MATRIX USE_COMPRESSED_MATRIX USE_COORDINATE_MATRIX ;
+            USE_MAPPED_VECTOR USE_COMPRESSED_VECTOR USE_COORDINATE_VECTOR
+            USE_MAPPED_MATRIX USE_COMPRESSED_MATRIX USE_COORDINATE_MATRIX 
+            USE_GENERALIZED_VECTOR_OF_VECTOR
+			;
 
 
 # Settings propogated to individual project targets, but not test-suite