[telepathy-python/master] Drop the Client from the class name alises, e.g. ClientObserver -> Observer

[Danielle Madeley]

---
 examples/observer.py   |    4 ++--
 src/server/__init__.py |    6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/examples/observer.py b/examples/observer.py
index 5c30de8..1ae1154 100644
--- a/examples/observer.py
+++ b/examples/observer.py
@@ -6,7 +6,7 @@ from telepathy.interfaces import CLIENT, \
                                  CLIENT_OBSERVER, \
                                  CHANNEL
 
-class ExampleObserver(telepathy.server.ClientObserver,
+class ExampleObserver(telepathy.server.Observer,
                       telepathy.server.DBusProperties):
 
     def __init__(self, client_name):
@@ -15,7 +15,7 @@ class ExampleObserver(telepathy.server.ClientObserver,
 
         bus_name = dbus.service.BusName(bus_name, bus=dbus.SessionBus())
 
-        telepathy.server.ClientObserver.__init__(self, bus_name, object_path)
+        telepathy.server.Observer.__init__(self, bus_name, object_path)
         telepathy.server.DBusProperties.__init__(self)
 
         self._implement_property_get(CLIENT, {
diff --git a/src/server/__init__.py b/src/server/__init__.py
index 1817355..16167aa 100644
--- a/src/server/__init__.py
+++ b/src/server/__init__.py
@@ -29,9 +29,9 @@ from telepathy.server.handle import *
 from telepathy.server.media import *
 from telepathy.server.properties import *
 
-from telepathy._generated.Client_Observer import ClientObserver
-from telepathy._generated.Client_Approver import ClientApprover
-from telepathy._generated.Client_Handler import ClientHandler
+from telepathy._generated.Client_Observer import ClientObserver as Observer
+from telepathy._generated.Client_Approver import ClientApprover as Approver
+from telepathy._generated.Client_Handler import ClientHandler as Handler
 from telepathy._generated.Client_Interface_Requests import ClientInterfaceRequests
 
 from telepathy import version, __version__
-- 
1.5.6.5