Index: tol_tests/tol/BSR/general/NonLinearFilter/_DeltaPrior.tol
===================================================================
--- tol_tests/tol/BSR/general/NonLinearFilter/_DeltaPrior.tol	(revision 23bec04dfd3e2c003f0e93b19c56d09f258e1f8e)
+++ tol_tests/tol/BSR/general/NonLinearFilter/_DeltaPrior.tol	(revision ef570a8a7fd47791158f46e9f7f4e23dba44bc90)
@@ -19,6 +19,6 @@
 "  Text   inputName   : identifier of affected input group\n"
 "  Serie  oriInp      : original input data\n"
-"  Set    omega.info  : Bsr.Param.Info or Empty if it's for output\n" 
-"  Set    delta.info  : Bsr.TruncatedNormal \n" 
+"  Set    omega.info  : @Bsr.Param.Info or Empty if it's for output\n" 
+"  Set    delta.info  : @Bsr.TruncatedNormal \n" 
 "";
 //////////////////////////////////////////////////////////////////////////////
Index: tol_tests/tol/BSR/general/NonLinearFilter/_PubAdStock_ExpBetaDelta.tol
===================================================================
--- tol_tests/tol/BSR/general/NonLinearFilter/_PubAdStock_ExpBetaDelta.tol	(revision 23bec04dfd3e2c003f0e93b19c56d09f258e1f8e)
+++ tol_tests/tol/BSR/general/NonLinearFilter/_PubAdStock_ExpBetaDelta.tol	(revision ef570a8a7fd47791158f46e9f7f4e23dba44bc90)
@@ -13,7 +13,7 @@
 "  Serie          oriInp      : original input data\n"
 "  Set            omega.info  : linear parameter or Empty if it's for output\n" 
-"  Bsr.Param.Info beta.info   : coefficient of exponent\n" 
-"  Bsr.Param.Info delta.info  : transfer denominator coefficient\n" 
-"  Bsr.Param.Info iniVal.info : initial value of difference equation\n"
+"  @Bsr.Param.Info beta.info   : coefficient of exponent\n" 
+"  @Bsr.Param.Info delta.info  : transfer denominator coefficient\n" 
+"  @Bsr.Param.Info iniVal.info : initial value of difference equation\n"
 "";
 //////////////////////////////////////////////////////////////////////////////
@@ -25,7 +25,7 @@
   Serie          oriInp,
   Set            omega.info,
-  Bsr.Param.Info beta.info,    
-  Bsr.Param.Info delta.info,    
-  Bsr.Param.Info iniVal.info,
+  @Bsr.Param.Info beta.info,    
+  @Bsr.Param.Info delta.info,    
+  @Bsr.Param.Info iniVal.info,
   Real simulate.iniVal
 )
Index: tol_tests/tol/BSR/test_01/test.tol
===================================================================
--- tol_tests/tol/BSR/test_01/test.tol	(revision 23bec04dfd3e2c003f0e93b19c56d09f258e1f8e)
+++ tol_tests/tol/BSR/test_01/test.tol	(revision ef570a8a7fd47791158f46e9f7f4e23dba44bc90)
@@ -87,5 +87,5 @@
   For(1,Card(estim::report::colNames), Set(Real k)
   {
-    CompareStruct
+    @CompareStruct
     (
       k, 
Index: tol_tests/tol/BSR/test_05/test.tol
===================================================================
--- tol_tests/tol/BSR/test_05/test.tol	(revision 23bec04dfd3e2c003f0e93b19c56d09f258e1f8e)
+++ tol_tests/tol/BSR/test_05/test.tol	(revision ef570a8a7fd47791158f46e9f7f4e23dba44bc90)
@@ -145,8 +145,8 @@
       Text  inputName = "priMesAdStock",
       Serie oriInp = tmIn::sub(CalInd(D(1),C),0),
-      Set Bsr.Param.Info("Omega", Rand(500,1000),100,5000),
-      Set Bsr.Param.Info("Beta",  Rand(0.60,0.60),0.0001, 1),
-      Set Bsr.Param.Info("Delta", _priMesAdStock.delta,0.0001,0.9999),
-      Set Bsr.Param.Info("IniVal",_priMesAdStock.iniVal,
+      Set @Bsr.Param.Info("Omega", Rand(500,1000),100,5000),
+      Set @Bsr.Param.Info("Beta",  Rand(0.60,0.60),0.0001, 1),
+      Set @Bsr.Param.Info("Delta", _priMesAdStock.delta,0.0001,0.9999),
+      Set @Bsr.Param.Info("IniVal",_priMesAdStock.iniVal,
                                 _priMesAdStock.iniVal,_priMesAdStock.iniVal),
       Real simulate.iniVal=False
Index: tol_tests/tol/BSR/test_07/test.tol
===================================================================
--- tol_tests/tol/BSR/test_07/test.tol	(revision 23bec04dfd3e2c003f0e93b19c56d09f258e1f8e)
+++ tol_tests/tol/BSR/test_07/test.tol	(revision ef570a8a7fd47791158f46e9f7f4e23dba44bc90)
@@ -62,5 +62,5 @@
 [[
   //##Documentation about the model
-  Set  _.docInfo = BSR.DocInfo (
+  Set  _.docInfo = @BSR.DocInfo (
     Text Model.Name = 
       "OneNodeLinear",
Index: tol_tests/tol/BSR/test_08/test.tol
===================================================================
--- tol_tests/tol/BSR/test_08/test.tol	(revision 23bec04dfd3e2c003f0e93b19c56d09f258e1f8e)
+++ tol_tests/tol/BSR/test_08/test.tol	(revision ef570a8a7fd47791158f46e9f7f4e23dba44bc90)
@@ -66,5 +66,5 @@
 [[
   //##Documentation about the model
-  Set  _.docInfo = BSR.DocInfo (
+  Set  _.docInfo = @BSR.DocInfo (
     Text Model.Name = 
       "OneNodeProbit",
@@ -120,5 +120,5 @@
   //Input matrix
   VMatrix _.X = Group("ConcatColumns",
-  EvalSet(_.linearParamInfo, VMatrix(Bsr.OneNode.LinearParamInfo lpi)
+  EvalSet(_.linearParamInfo, VMatrix(@Bsr.OneNode.LinearParamInfo lpi)
   {
     Mat2VMat(_.data.handler[lpi->Name])