Index: /issm/trunk-jpl/src/c/shared/Random/randomgenerator.cpp
===================================================================
--- /issm/trunk-jpl/src/c/shared/Random/randomgenerator.cpp	(revision 26602)
+++ /issm/trunk-jpl/src/c/shared/Random/randomgenerator.cpp	(revision 26603)
@@ -11,68 +11,72 @@
 #define M_PI 3.141592653589793238462643
 
-rnd_uniform_distribution::rnd_uniform_distribution(){/*{{{*/
+namespace rnd{
 
-		a   = 1103515245; 	// BSD Formula
-		c  = 12345;					// BSD Formula
-		m = 2147483648;			// BSD Formula
-		_seed = 0;
-		lbound = 0.0;
-		ubound = 1.0;
-		return;
-}
-/*}}}*/
-rnd_uniform_distribution::rnd_uniform_distribution(double lower,double upper){/*{{{*/
+	uniform_distribution::uniform_distribution(){/*{{{*/
 
-		a   = 1103515245;		// BSD Formula
-		c  = 12345;					// BSD Formula
-		m = 2147483648;			// BSD Formula
-		_seed = 0;
-		lbound = lower;
-		ubound = upper;
-		return;
-}
-/*}}}*/
-rnd_uniform_distribution::~rnd_uniform_distribution(){}
-void rnd_uniform_distribution::seed( unsigned int s ) { _seed = s; }
-unsigned int rnd_uniform_distribution::get_seed() { return _seed; }
-double rnd_uniform_distribution::generator() {
-		_seed = ( a * _seed + c ) % m ;
-		return (ubound-lbound)*(double) _seed/ m + lbound;
-}
+			a   = 1103515245; 	// BSD Formula
+			c  = 12345;					// BSD Formula
+			m = 2147483648;			// BSD Formula
+			_seed = 0;
+			lbound = 0.0;
+			ubound = 1.0;
+			return;
+	}
+	/*}}}*/
+	uniform_distribution::uniform_distribution(double lower,double upper){/*{{{*/
+
+			a   = 1103515245;		// BSD Formula
+			c  = 12345;					// BSD Formula
+			m = 2147483648;			// BSD Formula
+			_seed = 0;
+			lbound = lower;
+			ubound = upper;
+			return;
+	}
+	/*}}}*/
+	uniform_distribution::~uniform_distribution(){}
+	void uniform_distribution::seed( unsigned int s ) { _seed = s; }
+	unsigned int uniform_distribution::get_seed() { return _seed; }
+	double uniform_distribution::generator() {
+			_seed = ( a * _seed + c ) % m ;
+			return (ubound-lbound)*(double) _seed/ m + lbound;
+	}
 
 
-rnd_normal_distribution::rnd_normal_distribution(){/*{{{*/
+	normal_distribution::normal_distribution(){/*{{{*/
 
-		_seed = 0;
-		mean   = 0;
-		sdev  = 1.0;
-		return;
-}
-/*}}}*/
-rnd_normal_distribution::rnd_normal_distribution(double m,double s){/*{{{*/
+			_seed = 0;
+			mean   = 0;
+			sdev  = 1.0;
+			return;
+	}
+	/*}}}*/
+	normal_distribution::normal_distribution(double m,double s){/*{{{*/
 
-		_seed = 0;
-		mean   = m;
-		sdev  = s;
-		return;
-}
+			_seed = 0;
+			mean   = m;
+			sdev  = s;
+			return;
+	}
+		/*}}}*/
+	normal_distribution::~normal_distribution(){}
+	void normal_distribution::seed( unsigned int s ) { _seed = s; }
+	double normal_distribution::generator(){/*{{{*/
+
+			rnd::uniform_distribution	unifdistri;
+			unifdistri.seed(_seed);
+
+			double u1 = unifdistri.generator();
+			double u2 = unifdistri.generator();
+
+			double R = sqrt(-2*log(u1));
+			double theta = 2*M_PI*u2;
+
+			seed(unifdistri.get_seed());
+
+			return mean + sdev * (R*cos(theta));
+
+	}
 	/*}}}*/
-rnd_normal_distribution::~rnd_normal_distribution(){}
-void rnd_normal_distribution::seed( unsigned int s ) { _seed = s; }
-double rnd_normal_distribution::generator(){/*{{{*/
-
-		rnd_uniform_distribution	unifdistri;
-		unifdistri.seed(_seed);
-
-		double u1 = unifdistri.generator();
-		double u2 = unifdistri.generator();
-
-		double R = sqrt(-2*log(u1));
-		double theta = 2*M_PI*u2;
-
-		seed(unifdistri.get_seed());
-
-		return mean + sdev * (R*cos(theta));
 
 }
-/*}}}*/
Index: /issm/trunk-jpl/src/c/shared/Random/randomgenerator.h
===================================================================
--- /issm/trunk-jpl/src/c/shared/Random/randomgenerator.h	(revision 26602)
+++ /issm/trunk-jpl/src/c/shared/Random/randomgenerator.h	(revision 26603)
@@ -9,47 +9,51 @@
 #define M_PI 3.141592653589793238462643
 
-class rnd_uniform_distribution
-{
+namespace rnd{
 
-  private:
-    int a;
-    int c;
-    unsigned int m;
-    unsigned _seed;
-    double lbound;
-    double ubound;
+  class uniform_distribution
+  {
 
-  public:
+    private:
+      int a;
+      int c;
+      unsigned int m;
+      unsigned _seed;
+      double lbound;
+      double ubound;
 
-    /*constructors, destructors: */
-    rnd_uniform_distribution();
-    rnd_uniform_distribution(double a_1,double a_2);
-    ~rnd_uniform_distribution();
+    public:
 
-    void seed( unsigned int s );
-    unsigned int get_seed();
-    double generator();
+      /*constructors, destructors: */
+      uniform_distribution();
+      uniform_distribution(double a_1,double a_2);
+      ~uniform_distribution();
 
-};
+      void seed( unsigned int s );
+      unsigned int get_seed();
+      double generator();
 
-class rnd_normal_distribution
-{
+  };
 
-  private:
-    unsigned _seed;
-    double mean;
-    double sdev;
+  class normal_distribution
+  {
 
-  public:
+    private:
+      unsigned _seed;
+      double mean;
+      double sdev;
 
-    /*constructors, destructors: */
-    rnd_normal_distribution();
-    rnd_normal_distribution(double m,double s);
-    ~rnd_normal_distribution();
+    public:
 
-    void seed( unsigned int s );
-    double generator();
+      /*constructors, destructors: */
+      normal_distribution();
+      normal_distribution(double m,double s);
+      ~normal_distribution();
 
-};
+      void seed( unsigned int s );
+      double generator();
+
+  };
+
+}
 
 #endif //ifndef _RANDOMGENERATOR_H_
Index: /issm/trunk-jpl/src/c/solutionsequences/solutionsequence_sampling.cpp
===================================================================
--- /issm/trunk-jpl/src/c/solutionsequences/solutionsequence_sampling.cpp	(revision 26602)
+++ /issm/trunk-jpl/src/c/solutionsequences/solutionsequence_sampling.cpp	(revision 26603)
@@ -18,5 +18,5 @@
 
 	/*Define seed*/
-	rnd_normal_distribution distribution;
+	rnd::normal_distribution distribution;
 	if(seed<0){
 		std::random_device rd;