diff --git a/EmotionMotorWPositions.py b/BlissMotorWPositions.py
similarity index 91%
rename from EmotionMotorWPositions.py
rename to BlissMotorWPositions.py
index f7554ac..f50a3c1 100644
--- a/EmotionMotorWPositions.py
+++ b/BlissMotorWPositions.py
@@ -1,16 +1,16 @@
-from EmotionMotor import EmotionMotor
+from BlissMotor import BlissMotor
 import math
 import logging
 import time
 import gevent
 import types
 
-class EmotionMotorWPositions(EmotionMotor):      
+class BlissMotorWPositions(BlissMotor):      
     def __init__(self, name):
-        EmotionMotor.__init__(self, name)
+        BlissMotor.__init__(self, name)
 
     def init(self): 
-        EmotionMotor.init(self)
+        BlissMotor.init(self)
 
         self.predefinedPositions = {}
         self.predefinedPositionsNamesList = []
@@ -37,7 +37,7 @@ def getPositionsData(self):
         return self["positions"]
 
     def connectNotify(self, signal):
-        EmotionMotor.connectNotify(self, signal)
+        BlissMotor.connectNotify(self, signal)
 
         if signal == 'predefinedPositionChanged':
             positionName = self.getCurrentPositionName()
@@ -56,9 +56,9 @@ def sortPredefinedPositionsList(self):
 	self.predefinedPositionsNamesList.sort(lambda x, y: int(round(self.predefinedPositions[x] - self.predefinedPositions[y]))) 
         
     def updateState(self, state=None):
-       EmotionMotor.updateState(self, state)
+       BlissMotor.updateState(self, state)
        
-       if self.motorState==EmotionMotor.READY: 
+       if self.motorState==BlissMotor.READY: 
          pos = self.getPosition()
 
          for positionName in self.predefinedPositions:
diff --git a/ESRF/ID30Controller.py b/ESRF/ID30Controller.py
index d53e72a..d8b63bd 100644
--- a/ESRF/ID30Controller.py
+++ b/ESRF/ID30Controller.py
@@ -1,11 +1,11 @@
-from Khoros import Khoros
+from Bliss import Bliss
 
-class ID30Controller(Khoros):
+class ID30Controller(Bliss):
   def __init__(self, *args):
-     Khoros.__init__(self, *args)
+     Bliss.__init__(self, *args)
 
   def init(self, *args):  
-     Khoros.init(self)
+     Bliss.init(self)
 
   def set_diagfile(self, diagfile):
      self.minidiff.diagfile = diagfile