diff --git a/Modules/SemanticRelations/src/mitkLesionManager.cpp b/Modules/SemanticRelations/src/mitkLesionManager.cpp
index fc459ad32e..623d33f2c6 100644
--- a/Modules/SemanticRelations/src/mitkLesionManager.cpp
+++ b/Modules/SemanticRelations/src/mitkLesionManager.cpp
@@ -1,122 +1,120 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 // semantic relations module
 #include "mitkLesionManager.h"
 #include "mitkSemanticRelationException.h"
 #include "mitkSemanticRelationsInference.h"
 #include "mitkRelationStorage.h"
 #include "mitkUIDGeneratorBoost.h"
 
 double GetLesionVolume(const mitk::SemanticTypes::CaseID& caseID, const mitk::SemanticTypes::Lesion& lesion, const mitk::SemanticTypes::ControlPoint& controlPoint);
 
 mitk::SemanticTypes::Lesion mitk::GenerateNewLesion(const std::string& lesionClassType/* = ""*/)
 {
-  mitk::SemanticTypes::Lesion lesion;
+  SemanticTypes::Lesion lesion;
   lesion.UID = mitk::UIDGeneratorBoost::GenerateUID();
   lesion.name = "New lesion";
-  lesion.lesionClass = mitk::SemanticTypes::LesionClass();
-  lesion.lesionClass.UID = mitk::UIDGeneratorBoost::GenerateUID();
-  lesion.lesionClass.classType = lesionClassType;
+  lesion.lesionClass = GenerateNewLesionClass();
 
   return lesion;
 }
 
 mitk::SemanticTypes::LesionClass mitk::GenerateNewLesionClass(const std::string& lesionClassType/* = ""*/)
 {
-  mitk::SemanticTypes::LesionClass lesionClass;
+  SemanticTypes::LesionClass lesionClass;
   lesionClass.UID = mitk::UIDGeneratorBoost::GenerateUID();
   lesionClass.classType = lesionClassType;
 
   return lesionClass;
 }
 
 mitk::SemanticTypes::Lesion mitk::GetLesionByUID(const SemanticTypes::ID& lesionUID, const std::vector<SemanticTypes::Lesion>& allLesions)
 {
   auto lambda = [&lesionUID](const SemanticTypes::Lesion& currentLesion)
   {
     return currentLesion.UID == lesionUID;
   };
 
   const auto existingLesion = std::find_if(allLesions.begin(), allLesions.end(), lambda);
 
-  mitk::SemanticTypes::Lesion lesion;
+  SemanticTypes::Lesion lesion;
   if (existingLesion != allLesions.end())
   {
     lesion = *existingLesion;
   }
 
   return lesion;
 }
 
 mitk::SemanticTypes::LesionClass mitk::FindExistingLesionClass(const std::string& lesionClassType, const std::vector<SemanticTypes::LesionClass>& allLesionClasses)
 {
   auto lambda = [&lesionClassType](const SemanticTypes::LesionClass& currentLesionClass)
   {
     return currentLesionClass.classType == lesionClassType;
   };
 
   const auto existingLesionClass = std::find_if(allLesionClasses.begin(), allLesionClasses.end(), lambda);
 
-  mitk::SemanticTypes::LesionClass lesionClass;
+  SemanticTypes::LesionClass lesionClass;
   if (existingLesionClass != allLesionClasses.end())
   {
     lesionClass = *existingLesionClass;
   }
 
   return lesionClass;
 }
 
 void mitk::GenerateAdditionalLesionData(LesionData& lesionData, const SemanticTypes::CaseID& caseID)
 {
   std::vector<bool> lesionPresence;
   std::vector<double> lesionVolume;
   SemanticTypes::Lesion lesion = lesionData.GetLesion();
   bool presence = false;
   double volume = 0.0;
   try
   {
-    SemanticTypes::ControlPointVector controlPoints = mitk::RelationStorage::GetAllControlPointsOfCase(caseID);
+    SemanticTypes::ControlPointVector controlPoints = RelationStorage::GetAllControlPointsOfCase(caseID);
     for (const auto& controlPoint : controlPoints)
     {
-      presence = mitk::SemanticRelationsInference::IsLesionPresentAtControlPoint(caseID, lesion, controlPoint);
+      presence = SemanticRelationsInference::IsLesionPresentAtControlPoint(caseID, lesion, controlPoint);
       lesionPresence.push_back(presence);
 
       volume = GetLesionVolume(caseID, lesion, controlPoint);
       lesionVolume.push_back(volume);
     }
   }
-  catch (const mitk::SemanticRelationException&)
+  catch (const SemanticRelationException&)
   {
     return;
   }
 
   lesionData.SetLesionPresence(lesionPresence);
   lesionData.SetLesionVolume(lesionVolume);
 }
 
 double GetLesionVolume(const mitk::SemanticTypes::CaseID& caseID, const mitk::SemanticTypes::Lesion& lesion, const mitk::SemanticTypes::ControlPoint& controlPoint)
 {
   bool presence = mitk::SemanticRelationsInference::IsLesionPresentAtControlPoint(caseID, lesion, controlPoint);
   if (presence)
   {
     return 1.0;
   }
   else
   {
     return 0.0;
   }
 }