diff --git a/Modules/PhotoacousticSimulation/Algorithms/mitkPhotoacousticFatTissueGenerator.h b/Modules/PhotoacousticSimulation/Algorithms/mitkPhotoacousticFatTissueGenerator.h
index 9c46f69c6c..9dde4dabc0 100644
--- a/Modules/PhotoacousticSimulation/Algorithms/mitkPhotoacousticFatTissueGenerator.h
+++ b/Modules/PhotoacousticSimulation/Algorithms/mitkPhotoacousticFatTissueGenerator.h
@@ -1,41 +1,41 @@
 /*===================================================================
 
 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.
 
 ===================================================================*/
 
-#ifndef MITKPHOTOACOUSTICNOISEGENERATOR_H
-#define MITKPHOTOACOUSTICNOISEGENERATOR_H
+#ifndef MITKPHOTOACOUSTICFATTISSUEGENERATOR_H
+#define MITKPHOTOACOUSTICFATTISSUEGENERATOR_H
 
 #include "MitkPhotoacousticSimulationExports.h"
 
 #include "mitkPhotoacousticVolume.h"
 
 namespace mitk
 {
 class MITKPHOTOACOUSTICSIMULATION_EXPORT PhotoacousticFatTissueGenerator
 {
 public:
 
   static void CreateFatGlobules(mitk::PhotoacousticVolume::Pointer image, double bodyFatPercentage,
                                double fatAbsorption, double fatScattering, double fatAnisotropy,
                                 bool useRngSeed, long rngSeed);
 
 private:
   PhotoacousticFatTissueGenerator();
   ~PhotoacousticFatTissueGenerator();
 
 };
 }
 
-#endif // MITKPHOTOACOUSTICNOISEGENERATOR_H
+#endif // MITKPHOTOACOUSTICFATTISSUEGENERATOR_H
diff --git a/Modules/PhotoacousticSimulation/Utils/mitkPhotoacousticPropertyCalculator.h b/Modules/PhotoacousticSimulation/Utils/mitkPhotoacousticPropertyCalculator.h
index bc60126f5a..c6f0cd6b11 100644
--- a/Modules/PhotoacousticSimulation/Utils/mitkPhotoacousticPropertyCalculator.h
+++ b/Modules/PhotoacousticSimulation/Utils/mitkPhotoacousticPropertyCalculator.h
@@ -1,74 +1,74 @@
 /*===================================================================
 
 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.
 
 ===================================================================*/
 
-#ifndef MITKPHOTOACOUSTICNOISEGENERATOR_H
-#define MITKPHOTOACOUSTICNOISEGENERATOR_H
+#ifndef MITKPHOTOACOUSTICPROPERTYCALCULATOR_H
+#define MITKPHOTOACOUSTICPROPERTYCALCULATOR_H
 
 #include "MitkPhotoacousticSimulationExports.h"
 
 //Includes for smart pointer usage
 #include "mitkCommon.h"
 #include "itkLightObject.h"
 #include "mitkPhotoacousticStatefulObject.h"
 
 namespace mitk
 {
 class MITKPHOTOACOUSTICSIMULATION_EXPORT PhotoacousticPropertyCalculator : public itk::LightObject
 {
 public:
 
   mitkClassMacroItkParent(mitk::PhotoacousticPropertyCalculator, itk::LightObject)
   itkFactorylessNewMacro(Self)
 
   struct Properties
   {
     double mua;
     double mus;
     double g;
   };
 
   enum TissueType
   {
     AIR = 1,
     BLOOD = 2,
     EPIDERMIS = 3,
     FAT = 4,
     STANDARD_TISSUE = 5
   };
 
   Properties CalculatePropertyForSpecificWavelength(TissueType tissueType, int wavelength, double oxygenSaturaton=0);
 
 protected:
   PhotoacousticPropertyCalculator();
   virtual ~PhotoacousticPropertyCalculator();
 
   bool m_Valid = false;
 
   std::map<int, std::map<int, double>> m_SpectralLibMap;
 
   enum MapType
   {
     OXYGENATED = 1,
     DEOXYGENATED = 2,
     WATER = 3,
     FATTY = 4,
     MELANIN = 5
   };
 
 };
 }
 
-#endif // MITKPHOTOACOUSTICNOISEGENERATOR_H
+#endif // MITKPHOTOACOUSTICPROPERTYCALCULATOR_H