diff --git a/src/adaptors/UBSvgSubsetAdaptor.cpp b/src/adaptors/UBSvgSubsetAdaptor.cpp
index 0515fd54..516e9827 100644
--- a/src/adaptors/UBSvgSubsetAdaptor.cpp
+++ b/src/adaptors/UBSvgSubsetAdaptor.cpp
@@ -29,7 +29,7 @@
 #include "domain/UBAbstractWidget.h"
 #include "domain/UBGraphicsStroke.h"
 #include "domain/UBGraphicsStrokesGroup.h"
-#include "domain/ubgraphicsgroupcontaineritem.h"
+#include "domain/UBGraphicsGroupContainerItem.h"
 #include "domain/UBItem.h"
 
 #include "tools/UBGraphicsRuler.h"
diff --git a/src/board/UBBoardController.cpp b/src/board/UBBoardController.cpp
index 85872574..b94fbc16 100644
--- a/src/board/UBBoardController.cpp
+++ b/src/board/UBBoardController.cpp
@@ -49,7 +49,7 @@
 #include "domain/UBW3CWidget.h"
 #include "domain/UBGraphicsTextItem.h"
 #include "domain/UBPageSizeUndoCommand.h"
-#include "domain/ubgraphicsgroupcontaineritem.h"
+#include "domain/UBGraphicsGroupContainerItem.h"
 
 #include "tools/UBToolsManager.h"
 
diff --git a/src/board/UBBoardView.cpp b/src/board/UBBoardView.cpp
index 4f8eddab..2185125d 100644
--- a/src/board/UBBoardView.cpp
+++ b/src/board/UBBoardView.cpp
@@ -49,7 +49,7 @@
 #include "domain/UBItem.h"
 #include "domain/UBGraphicsMediaItem.h"
 #include "domain/UBGraphicsSvgItem.h"
-#include "domain/ubgraphicsgroupcontaineritem.h"
+#include "domain/UBGraphicsGroupContainerItem.h"
 #include "domain/UBGraphicsStrokesGroup.h"
 
 #include "document/UBDocumentProxy.h"
diff --git a/src/domain/ubgraphicsgroupcontaineritem.cpp b/src/domain/UBGraphicsGroupContainerItem.cpp
similarity index 98%
rename from src/domain/ubgraphicsgroupcontaineritem.cpp
rename to src/domain/UBGraphicsGroupContainerItem.cpp
index cea31fb9..a342d848 100644
--- a/src/domain/ubgraphicsgroupcontaineritem.cpp
+++ b/src/domain/UBGraphicsGroupContainerItem.cpp
@@ -1,11 +1,11 @@
-#include "ubgraphicsgroupcontaineritem.h"
+#include "UBGraphicsGroupContainerItem.h"
 
 #include <QtGui>
 
 #include "UBGraphicsMediaItem.h"
 #include "UBGraphicsTextItem.h"
 #include "domain/UBGraphicsItemDelegate.h"
-#include "domain/ubgraphicsgroupcontaineritemdelegate.h"
+#include "domain/UBGraphicsGroupContainerItemDelegate.h"
 #include "domain/UBGraphicsScene.h"
 
 #include "core/memcheck.h"
diff --git a/src/domain/ubgraphicsgroupcontaineritem.h b/src/domain/UBGraphicsGroupContainerItem.h
similarity index 100%
rename from src/domain/ubgraphicsgroupcontaineritem.h
rename to src/domain/UBGraphicsGroupContainerItem.h
diff --git a/src/domain/ubgraphicsgroupcontaineritemdelegate.cpp b/src/domain/UBGraphicsGroupContainerItemDelegate.cpp
similarity index 95%
rename from src/domain/ubgraphicsgroupcontaineritemdelegate.cpp
rename to src/domain/UBGraphicsGroupContainerItemDelegate.cpp
index 48f1270f..a78749f1 100644
--- a/src/domain/ubgraphicsgroupcontaineritemdelegate.cpp
+++ b/src/domain/UBGraphicsGroupContainerItemDelegate.cpp
@@ -1,4 +1,4 @@
-#include "ubgraphicsgroupcontaineritemdelegate.h"
+#include "UBGraphicsGroupContainerItemDelegate.h"
 
 #include <QtGui>
 
@@ -6,7 +6,7 @@
 #include "gui/UBResources.h"
 
 #include "domain/UBGraphicsDelegateFrame.h"
-#include "domain/ubgraphicsgroupcontaineritem.h"
+#include "domain/UBGraphicsGroupContainerItem.h"
 
 #include "board/UBBoardController.h"
 
diff --git a/src/domain/ubgraphicsgroupcontaineritemdelegate.h b/src/domain/UBGraphicsGroupContainerItemDelegate.h
similarity index 100%
rename from src/domain/ubgraphicsgroupcontaineritemdelegate.h
rename to src/domain/UBGraphicsGroupContainerItemDelegate.h
diff --git a/src/domain/UBGraphicsItemDelegate.cpp b/src/domain/UBGraphicsItemDelegate.cpp
index bbc13a99..d1759d3f 100644
--- a/src/domain/UBGraphicsItemDelegate.cpp
+++ b/src/domain/UBGraphicsItemDelegate.cpp
@@ -40,7 +40,7 @@
 #include "domain/UBAbstractWidget.h"
 #include "domain/UBGraphicsTextItem.h"
 #include "domain/UBGraphicsMediaItem.h"
-#include "domain/ubgraphicsgroupcontaineritem.h"
+#include "domain/UBGraphicsGroupContainerItem.h"
 
 #include "web/UBWebController.h"
 
diff --git a/src/domain/UBGraphicsMediaItem.cpp b/src/domain/UBGraphicsMediaItem.cpp
index da60415a..8a25a217 100644
--- a/src/domain/UBGraphicsMediaItem.cpp
+++ b/src/domain/UBGraphicsMediaItem.cpp
@@ -13,7 +13,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "ubgraphicsgroupcontaineritem.h"
+#include "UBGraphicsGroupContainerItem.h"
 #include "UBGraphicsMediaItem.h"
 #include "UBGraphicsMediaItemDelegate.h"
 #include "UBGraphicsScene.h"
diff --git a/src/domain/UBGraphicsScene.cpp b/src/domain/UBGraphicsScene.cpp
index 61f6ccee..f958f4ef 100644
--- a/src/domain/UBGraphicsScene.cpp
+++ b/src/domain/UBGraphicsScene.cpp
@@ -56,7 +56,7 @@
 #include "UBGraphicsTextItem.h"
 #include "UBGraphicsStrokesGroup.h"
 
-#include "domain/ubgraphicsgroupcontaineritem.h"
+#include "domain/UBGraphicsGroupContainerItem.h"
 
 #include "UBAppleWidget.h"
 #include "UBW3CWidget.h"
diff --git a/src/domain/UBGraphicsTextItem.cpp b/src/domain/UBGraphicsTextItem.cpp
index c0450aa8..16328d3e 100644
--- a/src/domain/UBGraphicsTextItem.cpp
+++ b/src/domain/UBGraphicsTextItem.cpp
@@ -14,7 +14,7 @@
  */
 
 #include <QtGui>
-#include "ubgraphicsgroupcontaineritem.h"
+#include "UBGraphicsGroupContainerItem.h"
 #include "UBGraphicsTextItem.h"
 #include "UBGraphicsTextItemDelegate.h"
 #include "UBGraphicsScene.h"
diff --git a/src/domain/UBGraphicsTextItemDelegate.cpp b/src/domain/UBGraphicsTextItemDelegate.cpp
index d5f3a36c..ce47c04c 100644
--- a/src/domain/UBGraphicsTextItemDelegate.cpp
+++ b/src/domain/UBGraphicsTextItemDelegate.cpp
@@ -17,7 +17,7 @@
 #include <QtSvg>
 
 #include "core/UBApplication.h"
-#include "ubgraphicsgroupcontaineritem.h"
+#include "UBGraphicsGroupContainerItem.h"
 #include "UBGraphicsTextItemDelegate.h"
 #include "UBGraphicsScene.h"
 #include "gui/UBResources.h"
diff --git a/src/domain/domain.pri b/src/domain/domain.pri
index 4028dfed..96dbe679 100644
--- a/src/domain/domain.pri
+++ b/src/domain/domain.pri
@@ -21,8 +21,8 @@ HEADERS      += src/domain/UBGraphicsScene.h \
     src/domain/UBGraphicsMediaItem.h \
     src/domain/UBAbstractUndoCommand.h\
     src/domain/UBAngleWidget.h \
-    src/domain/ubgraphicsgroupcontaineritem.h \
-    src/domain/ubgraphicsgroupcontaineritemdelegate.h \
+    src/domain/UBGraphicsGroupContainerItem.h \
+    src/domain/UBGraphicsGroupContainerItemDelegate.h \
     src/domain/UBGraphicsStrokesGroup.h
                 
 HEADERS      += src/domain/UBGraphicsItemDelegate.h \