diff --git a/ContextMenuDataControl.cc b/ContextMenuDataControl.cc
index 582d11c204c4a3f3d2e5d88755cad59b018fb7bc..2432d27c8c0d2007b74b5089341cf2cde061af80 100644
--- a/ContextMenuDataControl.cc
+++ b/ContextMenuDataControl.cc
@@ -43,7 +43,7 @@ void DataControlPlugin::slotContextMenuTarget( ) {
     return;
   
   BaseObjectData* object;
-  if ( ! PluginFunctions::get_object(objectId,object) )
+  if ( ! PluginFunctions::getObject(objectId,object) )
     return;
   
   object->target( targetAction_->isChecked() );
@@ -60,7 +60,7 @@ void DataControlPlugin::slotContextMenuHide( ) {
     return;
   
   BaseObjectData* object;
-  if ( ! PluginFunctions::get_object(objectId,object) )
+  if ( ! PluginFunctions::getObject(objectId,object) )
     return;
   
   object->hide();
@@ -78,7 +78,7 @@ void DataControlPlugin::slotContextMenuSource( ) {
     return;
   
   BaseObjectData* object;
-  if ( ! PluginFunctions::get_object(objectId,object) )
+  if ( ! PluginFunctions::getObject(objectId,object) )
     return;
   
   object->source( sourceAction_->isChecked() );
@@ -91,7 +91,7 @@ void DataControlPlugin::slotUpdateContextMenu( int _objectId) {
     return;
   
   BaseObjectData* object;
-  if ( ! PluginFunctions::get_object(_objectId,object) )
+  if ( ! PluginFunctions::getObject(_objectId,object) )
     return;
   
   sourceAction_->setText( "Source" );
diff --git a/DataControlPluginScripting.cc b/DataControlPluginScripting.cc
index 2d8e39b56e860241af8b626da91aea0825efd9d9..9dbd46631750a7c7952c515ccf700e89394dccc4 100644
--- a/DataControlPluginScripting.cc
+++ b/DataControlPluginScripting.cc
@@ -76,7 +76,7 @@ int DataControlPlugin::getObject( QString _name ) {
 QString DataControlPlugin::getObjectName( int objectId ) {
   
   BaseObjectData* object;
-  if ( ! PluginFunctions::get_object(objectId,object) ) {
+  if ( ! PluginFunctions::getObject(objectId,object) ) {
     emit log(LOGERR,"getObjectName : unable to get object" ); 
     return QString("Unknown Object");
   } else 
@@ -88,7 +88,7 @@ QString DataControlPlugin::getObjectName( int objectId ) {
 void DataControlPlugin::hideObject( int objectId ) {
   
   BaseObjectData* object;
-  if ( ! PluginFunctions::get_object(objectId,object) ) 
+  if ( ! PluginFunctions::getObject(objectId,object) ) 
     return;
   
   if ( object == 0)
@@ -101,7 +101,7 @@ void DataControlPlugin::hideObject( int objectId ) {
 void DataControlPlugin::showObject( int objectId ) {
   
   BaseObjectData* object;
-  if ( ! PluginFunctions::get_object(objectId,object) ) 
+  if ( ! PluginFunctions::getObject(objectId,object) ) 
     return;
   
   if ( object == 0)
@@ -117,7 +117,7 @@ void DataControlPlugin::groupObjects(idList _objectIDs, QString _groupName) {
 
   for (uint i=0; i < _objectIDs.size(); i++){
     BaseObject* obj;
-    if ( PluginFunctions::get_object(_objectIDs[i],obj) )
+    if ( PluginFunctions::getObject(_objectIDs[i],obj) )
       objs.push_back(obj);
   }
 
diff --git a/TreeModel.cc b/TreeModel.cc
index 9e28a37d6ef7012f4d00c54cde840381b034951b..516ae29cd3f463300fa85931af39047d1b6138f4 100644
--- a/TreeModel.cc
+++ b/TreeModel.cc
@@ -697,7 +697,7 @@ bool TreeModel::dropMimeData(const QMimeData *data,
       for (int i = 0; i < ids.count(); i++){
  
         BaseObject* item = 0;
-        if (PluginFunctions::get_object(ids[i], item)){
+        if (PluginFunctions::getObject(ids[i], item)){
     
           item->parent()->removeChild(item);