diff --git a/Makefile.am b/Makefile.am
index c836bb8..e86bb16 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 lib_LTLIBRARIES = libla.la
-include_HEADERS = version.h simple.h vecmat3.h quaternion.h fortran.h cuda_la.h auxstorage.h  davidson.h   laerror.h    mat.h          qsort.h             vec.h bisection.h   diis.h       la.h         noncblas.h     smat.h bitvector.h   fourindex.h  la_traits.h random.h  nonclass.h     sparsemat.h sparsesmat.h csrmat.h conjgrad.h    gmres.h      matexp.h     permutation.h   polynomial.h contfrac.h graph.h
-libla_la_SOURCES = simple.cc quaternion.cc vecmat3.cc vec.cc mat.cc smat.cc sparsemat.cc sparsesmat.cc csrmat.cc laerror.cc noncblas.cc  bitvector.cc strassen.cc nonclass.cc cuda_la.cc fourindex.cc permutation.cc polynomial.cc contfrac.cc graph.cc random.cc
+include_HEADERS = version.h simple.h vecmat3.h quaternion.h fortran.h cuda_la.h auxstorage.h  davidson.h   laerror.h    mat.h          qsort.h             vec.h bisection.h   diis.h       la.h         noncblas.h     smat.h bitvector.h   fourindex.h  la_traits.h la_random.h  nonclass.h     sparsemat.h sparsesmat.h csrmat.h conjgrad.h    gmres.h      matexp.h     permutation.h   polynomial.h contfrac.h graph.h
+libla_la_SOURCES = simple.cc quaternion.cc vecmat3.cc vec.cc mat.cc smat.cc sparsemat.cc sparsesmat.cc csrmat.cc laerror.cc noncblas.cc  bitvector.cc strassen.cc nonclass.cc cuda_la.cc fourindex.cc permutation.cc polynomial.cc contfrac.cc graph.cc la_random.cc
 nodist_libla_la_SOURCES = version.cc
 check_PROGRAMS = t test tX
 t_SOURCES = t.cc t2.cc 
diff --git a/random.cc b/la_random.cc
similarity index 91%
rename from random.cc
rename to la_random.cc
index 3a68c27..1266dff 100644
--- a/random.cc
+++ b/la_random.cc
@@ -1,5 +1,5 @@
 #include <stdlib.h>
-#include "random.h"
+#include "la_random.h"
 
 namespace LA {
 
diff --git a/random.h b/la_random.h
similarity index 92%
rename from random.h
rename to la_random.h
index b36d8ef..4263d66 100644
--- a/random.h
+++ b/la_random.h
@@ -1,5 +1,5 @@
-#ifndef _RANDOM_H
-#define _RANDOM_H
+#ifndef _LA_RANDOM_H
+#define _LA_RANDOM_H
 
 namespace LA {
 
diff --git a/la_traits.h b/la_traits.h
index e32cfee..dc682b7 100644
--- a/la_traits.h
+++ b/la_traits.h
@@ -44,7 +44,7 @@
 //using namespace std;
 
 #include "laerror.h"
-#include "random.h"
+#include "la_random.h"
 
 #include "cuda_la.h"