diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index be0bc110..935e1a6a 100644
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -1038,7 +1038,7 @@ void MainWindow::updatePreferences()
 //******************************************************************
 
 //** Db Tree Context Menu
-void MainWindow::on_tree_context_menu(const QPoint &qPoint)
+void MainWindow::createTreeContextMenu(const QPoint &qPoint)
 {
     if(!ui->dbTreeWidget->selectionModel()->hasSelection())
         return;
@@ -1051,7 +1051,7 @@ void MainWindow::on_tree_context_menu(const QPoint &qPoint)
         popupFieldMenu->exec(ui->dbTreeWidget->mapToGlobal(qPoint));
 }
 //** Tree selection changed
-void MainWindow::on_tree_selection_changed()
+void MainWindow::changeTreeSelection()
 {
     // Just assume first that something's selected that can not be edited at all
     ui->editDeleteObjectAction->setEnabled(false);
@@ -1088,7 +1088,7 @@ void MainWindow::on_tree_selection_changed()
     }
 }
 
-void MainWindow::on_add_field(){
+void MainWindow::addField(){
     //if( !dbTreeWidget->currentItem() ){
     //   return;
     //}
@@ -1099,7 +1099,7 @@ void MainWindow::on_add_field(){
         populateStructure();
 }
 
-void MainWindow::on_edit_field(){
+void MainWindow::editField(){
     if(!ui->dbTreeWidget->currentItem())
         return;
 
@@ -1115,7 +1115,7 @@ void MainWindow::on_edit_field(){
     }*/
 }
 
-void MainWindow::on_delete_field(){
+void MainWindow::deleteField(){
     if(!ui->dbTreeWidget->currentItem())
         return;
 
diff --git a/src/MainWindow.h b/src/MainWindow.h
index c76f0c0e..02ee0815 100644
--- a/src/MainWindow.h
+++ b/src/MainWindow.h
@@ -62,12 +62,11 @@ protected:
     void closeEvent(QCloseEvent *);
 
 public slots:
-    virtual void on_tree_context_menu(const QPoint & qPoint);
-    virtual void on_tree_selection_changed();
-    virtual void on_add_field();
-    virtual void on_edit_field();
-    virtual void on_delete_field();
-
+    virtual void createTreeContextMenu(const QPoint & qPoint);
+    virtual void changeTreeSelection();
+    virtual void addField();
+    virtual void editField();
+    virtual void deleteField();
     virtual void fileOpen( const QString & fileName );
     virtual void fileOpen();
     virtual void fileNew();
diff --git a/src/MainWindow.ui b/src/MainWindow.ui
index 82312e17..26c14736 100644
--- a/src/MainWindow.ui
+++ b/src/MainWindow.ui
@@ -1859,7 +1859,7 @@
    <sender>editAddFieldActionPopup</sender>
    <signal>activated()</signal>
    <receiver>MainWindow</receiver>
-   <slot>on_add_field()</slot>
+   <slot>addField()</slot>
    <hints>
     <hint type="sourcelabel">
      <x>-1</x>
@@ -1923,7 +1923,7 @@
    <sender>dbTreeWidget</sender>
    <signal>customContextMenuRequested(QPoint)</signal>
    <receiver>MainWindow</receiver>
-   <slot>on_tree_context_menu(QPoint)</slot>
+   <slot>createTreeContextMenu(QPoint)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>399</x>
@@ -1939,7 +1939,7 @@
    <sender>dbTreeWidget</sender>
    <signal>itemSelectionChanged()</signal>
    <receiver>MainWindow</receiver>
-   <slot>on_tree_selection_changed()</slot>
+   <slot>changeTreeSelection()</slot>
    <hints>
     <hint type="sourcelabel">
      <x>399</x>
@@ -1987,7 +1987,7 @@
    <sender>editModifyFieldActionPopup</sender>
    <signal>activated()</signal>
    <receiver>MainWindow</receiver>
-   <slot>on_edit_field()</slot>
+   <slot>editField()</slot>
    <hints>
     <hint type="sourcelabel">
      <x>-1</x>
@@ -2035,7 +2035,7 @@
    <sender>editDeleteFieldActionPopup</sender>
    <signal>activated()</signal>
    <receiver>MainWindow</receiver>
-   <slot>on_delete_field()</slot>
+   <slot>deleteField()</slot>
    <hints>
     <hint type="sourcelabel">
      <x>-1</x>
@@ -2109,16 +2109,16 @@
   <slot>deleteObject()</slot>
   <slot>editTable()</slot>
   <slot>editTablePopup()</slot>
-  <slot>on_add_field()</slot>
-  <slot>on_edit_field()</slot>
+  <slot>addField()</slot>
+  <slot>editField()</slot>
   <slot>exportDatabaseToSQL()</slot>
   <slot>importDatabaseFromSQL()</slot>
   <slot>openPreferences()</slot>
-  <slot>on_tree_context_menu(QPoint)</slot>
-  <slot>on_tree_selection_changed()</slot>
+  <slot>createTreeContextMenu(QPoint)</slot>
+  <slot>changeTreeSelection()</slot>
   <slot>fileNew()</slot>
   <slot>helpAbout()</slot>
-  <slot>on_delete_field()</slot>
+  <slot>deleteField()</slot>
   <slot>loadPragmas()</slot>
   <slot>savePragmas()</slot>
  </slots>