diff --git a/matlab/swz/c-code/Makefile b/matlab/swz/c-code/Makefile
index 54dcf77ba201c4a8ae926fdabbe30c19d036b96c..4f005814c4a5c78cdf5ce473116f73469bd0f35c 100644
--- a/matlab/swz/c-code/Makefile
+++ b/matlab/swz/c-code/Makefile
@@ -201,7 +201,7 @@ VAR_DIR = $(WORK_DIR)/sbvar/var
 # DW  FILES
 INCLUDE_DIR := -I$(MATRIX_DIR) -I$(ERROR_DIR) -I$(ARRAY_DIR) -I$(ASCII_DIR) -I$(STAT_DIR) -I$(SPHERICAL_DIR) -I$(SORT_DIR) -I$(SWITCH_DIR) -I$(VAR_DIR) $(INCLUDE_DIR) 
 VPATH := $(VPATH) $(MATRIX_DIR) $(ERROR_DIR) $(ARRAY_DIR) $(ASCII_DIR) $(STAT_DIR) $(SPHERICAL_DIR) $(SORT_DIR) $(SWITCH_DIR) $(VAR_DIR)
-OBJS := $(OBJS) bmatrix.o matrix.o dw_error.o dw_rand.o dw_matrix_rand.o dw_array.o dw_matrix_array.o dw_matrix_sort.o dw_ascii.o dw_parse_cmd.o
+OBJS := $(OBJS) bmatrix.o swzmatrix.o dw_error.o dw_rand.o dw_matrix_rand.o dw_array.o dw_matrix_array.o dw_matrix_sort.o dw_ascii.o dw_parse_cmd.o
 
 # TAO FILES
 OBJS := $(OBJS)
diff --git a/matlab/swz/c-code/sbvar/switching/switch.h b/matlab/swz/c-code/sbvar/switching/switch.h
index 2ef8b35ef3a5657cd0239663c250ca7518ecc6d2..b61fe62e450df1dbaf5e628d94a8b0a22570d5a0 100644
--- a/matlab/swz/c-code/sbvar/switching/switch.h
+++ b/matlab/swz/c-code/sbvar/switching/switch.h
@@ -5,7 +5,7 @@
 
 #define __SWITCHING_VER_100__
 
-#include "matrix.h"
+#include "swzmatrix.h"
 
 //=== Declaring structures so pointers can be defined ===
 struct TStateModel_tag;
diff --git a/matlab/swz/c-code/sbvar/var/PrintDraws.c b/matlab/swz/c-code/sbvar/var/PrintDraws.c
index b8a926be0a9203e0ac1fdc278429ceff0ed3a51a..f785f8a9d00091aad35d74bb3d0a41ea0214aad0 100644
--- a/matlab/swz/c-code/sbvar/var/PrintDraws.c
+++ b/matlab/swz/c-code/sbvar/var/PrintDraws.c
@@ -1,5 +1,5 @@
 
-#include "matrix.h"
+#include "swzmatrix.h"
 #include "dw_rand.h"
 #include "dw_parse_cmd.h"
 #include "dw_ascii.h"
diff --git a/matlab/swz/c-code/sbvar/var/VARbase.c b/matlab/swz/c-code/sbvar/var/VARbase.c
index 10cf3d521bfbd8ee6cf6850aa92db1909533a78b..bb84b6f0045a9e98d564f144909b780fcfcb55ef 100644
--- a/matlab/swz/c-code/sbvar/var/VARbase.c
+++ b/matlab/swz/c-code/sbvar/var/VARbase.c
@@ -4,7 +4,7 @@
 #include "switch.h"
 #include "switchio.h"
 #include "dw_error.h"
-#include "matrix.h"
+#include "swzmatrix.h"
 #include "bmatrix.h"
 #include "dw_array.h"
 #include "dw_matrix_array.h"
diff --git a/matlab/swz/c-code/sbvar/var/VARbase.h b/matlab/swz/c-code/sbvar/var/VARbase.h
index 7d066d20453b247f150553991c563901cf9f8f51..132c7e73d13900cdec9187f7e6e37ac0439d7a56 100644
--- a/matlab/swz/c-code/sbvar/var/VARbase.h
+++ b/matlab/swz/c-code/sbvar/var/VARbase.h
@@ -3,7 +3,7 @@
 #define __VAR_BASE_MODEL__
 
 #include "switch.h"
-#include "matrix.h"
+#include "swzmatrix.h"
 #include "dw_matrix_array.h"
 
 #define standard_ordering 1  // for future implementation
diff --git a/matlab/swz/c-code/sbvar/var/mhm_VAR.h b/matlab/swz/c-code/sbvar/var/mhm_VAR.h
index ca8c52b6e4cc34da60e8b61cb35de441e88041c6..49e47e665e962d9982b542070d267d61a47a1580 100644
--- a/matlab/swz/c-code/sbvar/var/mhm_VAR.h
+++ b/matlab/swz/c-code/sbvar/var/mhm_VAR.h
@@ -2,7 +2,7 @@
 #ifndef __MODIFIED_HARMONIC_MEAN_
 #define __MODIFIED_HARMONIC_MEAN_
 
-#include "matrix.h"
+#include "swzmatrix.h"
 #include "switch.h"
 #include "VARbase.h"
 
diff --git a/matlab/swz/c-code/sbvar/var/mhm_VAR_main_2.c b/matlab/swz/c-code/sbvar/var/mhm_VAR_main_2.c
index 9908132fd49369e747ce0f6e0a404a0961252b52..d5d65ad35e9c9e8cd06c0a19e3601c7e06765a76 100644
--- a/matlab/swz/c-code/sbvar/var/mhm_VAR_main_2.c
+++ b/matlab/swz/c-code/sbvar/var/mhm_VAR_main_2.c
@@ -1,6 +1,6 @@
 
 
-#include "matrix.h"
+#include "swzmatrix.h"
 #include "dw_ascii.h"
 #include "dw_rand.h"
 #include "dw_matrix_rand.h"
diff --git a/matlab/swz/c-code/utilities/DWCcode/arrays/dw_matrix_array.h b/matlab/swz/c-code/utilities/DWCcode/arrays/dw_matrix_array.h
index a0e3667d3d8916f16fa7ce8b33827d175443bae4..9afa24602e6f00d7c107b8ffff0f8113b2b6ac7f 100644
--- a/matlab/swz/c-code/utilities/DWCcode/arrays/dw_matrix_array.h
+++ b/matlab/swz/c-code/utilities/DWCcode/arrays/dw_matrix_array.h
@@ -2,7 +2,7 @@
 #ifndef __MATRIX_ARRAY__
 #define __MATRIX_ARRAY__
 
-#include "matrix.h"
+#include "swzmatrix.h"
 #include "dw_array.h"
 
 extern TElementSpecification dw_VectorSpecs;
diff --git a/matlab/swz/c-code/utilities/DWCcode/matrix/matrix.c b/matlab/swz/c-code/utilities/DWCcode/matrix/swzmatrix.c
similarity index 96%
rename from matlab/swz/c-code/utilities/DWCcode/matrix/matrix.c
rename to matlab/swz/c-code/utilities/DWCcode/matrix/swzmatrix.c
index f3ff112ac48947e1bbeff6dee410cc470d551f61..22ca614c2c0144307d917ee7436c683def9a2e1e 100644
--- a/matlab/swz/c-code/utilities/DWCcode/matrix/matrix.c
+++ b/matlab/swz/c-code/utilities/DWCcode/matrix/swzmatrix.c
@@ -1,5 +1,5 @@
 
-#include "matrix.h"
+#include "swzmatrix.h"
 #include "bmatrix.h"
 #include "dw_error.h"
 
diff --git a/matlab/swz/c-code/utilities/DWCcode/matrix/matrix.h b/matlab/swz/c-code/utilities/DWCcode/matrix/swzmatrix.h
similarity index 100%
rename from matlab/swz/c-code/utilities/DWCcode/matrix/matrix.h
rename to matlab/swz/c-code/utilities/DWCcode/matrix/swzmatrix.h
diff --git a/matlab/swz/c-code/utilities/DWCcode/matrix/tz2dw.h b/matlab/swz/c-code/utilities/DWCcode/matrix/tz2dw.h
index 09c77b5158d957abf9e2cb5a17d3bf98cc13b998..32a509c37227b2c0758e739b883c6b9fc39586f5 100644
--- a/matlab/swz/c-code/utilities/DWCcode/matrix/tz2dw.h
+++ b/matlab/swz/c-code/utilities/DWCcode/matrix/tz2dw.h
@@ -2,7 +2,7 @@
 #ifndef __TZ2DW__
 #define __TZ2DW__
 
-#include "matrix.h"
+#include "swzmatrix.h"
 
 // flags and defines
 #define NEARINFINITY 1.0E+300
diff --git a/matlab/swz/c-code/utilities/DWCcode/sort/dw_matrix_sort.h b/matlab/swz/c-code/utilities/DWCcode/sort/dw_matrix_sort.h
index 0beb5a8ac51ce869251619eaf43f9fea41f395b3..b1d8323965f87370018c3e189252bd37bb3f8cad 100644
--- a/matlab/swz/c-code/utilities/DWCcode/sort/dw_matrix_sort.h
+++ b/matlab/swz/c-code/utilities/DWCcode/sort/dw_matrix_sort.h
@@ -2,7 +2,7 @@
 #ifndef __SORT_MATRICES__
 #define __SORT_MATRICES__
 
-#include "matrix.h"
+#include "swzmatrix.h"
 
 TVector SortVectorAscending(TVector x, TVector y);
 TVector SortVectorDescending(TVector x, TVector y);
diff --git a/matlab/swz/c-code/utilities/DWCcode/spherical/spherical.h b/matlab/swz/c-code/utilities/DWCcode/spherical/spherical.h
index df4db59a1af31ae811501f0e86ddfdfafaec1748..342f02c38c521b002b5cb466f5fc6e02661a40d0 100644
--- a/matlab/swz/c-code/utilities/DWCcode/spherical/spherical.h
+++ b/matlab/swz/c-code/utilities/DWCcode/spherical/spherical.h
@@ -1,5 +1,5 @@
 
-#include "matrix.h"
+#include "swzmatrix.h"
 
 char* SphericalType(void);
 void SetupSpherical_Gaussian(int n);
diff --git a/matlab/swz/c-code/utilities/DWCcode/stat/dw_matrix_rand.h b/matlab/swz/c-code/utilities/DWCcode/stat/dw_matrix_rand.h
index c70d30814a078b76a89361a146af2fed857d15ce..2bf133971d88f46a3a92edbfabb052322ef40b59 100644
--- a/matlab/swz/c-code/utilities/DWCcode/stat/dw_matrix_rand.h
+++ b/matlab/swz/c-code/utilities/DWCcode/stat/dw_matrix_rand.h
@@ -2,7 +2,7 @@
 #ifndef __RANDOM_MATRIX__
 #define __RANDOM_MATRIX__
 
-#include "matrix.h"
+#include "swzmatrix.h"
 
 /* Random Matrices and Vectors */
 TVector dw_UniformVector(TVector x);