diff --git a/ContextMenuDataControl.cc b/ContextMenuDataControl.cc
index b878f5fca5e6fa81ff8614b8c457dbae9c77fe35..582d11c204c4a3f3d2e5d88755cad59b018fb7bc 100644
--- a/ContextMenuDataControl.cc
+++ b/ContextMenuDataControl.cc
@@ -49,7 +49,7 @@ void DataControlPlugin::slotContextMenuTarget( ) {
   object->target( targetAction_->isChecked() );
   
   emit activeObjectChanged();
-  emit updated_objects(objectId);
+  emit updatedObject(objectId);
 }
 
 void DataControlPlugin::slotContextMenuHide( ) {
@@ -65,8 +65,8 @@ void DataControlPlugin::slotContextMenuHide( ) {
   
   object->hide();
   
-  emit update_view();
-  emit updated_objects(objectId);
+  emit updateView();
+  emit updatedObject(objectId);
 }
 
 
@@ -83,7 +83,7 @@ void DataControlPlugin::slotContextMenuSource( ) {
   
   object->source( sourceAction_->isChecked() );
   
-  emit updated_objects(objectId);
+  emit updatedObject(objectId);
 }
 
 void DataControlPlugin::slotUpdateContextMenu( int _objectId) {
diff --git a/DataControlPlugin.cc b/DataControlPlugin.cc
index b303e07a972c8855b70623ca57a0811ae6771414..c42f021ccbbc6ff788fa410bde208041e81a00be 100644
--- a/DataControlPlugin.cc
+++ b/DataControlPlugin.cc
@@ -214,7 +214,7 @@ void DataControlPlugin::update_active( ) {
       }
   }
 
-  emit update_view();
+  emit updateView();
 }
 
 void DataControlPlugin::slotKeyEvent( QKeyEvent* _event )
@@ -259,7 +259,7 @@ void DataControlPlugin::slotKeyEvent( QKeyEvent* _event )
 //                for ( uint i = 0 ; i < data_->size() ; ++i ) {
 //                   (*data_)[i]->source(false);
 //                }
-//                emit updated_objects(-1);
+//                emit updatedObject(-1);
 //               return;
 //           }
 //
@@ -267,7 +267,7 @@ void DataControlPlugin::slotKeyEvent( QKeyEvent* _event )
 //              for ( uint i = 0 ; i < data_->size() ; ++i ) {
 //                 (*data_)[i]->target(false);
 //               }
-//               emit updated_objects(-1);
+//               emit updatedObject(-1);
 //              return;
 //           }
 //
@@ -278,7 +278,7 @@ void DataControlPlugin::slotKeyEvent( QKeyEvent* _event )
 //                for ( uint i = 0 ; i < data_->size() ; ++i ) {
 //                   (*data_)[i]->source(true);
 //                }
-//                emit updated_objects(-1);
+//                emit updatedObject(-1);
 //               return;
 //           }
 //
@@ -286,7 +286,7 @@ void DataControlPlugin::slotKeyEvent( QKeyEvent* _event )
 //              for ( uint i = 0 ; i < data_->size() ; ++i ) {
 //                 (*data_)[i]->target(true);
 //               }
-//               emit updated_objects(-1);
+//               emit updatedObject(-1);
 //              return;
 //           }
 //
@@ -320,14 +320,14 @@ void DataControlPlugin::setAllTarget() {
                                     o_it != PluginFunctions::objects_end(); ++o_it)
   o_it->target(true);
   emit activeObjectChanged();
-  emit updated_objects(-1);
+  emit updatedObject(-1);
 }
 
 void DataControlPlugin::setAllSource() {
   for ( PluginFunctions::ObjectIterator o_it(PluginFunctions::ALL_OBJECTS) ;
                                     o_it != PluginFunctions::objects_end(); ++o_it)
   o_it->source(true);
-  emit updated_objects(-1);
+  emit updatedObject(-1);
 }
 
 void DataControlPlugin::clearAllTarget() {
@@ -335,28 +335,28 @@ void DataControlPlugin::clearAllTarget() {
                                     o_it != PluginFunctions::objects_end(); ++o_it)
   o_it->target(false);
   emit activeObjectChanged();
-  emit updated_objects(-1);
+  emit updatedObject(-1);
 }
 
 void DataControlPlugin::clearAllSource() {
   for ( PluginFunctions::ObjectIterator o_it(PluginFunctions::ALL_OBJECTS) ;
                                     o_it != PluginFunctions::objects_end(); ++o_it)
   o_it->source(false);
-  emit updated_objects(-1);
+  emit updatedObject(-1);
 }
 
 void DataControlPlugin::hideAll() {
   for ( PluginFunctions::ObjectIterator o_it(PluginFunctions::ALL_OBJECTS) ;
                                     o_it != PluginFunctions::objects_end(); ++o_it)
     o_it->hide();
-  emit update_view();
+  emit updateView();
 }
 
 void DataControlPlugin::showAll() {
   for ( PluginFunctions::ObjectIterator o_it(PluginFunctions::ALL_OBJECTS) ;
                                     o_it != PluginFunctions::objects_end(); ++o_it)
     o_it->show();
-  emit update_view();
+  emit updateView();
 }
 
 void DataControlPlugin::slotDataChanged ( const QModelIndex & topLeft,
@@ -371,7 +371,7 @@ void DataControlPlugin::slotDataChanged ( const QModelIndex & topLeft,
 
     // show/hide
     case 1:
-        emit update_view();
+        emit updateView();
       break;
 
     // source
@@ -390,7 +390,7 @@ void DataControlPlugin::slotDataChanged ( const QModelIndex & topLeft,
 
 void DataControlPlugin::slotRowsRemoved ( const QModelIndex & /*_parent*/, int /*_start*/, int /*_end*/ ) {
   std::cerr << "Row removed! " << std::endl;
-  emit update_view();
+  emit updateView();
 }
 
 void DataControlPlugin::loadIniFileOptions( INIFile& _ini ) {
@@ -455,7 +455,7 @@ void DataControlPlugin::loadIniFileOptions( INIFile& _ini ) {
     }
   }
 
-  emit updated_objects(-1);
+  emit updatedObject(-1);
 }
 
 void DataControlPlugin::saveIniFileOptions( INIFile& _ini ) {
diff --git a/DataControlPlugin.hh b/DataControlPlugin.hh
index bda7eb78140839014732167cd2a99dc8985bc5f0..a99e0641e3d823457c855aea258e0d98b38d60cd 100644
--- a/DataControlPlugin.hh
+++ b/DataControlPlugin.hh
@@ -72,10 +72,10 @@ class DataControlPlugin : public QObject, BaseInterface, ToolboxInterface, Globa
 
   signals:
     /// Force Examiner widget to update their views
-    void update_view();
+    void updateView();
 
     /// Emit this Signal, if object list has changed (e.g. Source or Target changed)
-    void updated_objects(int);
+    void updatedObject(int);
 
     void activeObjectChanged();
 
@@ -110,7 +110,7 @@ class DataControlPlugin : public QObject, BaseInterface, ToolboxInterface, Globa
       *   Creates Table and buttons */
      bool initializeToolbox(QWidget*& _widget);
 
-     /// Sets examiner Widget (dummy here, using update_view signal here)
+     /// Sets examiner Widget (dummy here, using updateView signal here)
      void set_examiner(ACG::QtWidgets::QtExaminerViewer*  /* _examiner_widget */ ) { };
 
      /// Name of the Plugin
diff --git a/DataControlPluginScripting.cc b/DataControlPluginScripting.cc
index 8b15528334620c41d96161e80d0e3aa0acef10a8..2d8e39b56e860241af8b626da91aea0825efd9d9 100644
--- a/DataControlPluginScripting.cc
+++ b/DataControlPluginScripting.cc
@@ -154,6 +154,6 @@ void DataControlPlugin::groupObjects(idList _objectIDs, QString _groupName) {
     groupItem->appendChild( objs[i] );
   }
   
-  emit updated_objects(-1);
+  emit updatedObject(-1);
 }
 
diff --git a/Popup.cc b/Popup.cc
index 6a2b29264b084cb5f8e4d2a9adbc01199c219e50..9721a27ddce59ba041ed52fc3ed8dd40287af3cc 100644
--- a/Popup.cc
+++ b/Popup.cc
@@ -87,8 +87,8 @@ void DataControlPlugin::slotPopupRemove (  ) {
     delete deleteItem;
   }
 
-  emit update_view();
-  emit updated_objects(-1);
+  emit updateView();
+  emit updatedObject(-1);
 }
 
 /// Slot for Ungroup action in ContextMenu
@@ -110,7 +110,7 @@ void DataControlPlugin::slotUngroup (  ) {
 
   delete group;
 
-  emit updated_objects(-1);
+  emit updatedObject(-1);
 }
 
 /// Slot for Copy action in ContextMenu
@@ -132,10 +132,10 @@ void DataControlPlugin::slotCopy (  ) {
       continue;
     }
 
-    emit updated_objects(copyItem->id());
+    emit updatedObject(copyItem->id());
   }
 
-  emit update_view();
+  emit updateView();
 }
 
 /// Slot for Group action in ContextMenu
@@ -172,7 +172,7 @@ void DataControlPlugin::slotGroup (  ) {
     groupItem->appendChild(item);
   }
 
-  emit updated_objects(-1);
+  emit updatedObject(-1);
 }
 
 /// ContextMenu requested - creates the contextMenu
@@ -324,7 +324,7 @@ void DataControlPlugin::slotMaterialProperties(){
 
 ///Called when the material properties were changed inside the material dialog
 void DataControlPlugin::slotNodeChanged( ACG::SceneGraph::BaseNode* /*_node*/ ){
-  emit update_view();
+  emit updateView();
 }
 
 void DataControlPlugin::slotZoomTo(){