Index: trunk/MagicSoft/Mars/manalysis/MEnergyEstimate.cc
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MEnergyEstimate.cc	(revision 8020)
+++ trunk/MagicSoft/Mars/manalysis/MEnergyEstimate.cc	(revision 8073)
@@ -34,5 +34,5 @@
 //             "(4.4*MHillas.fSize*MHillas.fLength) + (5.5*MHillasSrc.fDist*MHillas.fLength)");
 //
-// For description of rules, see MDataChain.
+// For description of rules, see MDataPhrase.
 //
 // The default rule is "MMcEvt.fEnergy"
Index: trunk/MagicSoft/Mars/manalysis/MParameterCalc.cc
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MParameterCalc.cc	(revision 8020)
+++ trunk/MagicSoft/Mars/manalysis/MParameterCalc.cc	(revision 8073)
@@ -33,5 +33,5 @@
 //             "(4.4*MHillas.fSize*MHillas.fLength) + (5.5*MHillasSrc.fDist*MHillas.fLength)");
 //
-// For description of rules, see MDataChain.
+// For description of rules, see MDataPhrase.
 //
 // Output:
@@ -43,5 +43,5 @@
 #include "MParList.h"
 
-#include "MDataChain.h"
+#include "MDataPhrase.h"
 #include "MParameters.h"
 
@@ -63,5 +63,5 @@
     fTitle = title ? title : "Task to calculate a MParameterD";
 
-    fData = new MDataChain(def);
+    fData = new MDataPhrase(def);
 }
 
@@ -77,5 +77,5 @@
 // --------------------------------------------------------------------------
 //
-// Delete fData. Initialize a new MDataChain with rule.
+// Delete fData. Initialize a new MDataPhrase with rule.
 // Returns if fData->IsValid()
 //
@@ -83,5 +83,5 @@
 {
     delete fData;
-    fData = new MDataChain(rule);
+    fData = new MDataPhrase(rule);
 
     return fData->IsValid();
@@ -183,9 +183,9 @@
 //     MyEstimator.1: 5.5
 //
-// For more details see MDataChain::ReadEnv
+// For more details see MDataPhrase::ReadEnv
 //
 Int_t MParameterCalc::ReadEnv(const TEnv &env, TString prefix, Bool_t print)
 {
-    MDataChain *f = new MDataChain;
+    MDataPhrase *f = new MDataPhrase;
     f->SetName(fName);
 
Index: trunk/MagicSoft/Mars/manalysis/MParameterCalc.h
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MParameterCalc.h	(revision 8020)
+++ trunk/MagicSoft/Mars/manalysis/MParameterCalc.h	(revision 8073)
@@ -12,5 +12,5 @@
 {
 private:
-    MData       *fData;          //-> Input MDataChain with rule
+    MData       *fData;          //-> Input MDataPhrase with rule
     MParameterD *fParameter;     //!  Output parameter