diff --git a/CI_struct_ls/CI_struct_ls.h b/CI_struct_ls/CI_struct_ls.h
index 9d3a662ca..4ec2c4df1 100644
--- a/CI_struct_ls/CI_struct_ls.h
+++ b/CI_struct_ls/CI_struct_ls.h
@@ -7,7 +7,7 @@
 #define hypre_CI_LS_HEADER
 
 #include "utilities.h"
-#include "CI_struct_matrix_vector.h"
+#include "CI_struct_mv.h"
 #include "HYPRE.h"
 
 /*BHEADER**********************************************************************
diff --git a/CI_struct_mv/HYPRE_CI_mv.h b/CI_struct_mv/HYPRE_CI_mv.h
index a16d9438c..7766e4de0 100644
--- a/CI_struct_mv/HYPRE_CI_mv.h
+++ b/CI_struct_mv/HYPRE_CI_mv.h
@@ -1,4 +1,4 @@
-#include "../struct_matrix_vector/struct_matrix_vector.h"
+#include "../struct_mv/struct_mv.h"
 
 #ifndef HYPRE_CI_MV_HEADER
 #define HYPRE_CI_MV_HEADER
diff --git a/CI_struct_mv/Makefile.in b/CI_struct_mv/Makefile.in
index 788d51028..c91033467 100644
--- a/CI_struct_mv/Makefile.in
+++ b/CI_struct_mv/Makefile.in
@@ -25,7 +25,7 @@ CFLAGS = \
  -I$(srcdir)\
  -I$(srcdir)/..\
  -I$(srcdir)/../utilities\
- -I$(srcdir)/../struct_matrix_vector\
+ -I$(srcdir)/../struct_mv\
  @PETSCINCLUDE@ \
  ${CINCLUDES} ${CDEFS}
 
@@ -33,7 +33,7 @@ RANLIB = @RANLIB@
 
 HEADERS =\
  headers.h\
- CI_struct_matrix_vector.h\
+ CI_struct_mv.h\
  HYPRE_CI_mv.h
  
 FILES =\
diff --git a/CI_struct_mv/headers.h b/CI_struct_mv/headers.h
index 1ada810e3..7d88041cd 100644
--- a/CI_struct_mv/headers.h
+++ b/CI_struct_mv/headers.h
@@ -11,4 +11,4 @@
 #include <stdio.h>
 #include <math.h>
 
-#include "CI_struct_matrix_vector.h"
+#include "CI_struct_mv.h"
diff --git a/CI_struct_mv/struct_matrix_ParCSR.c b/CI_struct_mv/struct_matrix_ParCSR.c
index 2be21c229..dc5180e6d 100644
--- a/CI_struct_mv/struct_matrix_ParCSR.c
+++ b/CI_struct_mv/struct_matrix_ParCSR.c
@@ -18,7 +18,7 @@
 pound include "HYPRE_parcsr_mv.h"
 */
 
-#include "parcsr_matrix_vector.h"
+#include "parcsr_mv.h"
 
 
 #define hypre_AddStructStencilEltToStructGridpoint( stencil_shape, index, new_index ) \
diff --git a/FEI_mv/fei-base/Makefile.in b/FEI_mv/fei-base/Makefile.in
index 5bb5c224a..b09ecce8f 100644
--- a/FEI_mv/fei-base/Makefile.in
+++ b/FEI_mv/fei-base/Makefile.in
@@ -19,7 +19,7 @@ PACKAGE=fei-isis
 #######################################################################
 
 HYPRE_ROOT = @HYPRE_TOP_SRC_DIR@
-FEI_ROOT= ${HYPRE_ROOT}/FEI_matrix_vector/fei-base
+FEI_ROOT= ${HYPRE_ROOT}/FEI_mv/fei-base
 HYPRE_ARCH=@ARCH@
 FEI_TARGET=FEI_PLL
 
@@ -39,8 +39,8 @@ C++INCLUDES=-I$(FEI_ROOT) -I$(HYPRE_ROOT) \
             -I$(FEI_ROOT)/../fei-hypre \
             -I$(HYPRE_ROOT)/hypre/include \
             -I$(HYPRE_ROOT)/utilities \
-            -I$(HYPRE_ROOT)/parcsr_matrix_vector \
-            -I$(HYPRE_ROOT)/seq_matrix_vector \
+            -I$(HYPRE_ROOT)/parcsr_mv \
+            -I$(HYPRE_ROOT)/seq_mv \
             ${CINCLUDES}
 CXXFLAGS=${CXX_COMPILE_FLAGS} $(OPT) -c
 
diff --git a/FEI_mv/fei-hypre/hypre_lsi_misc.c b/FEI_mv/fei-hypre/hypre_lsi_misc.c
index e2da60e9d..2b08e25dd 100644
--- a/FEI_mv/fei-hypre/hypre_lsi_misc.c
+++ b/FEI_mv/fei-hypre/hypre_lsi_misc.c
@@ -12,8 +12,8 @@
 #include <assert.h>
 
 #include "utilities/utilities.h"
-#include "IJ_matrix_vector/HYPRE_IJ_mv.h"
-#include "parcsr_matrix_vector/parcsr_matrix_vector.h"
+#include "IJ_mv/HYPRE_IJ_mv.h"
+#include "parcsr_mv/parcsr_mv.h"
 
 extern void qsort1(int*, double*, int, int);
 
diff --git a/IJ_mv/F90_HYPRE_IJMatrix.c b/IJ_mv/F90_HYPRE_IJMatrix.c
index 80c0eb50d..d8a1508c3 100644
--- a/IJ_mv/F90_HYPRE_IJMatrix.c
+++ b/IJ_mv/F90_HYPRE_IJMatrix.c
@@ -12,7 +12,7 @@
  *
  *****************************************************************************/
 
-#include "./IJ_matrix_vector.h"
+#include "./IJ_mv.h"
 #include "fortran.h"
 
 /*--------------------------------------------------------------------------
diff --git a/IJ_mv/F90_HYPRE_IJVector.c b/IJ_mv/F90_HYPRE_IJVector.c
index 74b2e1bcf..1c51cdd68 100644
--- a/IJ_mv/F90_HYPRE_IJVector.c
+++ b/IJ_mv/F90_HYPRE_IJVector.c
@@ -12,7 +12,7 @@
  *
  *****************************************************************************/
 
-#include "./IJ_matrix_vector.h"
+#include "./IJ_mv.h"
 #include "fortran.h"
 
 /*--------------------------------------------------------------------------
diff --git a/IJ_mv/HYPRE_IJMatrix.c b/IJ_mv/HYPRE_IJMatrix.c
index 2798bdd55..5f7c368b1 100644
--- a/IJ_mv/HYPRE_IJMatrix.c
+++ b/IJ_mv/HYPRE_IJMatrix.c
@@ -12,7 +12,7 @@
  *
  *****************************************************************************/
 
-#include "./IJ_matrix_vector.h"
+#include "./IJ_mv.h"
 
 #include "../HYPRE.h"
 
diff --git a/IJ_mv/HYPRE_IJVector.c b/IJ_mv/HYPRE_IJVector.c
index c038205f5..8c679d437 100644
--- a/IJ_mv/HYPRE_IJVector.c
+++ b/IJ_mv/HYPRE_IJVector.c
@@ -12,7 +12,7 @@
  *
  *****************************************************************************/
 
-#include "./IJ_matrix_vector.h"
+#include "./IJ_mv.h"
 
 #include "../HYPRE.h"
 
diff --git a/IJ_mv/IJ_mv.h b/IJ_mv/IJ_mv.h
index 51b0600f0..b42043195 100644
--- a/IJ_mv/IJ_mv.h
+++ b/IJ_mv/IJ_mv.h
@@ -5,8 +5,8 @@
 #define hypre_IJ_HEADER
 
 #include "utilities.h"
-#include "seq_matrix_vector.h"
-#include "parcsr_matrix_vector.h"
+#include "seq_mv.h"
+#include "parcsr_mv.h"
 #include "HYPRE_IJ_mv.h"
 
 #ifdef __cplusplus
diff --git a/IJ_mv/aux_parcsr_matrix.c b/IJ_mv/aux_parcsr_matrix.c
index 4622a58b3..a7663aa30 100644
--- a/IJ_mv/aux_parcsr_matrix.c
+++ b/IJ_mv/aux_parcsr_matrix.c
@@ -13,7 +13,7 @@
  *
  *****************************************************************************/
 
-#include "IJ_matrix_vector.h"
+#include "IJ_mv.h"
 #include "aux_parcsr_matrix.h"
 
 /*--------------------------------------------------------------------------
diff --git a/IJ_mv/headers b/IJ_mv/headers
index 4cbf226d6..8dd90f18c 100755
--- a/IJ_mv/headers
+++ b/IJ_mv/headers
@@ -8,7 +8,7 @@
 # $Revision$
 #EHEADER***********************************************************************
 
-INTERNAL_HEADER=IJ_matrix_vector.h
+INTERNAL_HEADER=IJ_mv.h
 
 #===========================================================================
 # Include guards and other includes
@@ -22,8 +22,8 @@ cat > $INTERNAL_HEADER <<@
 #define hypre_IJ_HEADER
 
 #include "utilities.h"
-#include "seq_matrix_vector.h"
-#include "parcsr_matrix_vector.h"
+#include "seq_mv.h"
+#include "parcsr_mv.h"
 #include "HYPRE_IJ_mv.h"
 
 #ifdef __cplusplus
diff --git a/IJ_mv/headers.h b/IJ_mv/headers.h
index 2a82fef1e..8eec0a09e 100644
--- a/IJ_mv/headers.h
+++ b/IJ_mv/headers.h
@@ -11,5 +11,5 @@
 #include <stdio.h>
 #include <math.h>
 
-#include "IJ_matrix_vector.h"
+#include "IJ_mv.h"
 #include "HYPRE_IJ_mv.h"
diff --git a/IJ_mv/hypre_IJVector_parcsr.c b/IJ_mv/hypre_IJVector_parcsr.c
index f52f53d17..fb692ba2c 100644
--- a/IJ_mv/hypre_IJVector_parcsr.c
+++ b/IJ_mv/hypre_IJVector_parcsr.c
@@ -12,7 +12,7 @@
  *
  *****************************************************************************/
  
-#include "IJ_matrix_vector.h"
+#include "IJ_mv.h"
 #include "aux_parcsr_matrix.h"
 
 /******************************************************************************
diff --git a/babel/Hypre/Hypre_Box_Data.h b/babel/Hypre/Hypre_Box_Data.h
index 9c2d2fb94..a4e69c4dc 100644
--- a/babel/Hypre/Hypre_Box_Data.h
+++ b/babel/Hypre/Hypre_Box_Data.h
@@ -7,7 +7,7 @@
 #ifndef Hypre_Box_DataMembers_
 #define Hypre_Box_DataMembers_
 
-#include "struct_matrix_vector.h"
+#include "struct_mv.h"
 
 struct Hypre_Box_private_type
 {
diff --git a/babel/Hypre/Hypre_ParAMG.c b/babel/Hypre/Hypre_ParAMG.c
index 4a2a51e0c..6b2e9ad17 100644
--- a/babel/Hypre/Hypre_ParAMG.c
+++ b/babel/Hypre/Hypre_ParAMG.c
@@ -14,7 +14,7 @@
 #include "Hypre_ParCSRMatrix_Data.h"
 #include "HYPRE_parcsr_ls.h"
 #include "HYPRE_IJ_mv.h"
-#include "IJ_matrix_vector.h"
+#include "IJ_mv.h"
 
 /* *************************************************
  * Constructor
diff --git a/babel/Hypre/Hypre_ParCSRMatrix.c b/babel/Hypre/Hypre_ParCSRMatrix.c
index a1683d12d..a4d8b3fef 100644
--- a/babel/Hypre/Hypre_ParCSRMatrix.c
+++ b/babel/Hypre/Hypre_ParCSRMatrix.c
@@ -11,7 +11,7 @@
 #include <assert.h>
 #include "Hypre_ParCSRVector_Skel.h" 
 #include "Hypre_ParCSRVector_Data.h" 
-#include "IJ_matrix_vector.h"
+#include "IJ_mv.h"
 #include "Hypre_Partition_Skel.h"
 #include "Hypre_PartitionBuilder_Skel.h"
 #include "Hypre_Map_Stub.h"
diff --git a/babel/Hypre/Hypre_ParCSRMatrixBuilder.c b/babel/Hypre/Hypre_ParCSRMatrixBuilder.c
index 41808ad1a..9f9b9735e 100644
--- a/babel/Hypre/Hypre_ParCSRMatrixBuilder.c
+++ b/babel/Hypre/Hypre_ParCSRMatrixBuilder.c
@@ -14,7 +14,7 @@
 #include "Hypre_MPI_Com_Skel.h" 
 #include "Hypre_MPI_Com_Data.h" 
 #include "HYPRE_IJ_mv.h"
-#include "IJ_matrix_vector.h"
+#include "IJ_mv.h"
 #include "Hypre_Partition_Skel.h"
 #include "Hypre_PartitionBuilder_Skel.h"
 #include "Hypre_Map_Stub.h"
diff --git a/babel/Hypre/Hypre_ParCSRVector.c b/babel/Hypre/Hypre_ParCSRVector.c
index 6c3a1ea4d..7c875d16e 100644
--- a/babel/Hypre/Hypre_ParCSRVector.c
+++ b/babel/Hypre/Hypre_ParCSRVector.c
@@ -19,8 +19,8 @@ which needs libgcc.a ... */
 #include "Hypre_PartitionBuilder_Skel.h"
 #include "Hypre_Map_Stub.h"
 #include "HYPRE_IJ_mv.h"
-#include "IJ_matrix_vector.h"
-#include "parcsr_matrix_vector.h"
+#include "IJ_mv.h"
+#include "parcsr_mv.h"
 #include "Hypre_ParCSRVectorBuilder_IOR.h"
 #include "HYPRE.h"
 
diff --git a/babel/Hypre/Hypre_ParCSRVectorBuilder.c b/babel/Hypre/Hypre_ParCSRVectorBuilder.c
index d59468d1a..9c0d90174 100644
--- a/babel/Hypre/Hypre_ParCSRVectorBuilder.c
+++ b/babel/Hypre/Hypre_ParCSRVectorBuilder.c
@@ -88,8 +88,8 @@ int impl_Hypre_ParCSRVectorBuilder_Start
  * set and storage allocated, this just resets the partitioning vector.
  * But that could invalidate the already-set local storage and indices.
  * For some hints about this issue, look at
- * IJ_matrix_vector/hypre_IJVector_parcsr.c:hypre_IJVectorSetPartitioningPar
- * and parcsr_matrix_vector/par_vector.c:hypre_ParVectorCreate .
+ * IJ_mv/hypre_IJVector_parcsr.c:hypre_IJVectorSetPartitioningPar
+ * and parcsr_mv/par_vector.c:hypre_ParVectorCreate .
  **********************************************************/
 /*  int  impl_Hypre_ParCSRVectorBuilder_SetPartitioning */
 /*  ( Hypre_ParCSRVectorBuilder this, array1int partitioning ) { */
diff --git a/babel/Hypre/Hypre_StructGrid_Data.h b/babel/Hypre/Hypre_StructGrid_Data.h
index a1b1e5284..d99071622 100644
--- a/babel/Hypre/Hypre_StructGrid_Data.h
+++ b/babel/Hypre/Hypre_StructGrid_Data.h
@@ -8,7 +8,7 @@
 #define Hypre_StructGrid_DataMembers_
 
 #include "HYPRE_struct_mv.h"
-#include "struct_matrix_vector.h"
+#include "struct_mv.h"
 #include "Hypre_MPI_Com_Skel.h"
 #include "Hypre_MPI_Com_Data.h"
 
diff --git a/babel/Hypre/Hypre_StructMatrixBuilder.c b/babel/Hypre/Hypre_StructMatrixBuilder.c
index da0a48954..a1e61507b 100644
--- a/babel/Hypre/Hypre_StructMatrixBuilder.c
+++ b/babel/Hypre/Hypre_StructMatrixBuilder.c
@@ -16,7 +16,7 @@
 */
 
 #include "HYPRE_struct_mv.h"
-#include "struct_matrix_vector.h"
+#include "struct_mv.h"
 #include "Hypre_Box_Skel.h"
 #include "Hypre_StructGrid_Skel.h"
 #include "Hypre_StructStencil_Skel.h"
diff --git a/babel/Hypre/Hypre_StructMatrix_Data.h b/babel/Hypre/Hypre_StructMatrix_Data.h
index 1b68a8256..7d488b72e 100644
--- a/babel/Hypre/Hypre_StructMatrix_Data.h
+++ b/babel/Hypre/Hypre_StructMatrix_Data.h
@@ -8,7 +8,7 @@
 #define Hypre_StructMatrix_DataMembers_
 
 #include "HYPRE_struct_mv.h"
-#include "struct_matrix_vector.h"
+#include "struct_mv.h"
 
 struct Hypre_StructMatrix_private_type
 {
diff --git a/babel/Hypre/Hypre_StructStencil_Data.h b/babel/Hypre/Hypre_StructStencil_Data.h
index 7a8d3586d..3fe3abedd 100644
--- a/babel/Hypre/Hypre_StructStencil_Data.h
+++ b/babel/Hypre/Hypre_StructStencil_Data.h
@@ -8,7 +8,7 @@
 #define Hypre_StructStencil_DataMembers_
 
 #include "HYPRE_struct_mv.h"
-#include "struct_matrix_vector.h"
+#include "struct_mv.h"
 
 struct Hypre_StructStencil_private_type
 {
diff --git a/babel/Hypre/Hypre_StructVectorBuilder.c b/babel/Hypre/Hypre_StructVectorBuilder.c
index 7a76c3c49..69db31473 100644
--- a/babel/Hypre/Hypre_StructVectorBuilder.c
+++ b/babel/Hypre/Hypre_StructVectorBuilder.c
@@ -12,7 +12,7 @@
 #include "Hypre_StructVector_Skel.h" 
 #include "Hypre_StructVector_Data.h" 
 #include "HYPRE_struct_mv.h"
-#include "struct_matrix_vector.h"
+#include "struct_mv.h"
 #include "Hypre_Box_Skel.h"
 #include "Hypre_StructGrid_Skel.h"
 
diff --git a/babel/Hypre/Hypre_StructVector_Data.h b/babel/Hypre/Hypre_StructVector_Data.h
index 0b89e55c3..cbbec6331 100644
--- a/babel/Hypre/Hypre_StructVector_Data.h
+++ b/babel/Hypre/Hypre_StructVector_Data.h
@@ -8,7 +8,7 @@
 #define Hypre_StructVector_DataMembers_
 
 #include "HYPRE_struct_mv.h"
-#include "struct_matrix_vector.h"
+#include "struct_mv.h"
 #include "Hypre_StructGrid_IOR.h"
 
 struct Hypre_StructVector_private_type
diff --git a/babel/Hypre/Makefile.am b/babel/Hypre/Makefile.am
index 1c5e57350..a5a3294d5 100644
--- a/babel/Hypre/Makefile.am
+++ b/babel/Hypre/Makefile.am
@@ -10,7 +10,7 @@ lib_LIBRARIES = libhypre_class.a
 libhypre_class_a_SOURCES = ${PREBUILT_SRCS} ${GENERATED_SRCS} ${PREBUILT_HDRS} ${GENERATED_HDRS}
 #libhypre_class_a_HEADERS = 
 
-HYPRE_INCLUDES = -I../../hypre/include -I../../struct_matrix_vector -I../babel_stubs_c -I../babel
+HYPRE_INCLUDES = -I../../hypre/include -I../../struct_mv -I../babel_stubs_c -I../babel
 # BABEL_INCLUDES  = -I${BABELDIR}/include -I${BABELDIR}/include/babel
 BABEL_INCLUDES = -I${BABELDIR}/babel-0.4.1/source/runtime/  -I${BABELDIR}/babel-0.4.1/source/runtime/babel
 INCLUDES = -I.. ${HYPRE_INCLUDES} ${BABEL_INCLUDES} 
diff --git a/babel/Hypre/Makefile.in b/babel/Hypre/Makefile.in
index baa1a446e..d7443c424 100644
--- a/babel/Hypre/Makefile.in
+++ b/babel/Hypre/Makefile.in
@@ -128,7 +128,7 @@ lib_LIBRARIES = libhypre_class.a
 libhypre_class_a_SOURCES = ${PREBUILT_SRCS} ${GENERATED_SRCS} ${PREBUILT_HDRS} ${GENERATED_HDRS}
 #libhypre_class_a_HEADERS = 
 
-HYPRE_INCLUDES = -I../../hypre/include -I../../struct_matrix_vector -I../babel_stubs_c -I../babel
+HYPRE_INCLUDES = -I../../hypre/include -I../../struct_mv -I../babel_stubs_c -I../babel
 # BABEL_INCLUDES  = -I${BABELDIR}/include -I${BABELDIR}/include/babel
 BABEL_INCLUDES = -I${BABELDIR}/babel-0.4.1/source/runtime/  -I${BABELDIR}/babel-0.4.1/source/runtime/babel
 INCLUDES = -I.. ${HYPRE_INCLUDES} ${BABEL_INCLUDES} 
diff --git a/babel/test/Makefile.am b/babel/test/Makefile.am
index 9bbff0caa..83beee051 100644
--- a/babel/test/Makefile.am
+++ b/babel/test/Makefile.am
@@ -8,7 +8,7 @@ testum_SOURCES = testum.c
 
 testum_LDADD =  -L$(BABELDIR)/lib -L../../hypre/lib -L../Hypre -lhypre_class -lbabel -lHYPRE_ls -lHYPRE_mv -lHYPRE_utilities
 
-HYPRE_INCLUDES = -I../../hypre/include -I../../struct_matrix_vector
+HYPRE_INCLUDES = -I../../hypre/include -I../../struct_mv
 BABEL_INCLUDES  = -I${BABELDIR}/include -I${BABELDIR}/include/babel
 INCLUDES = -I.. ${HYPRE_INCLUDES} ${BABEL_INCLUDES} -I../Hypre
 
diff --git a/babel/test/Makefile.in b/babel/test/Makefile.in
index 5a3eff1e6..0a59e29c1 100644
--- a/babel/test/Makefile.in
+++ b/babel/test/Makefile.in
@@ -77,7 +77,7 @@ testum_SOURCES = testum.c
 
 testum_LDADD = -L$(BABELDIR)/lib -L../../hypre/lib -L../Hypre -lhypre_class -lbabel -lHYPRE_ls -lHYPRE_mv -lHYPRE_utilities
 
-HYPRE_INCLUDES = -I../../hypre/include -I../../struct_matrix_vector
+HYPRE_INCLUDES = -I../../hypre/include -I../../struct_mv
 BABEL_INCLUDES = -I${BABELDIR}/include -I${BABELDIR}/include/babel
 INCLUDES = -I.. ${HYPRE_INCLUDES} ${BABEL_INCLUDES} -I../Hypre
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/distributed_ls/Euclid/Makefile.in b/distributed_ls/Euclid/Makefile.in
index 29bdccc5b..c0bc35879 100644
--- a/distributed_ls/Euclid/Makefile.in
+++ b/distributed_ls/Euclid/Makefile.in
@@ -33,8 +33,8 @@ CFLAGS = \
  -I$(srcdir)\
  -I$(srcdir)/../..\
  -I$(srcdir)/../../utilities\
- -I$(srcdir)/../../parcsr_matrix_vector\
- -I$(srcdir)/../../seq_matrix_vector\
+ -I$(srcdir)/../../parcsr_mv\
+ -I$(srcdir)/../../seq_mv\
  -I$(srcdir)/../../hypre/include\
  ${CINCLUDES}\
  ${CDEFS}
diff --git a/distributed_matrix/Makefile.in b/distributed_matrix/Makefile.in
index c9e2cd6e1..5361cb73d 100644
--- a/distributed_matrix/Makefile.in
+++ b/distributed_matrix/Makefile.in
@@ -62,8 +62,8 @@ CFLAGS = \
  -I$(srcdir)/..\
  -I$(srcdir)/../utilities\
  -I$(srcdir)/../distributed_matrix\
- -I$(srcdir)/../seq_matrix_vector\
- -I$(srcdir)/../parcsr_matrix_vector\
+ -I$(srcdir)/../seq_mv\
+ -I$(srcdir)/../parcsr_mv\
  @PETSCINCLUDE@ \
  ${C_COMPILE_FLAGS}\
  ${CINCLUDES} ${CDEFS}
diff --git a/matrix_matrix/HYPRE_BuildIJMatrixFromDistributedMatrix.c b/matrix_matrix/HYPRE_BuildIJMatrixFromDistributedMatrix.c
index efbb8e226..5008a4d7e 100644
--- a/matrix_matrix/HYPRE_BuildIJMatrixFromDistributedMatrix.c
+++ b/matrix_matrix/HYPRE_BuildIJMatrixFromDistributedMatrix.c
@@ -28,7 +28,7 @@
 #include "HYPRE_distributed_matrix_protos.h"
 
 /* Matrix prototypes for IJMatirx */
-#include "IJ_matrix_vector/HYPRE_IJ_mv.h"
+#include "IJ_mv/HYPRE_IJ_mv.h"
 
 /*--------------------------------------------------------------------------
  * HYPRE_BuildIJMatrixFromDistributedMatrix
diff --git a/matrix_matrix/Makefile.in b/matrix_matrix/Makefile.in
index d5bab0f3b..0a9648efa 100644
--- a/matrix_matrix/Makefile.in
+++ b/matrix_matrix/Makefile.in
@@ -51,9 +51,9 @@ CFLAGS = \
  -I$(srcdir)/../utilities\
  -I$(srcdir)/../matrix_matrix\
  -I$(srcdir)/../distributed_matrix\
- -I$(srcdir)/../IJ_matrix_vector\
- -I$(srcdir)/../seq_matrix_vector\
- -I$(srcdir)/../parcsr_matrix_vector\
+ -I$(srcdir)/../IJ_mv\
+ -I$(srcdir)/../seq_mv\
+ -I$(srcdir)/../parcsr_mv\
  @PETSCINCLUDE@\
  ${C_COMPILE_FLAGS}\
  ${CINCLUDES} ${CDEFS}
diff --git a/parcsr_ls/HYPRE_parcsr_ml.cpp b/parcsr_ls/HYPRE_parcsr_ml.cpp
index 5dd30bf90..ef2de305f 100644
--- a/parcsr_ls/HYPRE_parcsr_ml.cpp
+++ b/parcsr_ls/HYPRE_parcsr_ml.cpp
@@ -42,8 +42,8 @@
 
 #include "../matrix_matrix/HYPRE_matrix_matrix_protos.h"
 
-#include "../seq_matrix_vector/vector.h"
-#include "../parcsr_matrix_vector/par_vector.h"
+#include "../seq_mv/vector.h"
+#include "../parcsr_mv/par_vector.h"
 
 #ifdef MLPACK
 
diff --git a/parcsr_ls/parcsr_ls.h b/parcsr_ls/parcsr_ls.h
index 26a73a184..fc563c5c9 100644
--- a/parcsr_ls/parcsr_ls.h
+++ b/parcsr_ls/parcsr_ls.h
@@ -8,8 +8,8 @@
 
 #include "utilities.h"
 #include "krylov.h"
-#include "seq_matrix_vector.h"
-#include "parcsr_matrix_vector.h"
+#include "seq_mv.h"
+#include "parcsr_mv.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/parcsr_mv/Makefile.in b/parcsr_mv/Makefile.in
index d4ca7c4cc..996535d31 100644
--- a/parcsr_mv/Makefile.in
+++ b/parcsr_mv/Makefile.in
@@ -27,7 +27,7 @@ CFLAGS =\
  -I$(srcdir)\
  -I$(srcdir)/..\
  -I$(srcdir)/../utilities\
- -I$(srcdir)/../seq_matrix_vector\
+ -I$(srcdir)/../seq_mv\
  ${CINCLUDES}\
  ${CDEFS}
  
@@ -39,7 +39,7 @@ LDLIBFLAGS = @LDLIBDIRS@ @LDLIBS@
  
 LFLAGS =\
  -L.\
- -L../seq_matrix_vector\
+ -L../seq_mv\
  -L../utilities\
  -lHYPRE_parcsr_mv\
  -lHYPRE_seq_mv\
@@ -51,7 +51,7 @@ HEADERS =\
  headers.h\
  par_csr_matrix.h\
  par_vector.h\
- parcsr_matrix_vector.h\
+ parcsr_mv.h\
  HYPRE_parcsr_mv.h
 
 FILES =\
@@ -95,7 +95,7 @@ driver_matmul: driver_matmul.o libHYPRE_parcsr_mv.a
 
 install: all
 	@cp -f $(srcdir)/HYPRE_*.h $$HYPRE_INSTALL_DIR/include/.
-	@cp -f $(srcdir)/parcsr_matrix_vector.h $$HYPRE_INSTALL_DIR/include/.
+	@cp -f $(srcdir)/parcsr_mv.h $$HYPRE_INSTALL_DIR/include/.
 	@cp -f libHYPRE_*.a $$HYPRE_INSTALL_DIR/lib/.
  
 clean:
diff --git a/parcsr_mv/headers b/parcsr_mv/headers
index 302cb637e..0e1208658 100755
--- a/parcsr_mv/headers
+++ b/parcsr_mv/headers
@@ -8,7 +8,7 @@
 # $Revision$
 #EHEADER***********************************************************************
 
-INTERNAL_HEADER=parcsr_matrix_vector.h
+INTERNAL_HEADER=parcsr_mv.h
 
 #===========================================================================
 # Include guards and other includes
@@ -24,7 +24,7 @@ cat > $INTERNAL_HEADER <<@
 #define hypre_PARCSR_MV_HEADER
 
 #include "utilities.h"
-#include "seq_matrix_vector.h"
+#include "seq_mv.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/parcsr_mv/headers.h b/parcsr_mv/headers.h
index ea155fd22..a740229dd 100644
--- a/parcsr_mv/headers.h
+++ b/parcsr_mv/headers.h
@@ -11,6 +11,6 @@
 #include <stdio.h>
 #include <math.h>
 
-#include "parcsr_matrix_vector.h"
+#include "parcsr_mv.h"
 
 
diff --git a/parcsr_mv/par_csr_matrix.c b/parcsr_mv/par_csr_matrix.c
index af4a8a0d6..8c0661914 100644
--- a/parcsr_mv/par_csr_matrix.c
+++ b/parcsr_mv/par_csr_matrix.c
@@ -14,13 +14,13 @@
 
 #include "headers.h"
 
-#include "../seq_matrix_vector/HYPRE_seq_mv.h"
+#include "../seq_mv/HYPRE_seq_mv.h"
 /* In addition to publically accessible interface in HYPRE_mv.h, the implementation
    in this file uses accessor macros into the sequential matrix structure, and
    so includes the .h that defines that structure. Should those accessor functions
    become proper functions at some later date, this will not be necessary. AJC 4/99
 */
-#include "../seq_matrix_vector/csr_matrix.h"
+#include "../seq_mv/csr_matrix.h"
 
 /*--------------------------------------------------------------------------
  * hypre_ParCSRMatrixCreate
diff --git a/parcsr_mv/parcsr_mv.h b/parcsr_mv/parcsr_mv.h
index d70b06f86..7ccb12f40 100644
--- a/parcsr_mv/parcsr_mv.h
+++ b/parcsr_mv/parcsr_mv.h
@@ -7,7 +7,7 @@
 #define hypre_PARCSR_MV_HEADER
 
 #include "utilities.h"
-#include "seq_matrix_vector.h"
+#include "seq_mv.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/seq_ls/amge/AMGe_matrix_topology.h b/seq_ls/amge/AMGe_matrix_topology.h
index 728a72710..59a4e605c 100644
--- a/seq_ls/amge/AMGe_matrix_topology.h
+++ b/seq_ls/amge/AMGe_matrix_topology.h
@@ -8,7 +8,7 @@
 #define hypre_LS_HEADER
 
 #include "utilities.h"
-#include "seq_matrix_vector.h"
+#include "seq_mv.h"
 
 */
 
diff --git a/seq_ls/amge/Makefile.in b/seq_ls/amge/Makefile.in
index 084b8018d..ec2dddcb4 100644
--- a/seq_ls/amge/Makefile.in
+++ b/seq_ls/amge/Makefile.in
@@ -26,7 +26,7 @@ CFLAGS =\
  -I$(srcdir)\
  -I$(srcdir)/../..\
  -I$(srcdir)/../../utilities\
- -I$(srcdir)/../../seq_matrix_vector\
+ -I$(srcdir)/../../seq_mv\
  ${CINCLUDES}\
  ${CDEFS}
  
@@ -39,7 +39,7 @@ LDLIBFLAGS = @LDLIBDIRS@ @LDLIBS@
 LFLAGS =\
  -L.\
  -lX11\
- -L../../seq_matrix_vector\
+ -L../../seq_mv\
  -L../../utilities\
  -lHYPRE_amge_ls\
  -lHYPRE_seq_mv\
diff --git a/seq_ls/amge/headers.h b/seq_ls/amge/headers.h
index 8662d626a..83e568b07 100644
--- a/seq_ls/amge/headers.h
+++ b/seq_ls/amge/headers.h
@@ -18,7 +18,7 @@
 #define hypre_LS_HEADER
 
 #include "utilities.h"
-#include "seq_matrix_vector.h"
+#include "seq_mv.h"
 
 #include "AMGe_matrix_topology.h"
 
diff --git a/seq_ls/amge_ag/AMGe_matrix_topology.h b/seq_ls/amge_ag/AMGe_matrix_topology.h
index 728a72710..59a4e605c 100644
--- a/seq_ls/amge_ag/AMGe_matrix_topology.h
+++ b/seq_ls/amge_ag/AMGe_matrix_topology.h
@@ -8,7 +8,7 @@
 #define hypre_LS_HEADER
 
 #include "utilities.h"
-#include "seq_matrix_vector.h"
+#include "seq_mv.h"
 
 */
 
diff --git a/seq_ls/amge_ag/Makefile.in b/seq_ls/amge_ag/Makefile.in
index b5f78bf59..d49cf2f37 100644
--- a/seq_ls/amge_ag/Makefile.in
+++ b/seq_ls/amge_ag/Makefile.in
@@ -26,7 +26,7 @@ CFLAGS =\
  -I$(srcdir)\
  -I$(srcdir)/../..\
  -I$(srcdir)/../../utilities\
- -I$(srcdir)/../../seq_matrix_vector\
+ -I$(srcdir)/../../seq_mv\
  ${CINCLUDES}\
  ${CDEFS}
  
@@ -39,7 +39,7 @@ LDLIBFLAGS = @LDLIBDIRS@ @LDLIBS@
 LFLAGS =\
  -L.\
  -lX11\
- -L../../seq_matrix_vector\
+ -L../../seq_mv\
  -L../../utilities\
  -lHYPRE_amge_ls\
  -lHYPRE_seq_mv\
diff --git a/seq_ls/amge_ag/Makefile_Schwarz b/seq_ls/amge_ag/Makefile_Schwarz
index 06bff8434..a46bd80b4 100644
--- a/seq_ls/amge_ag/Makefile_Schwarz
+++ b/seq_ls/amge_ag/Makefile_Schwarz
@@ -25,7 +25,7 @@ CFLAGS =\
  ${C_COMPILE_FLAGS}\
  -I../..\
  -I../../utilities\
- -I../../seq_matrix_vector\
+ -I../../seq_mv\
  ${CINCLUDES}\
  ${CDEFS}
  
@@ -38,7 +38,7 @@ LDLIBFLAGS =
 LFLAGS =\
  -L.\
  -lX11\
- -L../../seq_matrix_vector\
+ -L../../seq_mv\
  -L../../utilities\
  -lHYPRE_amge_ls\
  -lHYPRE_seq_mv\
diff --git a/seq_ls/amge_ag/headers.h b/seq_ls/amge_ag/headers.h
index 8662d626a..83e568b07 100644
--- a/seq_ls/amge_ag/headers.h
+++ b/seq_ls/amge_ag/headers.h
@@ -18,7 +18,7 @@
 #define hypre_LS_HEADER
 
 #include "utilities.h"
-#include "seq_matrix_vector.h"
+#include "seq_mv.h"
 
 #include "AMGe_matrix_topology.h"
 
diff --git a/seq_ls/pamg/MakeIRIX b/seq_ls/pamg/MakeIRIX
index c12b76f68..705189a70 100644
--- a/seq_ls/pamg/MakeIRIX
+++ b/seq_ls/pamg/MakeIRIX
@@ -46,7 +46,7 @@ LFLAGS =\
  -L/home/casc/g77/lib\
  -L/usr/local/mpi/mpich/lib/solaris/ch_p4\
  -L.\
- -L../../seq_matrix_vector\
+ -L../../seq_mv\
  -L../../utilities\
  -lHYPRE_ls\
  -lHYPRE_mv\
diff --git a/seq_ls/pamg/MakePCG b/seq_ls/pamg/MakePCG
index 05221dfbf..1a4f54740 100644
--- a/seq_ls/pamg/MakePCG
+++ b/seq_ls/pamg/MakePCG
@@ -51,7 +51,7 @@ LFLAGS =\
  -L/home/casc/g77/lib\
  -L/usr/local/mpi/mpich/lib/solaris/ch_p4\
  -L.\
- -L../../seq_matrix_vector\
+ -L../../seq_mv\
  -L../../utilities\
  -lHYPRE_ls\
  -lHYPRE_mv\
diff --git a/seq_ls/pamg/Makefile.in b/seq_ls/pamg/Makefile.in
index 8436cef03..0f57a4686 100644
--- a/seq_ls/pamg/Makefile.in
+++ b/seq_ls/pamg/Makefile.in
@@ -28,7 +28,7 @@ CFLAGS =\
  -I$(srcdir)/../..\
  -I$(srcdir)/../../utilities\
  -I$(srcdir)/../../krylov\
- -I$(srcdir)/../../seq_matrix_vector\
+ -I$(srcdir)/../../seq_mv\
  ${CINCLUDES}\
  ${CDEFS}
  
@@ -40,7 +40,7 @@ LDLIBFLAGS = @LDLIBDIRS@ @LDLIBS@
  
 LFLAGS =\
  -L.\
- -L../../seq_matrix_vector\
+ -L../../seq_mv\
  -L../../utilities\
  -lHYPRE_amg_ls\
  -lHYPRE_seq_mv\
diff --git a/seq_ls/pamg/headers b/seq_ls/pamg/headers
index daec9f0d6..1e1122ef5 100755
--- a/seq_ls/pamg/headers
+++ b/seq_ls/pamg/headers
@@ -25,7 +25,7 @@ cat > $INTERNAL_HEADER <<@
 
 #include "utilities.h"
 #include "krylov.h"
-#include "seq_matrix_vector.h"
+#include "seq_mv.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/seq_ls/pamg/pamg.h b/seq_ls/pamg/pamg.h
index 139aa4d05..b2bc44783 100644
--- a/seq_ls/pamg/pamg.h
+++ b/seq_ls/pamg/pamg.h
@@ -8,7 +8,7 @@
 
 #include "utilities.h"
 #include "krylov.h"
-#include "seq_matrix_vector.h"
+#include "seq_mv.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/seq_mv/Makefile.in b/seq_mv/Makefile.in
index 48f5c36cc..a554f0452 100644
--- a/seq_mv/Makefile.in
+++ b/seq_mv/Makefile.in
@@ -45,7 +45,7 @@ LFLAGS =\
 
 HEADERS =\
  HYPRE_seq_mv.h\
- seq_matrix_vector.h\
+ seq_mv.h\
  csr_matrix.h\
  headers.h\
  mapped_matrix.h\
@@ -75,7 +75,7 @@ all: libHYPRE_seq_mv.a
  
 install: all
 	@cp -f $(srcdir)/HYPRE_*.h $$HYPRE_INSTALL_DIR/include/.
-	@cp -f $(srcdir)/seq_matrix_vector.h $$HYPRE_INSTALL_DIR/include/.
+	@cp -f $(srcdir)/seq_mv.h $$HYPRE_INSTALL_DIR/include/.
 	@cp -f libHYPRE_*.a $$HYPRE_INSTALL_DIR/lib/.
 
 clean:
diff --git a/seq_mv/headers b/seq_mv/headers
index 47e355f87..17914ba24 100755
--- a/seq_mv/headers
+++ b/seq_mv/headers
@@ -8,7 +8,7 @@
 # $Revision$
 #EHEADER***********************************************************************
 
-INTERNAL_HEADER=seq_matrix_vector.h
+INTERNAL_HEADER=seq_mv.h
 
 #===========================================================================
 # Include guards and other includes
diff --git a/seq_mv/headers.h b/seq_mv/headers.h
index b4d8a4733..a588e223d 100644
--- a/seq_mv/headers.h
+++ b/seq_mv/headers.h
@@ -11,6 +11,6 @@
 #include <stdio.h>
 #include <math.h>
 
-#include "seq_matrix_vector.h"
+#include "seq_mv.h"
 
 
diff --git a/sstruct_ls/sstruct_ls.h b/sstruct_ls/sstruct_ls.h
index 947180096..4b81cc265 100644
--- a/sstruct_ls/sstruct_ls.h
+++ b/sstruct_ls/sstruct_ls.h
@@ -8,7 +8,7 @@
 
 #include "utilities.h"
 #include "krylov.h"
-#include "sstruct_matrix_vector.h"
+#include "sstruct_mv.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/sstruct_mv/Makefile.in b/sstruct_mv/Makefile.in
index d590dbc97..9af6e5378 100644
--- a/sstruct_mv/Makefile.in
+++ b/sstruct_mv/Makefile.in
@@ -25,17 +25,17 @@ CFLAGS =\
  -I$(srcdir)\
  -I$(srcdir)/..\
  -I$(srcdir)/../utilities\
- -I$(srcdir)/../struct_matrix_vector\
- -I$(srcdir)/../seq_matrix_vector\
- -I$(srcdir)/../parcsr_matrix_vector\
- -I$(srcdir)/../IJ_matrix_vector\
+ -I$(srcdir)/../struct_mv\
+ -I$(srcdir)/../seq_mv\
+ -I$(srcdir)/../parcsr_mv\
+ -I$(srcdir)/../IJ_mv\
  ${CINCLUDES}
 
 RANLIB= @RANLIB@
 
 HEADERS =\
  HYPRE_sstruct_mv.h\
- sstruct_matrix_vector.h\
+ sstruct_mv.h\
  headers.h\
  sstruct_graph.h\
  sstruct_grid.h\
@@ -72,7 +72,7 @@ all: libHYPRE_sstruct_mv.a
 
 install: all
 	@cp -f $(srcdir)/HYPRE_*.h $$HYPRE_INSTALL_DIR/include/.
-	@cp -f $(srcdir)/sstruct_matrix_vector.h $$HYPRE_INSTALL_DIR/include/.
+	@cp -f $(srcdir)/sstruct_mv.h $$HYPRE_INSTALL_DIR/include/.
 	@cp -f libHYPRE_*.a $$HYPRE_INSTALL_DIR/lib/.
 
 clean:
diff --git a/sstruct_mv/headers b/sstruct_mv/headers
index 6b913df2c..ab3d2c9e4 100755
--- a/sstruct_mv/headers
+++ b/sstruct_mv/headers
@@ -8,7 +8,7 @@
 # $Revision$
 #EHEADER***********************************************************************
 
-INTERNAL_HEADER=sstruct_matrix_vector.h
+INTERNAL_HEADER=sstruct_mv.h
 
 #===========================================================================
 # Include guards and other includes
@@ -24,8 +24,8 @@ cat > $INTERNAL_HEADER <<@
 #define hypre_SSTRUCT_MV_HEADER
 
 #include "utilities.h"
-#include "struct_matrix_vector.h"
-#include "IJ_matrix_vector.h"
+#include "struct_mv.h"
+#include "IJ_mv.h"
 #include "HYPRE.h"
 
 #ifdef __cplusplus
diff --git a/sstruct_mv/headers.h b/sstruct_mv/headers.h
index 8a47b33b0..52123bc37 100644
--- a/sstruct_mv/headers.h
+++ b/sstruct_mv/headers.h
@@ -11,4 +11,4 @@
 #include <stdio.h>
 #include <math.h>
 
-#include "sstruct_matrix_vector.h"
+#include "sstruct_mv.h"
diff --git a/sstruct_mv/sstruct_mv.h b/sstruct_mv/sstruct_mv.h
index 11497176a..af09d4927 100644
--- a/sstruct_mv/sstruct_mv.h
+++ b/sstruct_mv/sstruct_mv.h
@@ -7,8 +7,8 @@
 #define hypre_SSTRUCT_MV_HEADER
 
 #include "utilities.h"
-#include "struct_matrix_vector.h"
-#include "IJ_matrix_vector.h"
+#include "struct_mv.h"
+#include "IJ_mv.h"
 #include "HYPRE.h"
 
 #ifdef __cplusplus
diff --git a/structIJ_mv/HYPRE_structIJ_mv.h b/structIJ_mv/HYPRE_structIJ_mv.h
index a84aee1a7..8e8a6455b 100644
--- a/structIJ_mv/HYPRE_structIJ_mv.h
+++ b/structIJ_mv/HYPRE_structIJ_mv.h
@@ -1,4 +1,4 @@
-#include "../struct_matrix_vector/struct_matrix_vector.h"
+#include "../struct_mv/struct_mv.h"
 
 #ifndef HYPRE_structIJ_MV_HEADER
 #define HYPRE_structIJ_MV_HEADER
diff --git a/structIJ_mv/headers.h b/structIJ_mv/headers.h
index ebcebda0e..8d17487fd 100644
--- a/structIJ_mv/headers.h
+++ b/structIJ_mv/headers.h
@@ -2,4 +2,4 @@
 #include <stdio.h>
 #include <math.h>
 
-#include "structIJ_matrix_vector.h"
+#include "structIJ_mv.h"
diff --git a/structIJ_mv/structIJ_mv.h b/structIJ_mv/structIJ_mv.h
index 39ac79497..b040da1ce 100644
--- a/structIJ_mv/structIJ_mv.h
+++ b/structIJ_mv/structIJ_mv.h
@@ -1,7 +1,7 @@
 #include "HYPRE_structIJ_mv.h"
 #include "HYPRE_IJ_mv.h"
-#include "IJ_matrix_vector.h"
-#include "CI_struct_matrix_vector.h"
+#include "IJ_mv.h"
+#include "CI_struct_mv.h"
 #include "utilities.h"
 
 #ifndef hypre_structIJ_MV_HEADER
diff --git a/struct_ls/struct_ls.h b/struct_ls/struct_ls.h
index 2554f533d..95c60ad78 100644
--- a/struct_ls/struct_ls.h
+++ b/struct_ls/struct_ls.h
@@ -7,7 +7,7 @@
 #define hypre_STRUCT_LS_HEADER
 
 #include "utilities.h"
-#include "struct_matrix_vector.h"
+#include "struct_mv.h"
 #include "krylov.h"
 
 #ifdef __cplusplus
diff --git a/struct_mv/Makefile.in b/struct_mv/Makefile.in
index 1e1f667b7..16ba67027 100644
--- a/struct_mv/Makefile.in
+++ b/struct_mv/Makefile.in
@@ -40,7 +40,7 @@ HEADERS =\
  struct_matrix.h\
  struct_stencil.h\
  struct_vector.h\
- struct_matrix_vector.h\
+ struct_mv.h\
  HYPRE_struct_mv.h
 
 FILES =\
@@ -83,7 +83,7 @@ all: libHYPRE_struct_mv.a
 
 install: all
 	@cp -f $(srcdir)/HYPRE_*.h $$HYPRE_INSTALL_DIR/include/.
-	@cp -f $(srcdir)/struct_matrix_vector.h $$HYPRE_INSTALL_DIR/include/.
+	@cp -f $(srcdir)/struct_mv.h $$HYPRE_INSTALL_DIR/include/.
 	@cp -f libHYPRE_*.a $$HYPRE_INSTALL_DIR/lib/.
 
 clean:
diff --git a/struct_mv/headers b/struct_mv/headers
index 4103068f0..d4566e412 100755
--- a/struct_mv/headers
+++ b/struct_mv/headers
@@ -8,7 +8,7 @@
 # $Revision$
 #EHEADER***********************************************************************
 
-INTERNAL_HEADER=struct_matrix_vector.h
+INTERNAL_HEADER=struct_mv.h
 
 #===========================================================================
 # Include guards and other includes
diff --git a/struct_mv/headers.h b/struct_mv/headers.h
index 11ca75626..8294aef44 100644
--- a/struct_mv/headers.h
+++ b/struct_mv/headers.h
@@ -11,4 +11,4 @@
 #include <stdio.h>
 #include <math.h>
 
-#include "struct_matrix_vector.h"
+#include "struct_mv.h"
diff --git a/test/IJ_linear_solvers_b.c b/test/IJ_linear_solvers_b.c
index 0de0711ab..a73f98ed3 100644
--- a/test/IJ_linear_solvers_b.c
+++ b/test/IJ_linear_solvers_b.c
@@ -15,7 +15,7 @@
 #include "HYPRE_parcsr_mv.h"
 
 #include "HYPRE_IJ_mv.h"
-#include "IJ_matrix_vector.h"
+#include "IJ_mv.h"
 #include "HYPRE_parcsr_ls.h"
 
 #include "Hypre_LinearOperator_Stub.h"
diff --git a/test/sstruct_linear_solvers.c b/test/sstruct_linear_solvers.c
index 6dd50971a..d3239c238 100644
--- a/test/sstruct_linear_solvers.c
+++ b/test/sstruct_linear_solvers.c
@@ -9,7 +9,7 @@
 #define DEBUG 0
 
 #if DEBUG
-#include "sstruct_matrix_vector.h"
+#include "sstruct_mv.h"
 #endif
 
 /*--------------------------------------------------------------------------
diff --git a/tools/Makefile.in b/tools/Makefile.in
index a5834d0ef..d7cb8fbb0 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -25,7 +25,7 @@ CDEFS = @HYPREDEFS@ -DHYPRE_TIMING
 CFLAGS =\
  ${C_COMPILE_FLAGS}\
  -I$(srcdir)/../utilities\
- -I$(srcdir)/../struct_matrix_vector\
+ -I$(srcdir)/../struct_mv\
  ${CINCLUDES} ${CDEFS}
 
 RANLIB= @RANLIB@
@@ -35,7 +35,7 @@ LIBFLAGS = @LIBDIRS@ @LIBS@
 LDLIBFLAGS = @LDLIBDIRS@ @LDLIBS@
 
 LFLAGS =\
- -L../struct_matrix_vector\
+ -L../struct_mv\
  -L../utilities\
  -lHYPRE_mv\
  -lHYPRE_utilities\