diff --git a/processors/TPlasticMappingProcessor.cc b/processors/TTimingChargeMappingProcessor.cc
similarity index 89%
rename from processors/TPlasticMappingProcessor.cc
rename to processors/TTimingChargeMappingProcessor.cc
index 8780c94aa6a3ec3295d9d94256193f80b229a9bb..2f5aaf51591614a84edb6e72fd2ea01a634b7285 100644
--- a/processors/TPlasticMappingProcessor.cc
+++ b/processors/TTimingChargeMappingProcessor.cc
@@ -1,27 +1,27 @@
 /**
- * @file   TPlasticMappingProcessor.cc
+ * @file   TTimingChargeMappingProcessor.cc
  * @brief
  *
  * @date   Created:       2013-08-12 12:45:58
- *         Last Modified: 2013-10-14 17:23:07
+ *         Last Modified: 2013-10-14 18:27:35
  * @author KAWASE Shoichiro <kawase@cns.s.u-tokyo.ac.jp>
  *
  *    Copyright (C) 2013 KAWASE Shoichiro All rights reserved.
  */
 
-#include "TPlasticMappingProcessor.h"
+#include "TTimingChargeMappingProcessor.h"
 #include "TTimingChargeData.h"
 #include "TConverterBase.h"
 
 #include <TCategorizedData.h>
 #include <TRawTimingWithEdge.h>
 
-using art::TPlasticMappingProcessor;
+using art::TTimingChargeMappingProcessor;
 using art::TTimingChargeData;
 using art::TConverterBase;
 
 // Default constructor
-TPlasticMappingProcessor::TPlasticMappingProcessor() 
+TTimingChargeMappingProcessor::TTimingChargeMappingProcessor() 
    : fPlastic(NULL),
      fDoTimingConversion(kTRUE), fDoChargeConversion(kTRUE),
      fTimingConversionPrm(NULL), fChargeConversionPrm(NULL) {
@@ -47,15 +47,15 @@ TPlasticMappingProcessor::TPlasticMappingProcessor()
 }
 
 // Default destructor
-TPlasticMappingProcessor::~TPlasticMappingProcessor() {
+TTimingChargeMappingProcessor::~TTimingChargeMappingProcessor() {
    if(fPlastic) delete fPlastic;
    fPlastic = NULL;
    if (fTimingConversionPrm) delete fTimingConversionPrm;
    if (fChargeConversionPrm) delete fChargeConversionPrm;
 }
 
-void TPlasticMappingProcessor::Init(TEventCollection *col) {
-   printf("art::TPlasticMappingProcessor::Init()\n");
+void TTimingChargeMappingProcessor::Init(TEventCollection *col) {
+   printf("art::TTimingChargeMappingProcessor::Init()\n");
 
    fCategorizedData = reinterpret_cast<TCategorizedData**>(col->Get(fInputColName.front())->GetObjectRef());
    fPlastic = new TClonesArray("art::TTimingChargeData");
@@ -90,7 +90,7 @@ void TPlasticMappingProcessor::Init(TEventCollection *col) {
    printf("\n");
 }
 
-void TPlasticMappingProcessor::SetConversionPrm(std::vector<TConverterBase*> *p,
+void TTimingChargeMappingProcessor::SetConversionPrm(std::vector<TConverterBase*> *p,
 						TString &name, TEventCollection *col) {
    TEventObject *convPrm = col->Get(name);
    TClonesArray **fConversionArray = 
@@ -103,7 +103,7 @@ void TPlasticMappingProcessor::SetConversionPrm(std::vector<TConverterBase*> *p,
    }
 }
 
-void TPlasticMappingProcessor::Process() {
+void TTimingChargeMappingProcessor::Process() {
 
    fPlastic->Clear("C");
 
@@ -143,7 +143,7 @@ void TPlasticMappingProcessor::Process() {
    }
 }
 
-void TPlasticMappingProcessor::MapEdgedTime(TRefArray *tArray)
+void TTimingChargeMappingProcessor::MapEdgedTime(TRefArray *tArray)
 {
    TTimingChargeData *data = NULL;
    TRawTimingWithEdge *hit = NULL;
@@ -166,7 +166,7 @@ void TPlasticMappingProcessor::MapEdgedTime(TRefArray *tArray)
 	 // "Leading" edge
 	 data = static_cast<TTimingChargeData*>(fPlastic->ConstructedAt(fPlastic->GetEntriesFast()));
 	 if (!data) {
-	    printf("something strange happened in TPlasticMappingProc::MapEdgedTime\n");
+	    printf("something strange happened in TTimingChargeMappingProc::MapEdgedTime\n");
 	    continue;
 	 }
 
@@ -201,7 +201,7 @@ void TPlasticMappingProcessor::MapEdgedTime(TRefArray *tArray)
    }
 }
 
-void TPlasticMappingProcessor::MapTimeCharge(TRefArray *tArray, TRefArray *qArray){
+void TTimingChargeMappingProcessor::MapTimeCharge(TRefArray *tArray, TRefArray *qArray){
 
    if(!tArray) return;
 
diff --git a/processors/TPlasticMappingProcessor.h b/processors/TTimingChargeMappingProcessor.h
similarity index 72%
rename from processors/TPlasticMappingProcessor.h
rename to processors/TTimingChargeMappingProcessor.h
index 33f7fb418a9480441992e86ef739d2ea10677f1d..4c5b564980a9f32117953e4ef7dae90207857966 100644
--- a/processors/TPlasticMappingProcessor.h
+++ b/processors/TTimingChargeMappingProcessor.h
@@ -1,34 +1,34 @@
 /**
- * @file   TPlasticMappingProcessor.h
+ * @file   TTimingChargeMappingProcessor.h
  * @brief
  *
  * @date   Created:       2013-08-12 12:36:40
- *         Last Modified: 2013-10-14 17:22:30
+ *         Last Modified: 2013-10-14 18:28:15
  * @author KAWASE Shoichiro <kawase@cns.s.u-tokyo.ac.jp>
  *
  *    Copyright (C) 2013 KAWASE Shoichiro All rights reserved
  */
 
-#ifndef TPLASTICMAPPINGPROCESSOR_H
-#define TPLASTICMAPPINGPROCESSOR_H
+#ifndef TTIMINGCHARGEMAPPINGPROCESSOR_H
+#define TTIMINGCHARGEMAPPINGPROCESSOR_H
 
 #include <TProcessor.h>
 
 namespace art{
-   class TPlasticMappingProcessor;
+   class TTimingChargeMappingProcessor;
    class TCategorizedData;
    class TConverterBase;
 }
 
 class TRefArray;
 
-class art::TPlasticMappingProcessor : public TProcessor {
+class art::TTimingChargeMappingProcessor : public TProcessor {
 
 public:
    // Default constructor
-   TPlasticMappingProcessor();
+   TTimingChargeMappingProcessor();
    // Default destructor
-   virtual ~TPlasticMappingProcessor();
+   virtual ~TTimingChargeMappingProcessor();
 
    virtual void Init(TEventCollection *col);
    virtual void Process();
@@ -51,9 +51,9 @@ protected:
 
 private:
    // Copy constructor (prohibited)
-   TPlasticMappingProcessor(const TPlasticMappingProcessor& rhs);
+   TTimingChargeMappingProcessor(const TTimingChargeMappingProcessor& rhs);
    // Assignment operator (prohibited)
-   TPlasticMappingProcessor& operator=(const TPlasticMappingProcessor& rhs);
+   TTimingChargeMappingProcessor& operator=(const TTimingChargeMappingProcessor& rhs);
 
    void MapEdgedTime(TRefArray *tArray);
    void MapTimeCharge(TRefArray *tArray, TRefArray *qArray);
@@ -63,4 +63,4 @@ private:
 
 };
 
-#endif // TPLASTICMAPPINGPROCESSOR_H
+#endif // TTIMINGCHARGEMAPPINGPROCESSOR_H
diff --git a/processors/linkdef_user.h b/processors/linkdef_user.h
index 1e676f64013b4cf39b6c4783662850bce87338b7..25d2a16d2c9d6512b30587a93b3fbfb8fcbf8df4 100644
--- a/processors/linkdef_user.h
+++ b/processors/linkdef_user.h
@@ -3,7 +3,7 @@
  * @brief
  *
  * @date   Created:       2013-08-12 14:48:07
- *         Last Modified: 2013-10-14 15:36:28
+ *         Last Modified: 2013-10-14 18:28:54
  * @author KAWASE Shoichiro <kawase@cns.s.u-tokyo.ac.jp>
  *
  *    Copyright (C) 2013 KAWASE Shoichiro All rights reserved
@@ -19,7 +19,7 @@
 #pragma link off all functions;
 
 #pragma link C++ class art::TTimingChargeData+;
-#pragma link C++ class art::TPlasticMappingProcessor-!;
+#pragma link C++ class art::TTimingChargeMappingProcessor-!;
 #pragma link C++ class art::TTwoSidedPlasticData+;
 #pragma link C++ class art::TTwoSidedPlasticCalibrationProcessor-!;
 #pragma link C++ class art::TConverterBase+;
diff --git a/processors/makefile b/processors/makefile
index db5ba636b7f082661c21dd5fe8932298b1e442fb..c83deccf65b1ce2d728da912d1c1d4556dbf7767 100644
--- a/processors/makefile
+++ b/processors/makefile
@@ -1,5 +1,5 @@
 #CXX = g++
-OBJ = TPlasticMappingProcessor.o \
+OBJ = TTimingChargeMappingProcessor.o \
       TTimingChargeData.o \
       TTwoSidedPlasticData.o \
       TTwoSidedPlasticCalibrationProcessor.o \