diff --git a/build_num b/build_num
index 5af416c2b..742c427bf 100644
--- a/build_num
+++ b/build_num
@@ -1 +1 @@
-#define BUILD_NUM 1548
+#define BUILD_NUM 1551
diff --git a/src/gui/AddressRangeDialog.h b/src/gui/AddressRangeDialog.h
index 35ad7b5da..8213bc1d1 100644
--- a/src/gui/AddressRangeDialog.h
+++ b/src/gui/AddressRangeDialog.h
@@ -29,7 +29,7 @@
 
 #include "../../config.h"
 #include <ui_addressrangedialog_q.h>
-#include "BaseObjectdialog.h"
+#include "BaseObjectDialog.h"
 #include <QWidget>
 
 #include "fwbuilder/FWObject.h"
diff --git a/src/gui/AddressTableDialog.h b/src/gui/AddressTableDialog.h
index fcc716f28..d94522ea4 100644
--- a/src/gui/AddressTableDialog.h
+++ b/src/gui/AddressTableDialog.h
@@ -29,7 +29,7 @@
 
 #include "../../config.h"
 #include <ui_addresstabledialog_q.h>
-#include "BaseObjectdialog.h"
+#include "BaseObjectDialog.h"
 #include <QWidget>
 
 #include "fwbuilder/FWObject.h"
diff --git a/src/gui/ClusterDialog.h b/src/gui/ClusterDialog.h
index 683b4ac39..880fdf809 100644
--- a/src/gui/ClusterDialog.h
+++ b/src/gui/ClusterDialog.h
@@ -19,7 +19,7 @@
 
 #include "../../config.h"
 #include <ui_clusterdialog_q.h>
-#include "BaseObjectdialog.h"
+#include "BaseObjectDialog.h"
 #include <QWidget>
 
 #include "utils.h"
diff --git a/src/gui/ClusterGroupDialog.h b/src/gui/ClusterGroupDialog.h
index 28bfe2d7f..427b99f01 100644
--- a/src/gui/ClusterGroupDialog.h
+++ b/src/gui/ClusterGroupDialog.h
@@ -19,7 +19,7 @@
 
 #include "../../config.h"
 #include <ui_clustergroupdialog_q.h>
-#include "BaseObjectdialog.h"
+#include "BaseObjectDialog.h"
 
 #include "fwbuilder/FWObject.h"
 
diff --git a/src/gui/CustomServiceDialog.h b/src/gui/CustomServiceDialog.h
index e276fa2b3..a35492c1d 100644
--- a/src/gui/CustomServiceDialog.h
+++ b/src/gui/CustomServiceDialog.h
@@ -29,7 +29,7 @@
 
 #include "../../config.h"
 #include <ui_customservicedialog_q.h>
-#include "BaseObjectdialog.h"
+#include "BaseObjectDialog.h"
 #include <QWidget>
 
 #include <qstring.h>
diff --git a/src/gui/DNSNameDialog.h b/src/gui/DNSNameDialog.h
index 3a8158eda..b5b8b64dd 100644
--- a/src/gui/DNSNameDialog.h
+++ b/src/gui/DNSNameDialog.h
@@ -29,7 +29,7 @@
 
 #include "../../config.h"
 #include <ui_dnsnamedialog_q.h>
-#include "BaseObjectdialog.h"
+#include "BaseObjectDialog.h"
 #include <QWidget>
 
 #include "fwbuilder/FWObject.h"
diff --git a/src/gui/FirewallDialog.h b/src/gui/FirewallDialog.h
index 7ffa2c7d2..070a974a2 100644
--- a/src/gui/FirewallDialog.h
+++ b/src/gui/FirewallDialog.h
@@ -29,7 +29,7 @@
 
 #include "../../config.h"
 #include <ui_firewalldialog_q.h>
-#include "BaseObjectdialog.h"
+#include "BaseObjectDialog.h"
 #include <QWidget>
 
 #include "fwbuilder/FWObject.h"
diff --git a/src/gui/GroupObjectDialog.h b/src/gui/GroupObjectDialog.h
index a6d21dfda..3b7acb11b 100644
--- a/src/gui/GroupObjectDialog.h
+++ b/src/gui/GroupObjectDialog.h
@@ -36,7 +36,7 @@
 #include "fwbuilder/FWObject.h"
 #include "ObjectListView.h"
 #include "ObjectIconView.h"
-#include "BaseObjectdialog.h"
+#include "BaseObjectDialog.h"
 #include <QWidget>
 
 class ObjectIconViewItem;
diff --git a/src/gui/HostDialog.h b/src/gui/HostDialog.h
index c30fa9f9b..dcfe97e34 100644
--- a/src/gui/HostDialog.h
+++ b/src/gui/HostDialog.h
@@ -29,7 +29,7 @@
 
 #include "../../config.h"
 #include <ui_hostdialog_q.h>
-#include "BaseObjectdialog.h"
+#include "BaseObjectDialog.h"
 #include <QWidget>
 
 #include "fwbuilder/FWObject.h"
diff --git a/src/gui/ICMPServiceDialog.h b/src/gui/ICMPServiceDialog.h
index b020c46a3..b9a908852 100644
--- a/src/gui/ICMPServiceDialog.h
+++ b/src/gui/ICMPServiceDialog.h
@@ -29,7 +29,7 @@
 
 #include "../../config.h"
 #include <ui_icmpservicedialog_q.h>
-#include "BaseObjectdialog.h"
+#include "BaseObjectDialog.h"
 #include <QWidget>
 
 #include "fwbuilder/FWObject.h"
diff --git a/src/gui/IPServiceDialog.h b/src/gui/IPServiceDialog.h
index bb483de64..7a41e9158 100644
--- a/src/gui/IPServiceDialog.h
+++ b/src/gui/IPServiceDialog.h
@@ -30,7 +30,7 @@
 #include "../../config.h"
 
 #include <ui_ipservicedialog_q.h>
-#include "BaseObjectdialog.h"
+#include "BaseObjectDialog.h"
 #include <QWidget>
 
 #include "fwbuilder/FWObject.h"
diff --git a/src/gui/IPv4Dialog.h b/src/gui/IPv4Dialog.h
index de28b2471..b4506e263 100644
--- a/src/gui/IPv4Dialog.h
+++ b/src/gui/IPv4Dialog.h
@@ -29,7 +29,7 @@
 
 #include "../../config.h"
 #include <ui_ipv4dialog_q.h>
-#include "BaseObjectdialog.h"
+#include "BaseObjectDialog.h"
 #include <QWidget>
 
 #include "fwbuilder/FWObject.h"
diff --git a/src/gui/IPv6Dialog.h b/src/gui/IPv6Dialog.h
index e29eb6dc2..9a0d292a5 100644
--- a/src/gui/IPv6Dialog.h
+++ b/src/gui/IPv6Dialog.h
@@ -29,7 +29,7 @@
 
 #include "../../config.h"
 #include <ui_ipv6dialog_q.h>
-#include "BaseObjectdialog.h"
+#include "BaseObjectDialog.h"
 #include <QWidget>
 
 #include "fwbuilder/FWObject.h"
diff --git a/src/gui/InterfaceDialog.h b/src/gui/InterfaceDialog.h
index 3216b5cac..fa4aaebfb 100644
--- a/src/gui/InterfaceDialog.h
+++ b/src/gui/InterfaceDialog.h
@@ -29,7 +29,7 @@
 
 #include "../../config.h"
 #include <ui_interfacedialog_q.h>
-#include "BaseObjectdialog.h"
+#include "BaseObjectDialog.h"
 #include <QWidget>
 
 #include "fwbuilder/FWObject.h"
diff --git a/src/gui/LibraryDialog.h b/src/gui/LibraryDialog.h
index 0526777cb..9cede4229 100644
--- a/src/gui/LibraryDialog.h
+++ b/src/gui/LibraryDialog.h
@@ -29,7 +29,7 @@
 
 #include "../../config.h"
 #include <ui_librarydialog_q.h>
-#include "BaseObjectdialog.h"
+#include "BaseObjectDialog.h"
 #include <QWidget>
 
 #include "fwbuilder/FWObject.h"
diff --git a/src/gui/NATRuleOptionsDialog.h b/src/gui/NATRuleOptionsDialog.h
index b72f72616..a005e67b0 100644
--- a/src/gui/NATRuleOptionsDialog.h
+++ b/src/gui/NATRuleOptionsDialog.h
@@ -27,7 +27,7 @@
 
 #include "../../config.h"
 #include <ui_natruleoptionsdialog_q.h>
-#include "BaseObjectdialog.h"
+#include "BaseObjectDialog.h"
 #include <QWidget>
 
 #include "DialogData.h"
diff --git a/src/gui/NetworkDialog.h b/src/gui/NetworkDialog.h
index ef3e744d3..75e91d4eb 100644
--- a/src/gui/NetworkDialog.h
+++ b/src/gui/NetworkDialog.h
@@ -29,7 +29,7 @@
 
 #include "../../config.h"
 #include <ui_networkdialog_q.h>
-#include "BaseObjectdialog.h"
+#include "BaseObjectDialog.h"
 #include <QWidget>
 
 #include "fwbuilder/FWObject.h"
diff --git a/src/gui/NetworkDialogIPv6.h b/src/gui/NetworkDialogIPv6.h
index 0f53f21cb..b1b2768b5 100644
--- a/src/gui/NetworkDialogIPv6.h
+++ b/src/gui/NetworkDialogIPv6.h
@@ -29,7 +29,7 @@
 
 #include "../../config.h"
 #include <ui_networkdialogipv6_q.h>
-#include "BaseObjectdialog.h"
+#include "BaseObjectDialog.h"
 #include <QWidget>
 
 #include "fwbuilder/FWObject.h"
diff --git a/src/gui/ObjectEditor.cpp b/src/gui/ObjectEditor.cpp
index b0c8c1a2b..2e5ab536b 100644
--- a/src/gui/ObjectEditor.cpp
+++ b/src/gui/ObjectEditor.cpp
@@ -40,7 +40,7 @@
 #include <qpushbutton.h>
 
 #include "FWWindow.h"
-#include "BaseObjectdialog.h"
+#include "BaseObjectDialog.h"
 #include "DialogFactory.h"
 #include "FWBTree.h"
 #include "ProjectPanel.h"
diff --git a/src/gui/PhysicalAddressDialog.h b/src/gui/PhysicalAddressDialog.h
index c2907a729..443fbe970 100644
--- a/src/gui/PhysicalAddressDialog.h
+++ b/src/gui/PhysicalAddressDialog.h
@@ -29,7 +29,7 @@
 
 #include "../../config.h"
 #include <ui_physaddressdialog_q.h>
-#include "BaseObjectdialog.h"
+#include "BaseObjectDialog.h"
 #include <QWidget>
 
 #include "fwbuilder/FWObject.h"
diff --git a/src/gui/RoutingRuleOptionsDialog.h b/src/gui/RoutingRuleOptionsDialog.h
index df18bf003..2da76f230 100644
--- a/src/gui/RoutingRuleOptionsDialog.h
+++ b/src/gui/RoutingRuleOptionsDialog.h
@@ -29,7 +29,7 @@
 
 #include "../../config.h"
 #include <ui_routingruleoptionsdialog_q.h>
-#include "BaseObjectdialog.h"
+#include "BaseObjectDialog.h"
 #include <QWidget>
 
 #include "DialogData.h"
diff --git a/src/gui/RuleOptionsDialog.h b/src/gui/RuleOptionsDialog.h
index 91a0951b8..ed07fe1af 100644
--- a/src/gui/RuleOptionsDialog.h
+++ b/src/gui/RuleOptionsDialog.h
@@ -29,7 +29,7 @@
 
 #include "../../config.h"
 #include <ui_ruleoptionsdialog_q.h>
-#include "BaseObjectdialog.h"
+#include "BaseObjectDialog.h"
 #include <QWidget>
 
 #include "DialogData.h"
diff --git a/src/gui/RuleSetDialog.h b/src/gui/RuleSetDialog.h
index b6a581f1f..8fa0ab231 100644
--- a/src/gui/RuleSetDialog.h
+++ b/src/gui/RuleSetDialog.h
@@ -29,7 +29,7 @@
 
 #include "../../config.h"
 #include <ui_rulesetdialog_q.h>
-#include "BaseObjectdialog.h"
+#include "BaseObjectDialog.h"
 #include <QWidget>
 
 #include "fwbuilder/FWObject.h"
diff --git a/src/gui/TCPServiceDialog.h b/src/gui/TCPServiceDialog.h
index 676fa6404..e105406bc 100644
--- a/src/gui/TCPServiceDialog.h
+++ b/src/gui/TCPServiceDialog.h
@@ -29,7 +29,7 @@
 
 #include "../../config.h"
 #include <ui_tcpservicedialog_q.h>
-#include "BaseObjectdialog.h"
+#include "BaseObjectDialog.h"
 #include <QWidget>
 
 #include "fwbuilder/FWObject.h"
diff --git a/src/gui/TagServiceDialog.h b/src/gui/TagServiceDialog.h
index fd1593ac3..b0ea0a586 100644
--- a/src/gui/TagServiceDialog.h
+++ b/src/gui/TagServiceDialog.h
@@ -29,7 +29,7 @@
 
 #include "../../config.h"
 #include <ui_tagservicedialog_q.h>
-#include "BaseObjectdialog.h"
+#include "BaseObjectDialog.h"
 #include <QWidget>
 
 #include "fwbuilder/FWObject.h"
diff --git a/src/gui/TimeDialog.h b/src/gui/TimeDialog.h
index 56d8b6f3a..76d8dd74b 100644
--- a/src/gui/TimeDialog.h
+++ b/src/gui/TimeDialog.h
@@ -29,7 +29,7 @@
 
 #include "../../config.h"
 #include <ui_timedialog_q.h>
-#include "BaseObjectdialog.h"
+#include "BaseObjectDialog.h"
 #include <QWidget>
 
 #include "fwbuilder/FWObject.h"
diff --git a/src/gui/UDPServiceDialog.h b/src/gui/UDPServiceDialog.h
index 24df2c7c8..62cc4f7b6 100644
--- a/src/gui/UDPServiceDialog.h
+++ b/src/gui/UDPServiceDialog.h
@@ -29,7 +29,7 @@
 
 #include "../../config.h"
 #include <ui_udpservicedialog_q.h>
-#include "BaseObjectdialog.h"
+#include "BaseObjectDialog.h"
 #include <QWidget>
 
 #include "fwbuilder/FWObject.h"
diff --git a/src/gui/UserDialog.h b/src/gui/UserDialog.h
index 9e9019835..ff5f990da 100644
--- a/src/gui/UserDialog.h
+++ b/src/gui/UserDialog.h
@@ -29,7 +29,7 @@
 
 #include "../../config.h"
 #include <ui_userdialog_q.h>
-#include "BaseObjectdialog.h"
+#include "BaseObjectDialog.h"
 
 #include <QWidget>