diff --git a/chamsin/src/analogic/GenV1Trans.cpp b/chamsin/src/analogic/GenV1Trans.cpp
index 8279a9dc..af904b3c 100644
--- a/chamsin/src/analogic/GenV1Trans.cpp
+++ b/chamsin/src/analogic/GenV1Trans.cpp
@@ -311,7 +311,7 @@ void GenV1Trans::Calculate(Transistor* transistor)
 void GenV1Trans::Generate(Transistor* transistor)
 // *********************************************
 {
-  OpenUpdateSession();
+  openUpdateSession();
 
   Net* source = transistor->getNet(Name(transistor->getSourceName())); 
   Net* drain  = transistor->getNet(Name(transistor->getDrainName()) ); 
@@ -472,7 +472,7 @@ END_IF
   // End Generation.
   // -------------------------------------------------------------
 
-  CloseUpdateSession();
+  closeUpdateSession();
 
   // Set Transistor::_mapNet2Box.  
   // ****************************
diff --git a/chamsin/src/analogic/MetaTransistor.cpp b/chamsin/src/analogic/MetaTransistor.cpp
index 08449e81..a05f1025 100644
--- a/chamsin/src/analogic/MetaTransistor.cpp
+++ b/chamsin/src/analogic/MetaTransistor.cpp
@@ -140,13 +140,14 @@ void MetaTransistor::createLayout()
 void MetaTransistor::Flush()
 // *************************
 {
-  OpenUpdateSession();
-  for_each_instance(instance, this->getInstances())   
+  openUpdateSession();
+  for_each_instance(instance, this->getInstances()) { 
     Cell * mastercell = instance->getMasterCell();
     instance->destroy();     
     mastercell->destroy();
-  end_for
-  CloseUpdateSession();
+    end_for
+  }
+  closeUpdateSession();
 }  
 
 
diff --git a/chamsin/src/analogic/Transistor.cpp b/chamsin/src/analogic/Transistor.cpp
index 846b3c32..f3850c1e 100644
--- a/chamsin/src/analogic/Transistor.cpp
+++ b/chamsin/src/analogic/Transistor.cpp
@@ -47,7 +47,7 @@ Record* Transistor::Polarity::_getRecord() const
 // *****************************************
 {
    Record* record = new Record(getString(this));
-   record->Add(getSlot("Code", _code));
+   record->add(getSlot("Code", _code));
    return record;
 }
 
@@ -90,7 +90,7 @@ Record* Transistor::MaskVersion::_getRecord() const
 // **************************************************
 {
   Record* record = new Record(getString(this));
-  record->Add(getSlot("Code", _code));
+  record->add(getSlot("Code", _code));
   return record;
 }
 
@@ -138,7 +138,7 @@ Record* Transistor::Type::_getRecord() const
 // *****************************************
 {
    Record* record = new Record(getString(this));
-   record->Add(getSlot("Code", _code));
+   record->add(getSlot("Code", _code));
    return record;
 }
 
@@ -409,7 +409,7 @@ void Transistor::createLayout()
 void Transistor::duplicateLayout(Transistor* transistor)
 // *****************************************************
 {
-   OpenUpdateSession();
+   openUpdateSession();
 
    setTerminal(false);
 
@@ -455,7 +455,7 @@ void Transistor::duplicateLayout(Transistor* transistor)
 
    materialize();   
 
-   CloseUpdateSession();
+   closeUpdateSession();
 
 }  
 
diff --git a/chamsin/src/analogic/Transistor.h b/chamsin/src/analogic/Transistor.h
index bd6fd3c6..7a36a96d 100644
--- a/chamsin/src/analogic/Transistor.h
+++ b/chamsin/src/analogic/Transistor.h
@@ -293,7 +293,7 @@ template<>
                               ( const Transistor::Polarity::Code* object )
                           {
                                 Record* record = new Record(getString(object));
-                                record->Add(getSlot("Code", (unsigned int*)object));
+                                record->add(getSlot("Code", (unsigned int*)object));
                                 return record;
                           }
 
@@ -324,7 +324,7 @@ template<>
                               ( const Transistor::MaskVersion::Code* object )
                           {
                                 Record* record = new Record(getString(object));
-                                record->Add(getSlot("Code", (unsigned int*)object));
+                                record->add(getSlot("Code", (unsigned int*)object));
                                 return record;
                           }
 
@@ -355,7 +355,7 @@ template<>
                               ( const Transistor::Type::Code* object )
                           {
                                 Record* record = new Record(getString(object));
-                                record->Add(getSlot("Code", (unsigned int*)object));
+                                record->add(getSlot("Code", (unsigned int*)object));
                                 return record;
                               }
 
diff --git a/chamsin/src/device/TrMos_PlaceRoute.cpp b/chamsin/src/device/TrMos_PlaceRoute.cpp
index 6ff6caa5..47de0ed4 100644
--- a/chamsin/src/device/TrMos_PlaceRoute.cpp
+++ b/chamsin/src/device/TrMos_PlaceRoute.cpp
@@ -99,7 +99,7 @@ void TrMos::_PlaceAndRoute()
    verticalHighMargin  = MAX_INTEGER(verticalHighMargin, horizontalMargin + getUnit(2*rdAlu2 + 2*widthOfDrainWire) );
    horizontalMargin    = MAX_INTEGER(horizontalMargin, getUnit(RETURN_EVEN(rdImp + widthOfImp/2)) );
 
-   OpenUpdateSession();
+   openUpdateSession();
 
    if(_m ==  1 ) {  // If there is only one finger.
      _Place( instance, Transformation::Orientation::ID, Point( horizontalMargin, verticalLowMargin ) );
@@ -179,7 +179,7 @@ void TrMos::_PlaceAndRoute()
      
    }  
 
-   CloseUpdateSession();
+   closeUpdateSession();
 
 
 
@@ -190,7 +190,7 @@ void TrMos::_PlaceAndRoute()
     instance->materialize();      
    end_for
 
-   OpenUpdateSession();
+   openUpdateSession();
 
 
    cout <<"Bounding box of TrMos is "<<getString(getBoundingBox())<<endl;
@@ -680,7 +680,7 @@ void TrMos::_PlaceAndRoute()
             );
    }   
 
-   CloseUpdateSession();
+   closeUpdateSession();
 
 }