diff --git a/GUI/coregui/Models/GUIObjectBuilder.cpp b/GUI/coregui/Models/GUIObjectBuilder.cpp
index 2f2154e63ee25c6a98f147416bafdc107a08eeb2..79149f338bf81b59c68b9b8d92eb5f1eb7b9ed18 100644
--- a/GUI/coregui/Models/GUIObjectBuilder.cpp
+++ b/GUI/coregui/Models/GUIObjectBuilder.cpp
@@ -649,6 +649,7 @@ void GUIObjectBuilder::visit(const RotationEuler *sample)
     SessionItem *transformation_item = m_sampleModel->insertNewItem(
         Constants::TransformationType, m_sampleModel->indexOfItem(parent),
                 -1, ParticleItem::T_TRANSFORMATION);
+    Q_ASSERT(transformation_item);
     SessionItem *p_rotationItem = transformation_item->setGroupProperty(
                 TransformationItem::P_ROT, Constants::EulerRotationType);
     p_rotationItem->setItemValue(EulerRotationItem::P_ALPHA,
diff --git a/GUI/coregui/Models/ParticleCompositionItem.cpp b/GUI/coregui/Models/ParticleCompositionItem.cpp
index 0b1f764987b1a5b76746dddc23c00f2b23dfb981..335c9258ac194a7d4959687550212c84cc996cb7 100644
--- a/GUI/coregui/Models/ParticleCompositionItem.cpp
+++ b/GUI/coregui/Models/ParticleCompositionItem.cpp
@@ -21,7 +21,6 @@
 #include "ModelPath.h"
 
 const QString ParticleCompositionItem::T_PARTICLES = "Particle Tag";
-const QString ParticleCompositionItem::T_TRANSFORMATION = "Transformation Tag";
 
 ParticleCompositionItem::ParticleCompositionItem()
     : SessionGraphicsItem(Constants::ParticleCompositionType)
@@ -36,7 +35,7 @@ ParticleCompositionItem::ParticleCompositionItem()
     registerTag(T_PARTICLES, 0, -1, QStringList() << Constants::ParticleType <<
                 Constants::ParticleCoreShellType << Constants::ParticleCompositionType);
     setDefaultTag(T_PARTICLES);
-    registerTag(T_TRANSFORMATION, 0, 1, QStringList() << Constants::TransformationType);
+    registerTag(ParticleItem::T_TRANSFORMATION, 0, 1, QStringList() << Constants::TransformationType);
     RotationTranslator rotation_translator;
     ModelPath::addParameterTranslator(rotation_translator);
 
diff --git a/GUI/coregui/Models/ParticleCompositionItem.h b/GUI/coregui/Models/ParticleCompositionItem.h
index 858c1d058de01e51b2dd6fd1f975993c589c3f2e..b5ff22e36d8dad5060976805d56a4ecdfc58b6f5 100644
--- a/GUI/coregui/Models/ParticleCompositionItem.h
+++ b/GUI/coregui/Models/ParticleCompositionItem.h
@@ -27,7 +27,6 @@ class BA_CORE_API_ ParticleCompositionItem : public SessionGraphicsItem
 
 public:
     const static QString T_PARTICLES;
-    const static QString T_TRANSFORMATION;
     explicit ParticleCompositionItem();
     virtual ~ParticleCompositionItem() {}
     std::unique_ptr<ParticleComposition> createParticleComposition() const;
diff --git a/GUI/coregui/Models/ParticleCoreShellItem.cpp b/GUI/coregui/Models/ParticleCoreShellItem.cpp
index c841f1ef944cbd2c6b233bd4cd1c4c5a6dbf443b..b9a817216b125d35fb5973b6831d249146801c76 100644
--- a/GUI/coregui/Models/ParticleCoreShellItem.cpp
+++ b/GUI/coregui/Models/ParticleCoreShellItem.cpp
@@ -23,7 +23,6 @@
 
 const QString ParticleCoreShellItem::T_CORE = "Core Tag";
 const QString ParticleCoreShellItem::T_SHELL = "Shell Tag";
-const QString ParticleCoreShellItem::T_TRANSFORMATION = "Transformation Tag";
 
 ParticleCoreShellItem::ParticleCoreShellItem()
     : SessionGraphicsItem(Constants::ParticleCoreShellType)
@@ -37,7 +36,7 @@ ParticleCoreShellItem::ParticleCoreShellItem()
 
     registerTag(T_CORE, 0, 1, QStringList() << Constants::ParticleType);
     registerTag(T_SHELL, 0, 1, QStringList() << Constants::ParticleType);
-    registerTag(T_TRANSFORMATION, 0, 1, QStringList() << Constants::TransformationType);
+    registerTag(ParticleItem::T_TRANSFORMATION, 0, 1, QStringList() << Constants::TransformationType);
     RotationTranslator rotation_translator;
     ModelPath::addParameterTranslator(rotation_translator);
     mapper()->setOnPropertyChange(
diff --git a/GUI/coregui/Models/ParticleCoreShellItem.h b/GUI/coregui/Models/ParticleCoreShellItem.h
index ff4b03fdd3b2d8358c41967a863bf352d11c3227..3b422291d6fdcaf26c5661405462d827daee9577 100644
--- a/GUI/coregui/Models/ParticleCoreShellItem.h
+++ b/GUI/coregui/Models/ParticleCoreShellItem.h
@@ -28,7 +28,6 @@ class BA_CORE_API_ ParticleCoreShellItem : public SessionGraphicsItem
 public:
     const static QString T_CORE;
     const static QString T_SHELL;
-    const static QString T_TRANSFORMATION;
     enum ECoreShell { CORE, SHELL};
     explicit ParticleCoreShellItem();
     virtual ~ParticleCoreShellItem() {}
diff --git a/GUI/coregui/Models/ParticleItem.cpp b/GUI/coregui/Models/ParticleItem.cpp
index aab137f0455ca2d80b74938866bb320d2c9c3bdd..02f5392f55ab8b7cfa451656e7fd47b3174e9b92 100644
--- a/GUI/coregui/Models/ParticleItem.cpp
+++ b/GUI/coregui/Models/ParticleItem.cpp
@@ -28,7 +28,7 @@ const QString ParticleItem::P_FORM_FACTOR = "Form Factor";
 const QString ParticleItem::P_ABUNDANCE = "Abundance";
 const QString ParticleItem::P_MATERIAL = "Material";
 const QString ParticleItem::P_POSITION = "Position Offset";
-const QString ParticleItem::T_TRANSFORMATION = "Transformation tag";
+const QString ParticleItem::T_TRANSFORMATION = "Transformation Tag";
 
 ParticleItem::ParticleItem()
     : SessionGraphicsItem(Constants::ParticleType)
diff --git a/GUI/coregui/Views/SampleDesigner/DesignerScene.cpp b/GUI/coregui/Views/SampleDesigner/DesignerScene.cpp
index 42c9724887ed79c6ab7c36ad06022bbedb0998d7..1014f0da53f9e5cd8ad049fa9ae25d0c94ca52f9 100644
--- a/GUI/coregui/Views/SampleDesigner/DesignerScene.cpp
+++ b/GUI/coregui/Views/SampleDesigner/DesignerScene.cpp
@@ -378,11 +378,11 @@ void DesignerScene::onEstablishedConnection(NodeEditorConnection *connection)
         else if (parentView->getInputPortIndex(connection->getInputPort()) == 1)
             tag = ParticleCoreShellItem::T_SHELL;
         else if (connection->getInputPort()->getPortType() == NodeEditorPort::TRANSFORMATION)
-            tag = ParticleCoreShellItem::T_TRANSFORMATION;
+            tag = ParticleItem::T_TRANSFORMATION;
 
     } else if (connection->getParentView()->getParameterizedItem()->modelType() == Constants::ParticleCompositionType) {
         if (connection->getInputPort()->getPortType() == NodeEditorPort::TRANSFORMATION)
-            tag = ParticleCompositionItem::T_TRANSFORMATION;
+            tag = ParticleItem::T_TRANSFORMATION;
     }
     delete connection; // deleting just created connection because it will be recreated from the
                        // model
diff --git a/GUI/coregui/Views/SampleDesigner/ParticleCompositionView.cpp b/GUI/coregui/Views/SampleDesigner/ParticleCompositionView.cpp
index 43f6da2616c8aeccc212799aa36fe22d86815c9b..0f604e252eee99a47b579b8aed45b7b915a9285d 100644
--- a/GUI/coregui/Views/SampleDesigner/ParticleCompositionView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/ParticleCompositionView.cpp
@@ -15,7 +15,8 @@
 
 #include "ParticleCompositionView.h"
 #include "SessionItem.h"
-#include "ParticleCompositionItem.h"
+#include "ParticleItem.h"
+#include "ParticleCompositionItem.h"
 #include <QDebug>
 
 ParticleCompositionView::ParticleCompositionView(QGraphicsItem *parent) : ConnectableView(parent)
@@ -36,8 +37,8 @@ void ParticleCompositionView::addView(IView *childView, int /* row */)
     int index = 0;//int(childView->getParameterizedItem()->port());
 //                    ->getRegisteredProperty(ParameterizedItem::OBSOLETE_P_PORT)
 //                    .toInt();
-    if (this->getParameterizedItem()->tagFromItem(childView->getParameterizedItem()) == ParticleCompositionItem::T_TRANSFORMATION)
-        index = 1;
+    if (this->getParameterizedItem()->tagFromItem(childView->getParameterizedItem()) == ParticleItem::T_TRANSFORMATION)
+        index = 1;
     qDebug() << "ParticleCompositionView::addView()" << index;
     connectInputPort(dynamic_cast<ConnectableView *>(childView), index);
 }