diff --git a/src/Libera.cpp b/src/Libera.cpp
index f569dbeef5c929c938bb225ecd408d3c02083524..efc789fd87e2c7154a20691a9a06c7159b34b99f 100644
--- a/src/Libera.cpp
+++ b/src/Libera.cpp
@@ -92,15 +92,15 @@ int Libera::instance_counter = 0;
 //      - s : Device name 
 //
 //-----------------------------------------------------------------------------
-Libera::Libera(Tango::DeviceClass * cl, string & s) :Tango::Device_3Impl(cl, s.c_str())
+Libera::Libera(Tango::DeviceClass * cl, string & s) : TANGO_BASE_CLASS(cl, s.c_str())
 {
   init_device();
 }
-Libera::Libera(Tango::DeviceClass * cl, const char *s) :Tango::Device_3Impl(cl, s)
+Libera::Libera(Tango::DeviceClass * cl, const char *s) : TANGO_BASE_CLASS(cl, s)
 {
   init_device();
 }
-Libera::Libera(Tango::DeviceClass * cl, const char *s, const char *d) :Tango::Device_3Impl(cl, s, d)
+Libera::Libera(Tango::DeviceClass * cl, const char *s, const char *d) : TANGO_BASE_CLASS(cl, s, d)
 {
   init_device();
 }
diff --git a/src/Libera.h b/src/Libera.h
index 488c7af7e247c5136ceb2f7884cb41868a0634e6..e19a212545690a9e348849ad6a9db127d6441486 100644
--- a/src/Libera.h
+++ b/src/Libera.h
@@ -58,7 +58,7 @@ namespace Libera_ns
  */
 
 
-class Libera: public Tango::Device_3Impl
+class Libera: public TANGO_BASE_CLASS
 {
 public:
   //  Add your own data members here