diff --git a/src/App/Extension.h b/src/App/Extension.h
index 67d729955e..2029ca2f4a 100644
--- a/src/App/Extension.h
+++ b/src/App/Extension.h
@@ -175,12 +175,12 @@ public:
     ExtensionPythonT() {
         ExtensionT::m_isPythonExtension = true;
         
-        ADD_PROPERTY(Proxy,(Py::Object()));
+        ADD_PROPERTY(ExtensionProxy,(Py::Object()));
     }
     virtual ~ExtensionPythonT() {
     }
 
-    PropertyPythonObject Proxy;
+    PropertyPythonObject ExtensionProxy;
 };
 
 typedef ExtensionPythonT<App::Extension> ExtensionPython;
@@ -190,7 +190,7 @@ typedef ExtensionPythonT<App::Extension> ExtensionPython;
     Base::PyGILStateLocker lock;\
     Py::Object result;\
     try {\
-        Property* proxy = this->getPropertyByName("Proxy");\
+        Property* proxy = this->getPropertyByName("ExtensionProxy");\
         if (proxy && proxy->getTypeId() == PropertyPythonObject::getClassTypeId()) {\
             Py::Object feature = static_cast<PropertyPythonObject*>(proxy)->getValue();\
             if (feature.hasAttr(std::string("function"))) {\
diff --git a/src/App/ExtensionContainerPyImp.cpp b/src/App/ExtensionContainerPyImp.cpp
index 1c800fe141..233fec71f6 100644
--- a/src/App/ExtensionContainerPyImp.cpp
+++ b/src/App/ExtensionContainerPyImp.cpp
@@ -152,7 +152,7 @@ PyObject* ExtensionContainerPy::addExtension(PyObject *args) {
     ext->initExtension(getExtensionContainerPtr());
     
     //set the proxy to allow python overrides
-    App::Property* pp = ext->getPropertyByName("Proxy");
+    App::Property* pp = ext->getPropertyByName("ExtensionProxy");
     if(!pp) {
         std::stringstream str;
         str << "Accessing the proxy property failed!" << std::ends;