diff --git a/src/Image/IntelliRasterImage.cpp b/src/Image/IntelliRasterImage.cpp
index 717702b..4bd0891 100644
--- a/src/Image/IntelliRasterImage.cpp
+++ b/src/Image/IntelliRasterImage.cpp
@@ -5,7 +5,7 @@
 
 IntelliRasterImage::IntelliRasterImage(int width, int height, bool fastRendererOn)
         : IntelliImage(width, height, fastRendererOn){
-        TypeOfImage = IntelliImage::ImageType::Raster_Image;
+        TypeOfImage = IntelliImage::ImageType::RASTERIMAGE;
         this->fastRenderer = fastRendererOn;
 }
 
diff --git a/src/Image/IntelliRasterImage.h b/src/Image/IntelliRasterImage.h
index 1f7156f..f589843 100644
--- a/src/Image/IntelliRasterImage.h
+++ b/src/Image/IntelliRasterImage.h
@@ -4,13 +4,13 @@
 #include "Image/IntelliImage.h"
 
 /*!
- * \brief The IntelliRasterImage manages a Rasterimage.
+ * \brief The IntelliRasterImage manages a RASTERIMAGE.
  */
 class IntelliRasterImage : public IntelliImage {
 friend IntelliTool;
 protected:
 /*!
- * \brief A function that calculates the visibility of the image if a polygon is given. [does nothing in Rasterimage]
+ * \brief A function that calculates the visibility of the image if a polygon is given. [does nothing in RASTERIMAGE]
  */
 virtual void calculateVisiblity() override;
 public:
diff --git a/src/Image/IntelliShapedImage.cpp b/src/Image/IntelliShapedImage.cpp
index 15fa543..74e8994 100644
--- a/src/Image/IntelliShapedImage.cpp
+++ b/src/Image/IntelliShapedImage.cpp
@@ -6,7 +6,7 @@
 
 IntelliShapedImage::IntelliShapedImage(int width, int height, bool fastRendererOn)
         : IntelliRasterImage(width, height, fastRendererOn){
-        TypeOfImage = IntelliImage::ImageType::Shaped_Image;
+        TypeOfImage = IntelliImage::ImageType::SHAPEDIMAGE;
         this->fastRenderer = fastRendererOn;
 }
 
diff --git a/src/Layer/PaintingArea.cpp b/src/Layer/PaintingArea.cpp
index d2be570..2258376 100644
--- a/src/Layer/PaintingArea.cpp
+++ b/src/Layer/PaintingArea.cpp
@@ -31,7 +31,7 @@ PaintingArea::PaintingArea(int maxWidth, int maxHeight, QWidget*parent)
 		polygon.push_back(QPoint(000,100));
 		layerBundle[0].image->setPolygon(polygon);
 
-		this->addLayer(200,200,150,150,IntelliImage::ImageType::RASTERIMAGE);
+        this->addLayer(200,200,150,150,IntelliImage::ImageType::RASTERIMAGE);
 		layerBundle[1].image->drawPlain(QColor(0,255,0,255));
 		layerBundle[1].alpha=200;
 
@@ -59,9 +59,9 @@ int PaintingArea::addLayer(int width, int height, int widthOffset, int heightOff
 		newLayer.height = height;
 		newLayer.widthOffset = widthOffset;
 		newLayer.heightOffset = heightOffset;
-        if(type==IntelliImage::ImageType::Raster_Image) {
+        if(type==IntelliImage::ImageType::RASTERIMAGE) {
                 newLayer.image = new IntelliRasterImage(width,height,renderSettings.getFastRenderer());
-        }else if(type==IntelliImage::ImageType::Shaped_Image) {
+        }else if(type==IntelliImage::ImageType::SHAPEDIMAGE) {
                 newLayer.image = new IntelliShapedImage(width, height, renderSettings.getFastRenderer());
 		}
 		newLayer.alpha = 255;