[pytango] 62/98: Rename PyTango module to tango

Sandor Bodo-Merle sbodomerle-guest at moszumanska.debian.org
Thu Sep 28 19:17:45 UTC 2017


This is an automated email from the git hooks/post-receive script.

sbodomerle-guest pushed a commit to tag v9.2.0
in repository pytango.

commit 0181a04102d5fcac6c08d9a821263ffe856422e5
Author: Vincent Michel <vincent.michel at maxlab.lu.se>
Date:   Fri Jul 8 16:26:50 2016 +0200

    Rename PyTango module to tango
---
 ext/constants.cpp                     |   2 +-
 ext/pytango.cpp                       |   2 +-
 ext/pyutils.h                         |  20 +-
 tango/__init__.py                     |  16 +-
 tango/api_util.py                     |   6 +-
 tango/attr_data.py                    |  14 +-
 tango/attribute_proxy.py              |  62 +++---
 tango/auto_monitor.py                 |   2 +-
 tango/base_types.py                   | 166 +++++++--------
 tango/callback.py                     |   2 +-
 tango/client.py                       |  26 +--
 tango/connection.py                   |   8 +-
 tango/databaseds/database.py          | 376 +++++++++++++++++-----------------
 tango/databaseds/db_access/beacon.py  |   4 +-
 tango/databaseds/db_access/sqlite3.py |   8 +-
 tango/db.py                           |  46 ++---
 tango/device_attribute.py             |   2 +-
 tango/device_class.py                 |  30 +--
 tango/device_data.py                  |   2 +-
 tango/device_proxy.py                 | 120 +++++------
 tango/device_server.py                |  28 +--
 tango/encoded_attribute.py            |  34 +--
 tango/exception.py                    |  58 +++---
 tango/futures.py                      |  24 +--
 tango/gevent.py                       |  24 +--
 tango/green.py                        |   8 +-
 tango/group.py                        |   6 +-
 tango/group_reply.py                  |   2 +-
 tango/group_reply_list.py             |   2 +-
 tango/log4tango.py                    |  48 ++---
 tango/pipe.py                         |   2 +-
 tango/pipe_data.py                    |   6 +-
 tango/pytango_init.py                 |   4 +-
 tango/pytango_pprint.py               |   2 +-
 tango/pyutil.py                       |  20 +-
 tango/server.py                       | 136 ++++++------
 tango/tango_numpy.py                  |  14 +-
 tango/time_val.py                     |   8 +-
 tango/utils.py                        | 284 ++++++++++++-------------
 39 files changed, 812 insertions(+), 812 deletions(-)

diff --git a/ext/constants.cpp b/ext/constants.cpp
index 91b94c7..4ac040a 100644
--- a/ext/constants.cpp
+++ b/ext/constants.cpp
@@ -19,7 +19,7 @@ long TANGO_VERSION_HEX;
 
 void export_constants()
 {
-    object consts_module(handle<>(borrowed(PyImport_AddModule("PyTango.constants"))));
+    object consts_module(handle<>(borrowed(PyImport_AddModule("tango.constants"))));
     scope().attr("constants") = consts_module;
     scope consts_scope = consts_module;
 
diff --git a/ext/pytango.cpp b/ext/pytango.cpp
index 930eb73..0cdd2e5 100644
--- a/ext/pytango.cpp
+++ b/ext/pytango.cpp
@@ -64,7 +64,7 @@ void* init_numpy(void) { import_array(); return NULL; }
 void init_numpy(void) { import_array(); return; }
 #endif
 
-BOOST_PYTHON_MODULE(_PyTango)
+BOOST_PYTHON_MODULE(_tango)
 {
 
 #ifndef DISABLE_BOOST_DOCSTRING_OPTIONS
diff --git a/ext/pyutils.h b/ext/pyutils.h
index 4bf9afd..04a885d 100644
--- a/ext/pyutils.h
+++ b/ext/pyutils.h
@@ -56,7 +56,7 @@ inline PyObject *PyImport_ImportModule_(const std::string &name)
     #define PyBytes_Type PyString_Type
 
     #define PyBytes_Check PyString_Check
-    #define PyBytes_CheckExact PyString_CheckExact 
+    #define PyBytes_CheckExact PyString_CheckExact
     #define PyBytes_CHECK_INTERNED PyString_CHECK_INTERNED
     #define PyBytes_AS_STRING PyString_AS_STRING
     #define PyBytes_GET_SIZE PyString_GET_SIZE
@@ -154,7 +154,7 @@ void * PyCapsule_Import(const char *name, int no_block);
 
 #endif /* #if PY_VERSION_HEX < 0x02070000 */
 
-PyObject* from_char_to_str(const char* in, Py_ssize_t size=-1, 
+PyObject* from_char_to_str(const char* in, Py_ssize_t size=-1,
                            const char* encoding=NULL, /* defaults to latin-1 */
                            const char* errors="strict");
 
@@ -162,7 +162,7 @@ PyObject* from_char_to_str(const std::string& in,
                            const char* encoding=NULL, /* defaults to latin-1 */
                            const char* errors="strict");
 
-bopy::object from_char_to_str2(const char* in, Py_ssize_t size=-1, 
+bopy::object from_char_to_str2(const char* in, Py_ssize_t size=-1,
                                const char* encoding=NULL, /* defaults to latin-1 */
                                const char* errors="strict");
 
@@ -184,9 +184,9 @@ inline void raise_(PyObject *type, const char *message)
 class AutoPythonAllowThreads
 {
     PyThreadState *m_save;
-    
+
 public:
-    
+
     inline void giveup()
     {
         if (m_save)
@@ -195,12 +195,12 @@ public:
             m_save = 0;
         }
     }
-    
+
     inline AutoPythonAllowThreads()
     {
         m_save = PyEval_SaveThread();
     }
-    
+
     inline ~AutoPythonAllowThreads()
     {
         giveup();
@@ -256,10 +256,10 @@ void is_method_defined(boost::python::object &obj, const std::string &method_nam
                        bool &exists, bool &is_method);
 
 #define PYTANGO_MOD \
-    boost::python::object pytango((boost::python::handle<>(boost::python::borrowed(PyImport_AddModule("PyTango")))));
-    
+    boost::python::object pytango((boost::python::handle<>(boost::python::borrowed(PyImport_AddModule("tango")))));
+
 #define CALL_METHOD(retType, self, name, ...) \
     boost::python::call_method<retType>(self, name , __VA_ARGS__);
-    
+
 
 bool hasattr(boost::python::object &, const std::string &);
diff --git a/tango/__init__.py b/tango/__init__.py
index 5f5715c..4d17c52 100644
--- a/tango/__init__.py
+++ b/tango/__init__.py
@@ -87,7 +87,7 @@ def __prepare_nt():
     if tango_root is None:
         tango_root = os.path.join(os.environ["ProgramFiles"], "tango")
     tango_root = tango_root.lower()
-    
+
     if sys.hexversion < 0x03030000:
         vc = "vc9_dll"
     else:
@@ -103,7 +103,7 @@ def __prepare_nt():
        tango_dll_path not in PATH.lower():
             os.environ['PATH'] += ";" + tango_dll_path
     else:
-        # Tango C++ could not be found on the system... 
+        # Tango C++ could not be found on the system...
         # ... use PyTango's private Tango C++ library
         tango_dll_path = os.path.dirname(os.path.abspath(__file__))
         tango_dll_path = os.path.join(tango_dll_path, "_tango_dll_")
@@ -112,15 +112,15 @@ def __prepare_nt():
 
 if os.name == 'nt':
     try:
-        from . import _PyTango
+        from . import _tango
     except ImportError as ie:
         # in windows try to find the location for tango
         __prepare_nt()
-        from . import _PyTango
+        from . import _tango
 else:
-    from . import _PyTango
-        
-from ._PyTango import (AccessControlType, ApiUtil, ArchiveEventInfo,
+    from . import _tango
+
+from ._tango import (AccessControlType, ApiUtil, ArchiveEventInfo,
     AsynCall, AsynReplyNotArrived, AttReqType, Attr, AttrConfEventData,
     AttrDataFormat, AttrList, AttrProperty, AttrQuality, AttrReadEvent,
     AttrSerialModel, AttrWriteType, AttrWrittenEvent, Attribute,
@@ -156,7 +156,7 @@ from ._PyTango import (AccessControlType, ApiUtil, ArchiveEventInfo,
     StdNamedDevFailedVector, StdStringVector, SubDevDiag, TimeVal,
     UserDefaultAttrProp, UserDefaultPipeProp, WAttribute, WRITE, WrongData,
     WrongNameSyntax, alarm_flags, asyn_req_type, cb_sub_model, constants,
-    raise_asynch_exception, Interceptors, 
+    raise_asynch_exception, Interceptors,
     AutoTangoMonitor, AutoTangoAllowThreads)
 
 ArgType = CmdArgType
diff --git a/tango/api_util.py b/tango/api_util.py
index 1184555..68b1485 100644
--- a/tango/api_util.py
+++ b/tango/api_util.py
@@ -17,7 +17,7 @@ __all__ = ["api_util_init"]
 
 __docformat__ = "restructuredtext"
 
-from ._PyTango import ApiUtil
+from ._tango import ApiUtil
 
 from .utils import document_method, document_static_method, _get_env_var
 
@@ -32,8 +32,8 @@ def __doc_api_util():
     It is designed as a singleton. To get a reference to the singleton object
     you must do::
     
-        import PyTango
-        apiutil = PyTango.ApiUtil.instance()
+        import tango
+        apiutil = tango.ApiUtil.instance()
         
     New in PyTango 7.1.3
     """
diff --git a/tango/attr_data.py b/tango/attr_data.py
index 47d95ae..93d1ffa 100644
--- a/tango/attr_data.py
+++ b/tango/attr_data.py
@@ -22,9 +22,9 @@ __docformat__ = "restructuredtext"
 
 import inspect
 
-from ._PyTango import Except, CmdArgType, AttrDataFormat, AttrWriteType
-from ._PyTango import DispLevel, UserDefaultAttrProp
-from ._PyTango import Attr, SpectrumAttr, ImageAttr
+from ._tango import Except, CmdArgType, AttrDataFormat, AttrWriteType
+from ._tango import DispLevel, UserDefaultAttrProp
+from ._tango import Attr, SpectrumAttr, ImageAttr
 from .utils import is_non_str_seq, is_pure_str
 
 
@@ -203,7 +203,7 @@ class AttrData(object):
         except:
             throw_ex("Wrong data type in attribute argument for attribute %s "
                      "in class %s\nAttribute data type (first element in first "
-                     "sequence) must be a PyTango.CmdArgType"
+                     "sequence) must be a tango.CmdArgType"
                      % (attr_name, name))
         
         # get format
@@ -212,7 +212,7 @@ class AttrData(object):
         except:
             throw_ex("Wrong data format in attribute argument for attribute %s "
                      "in class %s\nAttribute data format (second element in "
-                     "first sequence) must be a PyTango.AttrDataFormat"
+                     "first sequence) must be a tango.AttrDataFormat"
                      % (attr_name, name))
         
         if self.attr_format == AttrDataFormat.SCALAR:
@@ -262,14 +262,14 @@ class AttrData(object):
             throw_ex("Wrong data write type in attribute argument for "
                      "attribute %s in class %s\nAttribute write type (third "
                      "element in first sequence) must be a "
-                     "PyTango.AttrWriteType" % (attr_name, name))
+                     "tango.AttrWriteType" % (attr_name, name))
         try:
             self.display_level = DispLevel(extra_info.get("display level", 
                                                           DispLevel.OPERATOR))
         except:
             throw_ex("Wrong display level in attribute information for "
                      "attribute %s in class %s\nAttribute information for "
-                     "display level is not a PyTango.DispLevel"
+                     "display level is not a tango.DispLevel"
                      % (attr_name, name))
         try:
             self.polling_period = int(extra_info.get("polling period", -1))
diff --git a/tango/attribute_proxy.py b/tango/attribute_proxy.py
index 0d792b6..79c0331 100644
--- a/tango/attribute_proxy.py
+++ b/tango/attribute_proxy.py
@@ -11,10 +11,10 @@
 
 """
 This is an internal PyTango module. It completes the binding of
-:class:`PyTango.AttributeProxy`.
+:class:`tango.AttributeProxy`.
 
-To access these members use directly :mod:`PyTango` module and NOT
-PyTango.attribute_proxy.
+To access these members use directly :mod:`tango` module and NOT
+tango.attribute_proxy.
 """
 
 __all__ = [ "AttributeProxy", "attribute_proxy_init", "get_attribute_proxy" ]
@@ -23,8 +23,8 @@ __docformat__ = "restructuredtext"
 
 import collections
 
-from ._PyTango import StdStringVector, DbData, DbDatum, DeviceProxy
-from ._PyTango import __AttributeProxy as _AttributeProxy
+from ._tango import StdStringVector, DbData, DbDatum, DeviceProxy
+from ._tango import __AttributeProxy as _AttributeProxy
 from .utils import seq_2_StdStringVector, seq_2_DbData, DbData_2_dict
 from .utils import is_pure_str, is_non_str_seq
 from .green import result, submit, get_green_mode, get_wait_default_value
@@ -35,9 +35,9 @@ def get_attribute_proxy(*args, **kwargs):
     get_attribute_proxy(self, full_attr_name, green_mode=None, wait=True, timeout=True) -> AttributeProxy
     get_attribute_proxy(self, device_proxy, attr_name, green_mode=None, wait=True, timeout=True) -> AttributeProxy
 
-    Returns a new :class:`~PyTango.AttributeProxy`.
+    Returns a new :class:`~tango.AttributeProxy`.
     There is no difference between using this function and the direct
-    :class:`~PyTango.AttributeProxy` constructor if you use the default kwargs.
+    :class:`~tango.AttributeProxy` constructor if you use the default kwargs.
 
     The added value of this function becomes evident when you choose a green_mode
     to be *Futures* or *Gevent*. The AttributeProxy constructor internally makes some
@@ -46,15 +46,15 @@ def get_attribute_proxy(*args, **kwargs):
 
     :param full_attr_name: the full name of the attribute
     :type full_attr_name: str
-    :param device_proxy: the :class:`~PyTango.DeviceProxy`
+    :param device_proxy: the :class:`~tango.DeviceProxy`
     :type device_proxy: DeviceProxy
     :param attr_name: attribute name for the given device proxy
     :type attr_name: str
     :param green_mode: determines the mode of execution of the device (including
                       the way it is created). Defaults to the current global
-                      green_mode (check :func:`~PyTango.get_green_mode` and
-                      :func:`~PyTango.set_green_mode`)
-    :type green_mode: :obj:`~PyTango.GreenMode`
+                      green_mode (check :func:`~tango.get_green_mode` and
+                      :func:`~tango.set_green_mode`)
+    :type green_mode: :obj:`~tango.GreenMode`
     :param wait: whether or not to wait for result. If green_mode
                  Ignored when green_mode is Synchronous (always waits).
     :type wait: bool
@@ -64,7 +64,7 @@ def get_attribute_proxy(*args, **kwargs):
     :type timeout: float
     :returns:
         if green_mode is Synchronous or wait is True:
-            :class:`~PyTango.AttributeProxy`
+            :class:`~tango.AttributeProxy`
         else if green_mode is Futures:
             :class:`concurrent.futures.Future`
         else if green_mode is Gevent:
@@ -98,24 +98,24 @@ def __AttributeProxy__get_property(self, propname, value=None):
             This method accepts the following types as propname parameter:
             1. string [in] - single property data to be fetched
             2. sequence<string> [in] - several property data to be fetched
-            3. PyTango.DbDatum [in] - single property data to be fetched
-            4. PyTango.DbData [in,out] - several property data to be fetched.
+            3. tango.DbDatum [in] - single property data to be fetched
+            4. tango.DbData [in,out] - several property data to be fetched.
             5. sequence<DbDatum> - several property data to be feteched
 
             Note: for cases 3, 4 and 5 the 'value' parameter if given, is IGNORED.
 
-            If value is given it must be a PyTango.DbData that will be filled with the
+            If value is given it must be a tango.DbData that will be filled with the
             property values
 
         Parameters :
             - propname : (str) property(ies) name(s)
-            - value : (PyTango.DbData) (optional, default is None meaning that the
-                      method will create internally a PyTango.DbData and return
+            - value : (tango.DbData) (optional, default is None meaning that the
+                      method will create internally a tango.DbData and return
                       it filled with the property values
 
         Return     : (DbData) containing the property(ies) value(s). If a
-                     PyTango.DbData is given as parameter, it returns the same
-                     object otherwise a new PyTango.DbData is returned
+                     tango.DbData is given as parameter, it returns the same
+                     object otherwise a new tango.DbData is returned
 
         Throws     : NonDbDevice, ConnectionFailed (with database),
                      CommunicationFailed (with database),
@@ -158,8 +158,8 @@ def __AttributeProxy__put_property(self, value):
 
             Insert or update a list of properties for this attribute.
             This method accepts the following types as value parameter:
-            1. PyTango.DbDatum - single property data to be inserted
-            2. PyTango.DbData - several property data to be inserted
+            1. tango.DbDatum - single property data to be inserted
+            2. tango.DbData - several property data to be inserted
             3. sequence<DbDatum> - several property data to be inserted
             4. dict<str, DbDatum> - keys are property names and value has data to be inserted
             5. dict<str, seq<str>> - keys are property names and value has data to be inserted
@@ -167,8 +167,8 @@ def __AttributeProxy__put_property(self, value):
 
         Parameters :
             - value : can be one of the following:
-                1. PyTango.DbDatum - single property data to be inserted
-                2. PyTango.DbData - several property data to be inserted
+                1. tango.DbDatum - single property data to be inserted
+                2. tango.DbData - several property data to be inserted
                 3. sequence<DbDatum> - several property data to be inserted
                 4. dict<str, DbDatum> - keys are property names and value has data to be inserted
                 5. dict<str, seq<str>> - keys are property names and value has data to be inserted
@@ -201,7 +201,7 @@ def __AttributeProxy__put_property(self, value):
             new_value.append(db_datum)
         value = new_value
     else:
-        raise TypeError('value must be a PyTango.DbDatum, PyTango.DbData,'\
+        raise TypeError('value must be a tango.DbDatum, tango.DbData,'\
                         'a sequence<DbDatum> or a dictionary')
     return self._put_property(value)
 
@@ -213,8 +213,8 @@ def __AttributeProxy__delete_property(self, value):
         This method accepts the following types as value parameter:
 
             1. string [in] - single property to be deleted
-            2. PyTango.DbDatum [in] - single property data to be deleted
-            3. PyTango.DbData [in] - several property data to be deleted
+            2. tango.DbDatum [in] - single property data to be deleted
+            3. tango.DbData [in] - several property data to be deleted
             4. sequence<string> [in]- several property data to be deleted
             5. sequence<DbDatum> [in] - several property data to be deleted
             6. dict<str, obj> [in] - keys are property names to be deleted
@@ -226,8 +226,8 @@ def __AttributeProxy__delete_property(self, value):
             - value : can be one of the following:
 
                 1. string [in] - single property data to be deleted
-                2. PyTango.DbDatum [in] - single property data to be deleted
-                3. PyTango.DbData [in] - several property data to be deleted
+                2. tango.DbDatum [in] - single property data to be deleted
+                3. tango.DbData [in] - several property data to be deleted
                 4. sequence<string> [in]- several property data to be deleted
                 5. sequence<DbDatum> [in] - several property data to be deleted
                 6. dict<str, obj> [in] - keys are property names to be deleted
@@ -261,8 +261,8 @@ def __AttributeProxy__delete_property(self, value):
             else:
                 new_value.append(DbDatum(k))
     else:
-        raise TypeError('value must be a string, PyTango.DbDatum, '\
-                        'PyTango.DbData, a sequence or a dictionary')
+        raise TypeError('value must be a string, tango.DbDatum, '\
+                        'tango.DbData, a sequence or a dictionary')
 
     return self._delete_property(new_value)
 
@@ -271,7 +271,7 @@ def __AttributeProxy__delete_property(self, value):
 # AttributeProxy for the constructor (parsing strings if necessary) and some
 # other things. With the _method_* functions defined later it is really easy.
 # One reason to do it this way: get_device_proxy() will always return the
-# same PyTango.DeviceProxy with this implementation. And then we can trust
+# same tango.DeviceProxy with this implementation. And then we can trust
 # it's automatic event unsubscription to handle events.
 class AttributeProxy(object):
     """
diff --git a/tango/auto_monitor.py b/tango/auto_monitor.py
index d6ee330..4f4f8f4 100644
--- a/tango/auto_monitor.py
+++ b/tango/auto_monitor.py
@@ -17,7 +17,7 @@ __all__ = ["auto_monitor_init"]
 
 __docformat__ = "restructuredtext"
 
-from ._PyTango import AutoTangoMonitor, AutoTangoAllowThreads
+from ._tango import AutoTangoMonitor, AutoTangoAllowThreads
 
 
 def __AutoTangoMonitor__enter__(self):
diff --git a/tango/base_types.py b/tango/base_types.py
index e6617fa..3ee7750 100644
--- a/tango/base_types.py
+++ b/tango/base_types.py
@@ -18,7 +18,7 @@ __all__ = ["base_types_init"]
 __docformat__ = "restructuredtext"
 
 
-from ._PyTango import (StdStringVector, StdLongVector, StdDoubleVector, \
+from ._tango import (StdStringVector, StdLongVector, StdDoubleVector, \
     CommandInfoList, AttributeInfoList, AttributeInfoListEx, DbData, \
     DbDevInfos, DbDevExportInfos, DbDevImportInfos, DbHistoryList, \
     DeviceDataHistoryList, StdGroupReplyVector, \
@@ -53,7 +53,7 @@ def __StdVector__imul(self, n):
 def __StdVector__getitem(self, key):
     if is_integer(key) or key.step is None:
         return self.__original_getitem(key)
-    
+
     res = self.__class__()
     nb = len(self)
     start = key.start or 0
@@ -62,10 +62,10 @@ def __StdVector__getitem(self, key):
         return res
     if stop > nb:
         stop = nb
-    
+
     for i in range(start, stop, key.step or 1):
         res.append(self[i])
-    
+
     return res
 
 def __fillVectorClass(klass):
@@ -253,7 +253,7 @@ def __AttributeInfoEx__setstate__(self, state):
     self.sys_extensions = seq_2_StdStringVector(state[21])
 
 def __init_base_types():
-    
+
     v_klasses = (StdStringVector,StdLongVector,StdDoubleVector,CommandInfoList, \
                  AttributeInfoList,AttributeInfoListEx,DbData,DbDevInfos, \
                  DbDevExportInfos,DbDevImportInfos,DbHistoryList, \
@@ -294,13 +294,13 @@ def __init_base_types():
     AttributeInfoEx.__getinitargs__ = __AttributeInfoEx__getinitargs__
     AttributeInfoEx.__getstate__ = __AttributeInfoEx__getstate__
     AttributeInfoEx.__setstate__ = __AttributeInfoEx__setstate__
-    
+
 
 def __doc_base_types():
-    
+
     def document_enum(enum_name, desc):
-        import PyTango
-        __document_enum(PyTango, enum_name, desc)
+        import tango
+        __document_enum(tango, enum_name, desc)
 
     document_enum("ExtractAs", """
     Defines what will go into value field of DeviceAttribute, or what will
@@ -308,7 +308,7 @@ def __doc_base_types():
     in all the cases.
 
     Valid possible values are:
-    
+
         - Numpy    : Value will be stored in [value, w_value]. If the
           attribute is an scalar, they will contain a value. If it's
           an SPECTRUM or IMAGE it will be exported as a numpy array.
@@ -324,7 +324,7 @@ def __doc_base_types():
           as it comes from TangoC++ in 'value'.
         - Nothing  : The value will not be extracted from DeviceAttribute
     """ )
-    
+
     document_enum("CmdArgType", """
     An enumeration representing the command argument type.
 
@@ -363,37 +363,37 @@ def __doc_base_types():
 
     document_enum("LockerLanguage", """
     An enumeration representing the programming language in which the
-    client application who locked is written. 
-    
+    client application who locked is written.
+
         - CPP : C++/Python language
         - JAVA : Java language
-    
+
     New in PyTango 7.0.0
     """ )
 
     document_enum("MessBoxType", """
     An enumeration representing the MessBoxType
-    
+
         - STOP
         - INFO
-    
+
     New in PyTango 7.0.0
     """ )
 
     document_enum("PollObjType", """
     An enumeration representing the PollObjType
-        
+
         - POLL_CMD
         - POLL_ATTR
         - EVENT_HEARTBEAT
         - STORE_SUBDEV
-    
+
     New in PyTango 7.0.0
     """ )
 
     document_enum("PollCmdCode", """
     An enumeration representing the PollCmdCode
-    
+
         - POLL_ADD_OBJ
         - POLL_REM_OBJ
         - POLL_START
@@ -404,13 +404,13 @@ def __doc_base_types():
         - POLL_REM_EXT_TRIG_OBJ
         - POLL_ADD_HEARTBEAT
         - POLL_REM_HEARTBEAT
-        
+
     New in PyTango 7.0.0
     """ )
 
     document_enum("SerialModel", """
     An enumeration representing the type of serialization performed by the device server
-    
+
         - BY_DEVICE
         - BY_CLASS
         - BY_PROCESS
@@ -419,48 +419,48 @@ def __doc_base_types():
 
     document_enum("AttReqType", """
     An enumeration representing the type of attribute request
-    
+
         - READ_REQ
         - WRITE_REQ
     """ )
 
     document_enum("LockCmdCode", """
     An enumeration representing the LockCmdCode
-    
+
         - LOCK_ADD_DEV
         - LOCK_REM_DEV
         - LOCK_UNLOCK_ALL_EXIT
         - LOCK_EXIT
-        
+
     New in PyTango 7.0.0
     """ )
 
     document_enum("LogLevel", """
     An enumeration representing the LogLevel
-    
+
         - LOG_OFF
         - LOG_FATAL
         - LOG_ERROR
         - LOG_WARN
         - LOG_INFO
         - LOG_DEBUG
-        
+
     New in PyTango 7.0.0
     """ )
 
     document_enum("LogTarget", """
     An enumeration representing the LogTarget
-    
+
         - LOG_CONSOLE
         - LOG_FILE
         - LOG_DEVICE
-        
+
     New in PyTango 7.0.0
     """ )
 
     document_enum("EventType", """
     An enumeration representing event type
- 
+
         - CHANGE_EVENT
         - QUALITY_EVENT
         - PERIODIC_EVENT
@@ -470,73 +470,73 @@ def __doc_base_types():
         - DATA_READY_EVENT
 
         *DATA_READY_EVENT - New in PyTango 7.0.0*
-    
+
     """ )
 
     document_enum("AttrSerialModel", """
     An enumeration representing the AttrSerialModel
-    
+
         - ATTR_NO_SYNC
         - ATTR_BY_KERNEL
         - ATTR_BY_USER
-        
+
     New in PyTango 7.1.0
     """ )
-    
+
     document_enum("KeepAliveCmdCode", """
     An enumeration representing the KeepAliveCmdCode
 
         - EXIT_TH
-        
+
     New in PyTango 7.0.0
     """ )
 
     document_enum("AccessControlType", """
     An enumeration representing the AccessControlType
-    
+
         - ACCESS_READ
         - ACCESS_WRITE
-        
+
     New in PyTango 7.0.0
     """ )
 
     document_enum("asyn_req_type", """
     An enumeration representing the asynchronous request type
-    
+
         - POLLING
         - CALLBACK
         - ALL_ASYNCH
     """ )
-    
+
     document_enum("cb_sub_model", """
     An enumeration representing callback sub model
-    
+
         - PUSH_CALLBACK
         - PULL_CALLBACK
     """ )
-    
+
     document_enum("AttrQuality", """
     An enumeration representing the attribute quality
-    
+
         - ATTR_VALID
         - ATTR_INVALID
         - ATTR_ALARM
         - ATTR_CHANGING
         - ATTR_WARNING
     """ )
-    
+
     document_enum("AttrWriteType", """
     An enumeration representing the attribute type
-    
+
         - READ
         - READ_WITH_WRITE
         - WRITE
         - READ_WRITE
     """ )
-    
+
     document_enum("AttrDataFormat", """
     An enumeration representing the attribute format
-    
+
         - SCALAR
         - SPECTRUM
         - IMAGE
@@ -545,30 +545,30 @@ def __doc_base_types():
 
     document_enum("PipeWriteType", """
     An enumeration representing the pipe type
-    
+
         - PIPE_READ
         - PIPE_READ_WRITE
     """ )
 
     document_enum("DevSource", """
     An enumeration representing the device source for data
-    
+
         - DEV
         - CACHE
         - CACHE_DEV
     """ )
-    
+
     document_enum("ErrSeverity", """
     An enumeration representing the error severity
-    
+
         - WARN
         - ERR
         - PANIC
     """ )
-    
+
     document_enum("DevState", """
     An enumeration representing the device state
-    
+
         - ON
         - OFF
         - CLOSE
@@ -584,28 +584,28 @@ def __doc_base_types():
         - DISABLE
         - UNKNOWN
     """ )
-    
+
     document_enum("DispLevel", """
     An enumeration representing the display level
-    
+
         - OPERATOR
         - EXPERT
     """ )
 
     document_enum("GreenMode", """
     An enumeration representing the GreenMode
-    
+
         - Synchronous
         - Futures
         - Gevent
-    
+
     New in PyTango 8.1.0
     """ )
-    
+
     ArchiveEventInfo.__doc__ = """
     A structure containing available archiving event information for an attribute
     with the folowing members:
-        
+
         - archive_rel_change : (str) relative change that will generate an event
         - archive_abs_change : (str) absolute change that will generate an event
         - archive_period : (str) archive period
@@ -614,7 +614,7 @@ def __doc_base_types():
     EventData.__doc__ = """
     This class is used to pass data to the callback method when an event
     is sent to the client. It contains the following public fields:
-    
+
          - device : (DeviceProxy) The DeviceProxy object on which the call was
            executed.
          - attr_name : (str) The attribute name
@@ -641,7 +641,7 @@ def __doc_base_types():
     This class is used to pass data to the callback method when a
     configuration event is sent to the client. It contains the
     following public fields:
-    
+
         - device : (DeviceProxy) The DeviceProxy object on which the call was executed
         - attr_name : (str) The attribute name
         - event : (str) The event name
@@ -666,7 +666,7 @@ def __doc_base_types():
     AttributeAlarmInfo.__doc__ = """
     A structure containing available alarm information for an attribute
     with the folowing members:
-        
+
         - min_alarm : (str) low alarm level
         - max_alarm : (str) high alarm level
         - min_warning : (str) low warning level
@@ -678,14 +678,14 @@ def __doc_base_types():
     AttributeDimension.__doc__ = """
     A structure containing x and y attribute data dimensions with
     the following members:
-    
+
         - dim_x : (int) x dimension
         - dim_y : (int) y dimension"""
 
     AttributeEventInfo.__doc__ = """
     A structure containing available event information for an attribute
     with the folowing members:
-        
+
         - ch_event : (ChangeEventInfo) change event information
         - per_event : (PeriodicEventInfo) periodic event information
         - arch_event :  (ArchiveEventInfo) archiving event information"""
@@ -693,7 +693,7 @@ def __doc_base_types():
     DeviceAttributeConfig.__doc__ = """
     A base structure containing available information for an attribute
     with the following members:
-        
+
         - name : (str) attribute name
         - writable : (AttrWriteType) write type (R, W, RW, R with W)
         - data_format : (AttrDataFormat) data format (SCALAR, SPECTRUM, IMAGE)
@@ -716,11 +716,11 @@ def __doc_base_types():
     AttributeInfo.__doc__ = """
     A structure (inheriting from :class:`DeviceAttributeConfig`) containing
     available information for an attribute with the following members:
-    
+
         - disp_level : (DispLevel) display level (OPERATOR, EXPERT)
 
         Inherited members are:
-        
+
             - name : (str) attribute name
             - writable : (AttrWriteType) write type (R, W, RW, R with W)
             - data_format : (AttrDataFormat) data format (SCALAR, SPECTRUM, IMAGE)
@@ -743,13 +743,13 @@ def __doc_base_types():
     AttributeInfoEx.__doc__ = """
     A structure (inheriting from :class:`AttributeInfo`) containing
     available information for an attribute with the following members:
-    
+
         - alarms : object containing alarm information (see AttributeAlarmInfo).
         - events : object containing event information (see AttributeEventInfo).
         - sys_extensions : StdStringVector
 
         Inherited members are:
-        
+
             - name : (str) attribute name
             - writable : (AttrWriteType) write type (R, W, RW, R with W)
             - data_format : (AttrDataFormat) data format (SCALAR, SPECTRUM, IMAGE)
@@ -773,7 +773,7 @@ def __doc_base_types():
     ChangeEventInfo.__doc__ = """
     A structure containing available change event information for an attribute
     with the folowing members:
-        
+
         - rel_change : (str) relative change that will generate an event
         - abs_change : (str) absolute change that will generate an event
         - extensions : (StdStringVector) extensions (currently not used)"""
@@ -781,13 +781,13 @@ def __doc_base_types():
     PeriodicEventInfo.__doc__ = """
     A structure containing available periodic event information for an attribute
     with the folowing members:
-        
+
         - period : (str) event period
         - extensions : (StdStringVector) extensions (currently not used)"""
 
     DevCommandInfo.__doc__ = """
     A device command info with the following members:
-    
+
         - cmd_name : (str) command name
         - cmd_tag : command as binary value (for TACO)
         - in_type : (CmdArgType) input type
@@ -799,11 +799,11 @@ def __doc_base_types():
 
     CommandInfo.__doc__ = """
     A device command info (inheriting from :class:`DevCommandInfo`) with the following members:
-    
+
         - disp_level : (DispLevel) command display level
 
         Inherited members are (from :class:`DevCommandInfo`):
-        
+
             - cmd_name : (str) command name
             - cmd_tag : (str) command as binary value (for TACO)
             - in_type : (CmdArgType) input type
@@ -815,7 +815,7 @@ def __doc_base_types():
     This class is used to pass data to the callback method when an
     attribute data ready event is sent to the clien. It contains the
     following public fields:
-    
+
         - device : (DeviceProxy) The DeviceProxy object on which the call was executed
         - attr_name : (str) The attribute name
         - event : (str) The event name
@@ -832,7 +832,7 @@ def __doc_base_types():
     DeviceInfo.__doc__ = """
     A structure containing available information for a device with the"
     following members:
-    
+
         - dev_class : (str) device class
         - server_id : (str) server ID
         - server_host : (str) host name
@@ -841,24 +841,24 @@ def __doc_base_types():
 
     LockerInfo.__doc__ = """
     A structure with information about the locker with the folowing members:
-    
-        - ll : (PyTango.LockerLanguage) the locker language
+
+        - ll : (tango.LockerLanguage) the locker language
         - li : (pid_t / UUID) the locker id
         - locker_host : (str) the host
         - locker_class : (str) the class
-        
+
         pid_t should be an int, UUID should be a tuple of four numbers.
-        
+
         New in PyTango 7.0.0"""
-    
+
     PollDevice.__doc__ = """
     A structure containing PollDevice information with the folowing members:
-    
+
         - dev_name : (str) device name
         - ind_list : (sequence<int>) index list
-        
+
         New in PyTango 7.0.0"""
-    
+
     document_method(DataReadyEventData, "get_date", """
     get_date(self) -> TimeVal
 
@@ -872,7 +872,7 @@ def __doc_base_types():
 
     TimeVal.__doc__ = """
     Time value structure with the following members:
-    
+
         - tv_sec : seconds
         - tv_usec : microseconds
         - tv_nsec : nanoseconds"""
diff --git a/tango/callback.py b/tango/callback.py
index 629e01f..9ba140b 100644
--- a/tango/callback.py
+++ b/tango/callback.py
@@ -17,7 +17,7 @@ __all__ = ["callback_init"]
 
 __docformat__ = "restructuredtext"
 
-from ._PyTango import CmdDoneEvent, AttrReadEvent, AttrWrittenEvent
+from ._tango import CmdDoneEvent, AttrReadEvent, AttrWrittenEvent
 
 def __init_Callback():
     pass
diff --git a/tango/client.py b/tango/client.py
index 5ea0fa1..585964a 100644
--- a/tango/client.py
+++ b/tango/client.py
@@ -20,11 +20,11 @@ import functools
 
 import six
 
-import PyTango
-from PyTango import DeviceProxy as Device
-from PyTango import CmdArgType
-from PyTango.codec import loads
-from PyTango.codec import dumps as _dumps
+import tango
+from tango import DeviceProxy as Device
+from tango import CmdArgType
+from tango.codec import loads
+from tango.codec import dumps as _dumps
 
 _FMT = "pickle"
 
@@ -51,7 +51,7 @@ class _DeviceHelper(object):
         self.device = Device(dev_name, *args, **kwargs)
         self.slots = weakref.WeakKeyDictionary()
 
-    def connect(self, signal, slot, event_type=PyTango.EventType.CHANGE_EVENT):
+    def connect(self, signal, slot, event_type=tango.EventType.CHANGE_EVENT):
         i = self.device.subscribe_event(signal, event_type, slot)
         self.slots[slot] = i
         return i
@@ -76,7 +76,7 @@ class _DeviceHelper(object):
                     if attr_name.lower() in self.__ATTR_FILTER:
                         continue
                     cache[attr_name] = attr_info
-            except PyTango.DevFailed:
+            except tango.DevFailed:
                 pass
             self.__attr_cache = cache
         return cache
@@ -110,7 +110,7 @@ class _DeviceHelper(object):
                     cmd_func.__doc__ = cmd_info.in_type_desc
                     cmd_info.func = cmd_func
                     cache[cmd_name] = cmd_info
-            except PyTango.DevFailed:
+            except tango.DevFailed:
                 pass
             self.__cmd_cache = cache
         return cache
@@ -138,7 +138,7 @@ class _DeviceHelper(object):
         if result:
             result = dev.read_attribute(name)
             value = result.value
-            if result.type == PyTango.DevEncoded:
+            if result.type == tango.DevEncoded:
                 result = loads(*value)
             else:
                 result = value
@@ -152,7 +152,7 @@ class _DeviceHelper(object):
         result = self.get_attr_info(name)
         if result is None:
             raise KeyError("Unknown attribute %s" % name)
-        if result.data_type == PyTango.DevEncoded:
+        if result.data_type == tango.DevEncoded:
             self.device.write_attribute(name, dumps(value))
         else:
             self.device.write_attribute(name, value)
@@ -166,7 +166,7 @@ class _DeviceHelper(object):
             info = self.device.info()
             self.__dict__["__info"] = info
             return info
-        except PyTango.DevFailed:
+        except tango.DevFailed:
             return None
 
     def __getitem__(self, name):
@@ -205,7 +205,7 @@ class Object(object):
             r = self._helper.get(name)
         except KeyError as ke:
             six.raise_from(AttributeError('Unknown {0}'.format(name)), ke)
-        if isinstance(r, PyTango.CommandInfo):
+        if isinstance(r, tango.CommandInfo):
             self.__dict__[name] = r.func
             return r.func
         return r
@@ -262,7 +262,7 @@ def get_commands_config(obj, refresh=False):
     return obj._helper.get_cmd_cache(refresh=refresh)
 
 
-def connect(obj, signal, slot, event_type=PyTango.EventType.CHANGE_EVENT):
+def connect(obj, signal, slot, event_type=tango.EventType.CHANGE_EVENT):
     """Experimental function. Not part of the official API"""
     return obj._helper.connect(signal, slot, event_type=event_type)
 
diff --git a/tango/connection.py b/tango/connection.py
index 0c7418e..48e52a9 100644
--- a/tango/connection.py
+++ b/tango/connection.py
@@ -20,7 +20,7 @@ __docformat__ = "restructuredtext"
 import operator
 import collections
 
-from ._PyTango import Connection, DeviceData, __CallBackAutoDie, CmdArgType, \
+from ._tango import Connection, DeviceData, __CallBackAutoDie, CmdArgType, \
     DeviceProxy, Database, ExtractAs
 from .utils import document_method as __document_method
 from .utils import document_static_method as __document_static_method
@@ -78,8 +78,8 @@ def __Connection__command_inout(self, name, *args, **kwds):
                               command or a DeviceData object with this value inserted.
                               It can be ommited if the command should not get any argument.
                 - green_mode : (GreenMode) Defaults to the current DeviceProxy GreenMode.
-                               (see :meth:`~PyTango.DeviceProxy.get_green_mode` and
-                               :meth:`~PyTango.DeviceProxy.set_green_mode`).
+                               (see :meth:`~tango.DeviceProxy.get_green_mode` and
+                               :meth:`~tango.DeviceProxy.set_green_mode`).
                 - wait       : (bool) whether or not to wait for result. If green_mode
                                is *Synchronous*, this parameter is ignored as it always
                                waits for the result.
@@ -175,7 +175,7 @@ def __Connection__command_inout_asynch(self, cmd_name, *args):
         by default, TANGO is initialized with the **polling** model. If you want
         to use the **push** model (the one with the callback parameter), you
         need to change the global TANGO model to PUSH_CALLBACK.
-        You can do this with the :meth:`PyTango.ApiUtil.set_asynch_cb_sub_model`
+        You can do this with the :meth:`tango.ApiUtil.set_asynch_cb_sub_model`
     """
     if len(args) == 0: # command_inout_asynch()
         argin = DeviceData()
diff --git a/tango/databaseds/database.py b/tango/databaseds/database.py
index 7886250..869d1b2 100644
--- a/tango/databaseds/database.py
+++ b/tango/databaseds/database.py
@@ -14,15 +14,15 @@ except ImportError:
     argparse = None
     from optparse import OptionParser
 
-import PyTango
-from PyTango import AttrWriteType, GreenMode
-from PyTango.server import Device, DeviceMeta
-from PyTango.server import attribute, command
-from PyTango.server import class_property
-from PyTango.server import device_property
-from PyTango.server import run
-
-from PyTango.globals import get_class, get_class_by_class, \
+import tango
+from tango import AttrWriteType, GreenMode
+from tango.server import Device, DeviceMeta
+from tango.server import attribute, command
+from tango.server import class_property
+from tango.server import device_property
+from tango.server import run
+
+from tango.globals import get_class, get_class_by_class, \
     get_constructed_class_by_class
 
 
@@ -35,7 +35,7 @@ READ_WITH_WRITE = AttrWriteType.READ_WITH_WRITE
 global options
 global WILDCARD_REPLACEMENT
 WILDCARD_REPLACEMENT = True
-class DbInter(PyTango.Interceptors):
+class DbInter(tango.Interceptors):
 
     def create_thread(self):
         pass
@@ -53,11 +53,11 @@ def get_db_name():
     return DB_NAME
 
 
-import db_access
+from . import db_access
 
-th_exc = PyTango.Except.throw_exception
+th_exc = tango.Except.throw_exception
 
-from db_errors import *
+from .db_errors import *
 
 def check_device_name(dev_name):
     if '*' in dev_name:
@@ -163,7 +163,7 @@ class DataBase(Device):
             WILDCARD_REPLACEMENT = m.get_wildcard_replacement()
         except AttributeError:
             pass
-        self.set_state(PyTango.DevState.ON)
+        self.set_state(tango.DevState.ON)
 
     def init_timing_stats(self):
         self.timing_maps = {}
@@ -180,7 +180,7 @@ class DataBase(Device):
 
     def read_Timing_average(self):
         self._log.debug("In read_Timing_average()")
-        
+
         return [x.average for x in self.timing_maps.values()]
 
     def read_Timing_index(self):
@@ -193,7 +193,7 @@ class DataBase(Device):
 
     def read_Timing_info(self):
         self._log.debug("In read_Timing_info()")
-        util = PyTango.Util.instance()
+        util = tango.Util.instance()
         attr_Timing_info_read = []
         attr_Timing_info_read.append("TANGO Database Timing info on host " + util.get_host_name())
         attr_Timing_info_read.append(" ")
@@ -221,9 +221,9 @@ class DataBase(Device):
         """ Get list of device domain name matching the specified
 
         :param argin: The wildcard
-        :type: PyTango.DevString
+        :type: tango.DevString
         :return: Device name domain list
-        :rtype: PyTango.DevVarStringArray """
+        :rtype: tango.DevVarStringArray """
         self._log.debug("In DbGetDeviceDomainList()")
         return self.db.get_device_domain_list(replace_wildcard(argin))
 
@@ -234,9 +234,9 @@ class DataBase(Device):
         process as non exported
 
         :param argin: Device server name (executable/instance)
-        :type: PyTango.DevString
+        :type: tango.DevString
         :return:
-        :rtype: PyTango.DevVoid """
+        :rtype: tango.DevVoid """
         self._log.debug("In DbUnExportServer()")
         self.db.unexport_server(argin)
 
@@ -246,9 +246,9 @@ class DataBase(Device):
 
         :param argin: str[0] = device name
         Str[1]...str[n] = attribute name(s)
-        :type: PyTango.DevVarStringArray
+        :type: tango.DevVarStringArray
         :return:
-        :rtype: PyTango.DevVoid """
+        :rtype: tango.DevVoid """
         self._log.debug("In DbDeleteAllDeviceAttributeProperty()")
 
         if len(argin) < 2:
@@ -273,9 +273,9 @@ class DataBase(Device):
         """ Delete an attribute alias.
 
         :param argin: Attriibute alias name.
-        :type: PyTango.DevString
+        :type: tango.DevString
         :return:
-        :rtype: PyTango.DevVoid """
+        :rtype: tango.DevVoid """
         self._log.debug("In DbDeleteAttributeAlias()")
         self.db.delete_attribute_alias(argin)
 
@@ -286,14 +286,14 @@ class DataBase(Device):
         :param argin: Str[0] = Tango class
         Str[1] = Attribute name
         Str[2] = Property name
-        :type: PyTango.DevVarStringArray
+        :type: tango.DevVarStringArray
         :return: Str[0] = Attribute name
         Str[1] = Property name
         Str[2] = date
         Str[3] = Property value number (array case)
         Str[4] = Property value 1
         Str[n] = Property value n
-        :rtype: PyTango.DevVarStringArray """
+        :rtype: tango.DevVarStringArray """
         self._log.debug("In DbGetClassAttributePropertyHist()")
         class_name = argin[0]
         attribute = replace_wildcard(argin[1])
@@ -316,9 +316,9 @@ class DataBase(Device):
         Str[5] = Property value 1
         Str[n] = Property value n (array case)
         .....
-        :type: PyTango.DevVarStringArray
+        :type: tango.DevVarStringArray
         :return:
-        :rtype: PyTango.DevVoid """
+        :rtype: tango.DevVoid """
         self._log.debug("In DbPutDeviceAttributeProperty2()")
         device_name = argin[0]
         nb_attributes = int(argin[1])
@@ -329,9 +329,9 @@ class DataBase(Device):
         """ Get attribute alias list for a specified filter
 
         :param argin: attribute alias filter string (eg: att*)
-        :type: PyTango.DevString
+        :type: tango.DevString
         :return: attribute aliases
-        :rtype: PyTango.DevVarStringArray """
+        :rtype: tango.DevVarStringArray """
         self._log.debug("In DbGetAttributeAliasList()")
         if not argin:
             argin = "%"
@@ -344,9 +344,9 @@ class DataBase(Device):
         """ Query the database for device exported for the specified class.
 
         :param argin: Class name
-        :type: PyTango.DevString
+        :type: tango.DevString
         :return: Device exported list
-        :rtype: PyTango.DevVarStringArray """
+        :rtype: tango.DevVarStringArray """
         self._log.debug("In DbGetExportdDeviceListForClass()")
         argin = replace_wildcard(argin)
         return self.db.get_exported_device_list_for_class(argin)
@@ -357,9 +357,9 @@ class DataBase(Device):
 
         :param argin: Str[0] = attribute name
         Str[1] = attribute alias
-        :type: PyTango.DevVarStringArray
+        :type: tango.DevVarStringArray
         :return:
-        :rtype: PyTango.DevVoid """
+        :rtype: tango.DevVoid """
         self._log.debug("In DbPutAttributeAlias()")
 
         if len(argin) < 2:
@@ -379,9 +379,9 @@ class DataBase(Device):
         with name matching the specified filter
 
         :param argin: The filter
-        :type: PyTango.DevString
+        :type: tango.DevString
         :return: Device server process name list
-        :rtype: PyTango.DevVarStringArray """
+        :rtype: tango.DevVarStringArray """
         self._log.debug("In DbGetServerList()")
         argin = replace_wildcard(argin)
         return self.db.get_server_list(argin)
@@ -396,9 +396,9 @@ class DataBase(Device):
         Str[2] = Device server process host name
         Str[3] = Device server process PID or string ``null``
         Str[4] = Device server process version
-        :type: PyTango.DevVarStringArray
+        :type: tango.DevVarStringArray
         :return:
-        :rtype: PyTango.DevVoid """
+        :rtype: tango.DevVoid """
         DbExportDevice(self, argin)
 
     @command(dtype_in=('str',), doc_in='Str[0] = Device name\nStr[1] = Attribute name\nStr[2] = Property name\nStr[n] = Property name', doc_out='none')
@@ -409,9 +409,9 @@ class DataBase(Device):
         Str[1] = Attribute name
         Str[2] = Property name
         Str[n] = Property name
-        :type: PyTango.DevVarStringArray
+        :type: tango.DevVarStringArray
         :return:
-        :rtype: PyTango.DevVoid """
+        :rtype: tango.DevVoid """
         self._log.debug("In DbDeleteDeviceAttributeProperty()")
 
         if len(argin) < 3:
@@ -439,9 +439,9 @@ class DataBase(Device):
         specified wildcard
 
         :param argin: The wildcard
-        :type: PyTango.DevString
+        :type: tango.DevString
         :return: Family list
-        :rtype: PyTango.DevVarStringArray """
+        :rtype: tango.DevVarStringArray """
         self._log.debug("In DbGetDeviceFamilyList()")
         argin = replace_wildcard(argin)
         return self.db.get_device_family_list(argin)
@@ -451,9 +451,9 @@ class DataBase(Device):
         """ Get a list of devices whose names satisfy the filter.
 
         :param argin: filter
-        :type: PyTango.DevString
+        :type: tango.DevString
         :return: list of exported devices
-        :rtype: PyTango.DevVarStringArray """
+        :rtype: tango.DevVarStringArray """
         self._log.debug("In DbGetDeviceWideList()")
         argin = replace_wildcard(argin)
         return self.db.get_device_wide_list(argin)
@@ -469,9 +469,9 @@ class DataBase(Device):
         Str[4] = Property value 1
         Str[n] = Property value n
         ....
-        :type: PyTango.DevVarStringArray
+        :type: tango.DevVarStringArray
         :return:
-        :rtype: PyTango.DevVoid """
+        :rtype: tango.DevVoid """
         self._log.debug("In DbPutProperty()")
         object_name = argin[0]
         nb_properties = int(argin[1])
@@ -484,9 +484,9 @@ class DataBase(Device):
         :param argin: Str[0]  = Object name
         Str[1] = Property name
         Str[n] = Property name
-        :type: PyTango.DevVarStringArray
+        :type: tango.DevVarStringArray
         :return:
-        :rtype: PyTango.DevVoid """
+        :rtype: tango.DevVoid """
         self._log.debug("In DbDeleteProperty()")
         obj_name = argin[0]
         for prop_name in argin[1:]:
@@ -501,7 +501,7 @@ class DataBase(Device):
         :param argin: Str[0] = Tango class name
         Str[1] = Attribute name
         Str[n] = Attribute name
-        :type: PyTango.DevVarStringArray
+        :type: tango.DevVarStringArray
         :return: Str[0] = Tango class name
         Str[1] = Attribute property  number
         Str[2] = Attribute property 1 name
@@ -512,7 +512,7 @@ class DataBase(Device):
         Str[n + 2] = Attribute property 2 value number (array case)
         Str[n + 3] = Attribute property 2 value
         Str[n + m] = Attribute property 2 value (array case)
-        :rtype: PyTango.DevVarStringArray """
+        :rtype: tango.DevVarStringArray """
         self._log.debug("In DbGetClassAttributeProperty2()")
         class_name = argin[0]
         return self.db.get_class_attribute_property2(class_name, argin[1:])
@@ -523,9 +523,9 @@ class DataBase(Device):
         """ Get a list of exported devices whose names satisfy the filter (wildcard is
 
         :param argin: filter
-        :type: PyTango.DevString
+        :type: tango.DevString
         :return: list of exported devices
-        :rtype: PyTango.DevVarStringArray """
+        :rtype: tango.DevVarStringArray """
         self._log.debug("In DbGetDeviceExportedList()")
         argin = replace_wildcard(argin)
         return self.db.get_device_exported_list(argin)
@@ -535,9 +535,9 @@ class DataBase(Device):
         """ Return alias for device name if found.
 
         :param argin: The device name
-        :type: PyTango.DevString
+        :type: tango.DevString
         :return: The alias found
-        :rtype: PyTango.DevString """
+        :rtype: tango.DevString """
         self._log.debug("In DbGetDeviceAlias()")
         ret, dev_name, dfm = check_device_name(argin)
         if not ret:
@@ -558,9 +558,9 @@ class DataBase(Device):
         Str[4] = Property name
         Str[5] = Property value
         .....
-        :type: PyTango.DevVarStringArray
+        :type: tango.DevVarStringArray
         :return:
-        :rtype: PyTango.DevVoid """
+        :rtype: tango.DevVoid """
         self._log.debug("In DbPutClassAttributeProperty()")
         class_name = argin[0]
         nb_attributes = int(argin[1])
@@ -572,9 +572,9 @@ class DataBase(Device):
         """ Get property list for a given Tango class with a specified filter
 
         :param argin: The filter
-        :type: PyTango.DevString
+        :type: tango.DevString
         :return: Property name list
-        :rtype: PyTango.DevVarStringArray """
+        :rtype: tango.DevVarStringArray """
         self._log.debug("In DbGetClassPropertyList()")
         if not argin:
             argin = "%"
@@ -587,9 +587,9 @@ class DataBase(Device):
         """ Get device alias name with a specific filter
 
         :param argin: The filter
-        :type: PyTango.DevString
+        :type: tango.DevString
         :return: Device alias list
-        :rtype: PyTango.DevVarStringArray """
+        :rtype: tango.DevVarStringArray """
         self._log.debug("In DbGetDeviceAliasList()")
         if not argin:
             argin = "%"
@@ -604,9 +604,9 @@ class DataBase(Device):
 
         :param argin: Str[0] = Tango class name
         Str[1] = Attribute name
-        :type: PyTango.DevVarStringArray
+        :type: tango.DevVarStringArray
         :return:
-        :rtype: PyTango.DevVoid """
+        :rtype: tango.DevVoid """
         self._log.debug("In DbDeleteClassAttribute()")
 
         if len(argin) < 2:
@@ -625,13 +625,13 @@ class DataBase(Device):
 
         :param argin: Str[0] = Tango class
         Str[1] = Property name
-        :type: PyTango.DevVarStringArray
+        :type: tango.DevVarStringArray
         :return: Str[0] = Property name
         Str[1] = date
         Str[2] = Property value number (array case)
         Str[3] = Property value 1
         Str[n] = Property value n
-        :rtype: PyTango.DevVarStringArray """
+        :rtype: tango.DevVarStringArray """
         self._log.debug("In DbGetClassPropertyHist()")
         class_name = argin[0]
         prop_name = argin[1]
@@ -643,9 +643,9 @@ class DataBase(Device):
 
         :param argin: Str[0] = Device name
         Str[1] = Attribute name
-        :type: PyTango.DevVarStringArray
+        :type: tango.DevVarStringArray
         :return:
-        :rtype: PyTango.DevVoid """
+        :rtype: tango.DevVoid """
         self._log.debug("In DbDeleteDeviceAttribute()")
 
         if len(argin) < 2:
@@ -672,12 +672,12 @@ class DataBase(Device):
         It executes the specified  SELECT command on TANGO database and returns its result without filter.
 
         :param argin: MySql Select command
-        :type: PyTango.DevString
+        :type: tango.DevString
         :return: MySql Select command result
          - svalues : select results
          - lvalue[n] : =0 if svalue[n] is null else =1
          (last lvalue -1) is number of rows, (last lvalue) is number of fields
-        :rtype: PyTango.DevVarLongStringArray """
+        :rtype: tango.DevVarLongStringArray """
         self._log.debug("In DbMySqlSelect()")
         tmp_argin = argin.lower()
 
@@ -708,9 +708,9 @@ class DataBase(Device):
         Str[4] = Property name
         Str[5] = Property value
         .....
-        :type: PyTango.DevVarStringArray
+        :type: tango.DevVarStringArray
         :return:
-        :rtype: PyTango.DevVoid """
+        :rtype: tango.DevVoid """
         self._log.debug("In DbPutDeviceAttributeProperty()")
         device_name = argin[0]
         nb_attributes = int(argin[1])
@@ -724,14 +724,14 @@ class DataBase(Device):
         :param argin: Str[0] = Device name
         Str[1] = Attribute name
         Str[n] = Attribute name
-        :type: PyTango.DevVarStringArray
+        :type: tango.DevVarStringArray
         :return: Str[0] = Device name
         Str[1] = Attribute property  number
         Str[2] = Attribute property 1 name
         Str[3] = Attribute property 1 value
         Str[n + 1] = Attribute property 2 name
         Str[n + 2] = Attribute property 2 value
-        :rtype: PyTango.DevVarStringArray """
+        :rtype: tango.DevVarStringArray """
         self._log.debug("In DbGetDeviceAttributeProperty()")
         dev_name = argin[0]
         return self.db.get_device_attribute_property(dev_name, argin[1:])
@@ -744,9 +744,9 @@ class DataBase(Device):
 
         :param argin: Str[0] = Object name
         Str[1] = filter
-        :type: PyTango.DevVarStringArray
+        :type: tango.DevVarStringArray
         :return: Property name list
-        :rtype: PyTango.DevVarStringArray """
+        :rtype: tango.DevVarStringArray """
         self._log.debug("In DbGetPropertyList()")
         object_name = argin[0]
         wildcard = replace_wildcard(argin[1])
@@ -758,12 +758,12 @@ class DataBase(Device):
         """ Get Tango classes/device list embedded in a specific device server
 
         :param argin: Device server process name
-        :type: PyTango.DevString
+        :type: tango.DevString
         :return: Str[0] = Device name
         Str[1] = Tango class
         Str[n] = Device name
         Str[n + 1] = Tango class
-        :rtype: PyTango.DevVarStringArray """
+        :rtype: tango.DevVarStringArray """
         self._log.debug("In DbGetDeviceClassList()")
         return self.db.get_device_class_list(argin)
 
@@ -772,9 +772,9 @@ class DataBase(Device):
         """ Mark a device as non exported in database
 
         :param argin: Device name
-        :type: PyTango.DevString
+        :type: tango.DevString
         :return:
-        :rtype: PyTango.DevVoid """
+        :rtype: tango.DevVoid """
         self._log.debug("In DbUnExportDevice()")
         dev_name = argin[0].lower()
         self.db.unexport_device(dev_name)
@@ -784,9 +784,9 @@ class DataBase(Device):
         """ Get device name from its alias.
 
         :param argin: Alias name
-        :type: PyTango.DevString
+        :type: tango.DevString
         :return: Device name
-        :rtype: PyTango.DevString """
+        :rtype: tango.DevString """
         self._log.debug("In DbGetAliasDevice()")
         if not argin:
             argin = "%"
@@ -799,9 +799,9 @@ class DataBase(Device):
         """ Delete a devcie from database
 
         :param argin: device name
-        :type: PyTango.DevString
+        :type: tango.DevString
         :return:
-        :rtype: PyTango.DevVoid """
+        :rtype: tango.DevVoid """
         self._log.debug("In DbDeleteDevice()")
 
         ret, dev_name, dfm = check_device_name(argin)
@@ -819,9 +819,9 @@ class DataBase(Device):
 
         :param argin: Str[0] = Device name
         Str[1] = Wildcard
-        :type: PyTango.DevVarStringArray
+        :type: tango.DevVarStringArray
         :return: attribute name list
-        :rtype: PyTango.DevVarStringArray """
+        :rtype: tango.DevVarStringArray """
         self._log.debug("In DbGetDeviceAttributeList()")
         dev_name = argin[0]
         wildcard = argin[1]
@@ -836,9 +836,9 @@ class DataBase(Device):
         """ Get info about all servers running on specified host, name, mode and level
 
         :param argin: Host name
-        :type: PyTango.DevString
+        :type: tango.DevString
         :return: Server info for all servers running on specified host
-        :rtype: PyTango.DevVarStringArray """
+        :rtype: tango.DevVarStringArray """
         self._log.debug("In DbGetHostServersInfo()")
         argin = replace_wildcard(argin)
         return self.db.get_host_servers_info(argin)
@@ -849,9 +849,9 @@ class DataBase(Device):
 
         :param argin: str[0] = old device server name (exec/instance)
         str[1] =  new device server name (exec/instance)
-        :type: PyTango.DevVarStringArray
+        :type: tango.DevVarStringArray
         :return:
-        :rtype: PyTango.DevVoid """
+        :rtype: tango.DevVoid """
         self._log.debug("In DbRenameServer()")
 
         if len(argin) < 2:
@@ -877,9 +877,9 @@ class DataBase(Device):
         """ Get host list with name matching the specified filter
 
         :param argin: The filter
-        :type: PyTango.DevString
+        :type: tango.DevString
         :return: Host name list
-        :rtype: PyTango.DevVarStringArray """
+        :rtype: tango.DevVarStringArray """
         self._log.debug("In DbGetHostList()")
         argin = replace_wildcard(argin)
         return self.db.get_host_list(argin)
@@ -889,12 +889,12 @@ class DataBase(Device):
         """ Get class inheritance for the specified device.
 
         :param argin: Device name
-        :type: PyTango.DevString
+        :type: tango.DevString
         :return: Classes off the specified device.
         [0] - is the class of the device.
         [1] - is the class from the device class is inherited.
         ........and so on
-        :rtype: PyTango.DevVarStringArray """
+        :rtype: tango.DevVarStringArray """
         self._log.debug("In DbGetClassInheritanceForDevice()")
         return self.db.get_class_inheritance_for_device(argin)
 
@@ -904,9 +904,9 @@ class DataBase(Device):
         """ Delete server from the database but dont delete device properties
 
         :param argin: Device server name
-        :type: PyTango.DevString
+        :type: tango.DevString
         :return:
-        :rtype: PyTango.DevVoid """
+        :rtype: tango.DevVoid """
         self._log.debug("In DbDeleteServer()")
 
         if '*' in argin or '%' in argin or not '/' in argin:
@@ -923,9 +923,9 @@ class DataBase(Device):
         If alias not found in database, returns an empty string.
 
         :param argin: The attribute alias name
-        :type: PyTango.DevString
+        :type: tango.DevString
         :return: The attribute name (device/attribute)
-        :rtype: PyTango.DevString """
+        :rtype: tango.DevString """
         self._log.debug("In DbGetAttributeAlias()")
         return self.db.get_attribute_alias(argin)
 
@@ -936,9 +936,9 @@ class DataBase(Device):
         device server startup sequence.
 
         :param argin: Elt[0] = DS name (exec_name/inst_name), Elt[1] = Host name
-        :type: PyTango.DevVarStringArray
+        :type: tango.DevVarStringArray
         :return: All the data needed by the device server during its startup sequence. Precise list depend on the device server
-        :rtype: PyTango.DevVarStringArray """
+        :rtype: tango.DevVarStringArray """
         self._log.debug("In DbGetDataForServerCache()")
         ##  TODO
         return ['']
@@ -950,7 +950,7 @@ class DataBase(Device):
         :param argin: Str[0] = Object name
         Str[1] = Property name
         Str[n] = Property name
-        :type: PyTango.DevVarStringArray
+        :type: tango.DevVarStringArray
         :return: Str[0] = Object name
         Str[1] = Property number
         Str[2] = Property name
@@ -961,7 +961,7 @@ class DataBase(Device):
         Str[n + 2] = Property value number (array case)
         Str[n + 3] = Property value 1
         Str[n + m] = Property value m
-        :rtype: PyTango.DevVarStringArray """
+        :rtype: tango.DevVarStringArray """
         self._log.debug("In DbGetProperty()")
         object_name = argin[0]
         return self.db.get_property(object_name, argin[1:])
@@ -971,9 +971,9 @@ class DataBase(Device):
         """ Get list of Tango classes for a device server
 
         :param argin: device server process name
-        :type: PyTango.DevString
+        :type: tango.DevString
         :return: list of classes for this device server
-        :rtype: PyTango.DevVarStringArray """
+        :rtype: tango.DevVarStringArray """
         self._log.debug("In DbGetDeviceServerClassList()")
         argin = replace_wildcard(argin)
         return self.db.get_server_class_list(argin)
@@ -990,9 +990,9 @@ class DataBase(Device):
         Str[4] = Property value 1
         Str[n] = Property value n
         ....
-        :type: PyTango.DevVarStringArray
+        :type: tango.DevVarStringArray
         :return:
-        :rtype: PyTango.DevVoid """
+        :rtype: tango.DevVoid """
         self._log.debug("In DbPutDeviceProperty()")
         device_name = argin[0]
         nb_properties = int(argin[1])
@@ -1003,9 +1003,9 @@ class DataBase(Device):
         """ Reset the timing attribute values.
 
         :param :
-        :type: PyTango.DevVoid
+        :type: tango.DevVoid
         :return:
-        :rtype: PyTango.DevVoid """
+        :rtype: tango.DevVoid """
         self._log.debug("In ResetTimingValues()")
         for tmp_timing in self.timing_maps.itervalues():
             tmp_timing.average = 0.
@@ -1019,9 +1019,9 @@ class DataBase(Device):
         """ Get a list of host:port for all database server defined in the control system
 
         :param :
-        :type: PyTango.DevVoid
+        :type: tango.DevVoid
         :return: List of host:port with one element for each database server
-        :rtype: PyTango.DevVarStringArray """
+        :rtype: tango.DevVarStringArray """
         self._log.debug("In DbGetCSDbServerList()")
         return self.db.get_csdb_server_list()
 
@@ -1037,9 +1037,9 @@ class DataBase(Device):
         Str[4] = Property value 1
         Str[n] = Property value n
         ....
-        :type: PyTango.DevVarStringArray
+        :type: tango.DevVarStringArray
         :return:
-        :rtype: PyTango.DevVoid """
+        :rtype: tango.DevVoid """
         self._log.debug("In DbPutClassProperty()")
         class_name = argin[0]
         nb_properties = int(argin[1])
@@ -1051,7 +1051,7 @@ class DataBase(Device):
         """ Import a device from the database
 
         :param argin: Device name (or alias)
-        :type: PyTango.DevString
+        :type: tango.DevString
         :return: Str[0] = device name
         Str[1] = CORBA IOR
         Str[2] = device version
@@ -1061,7 +1061,7 @@ class DataBase(Device):
 
         Lg[0] = Exported flag
         Lg[1] = Device server process PID
-        :rtype: PyTango.DevVarLongStringArray """
+        :rtype: tango.DevVarLongStringArray """
         self._log.debug("In DbImportDevice()")
         return self.db.import_device(argin.lower())
 
@@ -1073,9 +1073,9 @@ class DataBase(Device):
         :param argin: Str[0] = Device name
         Str[1] = Property name
         Str[n] = Property name
-        :type: PyTango.DevVarStringArray
+        :type: tango.DevVarStringArray
         :return:
-        :rtype: PyTango.DevVoid """
+        :rtype: tango.DevVoid """
         self._log.debug("In DbDeleteDeviceProperty()")
         dev_name = argin[0]
         for prop_name in argin[1:]:
@@ -1086,9 +1086,9 @@ class DataBase(Device):
         """ Get Tango class for the specified device.
 
         :param argin: Device name
-        :type: PyTango.DevString
+        :type: tango.DevString
         :return: Device Tango class
-        :rtype: PyTango.DevString """
+        :rtype: tango.DevString """
         self._log.debug("In DbGetClassForDevice()")
         return self.db.get_class_for_device(argin)
 
@@ -1099,14 +1099,14 @@ class DataBase(Device):
         :param argin: Str[0] = Device name
         Str[1] = Attribute name
         Str[2] = Property name
-        :type: PyTango.DevVarStringArray
+        :type: tango.DevVarStringArray
         :return: Str[0] = Attribute name
         Str[1] = Property name
         Str[2] = date
         Str[3] = Property value number (array case)
         Str[4] = Property value 1
         Str[n] = Property value n
-        :rtype: PyTango.DevVarStringArray """
+        :rtype: tango.DevVarStringArray """
         self._log.debug("In DbGetDeviceAttributePropertyHist()")
         dev_name = argin[0]
         attribute = replace_wildcard(argin[1])
@@ -1118,9 +1118,9 @@ class DataBase(Device):
         """ Get info about host, mode and level for specified server
 
         :param argin: server name
-        :type: PyTango.DevString
+        :type: tango.DevString
         :return: server info
-        :rtype: PyTango.DevVarStringArray """
+        :rtype: tango.DevVarStringArray """
         self._log.debug("In DbGetServerInfo()")
         return self.db.get_server_info(argin)
 
@@ -1130,9 +1130,9 @@ class DataBase(Device):
 
         :param argin: Str[0] = device name
         Str[1] = alias name
-        :type: PyTango.DevVarStringArray
+        :type: tango.DevVarStringArray
         :return:
-        :rtype: PyTango.DevVoid """
+        :rtype: tango.DevVoid """
         self._log.debug("In DbPutDeviceAlias()")
 
         if len(argin) < 2:
@@ -1153,9 +1153,9 @@ class DataBase(Device):
 
         :param argin: Str[0] = device name
         Str[1] = Filter
-        :type: PyTango.DevVarStringArray
+        :type: tango.DevVarStringArray
         :return: Property name list
-        :rtype: PyTango.DevVarStringArray """
+        :rtype: tango.DevVarStringArray """
         self._log.debug("In DbGetDevicePropertyList()")
         device_name = argin[0]
         prop_filter = argin[1]
@@ -1169,9 +1169,9 @@ class DataBase(Device):
         the specified filter
 
         :param argin: The filter
-        :type: PyTango.DevString
+        :type: tango.DevString
         :return: Device server process name list
-        :rtype: PyTango.DevVarStringArray """
+        :rtype: tango.DevVarStringArray """
         self._log.debug("In DbGetHostServerList()")
         argin = replace_wildcard(argin)
         return self.db.get_host_server_list(argin)
@@ -1183,7 +1183,7 @@ class DataBase(Device):
         :param argin: Str[0] = Tango class
         Str[1] = Property name
         Str[2] = Property name
-        :type: PyTango.DevVarStringArray
+        :type: tango.DevVarStringArray
         :return: Str[0] = Tango class
         Str[1] = Property number
         Str[2] = Property name
@@ -1191,7 +1191,7 @@ class DataBase(Device):
         Str[4] = Property value
         Str[n] = Propery value (array case)
         ....
-        :rtype: PyTango.DevVarStringArray """
+        :rtype: tango.DevVarStringArray """
         self._log.debug("In DbGetClassProperty()")
         class_name = argin[0]
         return self.db.get_class_property(class_name,argin[1:])
@@ -1202,9 +1202,9 @@ class DataBase(Device):
         matching the specified filter
 
         :param argin: The filter
-        :type: PyTango.DevString
+        :type: tango.DevString
         :return: Object name list
-        :rtype: PyTango.DevVarStringArray """
+        :rtype: tango.DevVarStringArray """
         self._log.debug("In DbGetObjectList()")
         argin = replace_wildcard(argin)
         return self.db.get_object_list(argin)
@@ -1217,9 +1217,9 @@ class DataBase(Device):
         Str[1] = Attribute name
         Str[2] = Property name
         Str[n] = Property name
-        :type: PyTango.DevVarStringArray
+        :type: tango.DevVarStringArray
         :return:
-        :rtype: PyTango.DevVoid """
+        :rtype: tango.DevVoid """
         self._log.debug("In DbDeleteClassAttributeProperty()")
 
         if len(argin) < 3:
@@ -1238,9 +1238,9 @@ class DataBase(Device):
         """ Returns the instance names found for specified server.
 
         :param argin: Server name
-        :type: PyTango.DevString
+        :type: tango.DevString
         :return: The instance names found for specified server.
-        :rtype: PyTango.DevVarStringArray """
+        :rtype: tango.DevVarStringArray """
         self._log.debug("In DbGetInstanceNameList()")
         return self.db.get_instance_name_list(argin)
 
@@ -1250,9 +1250,9 @@ class DataBase(Device):
         Returns one empty string if nothing found in database
 
         :param argin: The attribute name (dev_name/att_name)
-        :type: PyTango.DevString
+        :type: tango.DevString
         :return: The attribute alias name (or empty string)
-        :rtype: PyTango.DevString """
+        :rtype: tango.DevString """
         self._log.debug("In DbGetAttributeAlias2()")
         attr_name = argin[0]
         return self.db.get_attribute_alias2(attr_name)
@@ -1266,9 +1266,9 @@ class DataBase(Device):
         Str[2] = Tango class name
         Str[n] = Device name
         Str[n + 1] = Tango class name
-        :type: PyTango.DevVarStringArray
+        :type: tango.DevVarStringArray
         :return:
-        :rtype: PyTango.DevVoid """
+        :rtype: tango.DevVoid """
         self._log.debug("In DbAddServer()")
 
         if len(argin) < 3 or not len(argin) % 2:
@@ -1293,9 +1293,9 @@ class DataBase(Device):
         """ Get event channel info from database
 
         :param argin: name of event channel or factory
-        :type: PyTango.DevString
+        :type: tango.DevString
         :return: export information e.g. IOR
-        :rtype: PyTango.DevVarLongStringArray """
+        :rtype: tango.DevVarLongStringArray """
         self._log.debug("In DbImportEvent()")
         argin = replace_wildcard(argin.lower())
         return self.db.import_event(argin)
@@ -1306,13 +1306,13 @@ class DataBase(Device):
 
         :param argin: Str[0] = Device name
         Str[1] = Property name
-        :type: PyTango.DevVarStringArray
+        :type: tango.DevVarStringArray
         :return: Str[0] = Property name
         Str[1] = date
         Str[2] = Property value number (array case)
         Str[3] = Property value 1
         Str[n] = Property value n
-        :rtype: PyTango.DevVarStringArray """
+        :rtype: tango.DevVarStringArray """
         self._log.debug("In DbGetDevicePropertyHist()")
         device_name = argin[0]
         prop_name = argin[1]
@@ -1324,9 +1324,9 @@ class DataBase(Device):
         It returns only the server executable name without instance name as DbGetServerList.
 
         :param argin: wildcard for server names.
-        :type: PyTango.DevString
+        :type: tango.DevString
         :return: server names found.
-        :rtype: PyTango.DevVarStringArray """
+        :rtype: tango.DevVarStringArray """
         self._log.debug("In DbGetServerNameList()")
         argin = replace_wildcard(argin)
         return self.db.get_server_name_list(argin)
@@ -1342,7 +1342,7 @@ class DataBase(Device):
         :param argin: Str[0] = Device name
         Str[1] = Attribute name
         Str[n] = Attribute name
-        :type: PyTango.DevVarStringArray
+        :type: tango.DevVarStringArray
         :return: Str[0] = Device name
         Str[1] = Attribute property  number
         Str[2] = Attribute property 1 name
@@ -1353,7 +1353,7 @@ class DataBase(Device):
         Str[n + 2] = Attribute property 2 value number (array case)
         Str[n + 3] = Attribute property 2 value
         Str[n + m] = Attribute property 2 value (array case)
-        :rtype: PyTango.DevVarStringArray """
+        :rtype: tango.DevVarStringArray """
         self._log.debug("In DbGetDeviceAttributeProperty2()")
         dev_name = argin[0]
         return self.db.get_device_attribute_property2(dev_name, argin[1:])
@@ -1365,9 +1365,9 @@ class DataBase(Device):
         :param argin: Str[0] = Tango class name
         Str[1] = Property name
         Str[n] = Property name
-        :type: PyTango.DevVarStringArray
+        :type: tango.DevVarStringArray
         :return:
-        :rtype: PyTango.DevVoid """
+        :rtype: tango.DevVoid """
         self._log.debug("In DbDeleteClassProperty()")
         klass_name = argin[0]
         for prop_name in argin[1:]:
@@ -1378,9 +1378,9 @@ class DataBase(Device):
         """ Mark one event channel as non exported in database
 
         :param argin: name of event channel or factory to unexport
-        :type: PyTango.DevString
+        :type: tango.DevString
         :return: none
-        :rtype: PyTango.DevVoid """
+        :rtype: tango.DevVoid """
         self._log.debug("In DbUnExportEvent()")
         event_name = argin[0].lower()
         self.db.unexport_event(event_name)
@@ -1392,7 +1392,7 @@ class DataBase(Device):
         stored in database
 
         :param :
-        :type: PyTango.DevVoid
+        :type: tango.DevVoid
         :return: Miscellaneous info like:
         - Device defined in database
         - Device marked as exported in database
@@ -1403,7 +1403,7 @@ class DataBase(Device):
         - Device attribute properties defined in database
         - Class attribute properties defined in database
         - Object properties defined in database
-        :rtype: PyTango.DevVarStringArray """
+        :rtype: tango.DevVarStringArray """
         self._log.debug("In DbInfo()")
         return self.db.info()
 
@@ -1414,14 +1414,14 @@ class DataBase(Device):
         :param argin: Str[0] = Tango class name
         Str[1] = Attribute name
         Str[n] = Attribute name
-        :type: PyTango.DevVarStringArray
+        :type: tango.DevVarStringArray
         :return: Str[0] = Tango class name
         Str[1] = Attribute property  number
         Str[2] = Attribute property 1 name
         Str[3] = Attribute property 1 value
         Str[n + 1] = Attribute property 2 name
         Str[n + 2] = Attribute property 2 value
-        :rtype: PyTango.DevVarStringArray """
+        :rtype: tango.DevVarStringArray """
         self._log.debug("In DbGetClassAttributeProperty()")
         class_name = argin[0]
         return self.db.get_class_attribute_property(class_name, argin[1:])
@@ -1440,9 +1440,9 @@ class DataBase(Device):
         Str[5] = Property value 1
         Str[n] = Property value n (array case)
         .....
-        :type: PyTango.DevVarStringArray
+        :type: tango.DevVarStringArray
         :return:
-        :rtype: PyTango.DevVoid """
+        :rtype: tango.DevVoid """
         self._log.debug("In DbPutClassAttributeProperty2()")
         class_name = argin[0]
         nb_attributes = int(argin[1])
@@ -1453,9 +1453,9 @@ class DataBase(Device):
         """ Update server info including host, mode and level
 
         :param argin: server info
-        :type: PyTango.DevVarStringArray
+        :type: tango.DevVarStringArray
         :return:
-        :rtype: PyTango.DevVoid """
+        :rtype: tango.DevVoid """
         self._log.debug("In DbPutServerInfo()")
 
         if len(argin) < 4:
@@ -1480,9 +1480,9 @@ class DataBase(Device):
         """ Delete a device alias.
 
         :param argin: device alias name
-        :type: PyTango.DevString
+        :type: tango.DevString
         :return:
-        :rtype: PyTango.DevVoid """
+        :rtype: tango.DevVoid """
         self._log.debug("In DbDeleteDeviceAlias()")
         self.db.delete_device_alias(argin)
 
@@ -1496,9 +1496,9 @@ class DataBase(Device):
         Str[2] = Notifd host name
         Str[3] = Notifd pid
         Str[4] = Notifd version
-        :type: PyTango.DevVarStringArray
+        :type: tango.DevVarStringArray
         :return:
-        :rtype: PyTango.DevVoid """
+        :rtype: tango.DevVoid """
         self._log.debug("In DbExportEvent()")
 
         if len(argin) < 5:
@@ -1519,7 +1519,7 @@ class DataBase(Device):
         :param argin: Str[0] = Device name
         Str[1] = Property name
         Str[n] = Property name
-        :type: PyTango.DevVarStringArray
+        :type: tango.DevVarStringArray
         :return: Str[0] = Device name
         Str[1] = Property number
         Str[2] = Property name
@@ -1530,7 +1530,7 @@ class DataBase(Device):
         Str[n + 2] = Property value number (array case)
         Str[n + 3] = Property value 1
         Str[n + m] = Property value m
-        :rtype: PyTango.DevVarStringArray """
+        :rtype: tango.DevVarStringArray """
         self._log.debug("In DbGetDeviceProperty()")
         device_name = argin[0]
         return self.db.get_device_property(device_name, argin[1:])
@@ -1540,7 +1540,7 @@ class DataBase(Device):
         """ Returns info from DbImportDevice and started/stopped dates.
 
         :param argin: Device name
-        :type: PyTango.DevString
+        :type: tango.DevString
         :return: Str[0] = Device name
         Str[1] = CORBA IOR
         Str[2] = Device version
@@ -1552,7 +1552,7 @@ class DataBase(Device):
 
         Lg[0] = Device exported flag
         Lg[1] = Device Server process PID (or -1 if not set)
-        :rtype: PyTango.DevVarLongStringArray """
+        :rtype: tango.DevVarLongStringArray """
         self._log.debug("In DbGetDeviceInfo()")
         ret, dev_name, dfm = check_device_name(argin)
         if not ret:
@@ -1568,13 +1568,13 @@ class DataBase(Device):
 
         :param argin: Str[0] = Object name
         Str[2] = Property name
-        :type: PyTango.DevVarStringArray
+        :type: tango.DevVarStringArray
         :return: Str[0] = Property name
         Str[1] = date
         Str[2] = Property value number (array case)
         Str[3] = Property value 1
         Str[n] = Property value n
-        :rtype: PyTango.DevVarStringArray """
+        :rtype: tango.DevVarStringArray """
         self._log.debug("In DbGetPropertyHist()")
         object_name = argin[0]
         prop_name = argin[1]
@@ -1587,9 +1587,9 @@ class DataBase(Device):
         specified filter
 
         :param argin: The filter
-        :type: PyTango.DevString
+        :type: tango.DevString
         :return: Device names member list
-        :rtype: PyTango.DevVarStringArray """
+        :rtype: tango.DevVarStringArray """
         self._log.debug("In DbGetDeviceMemberList()")
         argin = replace_wildcard(argin)
         return self.db.get_device_member_list(argin)
@@ -1599,9 +1599,9 @@ class DataBase(Device):
         """ Get Tango class list with a specified filter
 
         :param argin: Filter
-        :type: PyTango.DevString
+        :type: tango.DevString
         :return: Class list
-        :rtype: PyTango.DevVarStringArray """
+        :rtype: tango.DevVarStringArray """
         self._log.debug("In DbGetClassList()")
         server = replace_wildcard(argin)
         return self.db.get_class_list(server)
@@ -1612,9 +1612,9 @@ class DataBase(Device):
         If the given alias is not found in database, returns an empty string
 
         :param argin: The attribute alias
-        :type: PyTango.DevString
+        :type: tango.DevString
         :return: The attribute name (dev_name/att_name)
-        :rtype: PyTango.DevString """
+        :rtype: tango.DevString """
         self._log.debug("In DbGetAliasAttribute()")
         alias_name = argin[0]
         return self.db.get_alias_attribute(alias_name)
@@ -1624,9 +1624,9 @@ class DataBase(Device):
         """ delete info related to a Tango devvice server process
 
         :param argin: Device server name
-        :type: PyTango.DevString
+        :type: tango.DevString
         :return:
-        :rtype: PyTango.DevVoid """
+        :rtype: tango.DevVoid """
         self._log.debug("In DbDeleteServerInfo()")
         self.db.delete_server_info(argin)
 
@@ -1636,10 +1636,10 @@ class DataBase(Device):
 
         :param argin: Str[0] = Tango class name
         Str[1] = Attribute name filter (eg: att*)
-        :type: PyTango.DevVarStringArray
+        :type: tango.DevVarStringArray
         :return: Str[0] = Class attribute name
         Str[n] = Class attribute name
-        :rtype: PyTango.DevVarStringArray """
+        :rtype: tango.DevVarStringArray """
         self._log.debug("In DbGetClassAttributeList()")
         class_name = argin[0]
         wildcard = replace_wildcard(argin[1])
@@ -1652,9 +1652,9 @@ class DataBase(Device):
         :param argin: Str[0] = Full device server process name
         Str[1] = Device name
         Str[2] = Tango class name
-        :type: PyTango.DevVarStringArray
+        :type: tango.DevVarStringArray
         :return:
-        :rtype: PyTango.DevVoid """
+        :rtype: tango.DevVoid """
         self._log.debug("In DbAddDevice()")
 
         if len(argin) < 3:
@@ -1684,9 +1684,9 @@ class DataBase(Device):
 
         :param argin: argin[0] : server name
         argin[1] : class name
-        :type: PyTango.DevVarStringArray
+        :type: tango.DevVarStringArray
         :return: The list of devices for specified server and class.
-        :rtype: PyTango.DevVarStringArray """
+        :rtype: tango.DevVarStringArray """
         self._log.debug("In DbGetDeviceList()")
         server_name = replace_wildcard(argin[0])
         class_name = replace_wildcard(argin[1])
@@ -1704,9 +1704,9 @@ def DbExportDevice(self, argin):
     Str[2] = Device server process host name
     Str[3] = Device server process PID or string ``null``
     Str[4] = Device server process version
-    :type: PyTango.DevVarStringArray
+    :type: tango.DevVarStringArray
     :return:
-    :rtype: PyTango.DevVoid """
+    :rtype: tango.DevVoid """
     self._log.debug("In DbExportDevice()")
     if len(argin) < 5:
         self.warn_stream("DataBase::DbExportDevice(): insufficient export info for device ")
@@ -1753,7 +1753,7 @@ def main(argv = None):
     port = options.port
     if port is None:
         try:
-            _, port = PyTango.ApiUtil.get_env_var("TANGO_HOST").split(":")
+            _, port = tango.ApiUtil.get_env_var("TANGO_HOST").split(":")
         except:
             port = 10000
 
@@ -1827,8 +1827,8 @@ def __run(db_name,argv):
 
         ./DataBaseds pydb-test -ORBendPoint giop:tcp::11000
     """
-    PyTango.Util.set_use_db(False)
-    util = PyTango.Util(argv)
+    tango.Util.set_use_db(False)
+    util = tango.Util(argv)
     __monkey_patch_util(util)
     __monkey_patch_database_class()
 
@@ -1837,7 +1837,7 @@ def __run(db_name,argv):
 
     def post_init_cb():
         logging.debug("post_init_cb()")
-        util = PyTango.Util.instance()
+        util = tango.Util.instance()
         dserver = util.get_dserver_device()
         dserver_name = dserver.get_name()
         dserver_ior = util.get_dserver_ior(dserver)
diff --git a/tango/databaseds/db_access/beacon.py b/tango/databaseds/db_access/beacon.py
index 3b0ae75..10ff23f 100644
--- a/tango/databaseds/db_access/beacon.py
+++ b/tango/databaseds/db_access/beacon.py
@@ -9,9 +9,9 @@ import Queue
 import re
 import weakref
 import datetime
-import PyTango
+import tango
 
-th_exc = PyTango.Except.throw_exception
+th_exc = tango.Except.throw_exception
 
 from ..db_errors import *
 
diff --git a/tango/databaseds/db_access/sqlite3.py b/tango/databaseds/db_access/sqlite3.py
index f31345b..a5416af 100644
--- a/tango/databaseds/db_access/sqlite3.py
+++ b/tango/databaseds/db_access/sqlite3.py
@@ -6,9 +6,9 @@ import functools
 import threading
 import Queue
 
-import PyTango
+import tango
 
-th_exc = PyTango.Except.throw_exception
+th_exc = tango.Except.throw_exception
 
 from db_errors import *
 
@@ -182,7 +182,7 @@ class Tango_dbapi2(object):
             pos = name.find('.')
             if pos != -1:
                 name = name[0:pos]
-            dev = PyTango.DeviceProxy(name)
+            dev = tango.DeviceProxy(name)
             dev.UpdateServersInfo()
             
             
@@ -403,7 +403,7 @@ class Tango_dbapi2(object):
         if self.fire_to_starter:
             if dev_name[0:8] == "dserver/":
                 # Get database server name
-                tango_util = PyTango.Util.instance()
+                tango_util = tango.Util.instance()
                 db_serv = tango_util.get_ds_name()
                 adm_dev_name = "dserver/" + db_serv.lower()
                 if dev_name != adm_dev_name and dev_name[0:16] != "dserver/starter/":
diff --git a/tango/db.py b/tango/db.py
index 693809b..dafd8be 100644
--- a/tango/db.py
+++ b/tango/db.py
@@ -19,7 +19,7 @@ __docformat__ = "restructuredtext"
 
 import collections
 
-from ._PyTango import StdStringVector, Database, DbDatum, DbData, \
+from ._tango import StdStringVector, Database, DbDatum, DbData, \
     DbDevInfo, DbDevInfos, DbDevImportInfo, DbDevExportInfo, DbDevExportInfos, \
     DbHistory, DbServerInfo, DbServerData
 
@@ -197,8 +197,8 @@ def __Database__generic_get_property(self, obj_name, value, f):
                 new_value.append(DbDatum(k))
         ret = value
     else:
-        raise TypeError('value must be a string, PyTango.DbDatum, '\
-                        'PyTango.DbData, a sequence or a dictionary')
+        raise TypeError('value must be a string, tango.DbDatum, '\
+                        'tango.DbData, a sequence or a dictionary')
 
     f(obj_name, new_value)
     if ret is None: ret = {}
@@ -228,7 +228,7 @@ def __Database__generic_put_property(self, obj_name, value, f):
             new_value.append(db_datum)
         value = new_value
     else:
-        raise TypeError('value must be a PyTango.DbDatum, PyTango.DbData,'\
+        raise TypeError('value must be a tango.DbDatum, tango.DbData,'\
                         'a sequence<DbDatum> or a dictionary')
     return f(obj_name, value)
 
@@ -257,8 +257,8 @@ def __Database__generic_delete_property(self, obj_name, value, f):
             else:
                 new_value.append(DbDatum(k))
     else:
-        raise TypeError('value must be a string, PyTango.DbDatum, '\
-                        'PyTango.DbData, a sequence or a dictionary')
+        raise TypeError('value must be a string, tango.DbDatum, '\
+                        'tango.DbData, a sequence or a dictionary')
 
     return f(obj_name, new_value)
 
@@ -497,8 +497,8 @@ def __Database__get_device_attribute_property(self, dev_name, value):
             else:
                 new_value.append(DbDatum(k))
     else:
-        raise TypeError('value must be a string, PyTango.DbDatum, '\
-                        'PyTango.DbData, a sequence or a dictionary')
+        raise TypeError('value must be a string, tango.DbDatum, '\
+                        'tango.DbData, a sequence or a dictionary')
 
     if ret is None: ret = {}
 
@@ -536,7 +536,7 @@ def __Database__put_device_attribute_property(self, dev_name, value):
                        associated with each key being:
                        
                        3.1 seq<str>
-                       3.2 PyTango.DbDatum
+                       3.2 tango.DbDatum
 
             Return     : None
 
@@ -565,7 +565,7 @@ def __Database__put_device_attribute_property(self, dev_name, value):
                 new_value.append(db_datum)
         value = new_value
     else:
-        raise TypeError('value must be a PyTango.DbData,'\
+        raise TypeError('value must be a tango.DbData,'\
                         'a sequence<DbDatum> or a dictionary')
     return self._put_device_attribute_property(dev_name, value)
 
@@ -600,8 +600,8 @@ def __Database__delete_device_attribute_property(self, dev_name, value):
             for k2 in v1:
                 new_value.append(DbDatum(k2))
     else:
-        raise TypeError('value must be a string, PyTango.DbDatum, '\
-                        'PyTango.DbData, a sequence or a dictionary')
+        raise TypeError('value must be a string, tango.DbDatum, '\
+                        'tango.DbData, a sequence or a dictionary')
 
     return self._delete_device_attribute_property(dev_name, new_value)
 
@@ -616,8 +616,8 @@ def __Database__get_class_property(self, class_name, value):
                 - value : can be one of the following:
                 
                     1. str [in] - single property data to be fetched
-                    2. PyTango.DbDatum [in] - single property data to be fetched
-                    3. PyTango.DbData [in,out] - several property data to be fetched
+                    2. tango.DbDatum [in] - single property data to be fetched
+                    3. tango.DbData [in,out] - several property data to be fetched
                        In this case (direct C++ API) the DbData will be filled with
                        the property values
                     4. sequence<str> [in] - several property data to be fetched
@@ -732,8 +732,8 @@ def __Database__get_class_attribute_property(self, class_name, value):
             else:
                 new_value.append(DbDatum(k))
     else:
-        raise TypeError('value must be a string, PyTango.DbDatum, '\
-                        'PyTango.DbData, a sequence or a dictionary')
+        raise TypeError('value must be a string, tango.DbDatum, '\
+                        'tango.DbData, a sequence or a dictionary')
 
     self._get_class_attribute_property(class_name, new_value)
 
@@ -764,14 +764,14 @@ def __Database__put_class_attribute_property(self, class_name, value):
                 - class_name : (str) class name
                 - propdata : can be one of the following:
                 
-                    1. PyTango.DbData - several property data to be inserted
+                    1. tango.DbData - several property data to be inserted
                     2. sequence<DbDatum> - several property data to be inserted
                     3. dict<str, dict<str, obj>> keys are attribute names and value
                        being another dictionary which keys are the attribute property
                        names and the value associated with each key being:
                        
                        3.1 seq<str>
-                       3.2 PyTango.DbDatum
+                       3.2 tango.DbDatum
 
             Return     : None
 
@@ -799,7 +799,7 @@ def __Database__put_class_attribute_property(self, class_name, value):
                 new_value.append(db_datum)
         value = new_value
     else:
-        raise TypeError('value must be a PyTango.DbData,'\
+        raise TypeError('value must be a tango.DbData,'\
                         'a sequence<DbDatum> or a dictionary')
     return self._put_class_attribute_property(class_name, value)
 
@@ -1255,7 +1255,7 @@ def __doc_Database():
         Return     : device name
 
         .. deprecated:: 8.1.0
-            Use :meth:`~PyTango.Database.get_device_from_alias` instead
+            Use :meth:`~tango.Database.get_device_from_alias` instead
     """ )
 
     document_method("get_alias", """
@@ -1270,7 +1270,7 @@ def __doc_Database():
         New in PyTango 3.0.4
         
         .. deprecated:: 8.1.0
-            Use :meth:`~PyTango.Database.get_alias_from_device` instead
+            Use :meth:`~tango.Database.get_alias_from_device` instead
     """ )
 
     document_method("get_device_from_alias", """
@@ -1794,7 +1794,7 @@ def __doc_Database():
             is an example of how to delete the unit property of the velocity attribute of
             the id11/motor/1 device using this method :
 
-            db_data = PyTango.DbData();
+            db_data = tango.DbData();
             db_data.append(DbDatum("velocity"));
             db_data.append(DbDatum("unit"));
             db.delete_device_attribute_property("id11/motor/1", db_data);
@@ -1994,7 +1994,7 @@ def __doc_Database():
         Throws     : ConnectionFailed, CommunicationFailed, DevFailed from device (DB_SQLError)
         
         .. deprecated:: 8.1.0
-            Use :meth:`~PyTango.Database.get_attribute_from_alias` instead
+            Use :meth:`~tango.Database.get_attribute_from_alias` instead
     """ )
 
     document_method("get_attribute_from_alias", """
diff --git a/tango/device_attribute.py b/tango/device_attribute.py
index 985de73..58049b6 100644
--- a/tango/device_attribute.py
+++ b/tango/device_attribute.py
@@ -20,7 +20,7 @@ __docformat__ = "restructuredtext"
 import copy
 
 from .utils import document_method as __document_method
-from ._PyTango import DeviceAttribute, ExtractAs
+from ._tango import DeviceAttribute, ExtractAs
 
 def __DeviceAttribute__get_data(self):
     return self.get_data_raw().extract()
diff --git a/tango/device_class.py b/tango/device_class.py
index d75c24a..060fd3c 100644
--- a/tango/device_class.py
+++ b/tango/device_class.py
@@ -21,7 +21,7 @@ __docformat__ = "restructuredtext"
 
 import collections
 
-from ._PyTango import Except, DevFailed, DeviceClass, CmdArgType, \
+from ._tango import Except, DevFailed, DeviceClass, CmdArgType, \
     DispLevel, UserDefaultAttrProp
 from .pyutil import Util
 
@@ -409,7 +409,7 @@ def __create_command(self, deviceimpl_class, cmd_name, cmd_info):
     except:
         msg = "Wrong data type in command argument for command %s in " \
               "class %s\nCommand parameter type (first element in first " \
-              "sequence) must be a PyTango.CmdArgType"
+              "sequence) must be a tango.CmdArgType"
         __throw_create_command_exception(msg)
 
     param_desc = ""
@@ -439,7 +439,7 @@ def __create_command(self, deviceimpl_class, cmd_name, cmd_info):
     except:
         msg = "Wrong data type in command result for command %s in " \
               "class %s\nCommand result type (first element in second " \
-              "sequence) must be a PyTango.CmdArgType" % (cmd_name, name)
+              "sequence) must be a tango.CmdArgType" % (cmd_name, name)
         __throw_create_command_exception(msg)
 
     result_desc = ""
@@ -476,7 +476,7 @@ def __create_command(self, deviceimpl_class, cmd_name, cmd_info):
                 except:
                     msg = "Wrong data type in command information for command %s in " \
                           "class %s\nCommand information for display level is not a " \
-                          "PyTango.DispLevel" % (cmd_name, name)
+                          "tango.DispLevel" % (cmd_name, name)
                     __throw_create_command_exception(msg)
             elif info_name_lower == "default command":
                 if not is_pure_str(info_value):
@@ -575,7 +575,7 @@ def __DeviceClass__create_device(self, device_name, alias=None, cb=None):
             registered in the database and BEFORE the init_device for the
             newly created device is called
 
-        Throws PyTango.DevFailed:
+        Throws tango.DevFailed:
             - the device name exists already or
             - the given class is not registered for this DS.
             - the cb is not a callable
@@ -602,7 +602,7 @@ def __DeviceClass__delete_device(self, device_name):
             Deletes an existing device from the database and from this running
             server
 
-            Throws PyTango.DevFailed:
+            Throws tango.DevFailed:
                 - the device name doesn't exist in the database
                 - the device name doesn't exist in this DS.
 
@@ -718,7 +718,7 @@ def __doc_DeviceClass():
             is sent to to the device server process.
             The second version of the method is available only under Linux.
 
-        Throws PyTango.DevFailed:
+        Throws tango.DevFailed:
             - if the signal number is out of range
             - if the operating system failed to register a signal for the process.
 
@@ -815,33 +815,33 @@ def __doc_DeviceClass():
     """ )
 
     document_method("get_device_list", """
-    get_device_list(self) -> sequence<PyTango.DeviceImpl>
+    get_device_list(self) -> sequence<tango.DeviceImpl>
 
-            Gets the list of PyTango.DeviceImpl objects for this class
+            Gets the list of tango.DeviceImpl objects for this class
 
         Parameters : None
-        Return     : (sequence<PyTango.DeviceImpl>) list of PyTango.DeviceImpl objects for this class
+        Return     : (sequence<tango.DeviceImpl>) list of tango.DeviceImpl objects for this class
     """ )
 
     document_method("get_command_list", """
-    get_command_list(self) -> sequence<PyTango.Command>
+    get_command_list(self) -> sequence<tango.Command>
 
-            Gets the list of PyTango.Command objects for this class
+            Gets the list of tango.Command objects for this class
 
         Parameters : None
-        Return     : (sequence<PyTango.Command>) list of PyTango.Command objects for this class
+        Return     : (sequence<tango.Command>) list of tango.Command objects for this class
         
         New in PyTango 8.0.0
     """ )
 
     document_method("get_cmd_by_name", """
-    get_cmd_by_name(self, (str)cmd_name) -> PyTango.Command
+    get_cmd_by_name(self, (str)cmd_name) -> tango.Command
 
             Get a reference to a command object.
 
         Parameters :
             - cmd_name : (str) command name
-        Return     : (PyTango.Command) PyTango.Command object
+        Return     : (tango.Command) tango.Command object
         
         New in PyTango 8.0.0
     """ )
diff --git a/tango/device_data.py b/tango/device_data.py
index 4efcaed..2b24027 100644
--- a/tango/device_data.py
+++ b/tango/device_data.py
@@ -18,7 +18,7 @@ __all__ = ["device_data_init"]
 __docformat__ = "restructuredtext"
 
 from .utils import document_method as __document_method
-from ._PyTango import DeviceData
+from ._tango import DeviceData
 
 def __DeviceData__get_data(self):
     return self.get_data_raw().extract()
diff --git a/tango/device_proxy.py b/tango/device_proxy.py
index 7b1ccb6..50a01f8 100644
--- a/tango/device_proxy.py
+++ b/tango/device_proxy.py
@@ -23,7 +23,7 @@ import time
 import threading
 import collections
 
-from ._PyTango import StdStringVector, DbData, DbDatum, AttributeInfo, \
+from ._tango import StdStringVector, DbData, DbDatum, AttributeInfo, \
     AttributeInfoEx, AttributeInfoList, AttributeInfoListEx, DeviceProxy, \
     __CallBackAutoDie, __CallBackPushEvent, EventType, DevFailed, Except, \
     ExtractAs, GreenMode, constants
@@ -42,9 +42,9 @@ def get_device_proxy(*args, **kwargs):
     """get_device_proxy(self, dev_name, green_mode=None, wait=True, timeout=True) -> DeviceProxy
     get_device_proxy(self, dev_name, need_check_acc, green_mode=None, wait=True, timeout=None) -> DeviceProxy
 
-    Returns a new :class:`~PyTango.DeviceProxy`.
+    Returns a new :class:`~tango.DeviceProxy`.
     There is no difference between using this function and the direct
-    :class:`~PyTango.DeviceProxy` constructor if you use the default kwargs.
+    :class:`~tango.DeviceProxy` constructor if you use the default kwargs.
 
     The added value of this function becomes evident when you choose a green_mode
     to be *Futures* or *Gevent*. The DeviceProxy constructor internally makes some
@@ -53,8 +53,8 @@ def get_device_proxy(*args, **kwargs):
 
     .. note::
         The timeout parameter has no relation with the tango device client side
-        timeout (gettable by :meth:`~PyTango.DeviceProxy.get_timeout_millis` and
-        settable through :meth:`~PyTango.DeviceProxy.set_timeout_millis`)
+        timeout (gettable by :meth:`~tango.DeviceProxy.get_timeout_millis` and
+        settable through :meth:`~tango.DeviceProxy.set_timeout_millis`)
 
     :param dev_name: the device name or alias
     :type dev_name: str
@@ -64,9 +64,9 @@ def get_device_proxy(*args, **kwargs):
     :type need_check_acc: bool
     :param green_mode: determines the mode of execution of the device (including
                       the way it is created). Defaults to the current global
-                      green_mode (check :func:`~PyTango.get_green_mode` and
-                      :func:`~PyTango.set_green_mode`)
-    :type green_mode: :obj:`~PyTango.GreenMode`
+                      green_mode (check :func:`~tango.get_green_mode` and
+                      :func:`~tango.set_green_mode`)
+    :type green_mode: :obj:`~tango.GreenMode`
     :param wait: whether or not to wait for result. If green_mode
                  Ignored when green_mode is Synchronous (always waits).
     :type wait: bool
@@ -76,7 +76,7 @@ def get_device_proxy(*args, **kwargs):
     :type timeout: float
     :returns:
         if green_mode is Synchronous or wait is True:
-            :class:`~PyTango.DeviceProxy`
+            :class:`~tango.DeviceProxy`
         else if green_mode is Futures:
             :class:`concurrent.futures.Future`
         else if green_mode is Gevent:
@@ -170,8 +170,8 @@ def __DeviceProxy__get_green_mode(self):
     :rtype: GreenMode
 
     .. seealso::
-        :func:`PyTango.get_green_mode`
-        :func:`PyTango.set_green_mode`
+        :func:`tango.get_green_mode`
+        :func:`tango.set_green_mode`
 
     New in PyTango 8.1.0
     """
@@ -183,7 +183,7 @@ def __DeviceProxy__get_green_mode(self):
 def __DeviceProxy__set_green_mode(self, green_mode=None):
     """Sets the green mode to be used by this DeviceProxy
     Setting it to None means use the global PyTango green mode
-    (see :func:`PyTango.get_green_mode`).
+    (see :func:`tango.get_green_mode`).
 
     :param green_mode: the new green mode
     :type green_mode: GreenMode
@@ -371,7 +371,7 @@ def __DeviceProxy__read_attributes_asynch(self, attr_names, cb=None, extract_as=
         by default, TANGO is initialized with the **polling** model. If you want
         to use the **push** model (the one with the callback parameter), you
         need to change the global TANGO model to PUSH_CALLBACK.
-        You can do this with the :meth:`PyTango.ApiUtil.set_asynch_cb_sub_model`
+        You can do this with the :meth:`tango.ApiUtil.set_asynch_cb_sub_model`
     """
     if cb is None:
         return self.__read_attributes_asynch(attr_names)
@@ -439,7 +439,7 @@ def __DeviceProxy__write_attributes_asynch(self, attr_values, cb=None):
         by default, TANGO is initialized with the **polling** model. If you want
         to use the **push** model (the one with the callback parameter), you
         need to change the global TANGO model to PUSH_CALLBACK.
-        You can do this with the :meth:`PyTango.ApiUtil.set_asynch_cb_sub_model`
+        You can do this with the :meth:`tango.ApiUtil.set_asynch_cb_sub_model`
     """
     if cb is None:
         return self.__write_attributes_asynch(attr_values)
@@ -475,31 +475,31 @@ def __DeviceProxy__write_read_attributes(self, name_val,
 
 def __DeviceProxy__get_property(self, propname, value=None):
     """
-    get_property(propname, value=None) -> PyTango.DbData
+    get_property(propname, value=None) -> tango.DbData
 
             Get a (list) property(ies) for a device.
 
             This method accepts the following types as propname parameter:
             1. string [in] - single property data to be fetched
             2. sequence<string> [in] - several property data to be fetched
-            3. PyTango.DbDatum [in] - single property data to be fetched
-            4. PyTango.DbData [in,out] - several property data to be fetched.
+            3. tango.DbDatum [in] - single property data to be fetched
+            4. tango.DbData [in,out] - several property data to be fetched.
             5. sequence<DbDatum> - several property data to be feteched
 
             Note: for cases 3, 4 and 5 the 'value' parameter if given, is IGNORED.
 
-            If value is given it must be a PyTango.DbData that will be filled with the
+            If value is given it must be a tango.DbData that will be filled with the
             property values
 
         Parameters :
             - propname : (any) property(ies) name(s)
             - value : (DbData) (optional, default is None meaning that the
-                      method will create internally a PyTango.DbData and return
+                      method will create internally a tango.DbData and return
                       it filled with the property values
 
         Return     : (DbData) object containing the property(ies) value(s). If a
-                     PyTango.DbData is given as parameter, it returns the same
-                     object otherwise a new PyTango.DbData is returned
+                     tango.DbData is given as parameter, it returns the same
+                     object otherwise a new tango.DbData is returned
 
         Throws     : NonDbDevice, ConnectionFailed (with database),
                      CommunicationFailed (with database),
@@ -542,8 +542,8 @@ def __DeviceProxy__put_property(self, value):
 
             Insert or update a list of properties for this device.
             This method accepts the following types as value parameter:
-            1. PyTango.DbDatum - single property data to be inserted
-            2. PyTango.DbData - several property data to be inserted
+            1. tango.DbDatum - single property data to be inserted
+            2. tango.DbData - several property data to be inserted
             3. sequence<DbDatum> - several property data to be inserted
             4. dict<str, DbDatum> - keys are property names and value has data to be inserted
             5. dict<str, seq<str>> - keys are property names and value has data to be inserted
@@ -551,8 +551,8 @@ def __DeviceProxy__put_property(self, value):
 
         Parameters :
             - value : can be one of the following:
-                1. PyTango.DbDatum - single property data to be inserted
-                2. PyTango.DbData - several property data to be inserted
+                1. tango.DbDatum - single property data to be inserted
+                2. tango.DbData - several property data to be inserted
                 3. sequence<DbDatum> - several property data to be inserted
                 4. dict<str, DbDatum> - keys are property names and value has data to be inserted
                 5. dict<str, seq<str>> - keys are property names and value has data to be inserted
@@ -585,7 +585,7 @@ def __DeviceProxy__put_property(self, value):
             new_value.append(db_datum)
         value = new_value
     else:
-        raise TypeError('value must be a PyTango.DbDatum, PyTango.DbData,'\
+        raise TypeError('value must be a tango.DbDatum, tango.DbData,'\
                         'a sequence<DbDatum> or a dictionary')
     return self._put_property(value)
 
@@ -597,8 +597,8 @@ def __DeviceProxy__delete_property(self, value):
             This method accepts the following types as value parameter:
 
                 1. string [in] - single property to be deleted
-                2. PyTango.DbDatum [in] - single property data to be deleted
-                3. PyTango.DbData [in] - several property data to be deleted
+                2. tango.DbDatum [in] - single property data to be deleted
+                3. tango.DbData [in] - several property data to be deleted
                 4. sequence<string> [in]- several property data to be deleted
                 5. sequence<DbDatum> [in] - several property data to be deleted
                 6. dict<str, obj> [in] - keys are property names to be deleted (values are ignored)
@@ -608,8 +608,8 @@ def __DeviceProxy__delete_property(self, value):
             - value : can be one of the following:
 
                 1. string [in] - single property data to be deleted
-                2. PyTango.DbDatum [in] - single property data to be deleted
-                3. PyTango.DbData [in] - several property data to be deleted
+                2. tango.DbDatum [in] - single property data to be deleted
+                3. tango.DbData [in] - several property data to be deleted
                 4. sequence<string> [in]- several property data to be deleted
                 5. sequence<DbDatum> [in] - several property data to be deleted
                 6. dict<str, obj> [in] - keys are property names to be deleted (values are ignored)
@@ -641,8 +641,8 @@ def __DeviceProxy__delete_property(self, value):
             else:
                 new_value.append(DbDatum(k))
     else:
-        raise TypeError('value must be a string, PyTango.DbDatum, '\
-                        'PyTango.DbData, a sequence or a dictionary')
+        raise TypeError('value must be a string, tango.DbDatum, '\
+                        'tango.DbData, a sequence or a dictionary')
 
     return self._delete_property(new_value)
 
@@ -707,7 +707,7 @@ def __DeviceProxy__get_attribute_config(self, value):
     get_attribute_config( self, names) -> AttributeInfoList
 
             Return the attribute configuration for the list of specified attributes. To get all the
-            attributes pass a sequence containing the constant PyTango.constants.AllAttr
+            attributes pass a sequence containing the constant tango.constants.AllAttr
 
         Parameters :
                 - names : (sequence<str>) attribute names
@@ -745,7 +745,7 @@ def __DeviceProxy__get_attribute_config_ex(self, value):
 
             Return the extended attribute configuration for the list of
             specified attributes. To get all the attributes pass a sequence
-            containing the constant PyTango.constants.AllAttr
+            containing the constant tango.constants.AllAttr
 
         Parameters :
                 - names : (sequence<str>) attribute names
@@ -839,7 +839,7 @@ def __DeviceProxy__get_pipe_config(self, value=None):
     get_pipe_config( self, names) -> PipeInfoList
 
             Return the pipe configuration for the list of specified pipes. To get all the
-            pipes pass a sequence containing the constant PyTango.constants.AllPipe
+            pipes pass a sequence containing the constant tango.constants.AllPipe
 
         Parameters :
                 - names : (sequence<str>) pipe names
@@ -1377,12 +1377,12 @@ def __doc_DeviceProxy():
     a DeviceProxy, a Tango Device name must be set in the object constructor.
 
     Example :
-       dev = PyTango.DeviceProxy("sys/tg_test/1")
+       dev = tango.DeviceProxy("sys/tg_test/1")
 
     DeviceProxy(dev_name, green_mode=None, wait=True, timeout=True) -> DeviceProxy
     DeviceProxy(self, dev_name, need_check_acc, green_mode=None, wait=True, timeout=True) -> DeviceProxy
 
-    Creates a new :class:`~PyTango.DeviceProxy`.
+    Creates a new :class:`~tango.DeviceProxy`.
 
     :param dev_name: the device name or alias
     :type dev_name: str
@@ -1392,9 +1392,9 @@ def __doc_DeviceProxy():
     :type need_check_acc: bool
     :param green_mode: determines the mode of execution of the device (including.
                       the way it is created). Defaults to the current global
-                      green_mode (check :func:`~PyTango.get_green_mode` and
-                      :func:`~PyTango.set_green_mode`)
-    :type green_mode: :obj:`~PyTango.GreenMode`
+                      green_mode (check :func:`~tango.get_green_mode` and
+                      :func:`~tango.set_green_mode`)
+    :type green_mode: :obj:`~tango.GreenMode`
     :param wait: whether or not to wait for result. If green_mode
                  Ignored when green_mode is Synchronous (always waits).
     :type wait: bool
@@ -1404,13 +1404,13 @@ def __doc_DeviceProxy():
     :type timeout: float
     :returns:
         if green_mode is Synchronous or wait is True:
-            :class:`~PyTango.DeviceProxy`
+            :class:`~tango.DeviceProxy`
         elif green_mode is Futures:
             :class:`concurrent.futures.Future`
         elif green_mode is Gevent:
             :class:`gevent.event.AsynchResult`
     :throws:
-        * :class:`~PyTango.DevFailed` if green_mode is Synchronous or wait is True
+        * :class:`~tango.DevFailed` if green_mode is Synchronous or wait is True
           and there is an error creating the device.
         * :class:`concurrent.futures.TimeoutError` if green_mode is Futures,
           wait is False, timeout is not None and the time to create the device
@@ -1639,7 +1639,7 @@ def __doc_DeviceProxy():
     attribute_list_query(self) -> sequence<AttributeInfo>
 
             Query the device for info on all attributes. This method returns
-            a sequence of PyTango.AttributeInfo.
+            a sequence of tango.AttributeInfo.
 
         Parameters : None
         Return     : (sequence<AttributeInfo>) containing the
@@ -1653,7 +1653,7 @@ def __doc_DeviceProxy():
     attribute_list_query_ex(self) -> sequence<AttributeInfoEx>
 
             Query the device for info on all attributes. This method returns
-            a sequence of PyTango.AttributeInfoEx.
+            a sequence of tango.AttributeInfoEx.
 
         Parameters : None
         Return     : (sequence<AttributeInfoEx>) containing the
@@ -1674,8 +1674,8 @@ def __doc_DeviceProxy():
             - attr_name  : (str) The name of the attribute to read.
             - extract_as : (ExtractAs) Defaults to numpy.
             - green_mode : (GreenMode) Defaults to the current DeviceProxy GreenMode.
-                           (see :meth:`~PyTango.DeviceProxy.get_green_mode` and
-                           :meth:`~PyTango.DeviceProxy.set_green_mode`).
+                           (see :meth:`~tango.DeviceProxy.get_green_mode` and
+                           :meth:`~tango.DeviceProxy.set_green_mode`).
             - wait       : (bool) whether or not to wait for result. If green_mode
                            is *Synchronous*, this parameter is ignored as it always
                            waits for the result.
@@ -1720,8 +1720,8 @@ def __doc_DeviceProxy():
                 - attr_names : (sequence<str>) A list of attributes to read.
                 - extract_as : (ExtractAs) Defaults to numpy.
                 - green_mode : (GreenMode) Defaults to the current DeviceProxy GreenMode.
-                               (see :meth:`~PyTango.DeviceProxy.get_green_mode` and
-                               :meth:`~PyTango.DeviceProxy.set_green_mode`).
+                               (see :meth:`~tango.DeviceProxy.get_green_mode` and
+                               :meth:`~tango.DeviceProxy.set_green_mode`).
                 - wait       : (bool) whether or not to wait for result. If green_mode
                                is *Synchronous*, this parameter is ignored as it always
                                waits for the result.
@@ -1753,8 +1753,8 @@ def __doc_DeviceProxy():
                 - attr_info : (AttributeInfo)
                 - value : The value. For non SCALAR attributes it may be any sequence of sequences.
                 - green_mode : (GreenMode) Defaults to the current DeviceProxy GreenMode.
-                               (see :meth:`~PyTango.DeviceProxy.get_green_mode` and
-                               :meth:`~PyTango.DeviceProxy.set_green_mode`).
+                               (see :meth:`~tango.DeviceProxy.get_green_mode` and
+                               :meth:`~tango.DeviceProxy.set_green_mode`).
                 - wait       : (bool) whether or not to wait for result. If green_mode
                                is *Synchronous*, this parameter is ignored as it always
                                waits for the result.
@@ -1781,8 +1781,8 @@ def __doc_DeviceProxy():
         Parameters :
                 - name_val: A list of pairs (attr_name, value). See write_attribute
                 - green_mode : (GreenMode) Defaults to the current DeviceProxy GreenMode.
-                               (see :meth:`~PyTango.DeviceProxy.get_green_mode` and
-                               :meth:`~PyTango.DeviceProxy.set_green_mode`).
+                               (see :meth:`~tango.DeviceProxy.get_green_mode` and
+                               :meth:`~tango.DeviceProxy.set_green_mode`).
                 - wait       : (bool) whether or not to wait for result. If green_mode
                                is *Synchronous*, this parameter is ignored as it always
                                waits for the result.
@@ -1810,7 +1810,7 @@ def __doc_DeviceProxy():
             the server can't be interrupted by other clients.
 
         Parameters : see write_attribute(attr_name, value)
-        Return     : A PyTango.DeviceAttribute object.
+        Return     : A tango.DeviceAttribute object.
 
         Throws     : ConnectionFailed, CommunicationFailed, DeviceUnlocked,
                      DevFailed from device, WrongData
@@ -1840,8 +1840,8 @@ def __doc_DeviceProxy():
                 - attr_names : (sequence<str>) A list of attributes to read.
                 - extract_as : (ExtractAs) Defaults to numpy.
                 - green_mode : (GreenMode) Defaults to the current DeviceProxy GreenMode.
-                               (see :meth:`~PyTango.DeviceProxy.get_green_mode` and
-                               :meth:`~PyTango.DeviceProxy.set_green_mode`).
+                               (see :meth:`~tango.DeviceProxy.get_green_mode` and
+                               :meth:`~tango.DeviceProxy.set_green_mode`).
                 - wait       : (bool) whether or not to wait for result. If green_mode
                                is *Synchronous*, this parameter is ignored as it always
                                waits for the result.
@@ -1881,8 +1881,8 @@ def __doc_DeviceProxy():
             - pipe_name  : (str) The name of the pipe to read.
             - extract_as : (ExtractAs) Defaults to numpy.
             - green_mode : (GreenMode) Defaults to the current DeviceProxy GreenMode.
-                           (see :meth:`~PyTango.DeviceProxy.get_green_mode` and
-                           :meth:`~PyTango.DeviceProxy.set_green_mode`).
+                           (see :meth:`~tango.DeviceProxy.get_green_mode` and
+                           :meth:`~tango.DeviceProxy.set_green_mode`).
             - wait       : (bool) whether or not to wait for result. If green_mode
                            is *Synchronous*, this parameter is ignored as it always
                            waits for the result.
@@ -2281,7 +2281,7 @@ def __doc_DeviceProxy():
 
         Parameters :
             - event_id : (int) event identifier
-        Return     : (PyTango.TimeVal) representing the arrival time
+        Return     : (tango.TimeVal) representing the arrival time
 
         Throws     : EventSystemFailed
 
@@ -2344,7 +2344,7 @@ def __doc_DeviceProxy():
         Parameters :
             - lock_validity : (int) lock validity time in seconds
                                 (optional, default value is
-                                PyTango.constants.DEFAULT_LOCK_VALIDITY)
+                                tango.constants.DEFAULT_LOCK_VALIDITY)
         Return     : None
 
         New in PyTango 7.0.0
@@ -2422,7 +2422,7 @@ def __doc_DeviceProxy():
             If the device is not locked, the method returns False.
 
         Parameters :
-            - lockinfo [out] : (PyTango.LockInfo) object that will be filled
+            - lockinfo [out] : (tango.LockInfo) object that will be filled
                                 with lock informantion
         Return     : (bool) True if the device is locked by us.
                      Otherwise, False
diff --git a/tango/device_server.py b/tango/device_server.py
index b31d844..500e77e 100644
--- a/tango/device_server.py
+++ b/tango/device_server.py
@@ -25,7 +25,7 @@ __docformat__ = "restructuredtext"
 
 import copy
 
-from ._PyTango import DeviceImpl, Device_3Impl, Device_4Impl, Device_5Impl, \
+from ._tango import DeviceImpl, Device_3Impl, Device_4Impl, Device_5Impl, \
     DevFailed, Attribute, WAttribute, \
     MultiAttribute, MultiClassAttribute, \
     Attr, Logger, AttrWriteType, AttrDataFormat, CmdArgType, \
@@ -1843,7 +1843,7 @@ def __doc_MultiClassAttribute():
 
     MultiClassAttribute.__doc__ = """
     There is one instance of this class for each device class.
-    This class is mainly an aggregate of :class:`~PyTango.Attr` objects. 
+    This class is mainly an aggregate of :class:`~tango.Attr` objects. 
     It eases management of multiple attributes
     
     New in PyTango 7.2.1"""
@@ -1851,7 +1851,7 @@ def __doc_MultiClassAttribute():
     document_method("get_attr", """
     get_attr(self, attr_name) -> Attr
 
-            Get the :class:`~PyTango.Attr` object for the attribute with
+            Get the :class:`~tango.Attr` object for the attribute with
             name passed as parameter
 
         Parameters :
@@ -1866,7 +1866,7 @@ def __doc_MultiClassAttribute():
     document_method("remove_attr", """
     remove_attr(self, attr_name, cl_name) -> None
 
-            Remove the :class:`~PyTango.Attr` object for the attribute with
+            Remove the :class:`~tango.Attr` object for the attribute with
             name passed as parameter. Does nothing if the attribute does not
             exist.
 
@@ -1880,7 +1880,7 @@ def __doc_MultiClassAttribute():
     document_method("get_attr_list", """
     get_attr_list(self) -> seq<Attr>
 
-            Get the list of :class:`~PyTango.Attr` for this device class.
+            Get the list of :class:`~tango.Attr` for this device class.
 
         Return     : (seq<Attr>) the list of attribute objects
         
@@ -1893,15 +1893,15 @@ def __doc_MultiAttribute():
 
     MultiAttribute.__doc__ = """
     There is one instance of this class for each device.
-    This class is mainly an aggregate of :class:`~PyTango.Attribute` or
-    :class:`~PyTango.WAttribute` objects. It eases management of multiple
+    This class is mainly an aggregate of :class:`~tango.Attribute` or
+    :class:`~tango.WAttribute` objects. It eases management of multiple
     attributes"""
     
     document_method("get_attr_by_name", """
     get_attr_by_name(self, attr_name) -> Attribute
 
-            Get :class:`~PyTango.Attribute` object from its name.
-            This method returns an :class:`~PyTango.Attribute` object with a
+            Get :class:`~tango.Attribute` object from its name.
+            This method returns an :class:`~tango.Attribute` object with a
             name passed as parameter. The equality on attribute name is case
             independant.
 
@@ -1915,8 +1915,8 @@ def __doc_MultiAttribute():
     document_method("get_attr_by_ind", """
     get_attr_by_ind(self, ind) -> Attribute
 
-            Get :class:`~PyTango.Attribute` object from its index.
-            This method returns an :class:`~PyTango.Attribute` object from the
+            Get :class:`~tango.Attribute` object from its index.
+            This method returns an :class:`~tango.Attribute` object from the
             index in the main attribute vector.
 
         Parameters :
@@ -1928,7 +1928,7 @@ def __doc_MultiAttribute():
     get_w_attr_by_name(self, attr_name) -> WAttribute
 
             Get a writable attribute object from its name.
-            This method returns an :class:`~PyTango.WAttribute` object with a
+            This method returns an :class:`~tango.WAttribute` object with a
             name passed as parameter. The equality on attribute name is case
             independant.
 
@@ -1943,7 +1943,7 @@ def __doc_MultiAttribute():
     get_w_attr_by_ind(self, ind) -> WAttribute
 
             Get a writable attribute object from its index.
-            This method returns an :class:`~PyTango.WAttribute` object from the
+            This method returns an :class:`~tango.WAttribute` object from the
             index in the main attribute vector.
 
         Parameters :
@@ -1956,7 +1956,7 @@ def __doc_MultiAttribute():
 
             Get Attribute index into the main attribute vector from its name.
             This method returns the index in the Attribute vector (stored in the 
-            :class:`~PyTango.MultiAttribute` object) of an attribute with a
+            :class:`~tango.MultiAttribute` object) of an attribute with a
             given name. The name equality is case independant.
 
         Parameters :
diff --git a/tango/encoded_attribute.py b/tango/encoded_attribute.py
index ca39bdd..8165ce6 100644
--- a/tango/encoded_attribute.py
+++ b/tango/encoded_attribute.py
@@ -19,8 +19,8 @@ __docformat__ = "restructuredtext"
 
 import collections
 
-from ._PyTango import EncodedAttribute, ExtractAs, _ImageFormat
-from ._PyTango import constants
+from ._tango import EncodedAttribute, ExtractAs, _ImageFormat
+from ._tango import constants
 
 from .utils import is_pure_str, is_seq
 
@@ -65,7 +65,7 @@ def __EncodedAttribute_encode_jpeg_gray8(self, gray8, width=0, height=0, quality
        Example::
            
            def read_myattr(self, attr):
-               enc = PyTango.EncodedAttribute()
+               enc = tango.EncodedAttribute()
                data = numpy.arange(100, dtype=numpy.byte)
                data = numpy.array((data,data,data))
                enc.encode_jpeg_gray8(data)
@@ -100,7 +100,7 @@ def __EncodedAttribute_encode_gray8(self, gray8, width=0, height=0):
        Example::
            
            def read_myattr(self, attr):
-               enc = PyTango.EncodedAttribute()
+               enc = tango.EncodedAttribute()
                data = numpy.arange(100, dtype=numpy.byte)
                data = numpy.array((data,data,data))
                enc.encode_gray8(data)
@@ -180,7 +180,7 @@ def __EncodedAttribute_encode_gray16(self, gray16, width=0, height=0):
        Example::
            
            def read_myattr(self, attr):
-               enc = PyTango.EncodedAttribute()
+               enc = tango.EncodedAttribute()
                data = numpy.arange(100, dtype=numpy.int16)
                data = numpy.array((data,data,data))
                enc.encode_gray16(data)
@@ -259,7 +259,7 @@ def __EncodedAttribute_encode_jpeg_rgb24(self, rgb24, width=0, height=0, quality
        Example::
            
            def read_myattr(self, attr):
-               enc = PyTango.EncodedAttribute()
+               enc = tango.EncodedAttribute()
                # create an 'image' where each pixel is R=0x01, G=0x01, B=0x01
                arr = numpy.ones((10,10,3), dtype=numpy.uint8)
                enc.encode_jpeg_rgb24(data)
@@ -295,7 +295,7 @@ def __EncodedAttribute_encode_rgb24(self, rgb24, width=0, height=0):
        Example::
            
            def read_myattr(self, attr):
-               enc = PyTango.EncodedAttribute()
+               enc = tango.EncodedAttribute()
                # create an 'image' where each pixel is R=0x01, G=0x01, B=0x01
                arr = numpy.ones((10,10,3), dtype=numpy.uint8)
                enc.encode_rgb24(data)
@@ -375,7 +375,7 @@ def __EncodedAttribute_encode_jpeg_rgb32(self, rgb32, width=0, height=0, quality
        Example::
            
            def read_myattr(self, attr):
-               enc = PyTango.EncodedAttribute()
+               enc = tango.EncodedAttribute()
                data = numpy.arange(100, dtype=numpy.int32)
                data = numpy.array((data,data,data))
                enc.encode_jpeg_rgb32(data)
@@ -447,9 +447,9 @@ def __EncodedAttribute_decode_gray8(self, da, extract_as=ExtractAs.Numpy):
            that the given :class:`DeviceAttribute` is obtained from a 
            call which **DOESN'T** extract the contents. Example::
                
-               dev = PyTango.DeviceProxy("a/b/c")
-               da = dev.read_attribute("my_attr", extract_as=PyTango.ExtractAs.Nothing)
-               enc = PyTango.EncodedAttribute()
+               dev = tango.DeviceProxy("a/b/c")
+               da = dev.read_attribute("my_attr", extract_as=tango.ExtractAs.Nothing)
+               enc = tango.EncodedAttribute()
                data = enc.decode_gray8(da)
     """
     if hasattr(da, 'value'):
@@ -482,9 +482,9 @@ def __EncodedAttribute_decode_gray16(self, da, extract_as=ExtractAs.Numpy):
            that the given :class:`DeviceAttribute` is obtained from a 
            call which **DOESN'T** extract the contents. Example::
                
-               dev = PyTango.DeviceProxy("a/b/c")
-               da = dev.read_attribute("my_attr", extract_as=PyTango.ExtractAs.Nothing)
-               enc = PyTango.EncodedAttribute()
+               dev = tango.DeviceProxy("a/b/c")
+               da = dev.read_attribute("my_attr", extract_as=tango.ExtractAs.Nothing)
+               enc = tango.EncodedAttribute()
                data = enc.decode_gray16(da)
     """
     if hasattr(da, 'value'):
@@ -517,9 +517,9 @@ def __EncodedAttribute_decode_rgb32(self, da, extract_as=ExtractAs.Numpy):
            that the given :class:`DeviceAttribute` is obtained from a 
            call which **DOESN'T** extract the contents. Example::
                
-               dev = PyTango.DeviceProxy("a/b/c")
-               da = dev.read_attribute("my_attr", extract_as=PyTango.ExtractAs.Nothing)
-               enc = PyTango.EncodedAttribute()
+               dev = tango.DeviceProxy("a/b/c")
+               da = dev.read_attribute("my_attr", extract_as=tango.ExtractAs.Nothing)
+               enc = tango.EncodedAttribute()
                data = enc.decode_rgb32(da)
     """
     if hasattr(da, 'value'):
diff --git a/tango/exception.py b/tango/exception.py
index 84b4cf7..7063160 100644
--- a/tango/exception.py
+++ b/tango/exception.py
@@ -18,15 +18,15 @@ __all__ = ["exception_init"]
 __docformat__ = "restructuredtext"
 
 from .utils import document_static_method as __document_static_method
-from ._PyTango import Except, DevError, ErrSeverity
+from ._tango import Except, DevError, ErrSeverity
 
 def __to_dev_failed(exc_type=None, exc_value=None, traceback=None):
-    """to_dev_failed(exc_type, exc_value, traceback) -> PyTango.DevFailed
+    """to_dev_failed(exc_type, exc_value, traceback) -> tango.DevFailed
 
             Generate a TANGO DevFailed exception.
-            The exception is created with a single :class:`~PyTango.DevError`
-            object. A default value *PyTango.ErrSeverity.ERR* is defined for
-            the :class:`~PyTango.DevError` severity field.
+            The exception is created with a single :class:`~tango.DevError`
+            object. A default value *tango.ErrSeverity.ERR* is defined for
+            the :class:`~tango.DevError` severity field.
             
             The parameters are the same as the ones generates by a call to
             :func:`sys.exc_info`.
@@ -38,7 +38,7 @@ def __to_dev_failed(exc_type=None, exc_value=None, traceback=None):
                       if the exception type is a class object)
             - traceback : (traceback) traceback object
         
-        Return     : (PyTango.DevFailed) a tango exception object
+        Return     : (tango.DevFailed) a tango exception object
         
         New in PyTango 7.2.1"""
     try:
@@ -83,36 +83,36 @@ def __doc_Except():
         - compare_exception"""
     
     document_static_method("throw_exception", """
-    throw_exception(reason, desc, origin, sever=PyTango.ErrSeverity.ERR) -> None
+    throw_exception(reason, desc, origin, sever=tango.ErrSeverity.ERR) -> None
 
             Generate and throw a TANGO DevFailed exception.
-            The exception is created with a single :class:`~PyTango.DevError` 
-            object. A default value *PyTango.ErrSeverity.ERR* is defined for 
-            the :class:`~PyTango.DevError` severity field.
+            The exception is created with a single :class:`~tango.DevError` 
+            object. A default value *tango.ErrSeverity.ERR* is defined for 
+            the :class:`~tango.DevError` severity field.
         
         Parameters :
-            - reason : (str) The exception :class:`~PyTango.DevError` object reason field
-            - desc   : (str) The exception :class:`~PyTango.DevError` object desc field
-            - origin : (str) The exception :class:`~PyTango.DevError` object origin field
-            - sever  : (PyTango.ErrSeverity) The exception DevError object severity field
+            - reason : (str) The exception :class:`~tango.DevError` object reason field
+            - desc   : (str) The exception :class:`~tango.DevError` object desc field
+            - origin : (str) The exception :class:`~tango.DevError` object origin field
+            - sever  : (tango.ErrSeverity) The exception DevError object severity field
 
         Throws     : DevFailed
     """ )
 
     document_static_method("re_throw_exception", """
-    re_throw_exception(ex, reason, desc, origin, sever=PyTango.ErrSeverity.ERR) -> None
+    re_throw_exception(ex, reason, desc, origin, sever=tango.ErrSeverity.ERR) -> None
 
-            Re-throw a TANGO :class:`~PyTango.DevFailed` exception with one more error.
-            The exception is re-thrown with one more :class:`~PyTango.DevError` object.
-            A default value *PyTango.ErrSeverity.ERR* is defined for the new
-            :class:`~PyTango.DevError` severity field.
+            Re-throw a TANGO :class:`~tango.DevFailed` exception with one more error.
+            The exception is re-thrown with one more :class:`~tango.DevError` object.
+            A default value *tango.ErrSeverity.ERR* is defined for the new
+            :class:`~tango.DevError` severity field.
         
         Parameters :
-            - ex     : (PyTango.DevFailed) The :class:`~PyTango.DevFailed` exception
-            - reason : (str) The exception :class:`~PyTango.DevError` object reason field
-            - desc   : (str) The exception :class:`~PyTango.DevError` object desc field
-            - origin : (str) The exception :class:`~PyTango.DevError` object origin field
-            - sever  : (PyTango.ErrSeverity) The exception DevError object severity field
+            - ex     : (tango.DevFailed) The :class:`~tango.DevFailed` exception
+            - reason : (str) The exception :class:`~tango.DevError` object reason field
+            - desc   : (str) The exception :class:`~tango.DevError` object desc field
+            - origin : (str) The exception :class:`~tango.DevError` object origin field
+            - sever  : (tango.ErrSeverity) The exception DevError object severity field
 
         Throws     : DevFailed
     """ )
@@ -123,7 +123,7 @@ def __doc_Except():
             Print all the details of a TANGO error stack.
         
         Parameters :
-            - ex     : (PyTango.DevErrorList) The error stack reference
+            - ex     : (tango.DevErrorList) The error stack reference
     """ )
 
     document_static_method("print_exception", """
@@ -132,16 +132,16 @@ def __doc_Except():
             Print all the details of a TANGO exception.
         
         Parameters :
-            - ex     : (PyTango.DevFailed) The :class:`~PyTango.DevFailed` exception
+            - ex     : (tango.DevFailed) The :class:`~tango.DevFailed` exception
     """ )
     
     document_static_method("throw_python_exception", """
     throw_python_exception(type, value, traceback) -> None
 
             Generate and throw a TANGO DevFailed exception.
-            The exception is created with a single :class:`~PyTango.DevError`
-            object. A default value *PyTango.ErrSeverity.ERR* is defined for
-            the :class:`~PyTango.DevError` severity field.
+            The exception is created with a single :class:`~tango.DevError`
+            object. A default value *tango.ErrSeverity.ERR* is defined for
+            the :class:`~tango.DevError` severity field.
             
             The parameters are the same as the ones generates by a call to
             :func:`sys.exc_info`.
diff --git a/tango/futures.py b/tango/futures.py
index b34f876..7326da1 100644
--- a/tango/futures.py
+++ b/tango/futures.py
@@ -9,16 +9,16 @@
 # See LICENSE.txt for more info.
 # ------------------------------------------------------------------------------
 
-"""This module exposes a futures version of :class:`PyTango.DeviceProxy` and
-:class:`PyTango.AttributeProxy"""
+"""This module exposes a futures version of :class:`tango.DeviceProxy` and
+:class:`tango.AttributeProxy"""
 
 __all__ = ["DeviceProxy", "AttributeProxy", "check_requirements"]
 
 from functools import partial
 
-from PyTango import GreenMode
-from PyTango.device_proxy import get_device_proxy
-from PyTango.attribute_proxy import get_attribute_proxy
+from tango import GreenMode
+from tango.device_proxy import get_device_proxy
+from tango.attribute_proxy import get_attribute_proxy
 
 
 def check_requirements():
@@ -39,7 +39,7 @@ DeviceProxy.__doc__ = """
     DeviceProxy(self, dev_name, wait=True, timeout=True) -> DeviceProxy
     DeviceProxy(self, dev_name, need_check_acc, wait=True, timeout=True) -> DeviceProxy
 
-    Creates a *futures* enabled :class:`~PyTango.DeviceProxy`.
+    Creates a *futures* enabled :class:`~tango.DeviceProxy`.
      
     The DeviceProxy constructor internally makes some network calls which makes
     it *slow*. By using the futures *green mode* you are allowing other
@@ -47,8 +47,8 @@ DeviceProxy.__doc__ = """
 
     .. note::
         The timeout parameter has no relation with the tango device client side
-        timeout (gettable by :meth:`~PyTango.DeviceProxy.get_timeout_millis` and 
-        settable through :meth:`~PyTango.DeviceProxy.set_timeout_millis`)
+        timeout (gettable by :meth:`~tango.DeviceProxy.get_timeout_millis` and 
+        settable through :meth:`~tango.DeviceProxy.set_timeout_millis`)
 
     :param dev_name: the device name or alias
     :type dev_name: str
@@ -64,7 +64,7 @@ DeviceProxy.__doc__ = """
     :type timeout: float
     :returns:
         if wait is True:
-            :class:`~PyTango.DeviceProxy`
+            :class:`~tango.DeviceProxy`
         else:
             :class:`concurrent.futures.Future`
     :throws:
@@ -81,7 +81,7 @@ AttributeProxy.__doc__ = """
     AttributeProxy(self, full_attr_name, wait=True, timeout=True) -> AttributeProxy
     AttributeProxy(self, device_proxy, attr_name, wait=True, timeout=True) -> AttributeProxy
 
-    Creates a *futures* enabled :class:`~PyTango.AttributeProxy`.
+    Creates a *futures* enabled :class:`~tango.AttributeProxy`.
     
     The AttributeProxy constructor internally makes some network calls which
     makes it *slow*. By using the *gevent mode* you are allowing other python
@@ -89,7 +89,7 @@ AttributeProxy.__doc__ = """
 
     :param full_attr_name: the full name of the attribute
     :type full_attr_name: str
-    :param device_proxy: the :class:`~PyTango.DeviceProxy`
+    :param device_proxy: the :class:`~tango.DeviceProxy`
     :type device_proxy: DeviceProxy
     :param attr_name: attribute name for the given device proxy
     :type attr_name: str
@@ -102,7 +102,7 @@ AttributeProxy.__doc__ = """
     :type timeout: float
     :returns:
         if wait is True:
-            :class:`~PyTango.AttributeProxy`
+            :class:`~tango.AttributeProxy`
         else:
             :class:`concurrent.futures.Future`
     :throws:
diff --git a/tango/gevent.py b/tango/gevent.py
index 72aa86c..b32fbf5 100644
--- a/tango/gevent.py
+++ b/tango/gevent.py
@@ -9,8 +9,8 @@
 # See LICENSE.txt for more info.
 # ------------------------------------------------------------------------------
 
-"""This module exposes a gevent version of :class:`PyTango.DeviceProxy` and
-:class:`PyTango.AttributeProxy"""
+"""This module exposes a gevent version of :class:`tango.DeviceProxy` and
+:class:`tango.AttributeProxy"""
 
 from __future__ import absolute_import
 
@@ -18,9 +18,9 @@ __all__ = ["DeviceProxy", "AttributeProxy", "check_requirements"]
 
 from functools import partial
     
-from PyTango import GreenMode
-from PyTango.device_proxy import get_device_proxy
-from PyTango.attribute_proxy import get_attribute_proxy
+from tango import GreenMode
+from tango.device_proxy import get_device_proxy
+from tango.attribute_proxy import get_attribute_proxy
 
 
 def check_requirements():
@@ -48,7 +48,7 @@ DeviceProxy.__doc__ = """
     DeviceProxy(self, dev_name, wait=True, timeout=True) -> DeviceProxy
     DeviceProxy(self, dev_name, need_check_acc, wait=True, timeout=True) -> DeviceProxy
 
-    Creates a *gevent* enabled :class:`~PyTango.DeviceProxy`.
+    Creates a *gevent* enabled :class:`~tango.DeviceProxy`.
      
     The DeviceProxy constructor internally makes some network calls which makes
     it *slow*. By using the gevent *green mode* you are allowing other python
@@ -56,8 +56,8 @@ DeviceProxy.__doc__ = """
 
     .. note::
         The timeout parameter has no relation with the tango device client side
-        timeout (gettable by :meth:`~PyTango.DeviceProxy.get_timeout_millis` and 
-        settable through :meth:`~PyTango.DeviceProxy.set_timeout_millis`)
+        timeout (gettable by :meth:`~tango.DeviceProxy.get_timeout_millis` and 
+        settable through :meth:`~tango.DeviceProxy.set_timeout_millis`)
 
     :param dev_name: the device name or alias
     :type dev_name: str
@@ -73,7 +73,7 @@ DeviceProxy.__doc__ = """
     :type timeout: float
     :returns:
         if wait is True:
-            :class:`~PyTango.DeviceProxy`
+            :class:`~tango.DeviceProxy`
         else:
             :class:`gevent.event.AsynchResult`
     :throws:
@@ -90,7 +90,7 @@ AttributeProxy.__doc__ = """
     AttributeProxy(self, full_attr_name, wait=True, timeout=True) -> AttributeProxy
     AttributeProxy(self, device_proxy, attr_name, wait=True, timeout=True) -> AttributeProxy
 
-    Creates a *gevent* enabled :class:`~PyTango.AttributeProxy`.
+    Creates a *gevent* enabled :class:`~tango.AttributeProxy`.
     
     The AttributeProxy constructor internally makes some network calls which
     makes it *slow*. By using the *gevent mode* you are allowing other python
@@ -98,7 +98,7 @@ AttributeProxy.__doc__ = """
 
     :param full_attr_name: the full name of the attribute
     :type full_attr_name: str
-    :param device_proxy: the :class:`~PyTango.DeviceProxy`
+    :param device_proxy: the :class:`~tango.DeviceProxy`
     :type device_proxy: DeviceProxy
     :param attr_name: attribute name for the given device proxy
     :type attr_name: str
@@ -111,7 +111,7 @@ AttributeProxy.__doc__ = """
     :type timeout: float
     :returns:
         if wait is True:
-            :class:`~PyTango.AttributeProxy`
+            :class:`~tango.AttributeProxy`
         else:
             :class:`gevent.event.AsynchResult`
     :throws:
diff --git a/tango/green.py b/tango/green.py
index 4fc1fc5..0bb4239 100644
--- a/tango/green.py
+++ b/tango/green.py
@@ -28,7 +28,7 @@ import os
 from functools import wraps, partial
 
 # Tango imports
-from ._PyTango import GreenMode
+from ._tango import GreenMode
 
 # Gevent imports
 from .tango_gevent import get_global_executor as get_gevent_executor
@@ -74,13 +74,13 @@ def set_green_mode(green_mode=None):
         return
     if green_mode == GreenMode.Gevent:
         # check if we can change to gevent mode
-        import PyTango.gevent
+        import tango.gevent
     elif green_mode == GreenMode.Futures:
         # check if we can change to futures mode
-        import PyTango.futures
+        import tango.futures
     elif green_mode == GreenMode.Asyncio:
         # check if we can change to asyncio mode
-        import PyTango.asyncio
+        import tango.asyncio
     __current_green_mode = green_mode
 
 
diff --git a/tango/group.py b/tango/group.py
index d97e9c4..66626ef 100644
--- a/tango/group.py
+++ b/tango/group.py
@@ -19,7 +19,7 @@ __docformat__ = "restructuredtext"
 
 import operator
 
-from ._PyTango import __Group as _RealGroup, StdStringVector
+from ._tango import __Group as _RealGroup, StdStringVector
 from .utils import seq_2_StdStringVector, is_pure_str
 from .utils import document_method as __document_method
 import collections
@@ -476,7 +476,7 @@ def __doc_Group():
         Parameters :
             - cmd_name   : (str) Command name
             - param      : (any) parameter value
-            - param_list : (PyTango.DeviceDataList) sequence of parameters.
+            - param_list : (tango.DeviceDataList) sequence of parameters.
                            When given, it's length must match the group size.
             - forget     : (bool) Fire and forget flag. If set to true, it means that
                            no reply is expected (i.e. the caller does not care
@@ -693,7 +693,7 @@ def __doc_Group():
         Parameters:
             - cmd_name   : (str) Command name
             - param      : (any) parameter value
-            - param_list : (PyTango.DeviceDataList) sequence of parameters.
+            - param_list : (tango.DeviceDataList) sequence of parameters.
                            When given, it's length must match the group size.
             - forward    : (bool) If it is set to true (the default) request is
                             forwarded to subgroups. Otherwise, it is only applied
diff --git a/tango/group_reply.py b/tango/group_reply.py
index 1ac3773..b8b56b0 100644
--- a/tango/group_reply.py
+++ b/tango/group_reply.py
@@ -18,7 +18,7 @@ __all__ = ["group_reply_init"]
 __docformat__ = "restructuredtext"
 
 from .utils import document_method as __document_method
-from ._PyTango import GroupReply, GroupCmdReply, GroupAttrReply, ExtractAs
+from ._tango import GroupReply, GroupCmdReply, GroupAttrReply, ExtractAs
 
 def __GroupCmdReply__get_data(self):
     return self.get_data_raw().extract()
diff --git a/tango/group_reply_list.py b/tango/group_reply_list.py
index 9f5067d..853f452 100644
--- a/tango/group_reply_list.py
+++ b/tango/group_reply_list.py
@@ -17,7 +17,7 @@ __all__ = ["group_reply_list_init"]
 
 __docformat__ = "restructuredtext"
 
-from ._PyTango import GroupReplyList, GroupCmdReplyList, GroupAttrReplyList
+from ._tango import GroupReplyList, GroupCmdReplyList, GroupAttrReplyList
 
 
 def __GroupReplyList__getitem(self, item):
diff --git a/tango/log4tango.py b/tango/log4tango.py
index 050977c..fa2a22b 100644
--- a/tango/log4tango.py
+++ b/tango/log4tango.py
@@ -11,17 +11,17 @@
 
 """
 This is an internal PyTango module. It provides tango log classes that can
-be used as decorators in any method of :class:`PyTango.DeviceImpl`.
+be used as decorators in any method of :class:`tango.DeviceImpl`.
 
-To access these members use directly :mod:`PyTango` module and NOT PyTango.log4tango.
+To access these members use directly :mod:`tango` module and NOT tango.log4tango.
 
 Example::
 
-    import PyTango
+    import tango
     
-    class MyDev(PyTango.Device_4Impl):
+    class MyDev(tango.Device_4Impl):
         
-        PyTango.InfoIt()
+        tango.InfoIt()
         def read_Current(self, attr):
             attr.set_value(self._current)
 """
@@ -60,20 +60,20 @@ class TangoStream:
 
 class LogIt(object):
     """A class designed to be a decorator of any method of a 
-    :class:`PyTango.DeviceImpl` subclass. The idea is to log the entrance and 
+    :class:`tango.DeviceImpl` subclass. The idea is to log the entrance and 
     exit of any decorated method.
 
     Example::
     
-        class MyDevice(PyTango.Device_4Impl):
+        class MyDevice(tango.Device_4Impl):
             
-            @PyTango.LogIt()
+            @tango.LogIt()
             def read_Current(self, attr):
                 attr.set_value(self._current, 1)
 
     All log messages generated by this class have DEBUG level. If you whish
     to have different log level messages, you should implement subclasses that
-    log to those levels. See, for example, :class:`PyTango.InfoIt`.
+    log to those levels. See, for example, :class:`tango.InfoIt`.
 
     The constructor receives three optional arguments:
         * show_args - shows method arguments in log message (defaults to False)
@@ -154,14 +154,14 @@ class LogIt(object):
 
 class DebugIt(LogIt):
     """A class designed to be a decorator of any method of a 
-    :class:`PyTango.DeviceImpl` subclass. The idea is to log the entrance and 
+    :class:`tango.DeviceImpl` subclass. The idea is to log the entrance and 
     exit of any decorated method as DEBUG level records.
 
     Example::
     
-        class MyDevice(PyTango.Device_4Impl):
+        class MyDevice(tango.Device_4Impl):
             
-            @PyTango.DebugIt()
+            @tango.DebugIt()
             def read_Current(self, attr):
                 attr.set_value(self._current, 1)
 
@@ -182,14 +182,14 @@ class DebugIt(LogIt):
 
 class InfoIt(LogIt):
     """A class designed to be a decorator of any method of a 
-    :class:`PyTango.DeviceImpl` subclass. The idea is to log the entrance and 
+    :class:`tango.DeviceImpl` subclass. The idea is to log the entrance and 
     exit of any decorated method as INFO level records.
 
     Example::
     
-        class MyDevice(PyTango.Device_4Impl):
+        class MyDevice(tango.Device_4Impl):
             
-            @PyTango.InfoIt()
+            @tango.InfoIt()
             def read_Current(self, attr):
                 attr.set_value(self._current, 1)
 
@@ -210,14 +210,14 @@ class InfoIt(LogIt):
 
 class WarnIt(LogIt):
     """A class designed to be a decorator of any method of a 
-    :class:`PyTango.DeviceImpl` subclass. The idea is to log the entrance and 
+    :class:`tango.DeviceImpl` subclass. The idea is to log the entrance and 
     exit of any decorated method as WARN level records.
 
     Example::
     
-        class MyDevice(PyTango.Device_4Impl):
+        class MyDevice(tango.Device_4Impl):
             
-            @PyTango.WarnIt()
+            @tango.WarnIt()
             def read_Current(self, attr):
                 attr.set_value(self._current, 1)
 
@@ -238,14 +238,14 @@ class WarnIt(LogIt):
 
 class ErrorIt(LogIt):
     """A class designed to be a decorator of any method of a 
-    :class:`PyTango.DeviceImpl` subclass. The idea is to log the entrance and 
+    :class:`tango.DeviceImpl` subclass. The idea is to log the entrance and 
     exit of any decorated method as ERROR level records.
 
     Example::
     
-        class MyDevice(PyTango.Device_4Impl):
+        class MyDevice(tango.Device_4Impl):
             
-            @PyTango.ErrorIt()
+            @tango.ErrorIt()
             def read_Current(self, attr):
                 attr.set_value(self._current, 1)
 
@@ -266,14 +266,14 @@ class ErrorIt(LogIt):
 
 class FatalIt(LogIt):
     """A class designed to be a decorator of any method of a 
-    :class:`PyTango.DeviceImpl` subclass. The idea is to log the entrance and 
+    :class:`tango.DeviceImpl` subclass. The idea is to log the entrance and 
     exit of any decorated method as FATAL level records.
 
     Example::
     
-        class MyDevice(PyTango.Device_4Impl):
+        class MyDevice(tango.Device_4Impl):
             
-            @PyTango.FatalIt()
+            @tango.FatalIt()
             def read_Current(self, attr):
                 attr.set_value(self._current, 1)
 
diff --git a/tango/pipe.py b/tango/pipe.py
index fd30fb2..61a71d2 100644
--- a/tango/pipe.py
+++ b/tango/pipe.py
@@ -13,7 +13,7 @@ __all__ = ['PipeConfig']
 
 
 
-from ._PyTango import Pipe, PipeWriteType, UserDefaultPipeProp, \
+from ._tango import Pipe, PipeWriteType, UserDefaultPipeProp, \
     AttrDataFormat, CmdArgType, DevState, DispLevel, constants
 
 from .utils import scalar_to_array_type, TO_TANGO_TYPE, \
diff --git a/tango/pipe_data.py b/tango/pipe_data.py
index 52df31e..3501f86 100644
--- a/tango/pipe_data.py
+++ b/tango/pipe_data.py
@@ -22,7 +22,7 @@ __docformat__ = "restructuredtext"
 
 import inspect
 
-from ._PyTango import Except, CmdArgType, DispLevel, AttrDataFormat, \
+from ._tango import Except, CmdArgType, DispLevel, AttrDataFormat, \
     Pipe, PipeWriteType, PipeSerialModel, UserDefaultPipeProp
 from .utils import is_non_str_seq, is_pure_str
 
@@ -167,14 +167,14 @@ class PipeData(object):
         except:
             throw_ex("Wrong data write type in pipe argument for "
                      "pipe %s in class %s\nPipe write type must be a "
-                     "PyTango.PipeWriteType" % (pipe_name, name))
+                     "tango.PipeWriteType" % (pipe_name, name))
         try:
             self.display_level = DispLevel(extra_info.get("display level", 
                                                           DispLevel.OPERATOR))
         except:
             throw_ex("Wrong display level in pipe information for "
                      "pipe %s in class %s\nPipe information for "
-                     "display level is not a PyTango.DispLevel"
+                     "display level is not a tango.DispLevel"
                      % (pipe_name, name))
 
         self.pipe_class = extra_info.get("klass", Pipe)
diff --git a/tango/pytango_init.py b/tango/pytango_init.py
index 6bdb820..9b116e0 100644
--- a/tango/pytango_init.py
+++ b/tango/pytango_init.py
@@ -38,8 +38,8 @@ from .pyutil import pyutil_init
 from .time_val import time_val_init
 from .auto_monitor import auto_monitor_init
 from .pipe import pipe_init
-from ._PyTango import constants
-from ._PyTango import _get_tango_lib_release
+from ._tango import constants
+from ._tango import _get_tango_lib_release
 
 __INITIALIZED = False
 __DOC = True
diff --git a/tango/pytango_pprint.py b/tango/pytango_pprint.py
index 75e63d8..4a209d8 100644
--- a/tango/pytango_pprint.py
+++ b/tango/pytango_pprint.py
@@ -19,7 +19,7 @@ __docformat__ = "restructuredtext"
 
 import operator
 
-from ._PyTango import (StdStringVector, StdLongVector, CommandInfoList,
+from ._tango import (StdStringVector, StdLongVector, CommandInfoList,
     AttributeInfoList, AttributeInfoListEx, PipeInfoList,
     DeviceDataHistoryList,
     GroupReplyList, GroupAttrReplyList, GroupCmdReplyList,
diff --git a/tango/pyutil.py b/tango/pyutil.py
index 0a8415a..2cc0cbb 100644
--- a/tango/pyutil.py
+++ b/tango/pyutil.py
@@ -20,7 +20,7 @@ __docformat__ = "restructuredtext"
 import os
 import copy
 
-from ._PyTango import Util, Except, DevFailed, DbDevInfo
+from ._tango import Util, Except, DevFailed, DbDevInfo
 from .utils import document_method as __document_method
 #from utils import document_static_method as __document_static_method
 from .globals import class_list, cpp_class_list, get_constructed_classes
@@ -61,7 +61,7 @@ def __Util__create_device(self, klass_name, device_name, alias=None, cb=None):
             registered in the database and BEFORE the init_device for the
             newly created device is called
 
-            Throws PyTango.DevFailed:
+            Throws tango.DevFailed:
                 - the device name exists already or
                 - the given class is not registered for this DS.
                 - the cb is not a callable
@@ -148,7 +148,7 @@ def __Util__delete_device(self, klass_name, device_name):
             Deletes an existing device from the database and from this running
             server
 
-            Throws PyTango.DevFailed:
+            Throws tango.DevFailed:
                 - the device name doesn't exist in the database
                 - the device name doesn't exist in this DS.
 
@@ -210,7 +210,7 @@ def __Util__add_TgClass(self, klass_device_class, klass_device,
            util.add_TgClass(MotorClass, Motor, 'Motor') # equivalent to previous line
 
        .. deprecated:: 7.1.2
-           Use :meth:`PyTango.Util.add_class` instead."""
+           Use :meth:`tango.Util.add_class` instead."""
     if device_class_name is None:
         device_class_name = klass_device.__name__
     class_list.append((klass_device_class, klass_device, device_class_name))
@@ -228,7 +228,7 @@ def __Util__add_Cpp_TgClass(self, device_class_name, tango_device_class_name):
                  library name.
 
        .. deprecated:: 7.1.2
-           Use :meth:`PyTango.Util.add_class` instead."""
+           Use :meth:`tango.Util.add_class` instead."""
     cpp_class_list.append((device_class_name, tango_device_class_name))
 
 def __Util__add_class(self, *args, **kwargs):
@@ -238,8 +238,8 @@ def __Util__add_class(self, *args, **kwargs):
             Register a new tango class ('python' or 'c++').
 
             If language is 'python' then args must be the same as
-            :meth:`PyTango.Util.add_TgClass`. Otherwise, args should be the ones
-            in :meth:`PyTango.Util.add_Cpp_TgClass`. Example::
+            :meth:`tango.Util.add_TgClass`. Otherwise, args should be the ones
+            in :meth:`tango.Util.add_Cpp_TgClass`. Example::
 
                 util.add_class(MotorClass, Motor)
                 util.add_class('CounterClass', 'Counter', language='c++')
@@ -271,7 +271,7 @@ def __doc_Util():
     Therefore a device server process can have only one instance of this
     class and its constructor is not public. Example::
 
-        util = PyTango.Util.instance()
+        util = tango.Util.instance()
             print(util.get_host_name())
     """
 
@@ -702,11 +702,11 @@ def __doc_Util():
                 return _LOOP_NB > 100
 
             def main():
-                py = PyTango.Util(sys.argv)
+                py = tango.Util(sys.argv)
 
                 # ...
 
-                U = PyTango.Util.instance()
+                U = tango.Util.instance()
                 U.server_set_event_loop(looping)
                 U.server_init()
                 U.server_run()
diff --git a/tango/server.py b/tango/server.py
index fb82416..17166fe 100644
--- a/tango/server.py
+++ b/tango/server.py
@@ -30,7 +30,7 @@ import operator
 import functools
 import traceback
 
-from ._PyTango import (CmdArgType, AttrDataFormat, AttrWriteType,
+from ._tango import (CmdArgType, AttrDataFormat, AttrWriteType,
                        DevFailed, Except, GreenMode, constants,
                        Database, DbDevInfo, DevState, CmdArgType,
                        Attr, PipeWriteType)
@@ -446,7 +446,7 @@ class _DeviceClass(DeviceClass):
         :meth:`TT.initialize_dynamic_attributes` for each device
 
         :param dev_list: list of devices
-        :type dev_list: :class:`PyTango.DeviceImpl`"""
+        :type dev_list: :class:`tango.DeviceImpl`"""
 
         for dev in dev_list:
             init_dyn_attrs = getattr(dev,
@@ -466,7 +466,7 @@ def __create_tango_deviceclass_klass(tango_device_klass, attrs=None):
     klass_name = tango_device_klass.__name__
     if not issubclass(tango_device_klass, (Device)):
         msg = "{0} device must inherit from " \
-              "PyTango.server.Device".format(klass_name)
+              "tango.server.Device".format(klass_name)
         raise Exception(msg)
 
     if attrs is None:
@@ -567,14 +567,14 @@ def DeviceMeta(name, bases, attrs):
 
     Example (python 2.x)::
 
-        from PyTango.server import Device, DeviceMeta
+        from tango.server import Device, DeviceMeta
 
         class PowerSupply(Device):
             __metaclass__ = DeviceMeta
 
     Example (python 3.x)::
 
-        from PyTango.server import Device, DeviceMeta
+        from tango.server import Device, DeviceMeta
 
         class PowerSupply(Device, metaclass=DeviceMeta):
             pass
@@ -671,17 +671,17 @@ class Device(LatestDeviceImpl):
     @classmethod
     def run_server(cls, args=None, **kwargs):
         """Run the class as a device server.
-        It is based on the PyTango.server.run method.
+        It is based on the tango.server.run method.
 
         The difference is that the device class
         and server name are automatically given.
 
         Args:
-            args (iterable): args as given in the PyTango.server.run method
+            args (iterable): args as given in the tango.server.run method
                              without the server name. If None, the sys.argv
                              list is used
             kwargs: the other keywords argument are as given
-                    in the PyTango.server.run method.
+                    in the tango.server.run method.
         """
         if args is None:
             args = sys.argv[1:]
@@ -695,7 +695,7 @@ class attribute(AttrData):
     '''
     Declares a new tango attribute in a :class:`Device`. To be used
     like the python native :obj:`property` function. For example, to
-    declare a scalar, `PyTango.DevDouble`, read-only attribute called
+    declare a scalar, `tango.DevDouble`, read-only attribute called
     *voltage* in a *PowerSupply* :class:`Device` do::
 
         class PowerSupply(Device):
@@ -722,15 +722,15 @@ class attribute(AttrData):
     parameter              type                                       default value                                 description
     ===================== ================================ ======================================= =======================================================================================
     name                   :obj:`str`                       class member name                       alternative attribute name
-    dtype                  :obj:`object`                    :obj:`~PyTango.CmdArgType.DevDouble`    data type (see :ref:`Data type equivalence <pytango-hlapi-datatypes>`)
-    dformat                :obj:`~PyTango.AttrDataFormat`   :obj:`~PyTango.AttrDataFormat.SCALAR`   data format
+    dtype                  :obj:`object`                    :obj:`~tango.CmdArgType.DevDouble`    data type (see :ref:`Data type equivalence <pytango-hlapi-datatypes>`)
+    dformat                :obj:`~tango.AttrDataFormat`   :obj:`~tango.AttrDataFormat.SCALAR`   data format
     max_dim_x              :obj:`int`                       1                                       maximum size for x dimension (ignored for SCALAR format)
     max_dim_y              :obj:`int`                       0                                       maximum size for y dimension (ignored for SCALAR and SPECTRUM formats)
-    display_level          :obj:`~PyTango.DispLevel`        :obj:`~PyTango.DisLevel.OPERATOR`       display level
+    display_level          :obj:`~tango.DispLevel`        :obj:`~tango.DisLevel.OPERATOR`       display level
     polling_period         :obj:`int`                       -1                                      polling period
     memorized              :obj:`bool`                      False                                   attribute should or not be memorized
     hw_memorized           :obj:`bool`                      False                                   write method should be called at startup when restoring memorize value (dangerous!)
-    access                 :obj:`~PyTango.AttrWriteType`    :obj:`~PyTango.AttrWriteType.READ`      read only/ read write / write only access
+    access                 :obj:`~tango.AttrWriteType`    :obj:`~tango.AttrWriteType.READ`      read only/ read write / write only access
     fget (or fread)        :obj:`str` or :obj:`callable`    'read_<attr_name>'                      read method name or method object
     fset (or fwrite)       :obj:`str` or :obj:`callable`    'write_<attr_name>'                     write method name or method object
     is_allowed             :obj:`str` or :obj:`callable`    'is_<attr_name>_allowed'                is allowed method name or method object
@@ -755,9 +755,9 @@ class attribute(AttrData):
     archive_abs_change     :obj:`str`                       None
     archive_rel_change     :obj:`str`                       None
     archive_period         :obj:`str`                       None
-    green_mode             :obj:`~PyTango.GreenMode`        None                                    green mode for read and write. None means use server green mode.
-    read_green_mode        :obj:`~PyTango.GreenMode`        None                                    green mode for read. None means use server green mode.
-    write_green_mode       :obj:`~PyTango.GreenMode`        None                                    green mode for write. None means use server green mode.
+    green_mode             :obj:`~tango.GreenMode`        None                                    green mode for read and write. None means use server green mode.
+    read_green_mode        :obj:`~tango.GreenMode`        None                                    green mode for read. None means use server green mode.
+    write_green_mode       :obj:`~tango.GreenMode`        None                                    green mode for write. None means use server green mode.
     ===================== ================================ ======================================= =======================================================================================
 
     .. note::
@@ -915,16 +915,16 @@ class pipe(PipeData):
     parameter              type                                       default value                                 description
     ===================== ================================ ======================================= =======================================================================================
     name                   :obj:`str`                       class member name                       alternative pipe name
-    display_level          :obj:`~PyTango.DispLevel`        :obj:`~PyTango.DisLevel.OPERATOR`       display level
-    access                 :obj:`~PyTango.PipeWriteType`    :obj:`~PyTango.PipeWriteType.READ`      read only/ read write access
+    display_level          :obj:`~tango.DispLevel`        :obj:`~tango.DisLevel.OPERATOR`       display level
+    access                 :obj:`~tango.PipeWriteType`    :obj:`~tango.PipeWriteType.READ`      read only/ read write access
     fget (or fread)        :obj:`str` or :obj:`callable`    'read_<pipe_name>'                      read method name or method object
     fset (or fwrite)       :obj:`str` or :obj:`callable`    'write_<pipe_name>'                     write method name or method object
     is_allowed             :obj:`str` or :obj:`callable`    'is_<pipe_name>_allowed'                is allowed method name or method object
     label                  :obj:`str`                       '<pipe_name>'                           pipe label
     doc (or description)   :obj:`str`                       ''                                      pipe description
-    green_mode             :obj:`~PyTango.GreenMode`        None                                    green mode for read and write. None means use server green mode.
-    read_green_mode        :obj:`~PyTango.GreenMode`        None                                    green mode for read. None means use server green mode.
-    write_green_mode       :obj:`~PyTango.GreenMode`        None                                    green mode for write. None means use server green mode.
+    green_mode             :obj:`~tango.GreenMode`        None                                    green mode for read and write. None means use server green mode.
+    read_green_mode        :obj:`~tango.GreenMode`        None                                    green mode for read. None means use server green mode.
+    write_green_mode       :obj:`~tango.GreenMode`        None                                    green mode for write. None means use server green mode.
     ===================== ================================ ======================================= =======================================================================================
 
     The same example with a read-write ROI, a customized label and description::
@@ -1124,8 +1124,8 @@ class _BaseProperty(object):
     def __set__(self, obj, value):
         obj._tango_properties[self.name] = value
         if self.update_db:
-            import PyTango
-            db = PyTango.Util.instance().get_database()
+            import tango
+            db = tango.Util.instance().get_database()
             db.put_device_property(obj.get_name(), {self.name: value})
 
     def __delete__(self, obj):
@@ -1136,11 +1136,11 @@ class device_property(_BaseProperty):
     """
     Declares a new tango device property in a :class:`Device`. To be
     used like the python native :obj:`property` function. For example,
-    to declare a scalar, `PyTango.DevString`, device property called
+    to declare a scalar, `tango.DevString`, device property called
     *host* in a *PowerSupply* :class:`Device` do::
 
-        from PyTango.server import Device, DeviceMeta
-        from PyTango.server import device_property
+        from tango.server import Device, DeviceMeta
+        from tango.server import device_property
 
         class PowerSupply(Device):
             __metaclass__ = DeviceMeta
@@ -1164,11 +1164,11 @@ class class_property(_BaseProperty):
     """
     Declares a new tango class property in a :class:`Device`. To be
     used like the python native :obj:`property` function. For example,
-    to declare a scalar, `PyTango.DevString`, class property called
+    to declare a scalar, `tango.DevString`, class property called
     *port* in a *PowerSupply* :class:`Device` do::
 
-        from PyTango.server import Device, DeviceMeta
-        from PyTango.server import class_property
+        from tango.server import Device, DeviceMeta
+        from tango.server import class_property
 
         class PowerSupply(Device):
             __metaclass__ = DeviceMeta
@@ -1229,7 +1229,7 @@ def _to_classes(classes):
                 if not hasattr(klass_info, '_api') or klass_info._api < 2:
                     raise Exception(
                         "When giving a single class, it must " \
-                        "implement HLAPI (see PyTango.server)")
+                        "implement HLAPI (see tango.server)")
                 klass_klass = klass_info.TangoClassClass
                 klass_name = klass_info.TangoClassName
                 klass = klass_info
@@ -1245,7 +1245,7 @@ def _to_classes(classes):
                 if not hasattr(klass_info, '_api') or klass_info._api < 2:
                     raise Exception(
                         "When giving a single class, it must " \
-                        "implement HLAPI (see PyTango.server)")
+                        "implement HLAPI (see tango.server)")
                 klass_klass = klass_info.TangoClassClass
                 klass_name = klass_info.TangoClassName
                 klass = klass_info
@@ -1262,11 +1262,11 @@ def __server_run(classes, args=None, msg_stream=sys.stdout, util=None,
                  event_loop=None, post_init_callback=None,
                  green_mode=None):
     if green_mode is None:
-        from PyTango import get_green_mode
+        from tango import get_green_mode
         green_mode = get_green_mode()
     async_mode = green_mode in (GreenMode.Gevent, GreenMode.Asyncio)
 
-    import PyTango
+    import tango
     if msg_stream is None:
         write = lambda msg: None
     else:
@@ -1278,10 +1278,10 @@ def __server_run(classes, args=None, msg_stream=sys.stdout, util=None,
     post_init_callback = __to_cb(post_init_callback)
 
     if util is None:
-        util = PyTango.Util(args)
+        util = tango.Util(args)
 
     if async_mode:
-        util.set_serial_model(PyTango.SerialModel.NO_SYNC)
+        util.set_serial_model(tango.SerialModel.NO_SYNC)
         worker = _create_async_worker(green_mode)
         set_worker(worker)
 
@@ -1292,7 +1292,7 @@ def __server_run(classes, args=None, msg_stream=sys.stdout, util=None,
             event_loop = functools.partial(worker.execute, event_loop)
         util.server_set_event_loop(event_loop)
 
-    log = logging.getLogger("PyTango")
+    log = logging.getLogger("tango")
 
     def tango_loop():
         log.debug("server loop started")
@@ -1323,23 +1323,23 @@ def run(classes, args=None, msg_stream=sys.stdout,
 
     The `classes` parameter can be either a sequence of:
 
-    * :class:`~PyTango.server.Device` or
+    * :class:`~tango.server.Device` or
     * a sequence of two elements
-      :class:`~PyTango.DeviceClass`, :class:`~PyTango.DeviceImpl` or
+      :class:`~tango.DeviceClass`, :class:`~tango.DeviceImpl` or
     * a sequence of three elements
-      :class:`~PyTango.DeviceClass`, :class:`~PyTango.DeviceImpl`,
+      :class:`~tango.DeviceClass`, :class:`~tango.DeviceImpl`,
       tango class name (str)
 
     or a dictionary where:
 
     * key is the tango class name
     * value is either:
-        * a :class:`~PyTango.server.Device` class or
+        * a :class:`~tango.server.Device` class or
         * a sequence of two elements
-          :class:`~PyTango.DeviceClass`, :class:`~PyTango.DeviceImpl`
+          :class:`~tango.DeviceClass`, :class:`~tango.DeviceImpl`
           or
         * a sequence of three elements
-          :class:`~PyTango.DeviceClass`, :class:`~PyTango.DeviceImpl`,
+          :class:`~tango.DeviceClass`, :class:`~tango.DeviceImpl`,
           tango class name (str)
 
     The optional `post_init_callback` can be a callable (without
@@ -1355,9 +1355,9 @@ def run(classes, args=None, msg_stream=sys.stdout,
        predefined order use a sequence or an OrderedDict.
 
     Example 1: registering and running a PowerSupply inheriting from
-    :class:`~PyTango.server.Device`::
+    :class:`~tango.server.Device`::
 
-        from PyTango.server import Device, DeviceMeta, run
+        from tango.server import Device, DeviceMeta, run
 
         class PowerSupply(Device):
             __metaclass__ = DeviceMeta
@@ -1367,8 +1367,8 @@ def run(classes, args=None, msg_stream=sys.stdout,
     Example 2: registering and running a MyServer defined by tango
     classes `MyServerClass` and `MyServer`::
 
-        from PyTango import Device_4Impl, DeviceClass
-        from PyTango.server import run
+        from tango import Device_4Impl, DeviceClass
+        from tango.server import run
 
         class MyServer(Device_4Impl):
             pass
@@ -1381,8 +1381,8 @@ def run(classes, args=None, msg_stream=sys.stdout,
     Example 3: registering and running a MyServer defined by tango
     classes `MyServerClass` and `MyServer`::
 
-        from PyTango import Device_4Impl, DeviceClass
-        from PyTango.server import Device, DeviceMeta, run
+        from tango import Device_4Impl, DeviceClass
+        from tango.server import Device, DeviceMeta, run
 
         class PowerSupply(Device):
             __metaclass__ = DeviceMeta
@@ -1397,7 +1397,7 @@ def run(classes, args=None, msg_stream=sys.stdout,
         # or: run({'MyServer': (MyServerClass, MyServer)})
 
     :param classes:
-        a sequence of :class:`~PyTango.server.Device` classes or
+        a sequence of :class:`~tango.server.Device` classes or
         a dictionary where keyword is the tango class name and value
         is a sequence of Tango Device Class python class, and Tango
         Device python class
@@ -1414,7 +1414,7 @@ def run(classes, args=None, msg_stream=sys.stdout,
     :param util:
         PyTango Util object [default: None meaning create a Util
         instance]
-    :type util: :class:`~PyTango.Util`
+    :type util: :class:`~tango.Util`
 
     :param event_loop: event_loop callable
     :type event_loop: callable
@@ -1426,7 +1426,7 @@ def run(classes, args=None, msg_stream=sys.stdout,
         callable or tuple (see description above)
 
     :return: The Util singleton object
-    :rtype: :class:`~PyTango.Util`
+    :rtype: :class:`~tango.Util`
 
     .. versionadded:: 8.1.2
 
@@ -1446,7 +1446,7 @@ def run(classes, args=None, msg_stream=sys.stdout,
     except KeyboardInterrupt:
         write("Exiting: Keyboard interrupt\n")
     except DevFailed as df:
-        write("Exiting: Server exited with PyTango.DevFailed:\n" + \
+        write("Exiting: Server exited with tango.DevFailed:\n" + \
               str(df) + "\n")
         if verbose:
             write(traceback.format_exc())
@@ -1462,7 +1462,7 @@ def server_run(classes, args=None, msg_stream=sys.stdout,
         post_init_callback=None, green_mode=None):
     """
     Since PyTango 8.1.2 it is just an alias to
-    :func:`~PyTango.server.run`. Use :func:`~PyTango.server.run`
+    :func:`~tango.server.run`. Use :func:`~tango.server.run`
     instead.
 
     .. versionadded:: 8.0.0
@@ -1480,7 +1480,7 @@ def server_run(classes, args=None, msg_stream=sys.stdout,
         Added `post_init_callback` keyword parameter
 
     .. deprecated:: 8.1.2
-        Use :func:`~PyTango.server.run` instead.
+        Use :func:`~tango.server.run` instead.
 
     """
     return run(classes, args=args, msg_stream=msg_stream,
@@ -1657,7 +1657,7 @@ def _create_asyncio_worker():
 
 _CLEAN_UP_TEMPLATE = """
 import sys
-from PyTango import Database
+from tango import Database
 
 db = Database()
 server_instance = '{server_instance}'
@@ -1698,7 +1698,7 @@ def __to_tango_type_fmt(value):
 
 def create_tango_class(server, obj, tango_class_name=None, member_filter=None):
     slog = server.server_instance.replace("/", ".")
-    log = logging.getLogger("PyTango.Server." + slog)
+    log = logging.getLogger("tango.Server." + slog)
 
     obj_klass = obj.__class__
     obj_klass_name = obj_klass.__name__
@@ -1897,7 +1897,7 @@ class Server:
         else:
             self.__worker = get_worker()
         set_worker(self.__worker)
-        self.log = logging.getLogger("PyTango.Server")
+        self.log = logging.getLogger("tango.Server")
         self.__phase = Server.Phase0
 
     def __build_args(self):
@@ -1931,8 +1931,8 @@ class Server:
         if server_registered:
             dserver_name = "dserver/{0}".format(server_instance)
             if db.import_device(dserver_name).exported:
-                import PyTango
-                dserver = PyTango.DeviceProxy(dserver_name)
+                import tango
+                dserver = tango.DeviceProxy(dserver_name)
                 try:
                     dserver.ping()
                     raise Exception("Server already running")
@@ -2064,8 +2064,8 @@ class Server:
     @property
     def tango_util(self):
         if self.__util is None:
-            import PyTango
-            self.__util = PyTango.Util(self.__build_args())
+            import tango
+            self.__util = tango.Util(self.__build_args())
             self._phase = Server.Phase1
         return self.__util
 
@@ -2073,7 +2073,7 @@ class Server:
     def green_mode(self):
         gm = self.__green_mode
         if gm is None:
-            from PyTango import get_green_mode
+            from tango import get_green_mode
             gm = get_green_mode()
         return gm
 
@@ -2108,8 +2108,8 @@ class Server:
         :rtype: tuple<dict, dict>
         """
         if self.__util is None:
-            import PyTango
-            db = PyTango.Database()
+            import tango
+            db = tango.Database()
         else:
             db = self.__util.get_database()
         server = self.server_instance
@@ -2150,8 +2150,8 @@ class Server:
     def unregister_object(self, name):
         tango_object = self.__objects.pop(name.lower())
         if self._phase > Server.Phase1:
-            import PyTango
-            util = PyTango.Util.instance()
+            import tango
+            util = tango.Util.instance()
             if not util.is_svr_shutting_down():
                 util.delete_device(tango_object.tango_class_name, name)
 
@@ -2183,8 +2183,8 @@ class Server:
                                                tango_class_name=class_name)
         self.__objects[full_name.lower()] = tango_object
         if self._phase > Server.Phase1:
-            import PyTango
-            util = PyTango.Util.instance()
+            import tango
+            util = tango.Util.instance()
             util.create_device(class_name, name)
         return tango_object
 
diff --git a/tango/tango_numpy.py b/tango/tango_numpy.py
index b8070af..828d793 100644
--- a/tango/tango_numpy.py
+++ b/tango/tango_numpy.py
@@ -17,8 +17,8 @@ __all__ = [ "NumpyType", "numpy_type", "numpy_spectrum", "numpy_image" ]
 
 __docformat__ = "restructuredtext"
 
-from ._PyTango import Except
-from ._PyTango import constants
+from ._tango import Except
+from ._tango import constants
 
 from .attribute_proxy import AttributeProxy
 import collections
@@ -38,9 +38,9 @@ def _define_numpy():
         import numpy
         import operator
 
-        ArgType = _PyTango.CmdArgType
-        AttributeInfo = _PyTango.AttributeInfo
-        Attribute = _PyTango.Attribute
+        ArgType = _tango.CmdArgType
+        AttributeInfo = _tango.AttributeInfo
+        Attribute = _tango.Attribute
 
         class NumpyType(object):
 
@@ -91,7 +91,7 @@ def _define_numpy():
                 numpy_spectrum(self, tg_type, dim_x, dim_y) -> numpy.array
                 numpy_spectrum(self, tg_type, sequence) -> numpy.array
 
-                        Get a square numpy array to be used with PyTango.
+                        Get a square numpy array to be used with tango.
                         One version gets dim_x and creates an object with
                         this size. The other version expects any sequence to
                         convert.
@@ -116,7 +116,7 @@ def _define_numpy():
                 numpy_image(self, tg_type, dim_x, dim_y) -> numpy.array
                 numpy_image(self, tg_type, sequence) -> numpy.array
 
-                        Get a square numpy array to be used with PyTango.
+                        Get a square numpy array to be used with tango.
                         One version gets dim_x and dim_y and creates an object with
                         this size. The other version expects a square sequence of
                         sequences to convert.
diff --git a/tango/time_val.py b/tango/time_val.py
index d2e54c9..2b73733 100644
--- a/tango/time_val.py
+++ b/tango/time_val.py
@@ -21,7 +21,7 @@ import time
 import datetime
 import operator
 
-from ._PyTango import TimeVal
+from ._tango import TimeVal
 import numbers
 
 def __TimeVal__init(self, a=None, b=None, c=None):
@@ -71,7 +71,7 @@ def __TimeVal__fromtimestamp(ts):
     """
     fromtimestamp(ts) -> TimeVal
 
-        A static method returning a :class:`PyTango.TimeVal` object representing
+        A static method returning a :class:`tango.TimeVal` object representing
         the given timestamp
     
         Parameters :
@@ -85,7 +85,7 @@ def __TimeVal__fromdatetime(dt):
     """
     fromdatetime(dt) -> TimeVal
 
-        A static method returning a :class:`PyTango.TimeVal` object representing
+        A static method returning a :class:`tango.TimeVal` object representing
         the given :class:`datetime.datetime`
     
         Parameters :
@@ -103,7 +103,7 @@ def __TimeVal__now():
     """
     now() -> TimeVal
 
-        A static method returning a :class:`PyTango.TimeVal` object representing
+        A static method returning a :class:`tango.TimeVal` object representing
         the current time
     
         Parameters : None
diff --git a/tango/utils.py b/tango/utils.py
index a5d6815..b9f0c96 100644
--- a/tango/utils.py
+++ b/tango/utils.py
@@ -35,13 +35,16 @@ import sys
 import numbers
 import collections
 
-from ._PyTango import StdStringVector, StdDoubleVector, \
+from ._tango import StdStringVector, StdDoubleVector, \
     DbData, DbDevInfos, DbDevExportInfos, CmdArgType, AttrDataFormat, \
     EventData, AttrConfEventData, DataReadyEventData, DevFailed, constants, \
-    GreenMode, DevState
+    DevState, CommunicationFailed
+
+from . import _tango
 from .constants import AlrmValueNotSpec, StatusNotSet, TgLibVers
 from .release import Release
 
+
 _scalar_int_types = (CmdArgType.DevShort, CmdArgType.DevUShort,
     CmdArgType.DevInt, CmdArgType.DevLong, CmdArgType.DevULong,
     CmdArgType.DevLong64, CmdArgType.DevULong64)
@@ -200,10 +203,10 @@ def __requires(package_name, min_version=None, conflicts=(),
             msg = "Error importing package {0} required by {1}".format(
                 package_name, software_name)
             raise Exception(msg)
-        
+
     if min_version is not None:
         min_version = LooseVersion(min_version)
-        if min_version > curr_version:        
+        if min_version > curr_version:
             msg = "{0} requires {1} {2} but {3} installed".format(
                 software_name, package_name, min_version, curr_version)
             raise Exception(msg)
@@ -212,7 +215,7 @@ def __requires(package_name, min_version=None, conflicts=(),
     if curr_version in conflicts:
         msg = "{0} cannot run with {1} {2}".format(
             software_name, package_name, curr_version)
-        raise Exception(msg)        
+        raise Exception(msg)
     return True
 
 def requires_pytango(min_version=None, conflicts=(),
@@ -222,7 +225,7 @@ def requires_pytango(min_version=None, conflicts=(),
     software is present. If not an exception is thrown.
     Example usage::
 
-        from PyTango import requires_pytango
+        from tango import requires_pytango
 
         requires_pytango('7.1', conflicts=['8.1.1'], software='MyDS')
 
@@ -239,14 +242,14 @@ def requires_pytango(min_version=None, conflicts=(),
     :type conflics:
         seq<str|LooseVersion>
     :param software_name:
-        software name using PyTango. Used in the exception message
+        software name using tango. Used in the exception message
     :type software_name: str
 
     :raises Exception: if the required PyTango version is not met
 
     New in PyTango 8.1.4
     """
-    return __requires("PyTango", min_version=min_version,
+    return __requires("pytango", min_version=min_version,
                       conflicts=conflicts, software_name=software_name)
 
 
@@ -257,7 +260,7 @@ def requires_tango(min_version=None, conflicts=(),
     software is present. If not an exception is thrown.
     Example usage::
 
-        from Tango import requires_tango
+        from tango import requires_tango
 
         requires_tango('7.1', conflicts=['8.1.1'], software='MyDS')
 
@@ -282,19 +285,19 @@ def requires_tango(min_version=None, conflicts=(),
     New in PyTango 8.1.4
     """
     return __requires("Tango", min_version=min_version,
-                      conflicts=conflicts, software_name=software_name)    
+                      conflicts=conflicts, software_name=software_name)
 
 
 def get_tango_device_classes():
     global __device_classes
     if __device_classes is None:
-        import PyTango
-        __device_classes = [PyTango.DeviceImpl]
+
+        __device_classes = [_tango.DeviceImpl]
         i = 2
         while True:
             dc = "Device_{0}Impl".format(i)
             try:
-               __device_classes.append(getattr(PyTango, dc))
+               __device_classes.append(getattr(_tango, dc))
                i = i + 1
             except AttributeError:
                 break
@@ -427,7 +430,7 @@ def is_non_str_seq(obj):
 
     :return: True is the given obj is a sequence or False otherwise
     :rtype: :py:obj:`bool`
-    """    
+    """
     return is_seq(obj) and not is_pure_str(obj)
 
 
@@ -467,10 +470,10 @@ def is_number(obj):
 
 def is_scalar(tg_type):
     """Tells if the given tango type is a scalar
-    
+
     :param tg_type: tango type
-    :type tg_type: :class:`PyTango.CmdArgType`
-    
+    :type tg_type: :class:`tango.CmdArgType`
+
     :return: True if the given tango type is a scalar or False otherwise
     :rtype: :py:obj:`bool`
     """
@@ -482,10 +485,10 @@ is_scalar_type = is_scalar
 
 def is_array(tg_type):
     """Tells if the given tango type is an array type
-    
+
     :param tg_type: tango type
-    :type tg_type: :class:`PyTango.CmdArgType`
-    
+    :type tg_type: :class:`tango.CmdArgType`
+
     :return: True if the given tango type is an array type or False otherwise
     :rtype: :py:obj:`bool`
     """
@@ -497,13 +500,13 @@ is_array_type = is_array
 
 def is_numerical(tg_type, inc_array=False):
     """Tells if the given tango type is numerical
-    
+
     :param tg_type: tango type
-    :type tg_type: :class:`PyTango.CmdArgType`
-    :param inc_array: (optional, default is False) determines if include array 
+    :type tg_type: :class:`tango.CmdArgType`
+    :param inc_array: (optional, default is False) determines if include array
                       in the list of checked types
     :type inc_array: :py:obj:`bool`
-    
+
     :return: True if the given tango type is a numerical or False otherwise
     :rtype: :py:obj:`bool`
     """
@@ -519,13 +522,13 @@ is_numerical_type = is_numerical
 
 def is_int(tg_type, inc_array=False):
     """Tells if the given tango type is integer
-    
+
     :param tg_type: tango type
-    :type tg_type: :class:`PyTango.CmdArgType`
-    :param inc_array: (optional, default is False) determines if include array 
+    :type tg_type: :class:`tango.CmdArgType`
+    :param inc_array: (optional, default is False) determines if include array
                       in the list of checked types
     :type inc_array: :py:obj:`bool`
-    
+
     :return: True if the given tango type is integer or False otherwise
     :rtype: :py:obj:`bool`
     """
@@ -541,13 +544,13 @@ is_int_type = is_int
 
 def is_float(tg_type, inc_array=False):
     """Tells if the given tango type is float
-    
+
     :param tg_type: tango type
-    :type tg_type: :class:`PyTango.CmdArgType`
-    :param inc_array: (optional, default is False) determines if include array 
+    :type tg_type: :class:`tango.CmdArgType`
+    :param inc_array: (optional, default is False) determines if include array
                       in the list of checked types
     :type inc_array: :py:obj:`bool`
-    
+
     :return: True if the given tango type is float or False otherwise
     :rtype: :py:obj:`bool`
     """
@@ -563,13 +566,13 @@ is_float_type = is_float
 
 def is_bool(tg_type, inc_array=False):
     """Tells if the given tango type is boolean
-    
+
     :param tg_type: tango type
-    :type tg_type: :class:`PyTango.CmdArgType`
-    :param inc_array: (optional, default is False) determines if include array 
+    :type tg_type: :class:`tango.CmdArgType`
+    :param inc_array: (optional, default is False) determines if include array
                       in the list of checked types
     :type inc_array: :py:obj:`bool`
-    
+
     :return: True if the given tango type is boolean or False otherwise
     :rtype: :py:obj:`bool`
     """
@@ -584,13 +587,13 @@ is_bool_type = is_bool
 
 def is_str(tg_type, inc_array=False):
     """Tells if the given tango type is string
-    
+
     :param tg_type: tango type
-    :type tg_type: :class:`PyTango.CmdArgType`
-    :param inc_array: (optional, default is False) determines if include array 
+    :type tg_type: :class:`tango.CmdArgType`
+    :param inc_array: (optional, default is False) determines if include array
                       in the list of checked types
     :type inc_array: :py:obj:`bool`
-    
+
     :return: True if the given tango type is string or False otherwise
     :rtype: :py:obj:`bool`
     """
@@ -606,13 +609,13 @@ is_str_type = is_str
 
 def is_bin(tg_type, inc_array=False):
     """Tells if the given tango type is binary
-    
+
     :param tg_type: tango type
-    :type tg_type: :class:`PyTango.CmdArgType`
-    :param inc_array: (optional, default is False) determines if include array 
+    :type tg_type: :class:`tango.CmdArgType`
+    :param inc_array: (optional, default is False) determines if include array
                       in the list of checked types
     :type inc_array: :py:obj:`bool`
-    
+
     :return: True if the given tango type is binary or False otherwise
     :rtype: :py:obj:`bool`
     """
@@ -623,31 +626,31 @@ is_bin_type = is_bin
 
 
 def seq_2_StdStringVector(seq, vec=None):
-    """Converts a python sequence<str> object to a :class:`PyTango.StdStringVector`
-        
+    """Converts a python sequence<str> object to a :class:`tango.StdStringVector`
+
         :param seq: the sequence of strings
         :type seq: sequence<:py:obj:`str`>
-        :param vec: (optional, default is None) an :class:`PyTango.StdStringVector`
-                    to be filled. If None is given, a new :class:`PyTango.StdStringVector`
+        :param vec: (optional, default is None) an :class:`tango.StdStringVector`
+                    to be filled. If None is given, a new :class:`tango.StdStringVector`
                     is created
-        :return: a :class:`PyTango.StdStringVector` filled with the same contents as seq
-        :rtype: :class:`PyTango.StdStringVector`
+        :return: a :class:`tango.StdStringVector` filled with the same contents as seq
+        :rtype: :class:`tango.StdStringVector`
     """
     if vec is None:
         if isinstance(seq, StdStringVector): return seq
         vec = StdStringVector()
     if not isinstance(vec, StdStringVector):
-        raise TypeError('vec must be a PyTango.StdStringVector')
+        raise TypeError('vec must be a tango.StdStringVector')
     for e in seq:
         vec.append(str(e))
     return vec
 
 
 def StdStringVector_2_seq(vec, seq=None):
-    """Converts a :class:`PyTango.StdStringVector` to a python sequence<str>
-        
-        :param seq: the :class:`PyTango.StdStringVector`
-        :type seq: :class:`PyTango.StdStringVector`
+    """Converts a :class:`tango.StdStringVector` to a python sequence<str>
+
+        :param seq: the :class:`tango.StdStringVector`
+        :type seq: :class:`tango.StdStringVector`
         :param vec: (optional, default is None) a python sequence to be filled.
                      If None is given, a new list is created
         :return: a python sequence filled with the same contents as seq
@@ -655,38 +658,38 @@ def StdStringVector_2_seq(vec, seq=None):
     """
     if seq is None: seq = []
     if not isinstance(vec, StdStringVector):
-        raise TypeError('vec must be a PyTango.StdStringVector')
+        raise TypeError('vec must be a tango.StdStringVector')
     for e in vec:
         seq.append(str(e))
     return seq
 
 
 def seq_2_StdDoubleVector(seq, vec=None):
-    """Converts a python sequence<float> object to a :class:`PyTango.StdDoubleVector`
-        
+    """Converts a python sequence<float> object to a :class:`tango.StdDoubleVector`
+
         :param seq: the sequence of floats
         :type seq: sequence<:py:obj:`float`>
-        :param vec: (optional, default is None) an :class:`PyTango.StdDoubleVector`
-                    to be filled. If None is given, a new :class:`PyTango.StdDoubleVector`
+        :param vec: (optional, default is None) an :class:`tango.StdDoubleVector`
+                    to be filled. If None is given, a new :class:`tango.StdDoubleVector`
                     is created
-        :return: a :class:`PyTango.StdDoubleVector` filled with the same contents as seq
-        :rtype: :class:`PyTango.StdDoubleVector`
+        :return: a :class:`tango.StdDoubleVector` filled with the same contents as seq
+        :rtype: :class:`tango.StdDoubleVector`
     """
     if vec is None:
         if isinstance(seq, StdDoubleVector): return seq
         vec = StdDoubleVector()
     if not isinstance(vec, StdDoubleVector):
-        raise TypeError('vec must be a PyTango.StdDoubleVector')
+        raise TypeError('vec must be a tango.StdDoubleVector')
     for e in seq:
         vec.append(str(e))
     return vec
 
 
 def StdDoubleVector_2_seq(vec, seq=None):
-    """Converts a :class:`PyTango.StdDoubleVector` to a python sequence<float>
-        
-        :param seq: the :class:`PyTango.StdDoubleVector`
-        :type seq: :class:`PyTango.StdDoubleVector`
+    """Converts a :class:`tango.StdDoubleVector` to a python sequence<float>
+
+        :param seq: the :class:`tango.StdDoubleVector`
+        :type seq: :class:`tango.StdDoubleVector`
         :param vec: (optional, default is None) a python sequence to be filled.
                      If None is given, a new list is created
         :return: a python sequence filled with the same contents as seq
@@ -694,67 +697,67 @@ def StdDoubleVector_2_seq(vec, seq=None):
     """
     if seq is None: seq = []
     if not isinstance(vec, StdDoubleVector):
-        raise TypeError('vec must be a PyTango.StdDoubleVector')
+        raise TypeError('vec must be a tango.StdDoubleVector')
     for e in vec: seq.append(float(e))
     return seq
 
 
 def seq_2_DbDevInfos(seq, vec=None):
-    """Converts a python sequence<DbDevInfo> object to a :class:`PyTango.DbDevInfos`
-        
+    """Converts a python sequence<DbDevInfo> object to a :class:`tango.DbDevInfos`
+
         :param seq: the sequence of DbDevInfo
         :type seq: sequence<DbDevInfo>
-        :param vec: (optional, default is None) an :class:`PyTango.DbDevInfos`
-                    to be filled. If None is given, a new :class:`PyTango.DbDevInfos`
+        :param vec: (optional, default is None) an :class:`tango.DbDevInfos`
+                    to be filled. If None is given, a new :class:`tango.DbDevInfos`
                     is created
-        :return: a :class:`PyTango.DbDevInfos` filled with the same contents as seq
-        :rtype: :class:`PyTango.DbDevInfos`
+        :return: a :class:`tango.DbDevInfos` filled with the same contents as seq
+        :rtype: :class:`tango.DbDevInfos`
     """
     if vec is None:
         if isinstance(seq, DbDevInfos): return seq
         vec = DbDevInfos()
     if not isinstance(vec, DbDevInfos):
-        raise TypeError('vec must be a PyTango.DbDevInfos')
+        raise TypeError('vec must be a tango.DbDevInfos')
     for e in seq: vec.append(e)
     return vec
 
 
 def seq_2_DbDevExportInfos(seq, vec=None):
-    """Converts a python sequence<DbDevExportInfo> object to a :class:`PyTango.DbDevExportInfos`
-        
+    """Converts a python sequence<DbDevExportInfo> object to a :class:`tango.DbDevExportInfos`
+
         :param seq: the sequence of DbDevExportInfo
         :type seq: sequence<DbDevExportInfo>
-        :param vec: (optional, default is None) an :class:`PyTango.DbDevExportInfos`
-                    to be filled. If None is given, a new :class:`PyTango.DbDevExportInfos`
+        :param vec: (optional, default is None) an :class:`tango.DbDevExportInfos`
+                    to be filled. If None is given, a new :class:`tango.DbDevExportInfos`
                     is created
-        :return: a :class:`PyTango.DbDevExportInfos` filled with the same contents as seq
-        :rtype: :class:`PyTango.DbDevExportInfos`
+        :return: a :class:`tango.DbDevExportInfos` filled with the same contents as seq
+        :rtype: :class:`tango.DbDevExportInfos`
     """
     if vec is None:
         if isinstance(seq, DbDevExportInfos): return seq
         vec = DbDevExportInfos()
     if not isinstance(vec, DbDevExportInfos):
-        raise TypeError('vec must be a PyTango.DbDevExportInfos')
+        raise TypeError('vec must be a tango.DbDevExportInfos')
     for e in seq: vec.append(e)
     return vec
 
 
 def seq_2_DbData(seq, vec=None):
-    """Converts a python sequence<DbDatum> object to a :class:`PyTango.DbData`
-        
+    """Converts a python sequence<DbDatum> object to a :class:`tango.DbData`
+
         :param seq: the sequence of DbDatum
         :type seq: sequence<DbDatum>
-        :param vec: (optional, default is None) an :class:`PyTango.DbData`
-                    to be filled. If None is given, a new :class:`PyTango.DbData`
+        :param vec: (optional, default is None) an :class:`tango.DbData`
+                    to be filled. If None is given, a new :class:`tango.DbData`
                     is created
-        :return: a :class:`PyTango.DbData` filled with the same contents as seq
-        :rtype: :class:`PyTango.DbData`
+        :return: a :class:`tango.DbData` filled with the same contents as seq
+        :rtype: :class:`tango.DbData`
     """
     if vec is None:
         if isinstance(seq, DbData): return seq
         vec = DbData()
     if not isinstance(vec, DbData):
-        raise TypeError('vec must be a PyTango.DbData')
+        raise TypeError('vec must be a tango.DbData')
     for e in seq: vec.append(e)
     return vec
 
@@ -762,7 +765,7 @@ def seq_2_DbData(seq, vec=None):
 def DbData_2_dict(db_data, d=None):
     if d is None: d = {}
     if not isinstance(db_data, DbData):
-        raise TypeError('db_data must be a PyTango.DbData. A %s found instead' % type(db_data))
+        raise TypeError('db_data must be a tango.DbData. A %s found instead' % type(db_data))
     for db_datum in db_data:
         d[db_datum.name] = db_datum.value_string
     return d
@@ -770,14 +773,14 @@ def DbData_2_dict(db_data, d=None):
 
 def seqStr_2_obj(seq, tg_type, tg_format=None):
     """Translates a sequence<str> to a sequence of objects of give type and format
-    
+
         :param seq: the sequence
         :type seq: sequence<str>
         :param tg_type: tango type
-        :type tg_type: :class:`PyTango.CmdArgType`
+        :type tg_type: :class:`tango.CmdArgType`
         :param tg_format: (optional, default is None, meaning SCALAR) tango format
-        :type tg_format: :class:`PyTango.AttrDataFormat`
-        
+        :type tg_format: :class:`tango.AttrDataFormat`
+
         :return: a new sequence
     """
     if tg_format:
@@ -870,13 +873,13 @@ def scalar_to_array_type(tg_type):
     """
     Gives the array tango type corresponding to the given tango
     scalar type. Example: giving DevLong will return DevVarLongArray.
-    
+
     :param tg_type: tango type
-    :type tg_type: :class:`PyTango.CmdArgType`
+    :type tg_type: :class:`tango.CmdArgType`
 
     :return: the array tango type for the given scalar tango type
-    :rtype: :class:`PyTango.CmdArgType`
-    
+    :rtype: :class:`tango.CmdArgType`
+
     :raises ValueError: in case the given dtype is not a tango scalar type
     """
     try:
@@ -887,11 +890,11 @@ def scalar_to_array_type(tg_type):
 
 def str_2_obj(obj_str, tg_type=None):
     """Converts a string into an object according to the given tango type
-    
+
            :param obj_str: the string to be converted
            :type obj_str: :py:obj:`str`
            :param tg_type: tango type
-           :type tg_type: :class:`PyTango.CmdArgType`
+           :type tg_type: :class:`tango.CmdArgType`
            :return: an object calculated from the given string
            :rtype: :py:obj:`object`
     """
@@ -913,11 +916,11 @@ def str_2_obj(obj_str, tg_type=None):
 
 def obj_2_str(obj, tg_type=None):
     """Converts a python object into a string according to the given tango type
-    
+
            :param obj: the object to be converted
            :type obj: :py:obj:`object`
            :param tg_type: tango type
-           :type tg_type: :class:`PyTango.CmdArgType`
+           :type tg_type: :class:`tango.CmdArgType`
            :return: a string representation of the given object
            :rtype: :py:obj:`str`
     """
@@ -953,7 +956,7 @@ def copy_doc(klass, fnname):
     meth, func = __get_meth_func(klass, fnname)
     func.__doc__ = base_func.__doc__
 
-    
+
 def document_method(klass, method_name, d, add=True):
     meth, func = __get_meth_func(klass, method_name)
     if add:
@@ -969,7 +972,7 @@ def document_method(klass, method_name, d, add=True):
         except AttributeError:
             pass
 
-        
+
 def document_static_method(klass, method_name, d, add=True):
     meth, func = __get_meth_func(klass, method_name)
     if add:
@@ -979,7 +982,7 @@ def document_static_method(klass, method_name, d, add=True):
             return
     meth.__doc__ = d
 
-    
+
 def document_enum(klass, enum_name, desc, append=True):
     # derived = type(base)('derived', (base,), {'__doc__': 'desc'})
 
@@ -997,10 +1000,10 @@ def document_enum(klass, enum_name, desc, append=True):
     # Replace the original enum type with the new one
     setattr(klass, enum_name, derived)
 
-    
+
 class CaselessList(list):
-    """A case insensitive lists that has some caseless methods. Only allows 
-    strings as list members. Most methods that would normally return a list, 
+    """A case insensitive lists that has some caseless methods. Only allows
+    strings as list members. Most methods that would normally return a list,
     return a CaselessList. (Except list() and lowercopy())
     Sequence Methods implemented are :
     __contains__, remove, count, index, append, extend, insert,
@@ -1064,7 +1067,7 @@ class CaselessList(list):
         list.append(self, item)
 
     def extend(self, item):
-        """Extend the list with another list. Each member of the list must be 
+        """Extend the list with another list. Each member of the list must be
         a string."""
         if not isinstance(item, list):
             raise TypeError('You can only extend lists with lists. ' \
@@ -1086,7 +1089,7 @@ class CaselessList(list):
         return count
 
     def index(self, item, minindex=0, maxindex=None):
-        """Provide an index of first occurence of item in the list. (or raise 
+        """Provide an index of first occurence of item in the list. (or raise
         a ValueError if item not present)
         If item is not a string, will raise a TypeError.
         minindex and maxindex are also optional arguments
@@ -1115,10 +1118,10 @@ class CaselessList(list):
 
     def __setitem__(self, index, value):
         """For setting values in the list.
-        index must be an integer or (extended) slice object. (__setslice__ used 
+        index must be an integer or (extended) slice object. (__setslice__ used
         for simple slices)
         If index is an integer then value must be a string.
-        If index is a slice object then value must be a list of strings - with 
+        If index is a slice object then value must be a list of strings - with
         the same length as the slice object requires.
         """
         if isinstance(index, int):
@@ -1147,7 +1150,7 @@ class CaselessList(list):
 
     def __getslice__(self, i, j):
         """Called to implement evaluation of self[i:j].
-        Although the manual says this method is deprecated - if I don't define 
+        Although the manual says this method is deprecated - if I don't define
         it the list one is called.
         (Which returns a list - this returns a CaselessList)"""
         return CaselessList(list.__getslice__(self, i, j))
@@ -1259,17 +1262,18 @@ def _notifd2db_file_db(ior_string, files, out=sys.stdout):
     return
 
 def _notifd2db_real_db(ior_string, host=None, out=sys.stdout):
-    import PyTango
+    from . import Database
+
     print("going to export notification service event factory to " \
           "Tango database ...", file=out)
 
     num_retries = 3
     while num_retries > 0:
         try:
-            db = PyTango.Database()
+            db = Database()
             db.set_timeout_millis(10000)
             num_retries = 0
-        except PyTango.DevFailed as df:
+        except DevFailed as df:
             num_retries -= 1
             if num_retries == 0:
                 print("Can't create Tango database object", file=out)
@@ -1293,7 +1297,7 @@ def _notifd2db_real_db(ior_string, host=None, out=sys.stdout):
             print("Successfully exported notification service event " \
                   "factory for host", host_name, "to Tango database !", file=out)
             break
-        except PyTango.CommunicationFailed as cf:
+        except CommunicationFailed as cf:
             if len(cf.errors) >= 2:
                 if cf.errors[1].reason == "API_DeviceTimedOut":
                     if num_retries > 0:
@@ -1313,23 +1317,23 @@ def _notifd2db_real_db(ior_string, host=None, out=sys.stdout):
 class EventCallBack(object):
     """
     Useful event callback for test purposes
-    
+
     Usage::
-    
-        >>> dev = PyTango.DeviceProxy(dev_name)
-        >>> cb = PyTango.utils.EventCallBack()
-        >>> id = dev.subscribe_event("state", PyTango.EventType.CHANGE_EVENT, cb, [])
+
+        >>> dev = tango.DeviceProxy(dev_name)
+        >>> cb = tango.utils.EventCallBack()
+        >>> id = dev.subscribe_event("state", tango.EventType.CHANGE_EVENT, cb, [])
         2011-04-06 15:33:18.910474 sys/tg_test/1 STATE CHANGE [ATTR_VALID] ON
-        
+
     Allowed format keys are:
-        
+
         - date (event timestamp)
         - reception_date (event reception timestamp)
         - type (event type)
         - dev_name (device name)
         - name (attribute name)
         - value (event value)
-        
+
     New in PyTango 7.1.4
     """
 
@@ -1343,7 +1347,7 @@ class EventCallBack(object):
 
     def get_events(self):
         """Returns the list of events received by this callback
-           
+
            :return: the list of events received by this callback
            :rtype: sequence<obj>
         """
@@ -1412,14 +1416,14 @@ class EventCallBack(object):
         elif isinstance(evt, DataReadyEventData):
             return ""
 
-        
+
 def get_home():
     """
     Find user's home directory if possible. Otherwise raise error.
-    
+
     :return: user's home directory
     :rtype: :py:obj:`str`
-    
+
     New in PyTango 7.1.4
     """
     path = ''
@@ -1439,7 +1443,7 @@ def get_home():
     else:
         raise RuntimeError('please define environment variable $HOME')
 
-    
+
 def _get_env_var(env_var_name):
     """
     Returns the value for the given environment name
@@ -1449,12 +1453,12 @@ def _get_env_var(env_var_name):
         * a real environ var
         * HOME/.tangorc
         * /etc/tangorc
-        
+
     :param env_var_name: the environment variable name
     :type env_var_name: str
     :return: the value for the given environment name
     :rtype: str
-    
+
     New in PyTango 7.1.4
     """
 
@@ -1484,7 +1488,7 @@ def _get_env_var(env_var_name):
         if key == env_var_name:
             return val
 
-        
+
 def from_version_str_to_hex_str(version_str):
     v = map(int, version_str.split('.'));
     return "0x%02d%02d%02d00" % (v[0], v[1], v[2])
@@ -1495,13 +1499,10 @@ def from_version_str_to_int(version_str):
 
 
 def info():
-    import PyTango.constants
-
-    Compile = PyTango.constants.Compile
-    Runtime = PyTango.constants.Runtime
-
+    # Compile and Runtime are set by `tango.pytango_init.init`
+    from .constants import Compile, Runtime
     msg = """\
-PyTango {0.Release.version} {0.Release.version_info}
+PyTango {0.version} {0.version_info}
 PyTango compiled with:
     Python : {1.PY_VERSION}
     Numpy  : {1.NUMPY_VERSION}
@@ -1515,8 +1516,7 @@ PyTango runtime is:
     Boost  : {2.BOOST_VERSION}
 
 PyTango running on:
-{2.UNAME}   
+{2.UNAME}
 """
-    msg = msg.format(PyTango, Compile, Runtime)
+    msg = msg.format(Release, Compile, Runtime)
     return msg
-

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/pytango.git



More information about the debian-science-commits mailing list