diff --git a/src/ansys/mapdl/core/errors.py b/src/ansys/mapdl/core/errors.py
index 7abce6b065..85a396eb15 100644
--- a/src/ansys/mapdl/core/errors.py
+++ b/src/ansys/mapdl/core/errors.py
@@ -264,3 +264,10 @@ class ComponentDoesNotExits(MapdlException):
 
     def __init__(self, msg=""):
         MapdlException.__init__(self, msg)
+
+
+class CommandDeprecated(MapdlException):
+    """Raised when a command is deprecated"""
+
+    def __init__(self, msg=""):
+        MapdlException.__init__(self, msg)
diff --git a/src/ansys/mapdl/core/mapdl_extended.py b/src/ansys/mapdl/core/mapdl_extended.py
index 1b7e174a3a..7e2308672a 100644
--- a/src/ansys/mapdl/core/mapdl_extended.py
+++ b/src/ansys/mapdl/core/mapdl_extended.py
@@ -12,6 +12,7 @@
 from ansys.mapdl.core import _HAS_PYVISTA
 from ansys.mapdl.core.commands import CommandListingOutput
 from ansys.mapdl.core.errors import (
+    CommandDeprecated,
     ComponentDoesNotExits,
     IncorrectWorkingDirectory,
     MapdlRuntimeError,
@@ -1495,7 +1496,7 @@ def lssolve(self, lsmin="", lsmax="", lsinc="", **kwargs):
             super().lssolve(lsmin=lsmin, lsmax=lsmax, lsinc=lsinc, **kwargs)
         return self.last_response
 
-    @wraps(Commands.edasmp)
+    @wraps(_MapdlCore.edasmp)
     def edasmp(self, *args, **kwargs):
         if self.version >= 19.1:
             raise CommandDeprecated(
@@ -1503,7 +1504,7 @@ def edasmp(self, *args, **kwargs):
             )
         super().edasmp(*args, **kwargs)
 
-    @wraps(Commands.edbound)
+    @wraps(_MapdlCore.edbound)
     def edbound(self, *args, **kwargs):
         if self.version >= 19.1:
             raise CommandDeprecated(
@@ -1511,7 +1512,7 @@ def edbound(self, *args, **kwargs):
             )
         super().edbound(*args, **kwargs)
 
-    @wraps(Commands.edbx)
+    @wraps(_MapdlCore.edbx)
     def edbx(self, *args, **kwargs):
         if self.version >= 19.1:
             raise CommandDeprecated(
@@ -1519,7 +1520,7 @@ def edbx(self, *args, **kwargs):
             )
         super().edbx(*args, **kwargs)
 
-    @wraps(Commands.edcgen)
+    @wraps(_MapdlCore.edcgen)
     def edcgen(self, *args, **kwargs):
         if self.version >= 19.1:
             raise CommandDeprecated(
@@ -1527,7 +1528,7 @@ def edcgen(self, *args, **kwargs):
             )
         super().edcgen(*args, **kwargs)
 
-    @wraps(Commands.edclist)
+    @wraps(_MapdlCore.edclist)
     def edclist(self, *args, **kwargs):
         if self.version >= 19.1:
             raise CommandDeprecated(
@@ -1535,7 +1536,7 @@ def edclist(self, *args, **kwargs):
             )
         super().edclist(*args, **kwargs)
 
-    @wraps(Commands.edcmore)
+    @wraps(_MapdlCore.edcmore)
     def edcmore(self, *args, **kwargs):
         if self.version >= 19.1:
             raise CommandDeprecated(
@@ -1543,7 +1544,7 @@ def edcmore(self, *args, **kwargs):
             )
         super().edcmore(*args, **kwargs)
 
-    @wraps(Commands.edcnstr)
+    @wraps(_MapdlCore.edcnstr)
     def edcnstr(self, *args, **kwargs):
         if self.version >= 19.1:
             raise CommandDeprecated(
@@ -1551,7 +1552,7 @@ def edcnstr(self, *args, **kwargs):
             )
         super().edcnstr(*args, **kwargs)
 
-    @wraps(Commands.edcontact)
+    @wraps(_MapdlCore.edcontact)
     def edcontact(self, *args, **kwargs):
         if self.version >= 19.1:
             raise CommandDeprecated(
@@ -1559,7 +1560,7 @@ def edcontact(self, *args, **kwargs):
             )
         super().edcontact(*args, **kwargs)
 
-    @wraps(Commands.edcrb)
+    @wraps(_MapdlCore.edcrb)
     def edcrb(self, *args, **kwargs):
         if self.version >= 19.1:
             raise CommandDeprecated(
@@ -1567,7 +1568,7 @@ def edcrb(self, *args, **kwargs):
             )
         super().edcrb(*args, **kwargs)
 
-    @wraps(Commands.edcurve)
+    @wraps(_MapdlCore.edcurve)
     def edcurve(self, *args, **kwargs):
         if self.version >= 19.1:
             raise CommandDeprecated(
@@ -1575,7 +1576,7 @@ def edcurve(self, *args, **kwargs):
             )
         super().edcurve(*args, **kwargs)
 
-    @wraps(Commands.eddbl)
+    @wraps(_MapdlCore.eddbl)
     def eddbl(self, *args, **kwargs):
         if self.version >= 19.1:
             raise CommandDeprecated(
@@ -1583,7 +1584,7 @@ def eddbl(self, *args, **kwargs):
             )
         super().eddbl(*args, **kwargs)
 
-    @wraps(Commands.eddc)
+    @wraps(_MapdlCore.eddc)
     def eddc(self, *args, **kwargs):
         if self.version >= 19.1:
             raise CommandDeprecated(
@@ -1591,7 +1592,7 @@ def eddc(self, *args, **kwargs):
             )
         super().eddc(*args, **kwargs)
 
-    @wraps(Commands.edipart)
+    @wraps(_MapdlCore.edipart)
     def edipart(self, *args, **kwargs):
         if self.version >= 19.1:
             raise CommandDeprecated(
@@ -1599,7 +1600,7 @@ def edipart(self, *args, **kwargs):
             )
         super().edipart(*args, **kwargs)
 
-    @wraps(Commands.edlcs)
+    @wraps(_MapdlCore.edlcs)
     def edlcs(self, *args, **kwargs):
         if self.version >= 19.1:
             raise CommandDeprecated(
@@ -1607,7 +1608,7 @@ def edlcs(self, *args, **kwargs):
             )
         super().edlcs(*args, **kwargs)
 
-    @wraps(Commands.edmp)
+    @wraps(_MapdlCore.edmp)
     def edmp(self, *args, **kwargs):
         if self.version >= 19.1:
             raise CommandDeprecated(
@@ -1615,7 +1616,7 @@ def edmp(self, *args, **kwargs):
             )
         super().edmp(*args, **kwargs)
 
-    @wraps(Commands.ednb)
+    @wraps(_MapdlCore.ednb)
     def ednb(self, *args, **kwargs):
         if self.version >= 19.1:
             raise CommandDeprecated(
@@ -1623,7 +1624,7 @@ def ednb(self, *args, **kwargs):
             )
         super().ednb(*args, **kwargs)
 
-    @wraps(Commands.edndtsd)
+    @wraps(_MapdlCore.edndtsd)
     def edndtsd(self, *args, **kwargs):
         if self.version >= 19.1:
             raise CommandDeprecated(
@@ -1631,7 +1632,7 @@ def edndtsd(self, *args, **kwargs):
             )
         super().edndtsd(*args, **kwargs)
 
-    @wraps(Commands.ednrot)
+    @wraps(_MapdlCore.ednrot)
     def ednrot(self, *args, **kwargs):
         if self.version >= 19.1:
             raise CommandDeprecated(
@@ -1639,7 +1640,7 @@ def ednrot(self, *args, **kwargs):
             )
         super().ednrot(*args, **kwargs)
 
-    @wraps(Commands.edpart)
+    @wraps(_MapdlCore.edpart)
     def edpart(self, *args, **kwargs):
         if self.version >= 19.1:
             raise CommandDeprecated(
@@ -1647,7 +1648,7 @@ def edpart(self, *args, **kwargs):
             )
         super().edpart(*args, **kwargs)
 
-    @wraps(Commands.edpc)
+    @wraps(_MapdlCore.edpc)
     def edpc(self, *args, **kwargs):
         if self.version >= 19.1:
             raise CommandDeprecated(
@@ -1655,7 +1656,7 @@ def edpc(self, *args, **kwargs):
             )
         super().edpc(*args, **kwargs)
 
-    @wraps(Commands.edsp)
+    @wraps(_MapdlCore.edsp)
     def edsp(self, *args, **kwargs):
         if self.version >= 19.1:
             raise CommandDeprecated(
@@ -1663,7 +1664,7 @@ def edsp(self, *args, **kwargs):
             )
         super().edsp(*args, **kwargs)
 
-    @wraps(Commands.edweld)
+    @wraps(_MapdlCore.edweld)
     def edweld(self, *args, **kwargs):
         if self.version >= 19.1:
             raise CommandDeprecated(
@@ -1671,7 +1672,7 @@ def edweld(self, *args, **kwargs):
             )
         super().edweld(*args, **kwargs)
 
-    @wraps(Commands.edadapt)
+    @wraps(_MapdlCore.edadapt)
     def edadapt(self, *args, **kwargs):
         if self.version >= 19.1:
             raise CommandDeprecated(
@@ -1679,7 +1680,7 @@ def edadapt(self, *args, **kwargs):
             )
         super().edadapt(*args, **kwargs)
 
-    @wraps(Commands.edale)
+    @wraps(_MapdlCore.edale)
     def edale(self, *args, **kwargs):
         if self.version >= 19.1:
             raise CommandDeprecated(
@@ -1687,7 +1688,7 @@ def edale(self, *args, **kwargs):
             )
         super().edale(*args, **kwargs)
 
-    @wraps(Commands.edbvis)
+    @wraps(_MapdlCore.edbvis)
     def edbvis(self, *args, **kwargs):
         if self.version >= 19.1:
             raise CommandDeprecated(
@@ -1695,7 +1696,7 @@ def edbvis(self, *args, **kwargs):
             )
         super().edbvis(*args, **kwargs)
 
-    @wraps(Commands.edcadapt)
+    @wraps(_MapdlCore.edcadapt)
     def edcadapt(self, *args, **kwargs):
         if self.version >= 19.1:
             raise CommandDeprecated(
@@ -1703,7 +1704,7 @@ def edcadapt(self, *args, **kwargs):
             )
         super().edcadapt(*args, **kwargs)
 
-    @wraps(Commands.edcpu)
+    @wraps(_MapdlCore.edcpu)
     def edcpu(self, *args, **kwargs):
         if self.version >= 19.1:
             raise CommandDeprecated(
@@ -1711,7 +1712,7 @@ def edcpu(self, *args, **kwargs):
             )
         super().edcpu(*args, **kwargs)
 
-    @wraps(Commands.edcsc)
+    @wraps(_MapdlCore.edcsc)
     def edcsc(self, *args, **kwargs):
         if self.version >= 19.1:
             raise CommandDeprecated(
@@ -1719,7 +1720,7 @@ def edcsc(self, *args, **kwargs):
             )
         super().edcsc(*args, **kwargs)
 
-    @wraps(Commands.edcts)
+    @wraps(_MapdlCore.edcts)
     def edcts(self, *args, **kwargs):
         if self.version >= 19.1:
             raise CommandDeprecated(
@@ -1727,7 +1728,7 @@ def edcts(self, *args, **kwargs):
             )
         super().edcts(*args, **kwargs)
 
-    @wraps(Commands.eddamp)
+    @wraps(_MapdlCore.eddamp)
     def eddamp(self, *args, **kwargs):
         if self.version >= 19.1:
             raise CommandDeprecated(
@@ -1735,7 +1736,7 @@ def eddamp(self, *args, **kwargs):
             )
         super().eddamp(*args, **kwargs)
 
-    @wraps(Commands.eddrelax)
+    @wraps(_MapdlCore.eddrelax)
     def eddrelax(self, *args, **kwargs):
         if self.version >= 19.1:
             raise CommandDeprecated(
@@ -1743,7 +1744,7 @@ def eddrelax(self, *args, **kwargs):
             )
         super().eddrelax(*args, **kwargs)
 
-    @wraps(Commands.eddump)
+    @wraps(_MapdlCore.eddump)
     def eddump(self, *args, **kwargs):
         if self.version >= 19.1:
             raise CommandDeprecated(
@@ -1751,7 +1752,7 @@ def eddump(self, *args, **kwargs):
             )
         super().eddump(*args, **kwargs)
 
-    @wraps(Commands.edenergy)
+    @wraps(_MapdlCore.edenergy)
     def edenergy(self, *args, **kwargs):
         if self.version >= 19.1:
             raise CommandDeprecated(
@@ -1759,7 +1760,7 @@ def edenergy(self, *args, **kwargs):
             )
         super().edenergy(*args, **kwargs)
 
-    @wraps(Commands.edfplot)
+    @wraps(_MapdlCore.edfplot)
     def edfplot(self, *args, **kwargs):
         if self.version >= 19.1:
             raise CommandDeprecated(
@@ -1767,7 +1768,7 @@ def edfplot(self, *args, **kwargs):
             )
         super().edfplot(*args, **kwargs)
 
-    @wraps(Commands.edgcale)
+    @wraps(_MapdlCore.edgcale)
     def edgcale(self, *args, **kwargs):
         if self.version >= 19.1:
             raise CommandDeprecated(
@@ -1775,7 +1776,7 @@ def edgcale(self, *args, **kwargs):
             )
         super().edgcale(*args, **kwargs)
 
-    @wraps(Commands.edhgls)
+    @wraps(_MapdlCore.edhgls)
     def edhgls(self, *args, **kwargs):
         if self.version >= 19.1:
             raise CommandDeprecated(
@@ -1783,7 +1784,7 @@ def edhgls(self, *args, **kwargs):
             )
         super().edhgls(*args, **kwargs)
 
-    @wraps(Commands.edhist)
+    @wraps(_MapdlCore.edhist)
     def edhist(self, *args, **kwargs):
         if self.version >= 19.1:
             raise CommandDeprecated(
@@ -1791,7 +1792,7 @@ def edhist(self, *args, **kwargs):
             )
         super().edhist(*args, **kwargs)
 
-    @wraps(Commands.edhtime)
+    @wraps(_MapdlCore.edhtime)
     def edhtime(self, *args, **kwargs):
         if self.version >= 19.1:
             raise CommandDeprecated(
@@ -1799,7 +1800,7 @@ def edhtime(self, *args, **kwargs):
             )
         super().edhtime(*args, **kwargs)
 
-    @wraps(Commands.edint)
+    @wraps(_MapdlCore.edint)
     def edint(self, *args, **kwargs):
         if self.version >= 19.1:
             raise CommandDeprecated(
@@ -1807,7 +1808,7 @@ def edint(self, *args, **kwargs):
             )
         super().edint(*args, **kwargs)
 
-    @wraps(Commands.edis)
+    @wraps(_MapdlCore.edis)
     def edis(self, *args, **kwargs):
         if self.version >= 19.1:
             raise CommandDeprecated(
@@ -1815,7 +1816,7 @@ def edis(self, *args, **kwargs):
             )
         super().edis(*args, **kwargs)
 
-    @wraps(Commands.edload)
+    @wraps(_MapdlCore.edload)
     def edload(self, *args, **kwargs):
         if self.version >= 19.1:
             raise CommandDeprecated(
@@ -1823,7 +1824,7 @@ def edload(self, *args, **kwargs):
             )
         super().edload(*args, **kwargs)
 
-    @wraps(Commands.edopt)
+    @wraps(_MapdlCore.edopt)
     def edopt(self, *args, **kwargs):
         if self.version >= 19.1:
             raise CommandDeprecated(
@@ -1831,7 +1832,7 @@ def edopt(self, *args, **kwargs):
             )
         super().edopt(*args, **kwargs)
 
-    @wraps(Commands.edout)
+    @wraps(_MapdlCore.edout)
     def edout(self, *args, **kwargs):
         if self.version >= 19.1:
             raise CommandDeprecated(
@@ -1839,7 +1840,7 @@ def edout(self, *args, **kwargs):
             )
         super().edout(*args, **kwargs)
 
-    @wraps(Commands.edpl)
+    @wraps(_MapdlCore.edpl)
     def edpl(self, *args, **kwargs):
         if self.version >= 19.1:
             raise CommandDeprecated(
@@ -1847,7 +1848,7 @@ def edpl(self, *args, **kwargs):
             )
         super().edpl(*args, **kwargs)
 
-    @wraps(Commands.edpvel)
+    @wraps(_MapdlCore.edpvel)
     def edpvel(self, *args, **kwargs):
         if self.version >= 19.1:
             raise CommandDeprecated(
@@ -1855,7 +1856,7 @@ def edpvel(self, *args, **kwargs):
             )
         super().edpvel(*args, **kwargs)
 
-    @wraps(Commands.edrc)
+    @wraps(_MapdlCore.edrc)
     def edrc(self, *args, **kwargs):
         if self.version >= 19.1:
             raise CommandDeprecated(
@@ -1863,7 +1864,7 @@ def edrc(self, *args, **kwargs):
             )
         super().edrc(*args, **kwargs)
 
-    @wraps(Commands.edrd)
+    @wraps(_MapdlCore.edrd)
     def edrd(self, *args, **kwargs):
         if self.version >= 19.1:
             raise CommandDeprecated(
@@ -1871,7 +1872,7 @@ def edrd(self, *args, **kwargs):
             )
         super().edrd(*args, **kwargs)
 
-    @wraps(Commands.edri)
+    @wraps(_MapdlCore.edri)
     def edri(self, *args, **kwargs):
         if self.version >= 19.1:
             raise CommandDeprecated(
@@ -1879,7 +1880,7 @@ def edri(self, *args, **kwargs):
             )
         super().edri(*args, **kwargs)
 
-    @wraps(Commands.edrst)
+    @wraps(_MapdlCore.edrst)
     def edrst(self, *args, **kwargs):
         if self.version >= 19.1:
             raise CommandDeprecated(
@@ -1887,7 +1888,7 @@ def edrst(self, *args, **kwargs):
             )
         super().edrst(*args, **kwargs)
 
-    @wraps(Commands.edrun)
+    @wraps(_MapdlCore.edrun)
     def edrun(self, *args, **kwargs):
         if self.version >= 19.1:
             raise CommandDeprecated(
@@ -1895,7 +1896,7 @@ def edrun(self, *args, **kwargs):
             )
         super().edrun(*args, **kwargs)
 
-    @wraps(Commands.edshell)
+    @wraps(_MapdlCore.edshell)
     def edshell(self, *args, **kwargs):
         if self.version >= 19.1:
             raise CommandDeprecated(
@@ -1903,7 +1904,7 @@ def edshell(self, *args, **kwargs):
             )
         super().edshell(*args, **kwargs)
 
-    @wraps(Commands.edsolv)
+    @wraps(_MapdlCore.edsolv)
     def edsolv(self, *args, **kwargs):
         if self.version >= 19.1:
             raise CommandDeprecated(
@@ -1911,7 +1912,7 @@ def edsolv(self, *args, **kwargs):
             )
         super().edsolv(*args, **kwargs)
 
-    @wraps(Commands.edstart)
+    @wraps(_MapdlCore.edstart)
     def edstart(self, *args, **kwargs):
         if self.version >= 19.1:
             raise CommandDeprecated(
@@ -1919,7 +1920,7 @@ def edstart(self, *args, **kwargs):
             )
         super().edstart(*args, **kwargs)
 
-    @wraps(Commands.edterm)
+    @wraps(_MapdlCore.edterm)
     def edterm(self, *args, **kwargs):
         if self.version >= 19.1:
             raise CommandDeprecated(
@@ -1927,7 +1928,7 @@ def edterm(self, *args, **kwargs):
             )
         super().edterm(*args, **kwargs)
 
-    @wraps(Commands.edtp)
+    @wraps(_MapdlCore.edtp)
     def edtp(self, *args, **kwargs):
         if self.version >= 19.1:
             raise CommandDeprecated(
@@ -1935,7 +1936,7 @@ def edtp(self, *args, **kwargs):
             )
         super().edtp(*args, **kwargs)
 
-    @wraps(Commands.edvel)
+    @wraps(_MapdlCore.edvel)
     def edvel(self, *args, **kwargs):
         if self.version >= 19.1:
             raise CommandDeprecated(
@@ -1943,7 +1944,7 @@ def edvel(self, *args, **kwargs):
             )
         super().edvel(*args, **kwargs)
 
-    @wraps(Commands.edwrite)
+    @wraps(_MapdlCore.edwrite)
     def edwrite(self, *args, **kwargs):
         if self.version >= 19.1:
             raise CommandDeprecated(
@@ -1951,7 +1952,7 @@ def edwrite(self, *args, **kwargs):
             )
         super().edwrite(*args, **kwargs)
 
-    @wraps(Commands.rexport)
+    @wraps(_MapdlCore.rexport)
     def rexport(self, *args, **kwargs):
         if self.version >= 19.1:
             raise CommandDeprecated(