Index: tol_pkg/MhCnstrLinRegArima/_MhCnstrLinRegArima.tol
===================================================================
--- tol_pkg/MhCnstrLinRegArima/_MhCnstrLinRegArima.tol	(revision 176aa3ef8a2b205a8793758988988ba3aed69d9a)
+++ tol_pkg/MhCnstrLinRegArima/_MhCnstrLinRegArima.tol	(revision ea1b10f9bb52161bd0b5e2cd3188f654b8593bbd)
@@ -1,24 +1,29 @@
 /////////////////////////////////////////////////////////////////////////////
 // FILE: _mhCnstrLinRegArima.tol
-// PURPOSE: Metropolis-Hastings simulation of a linear regression with ARIMA 
-// noise and linear inequality constraints
 /////////////////////////////////////////////////////////////////////////////
 
 
+NameBlock MhCnstrLinRegArima = [[
+Text _.autodoc.description = "Metropolis-Hastings "
+"simulation of a linear regression with ARIMA noise and linear inequality "
+"constraints:\n"
+"\n"
+"\n  Y = X*b + z"
+"\n  A*b <= a"
+"\n  Ar(B)*Dif(B):z = Ma(B):e"
+"\n  e ~ N(0, s^2)"
+"\n\n"
+"The tarjet of this package is just to serve as example and test for "
+"some constrained Metropolis-Hastings simulation methods and related "
+"functions as Gelman diagnosis.\n"
+"For more details see mhCnstrLinRegArima.pdf (Sorry only spanish doc).";
+
+Text _.autodoc.keywords = "MCMC,Markov,Bayesian,Metropolis,Hastings,"
+  "linear,regression,ARIMA,inequality,constraints,polytope";
+
 //////////////////////////////////////////////////////////////////////////////
-Class @MhCnstrLinRegArima
+Class @Simulator
 //////////////////////////////////////////////////////////////////////////////
 {
-  Static Text _.autodoc.description = "Basic class for Metropolis-Hastings "
-  "simulation of a linear regression with ARIMA noise and linear inequality "
-  "constraints:\n"
-  "\n"
-  "\n  Y = X*b + z"
-  "\n  A*b <= a"
-  "\n  Ar(B)*Dif(B):z = Ma(B):e"
-  "\n  e ~ N(0, s^2)"
-  "\n"
-  "\nFor more details see mhCnstrLinRegArima.pdf (Sorry only spanish doc).";
-
   ////////////////////////////////////////////////////////////////////////////
   //Definition members
@@ -86,6 +91,6 @@
 
   ////////////////////////////////////////////////////////////////////////////
-  //Creates an instance of @MhCnstrLinRegArima
-  Static @MhCnstrLinRegArima New(
+  //Creates an instance of @Simulator
+  Static @Simulator New(
     VMatrix Y,      //Output matrix
     VMatrix X,      //Input matrix
@@ -99,5 +104,5 @@
   ////////////////////////////////////////////////////////////////////////////
   {
-    @MhCnstrLinRegArima aux = 
+    @Simulator aux = 
     [[
       VMatrix _.Y = Y;
@@ -121,5 +126,5 @@
   ////////////////////////////////////////////////////////////////////////////
   {
-    Text _MID = "@MhCnstrLinRegArima::initialize ";
+    Text _MID = "@Simulator::initialize ";
 
     Real ok = Case(
@@ -220,5 +225,5 @@
   ////////////////////////////////////////////////////////////////////////////
   {
-    Text _MID = "@MhCnstrLinRegArima::new.candidate ";
+    Text _MID = "@Simulator::new.candidate ";
     If(!_.r,
     {
@@ -287,5 +292,5 @@
   ////////////////////////////////////////////////////////////////////////////
   {
-    Text _MID = "@MhCnstrLinRegArima::maxLikelihoodStep ";
+    Text _MID = "@Simulator::maxLikelihoodStep ";
     Real iter = 1;
     Real advance = False;
@@ -315,5 +320,5 @@
   ////////////////////////////////////////////////////////////////////////////
   {
-    Text _MID = "@MhCnstrLinRegArima::try ";
+    Text _MID = "@Simulator::try ";
     Real _.tryNumber := _.tryNumber + 1;
     VMatrix c = new.candidate(0);
@@ -394,10 +399,10 @@
   }
   
-};
-
-
+}
+
+/*
 //VBR: UNDER CONSTRUCTION
 ////////////////////////////////////////////////////////////////////////////
-Class @MhCnstrLinRegArimaStd : @MhCnstrLinRegArima
+Class @Simulator.Std : @Simulator
 ////////////////////////////////////////////////////////////////////////////
 {
@@ -407,5 +412,5 @@
 
   //////////////////////////////////////////////////////////////////////////
-  Static @MhCnstrLinRegArimaStd New(@MhCnstrLinRegArima reg)
+  Static @Simulator.Std New(@Simulator reg)
   //////////////////////////////////////////////////////////////////////////
   {
@@ -432,5 +437,5 @@
     VMatrix Dix = Eye(n,n,0,Mat2VMat(dxi));
 
-    @MhCnstrLinRegArimaStd aux = 
+    @Simulator.Std aux = 
     [[
       VMatrix _.Y = Y;
@@ -467,5 +472,8 @@
   }
 
-};
+}
+*/
+
+]];
 
 
@@ -476,5 +484,5 @@
   ////////////////////////////////////////////////////////////////////////////
   {
-    Text _MID = "@MhCnstrLinRegArima::try ";
+    Text _MID = "@Simulator::try ";
     Real _.tryNumber := _.tryNumber + 1;
     Set c = For(1, length, new.candidate);
Index: tol_pkg/MhCnstrLinRegArima/test/test_0001/test_01.tol
===================================================================
--- tol_pkg/MhCnstrLinRegArima/test/test_0001/test_01.tol	(revision 176aa3ef8a2b205a8793758988988ba3aed69d9a)
+++ tol_pkg/MhCnstrLinRegArima/test/test_0001/test_01.tol	(revision ea1b10f9bb52161bd0b5e2cd3188f654b8593bbd)
@@ -1,8 +1,7 @@
 /////////////////////////////////////////////////////////////////////////////
 // FILE: test_01.tol
-// PURPOSE: Checking class @MhCnstrLinRegArima
+// PURPOSE: Checking class MhCnstrLinRegArima::@Simulator
 /////////////////////////////////////////////////////////////////////////////
 
-#Embed "_mhCnstrLinRegArima.tol";
 
 /////////////////////////////////////////////////////////////////////////////
@@ -14,4 +13,6 @@
 Real rndSeed = GetRandomSeed(0);
 WriteLn("Current Random Seed = "<<rndSeed);
+
+#Embed "../../_MhCnstrLinRegArima.tol";
 
 /////////////////////////////////////////////////////////////////////////////
@@ -132,5 +133,6 @@
 
 //Simulation handler
-@MhCnstrLinRegArima mclra = @MhCnstrLinRegArima::New(
+MhCnstrLinRegArima::@Simulator mclra = 
+  MhCnstrLinRegArima::@Simulator::New(
     VMatrix Y,      //Output matrix
     VMatrix X,      //Input matrix
Index: tol_pkg/MhCnstrLinRegArima/test/test_0001/test_bsr.tol
===================================================================
--- tol_pkg/MhCnstrLinRegArima/test/test_0001/test_bsr.tol	(revision 176aa3ef8a2b205a8793758988988ba3aed69d9a)
+++ tol_pkg/MhCnstrLinRegArima/test/test_0001/test_bsr.tol	(revision ea1b10f9bb52161bd0b5e2cd3188f654b8593bbd)
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 // FILE: test_bsr.tol
-// PURPOSE: Checking class @MhCnstrLinRegArima
+// PURPOSE: Checking class MhCnstrLinRegArima::@Simulator
 /////////////////////////////////////////////////////////////////////////////