diff --git a/Makefile b/Makefile
index 94db5095050c3df258a243682edd1d87c1d6d367..d64ae99e6d7c1785a65b906b53aa54877e83e983 100644
--- a/Makefile
+++ b/Makefile
@@ -3,4 +3,4 @@ NAME_SRV = mpsdcct-srv
 CXXFLAGS = 
 LDFLAGS = -lmps -lbufferrt -lrnm -lrnmshare
 
-include ../makefiles/Make-8.1.2.c.in
+include ../makefiles/Make-9.3.3.in
diff --git a/src/MpsDcct.cpp b/src/MpsDcct.cpp
index e0761504a6e5f06b01bac07bb932cb27cbd854d0..457b1a0dfa799334668e9ffd2b8a6fa70b7bf683 100644
--- a/src/MpsDcct.cpp
+++ b/src/MpsDcct.cpp
@@ -93,19 +93,19 @@ namespace MpsDcct_ns
 //
 //-----------------------------------------------------------------------------
 MpsDcct::MpsDcct(Tango::DeviceClass *cl,string &s)
-:Tango::Device_4Impl(cl,s.c_str())
+:TANGO_BASE_CLASS(cl,s.c_str())
 {
 	init_device();
 }
 
 MpsDcct::MpsDcct(Tango::DeviceClass *cl,const char *s)
-:Tango::Device_4Impl(cl,s)
+:TANGO_BASE_CLASS(cl,s)
 {
 	init_device();
 }
 
 MpsDcct::MpsDcct(Tango::DeviceClass *cl,const char *s,const char *d)
-:Tango::Device_4Impl(cl,s,d)
+:TANGO_BASE_CLASS(cl,s,d)
 {
 	init_device();
 }
diff --git a/src/MpsDcct.h b/src/MpsDcct.h
index 04ea83110dabcd8b3288ffaac03c382f4af2d3d7..fc77a27a48c56c20e998940b04f9ed8a72e8ce6f 100644
--- a/src/MpsDcct.h
+++ b/src/MpsDcct.h
@@ -82,7 +82,7 @@ namespace MpsDcct_ns
  */
 
 
-class MpsDcct: public Tango::Device_4Impl
+class MpsDcct: public TANGO_BASE_CLASS
 {
 public :
 	//	Add your own data members here