diff --git a/CMakeLists.txt b/CMakeLists.txt
index a45621d8..92ccf476 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -75,7 +75,6 @@ add_subdirectory(src)
 add_subdirectory(solvers)
 
 add_subdirectory(utilities)
-
 #add_subdirectory(test_newFeatures)
 
 
@@ -88,3 +87,4 @@ set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
 set(CPACK_PACKAGE_VERSION_MAJOR "${phasicFlow_VERSION_MAJOR}")
 set(CPACK_PACKAGE_VERSION_MINOR "${phasicFlow_VERSION_MINOR}")
 include(CPack)
+
diff --git a/DEMSystems/CMakeLists.txt b/DEMSystems/CMakeLists.txt
index d9f7c681..156e23bd 100644
--- a/DEMSystems/CMakeLists.txt
+++ b/DEMSystems/CMakeLists.txt
@@ -1,6 +1,6 @@
 
 set(SourceFiles 
-sphereDEMSystem/sphereDEMSystem.C
+sphereDEMSystem/sphereDEMSystem.cpp
 )
 
 set(link_libs Kokkos::kokkos phasicFlow Particles Geometry Property Interaction Interaction Utilities)
diff --git a/DEMSystems/sphereDEMSystem/sphereDEMSystem.C b/DEMSystems/sphereDEMSystem/sphereDEMSystem.cpp
similarity index 98%
rename from DEMSystems/sphereDEMSystem/sphereDEMSystem.C
rename to DEMSystems/sphereDEMSystem/sphereDEMSystem.cpp
index f9a85f4d..9d145494 100644
--- a/DEMSystems/sphereDEMSystem/sphereDEMSystem.C
+++ b/DEMSystems/sphereDEMSystem/sphereDEMSystem.cpp
@@ -18,7 +18,7 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#include "sphereDEMSystem.H"
+#include "sphereDEMSystem.hpp"
 
 
 pFlow::sphereDEMSystem::sphereDEMSystem(int argc, char* argv[])
diff --git a/DEMSystems/sphereDEMSystem/sphereDEMSystem.H b/DEMSystems/sphereDEMSystem/sphereDEMSystem.hpp
similarity index 88%
rename from DEMSystems/sphereDEMSystem/sphereDEMSystem.H
rename to DEMSystems/sphereDEMSystem/sphereDEMSystem.hpp
index 7e6b7521..e6233bdd 100644
--- a/DEMSystems/sphereDEMSystem/sphereDEMSystem.H
+++ b/DEMSystems/sphereDEMSystem/sphereDEMSystem.hpp
@@ -18,19 +18,19 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __sphereDEMSystem_H__
-#define __sphereDEMSystem_H__
+#ifndef __sphereDEMSystem_hpp__
+#define __sphereDEMSystem_hpp__
 
 #include <array>
 
-#include "systemControl.H"
-#include "property.H"
-#include "uniquePtr.H"
-#include "geometry.H"
-#include "sphereParticles.H"
-#include "interaction.H"
-#include "Insertions.H"
-#include "readControlDict.H"
+#include "systemControl.hpp"
+#include "property.hpp"
+#include "uniquePtr.hpp"
+#include "geometry.hpp"
+#include "sphereParticles.hpp"
+#include "interaction.hpp"
+#include "Insertions.hpp"
+#include "readControlDict.hpp"
 
 
 
diff --git a/solvers/iterateGeometry/CMakeLists.txt b/solvers/iterateGeometry/CMakeLists.txt
index bbf408c9..e76f3b9f 100644
--- a/solvers/iterateGeometry/CMakeLists.txt
+++ b/solvers/iterateGeometry/CMakeLists.txt
@@ -1,6 +1,6 @@
 
 set(source_files
-iterateGeometry.C
+iterateGeometry.cpp
 )
 set(link_lib phasicFlow Geometry MotionModel Kokkos::kokkos Utilities)
 
diff --git a/solvers/iterateGeometry/iterateGeometry.C b/solvers/iterateGeometry/iterateGeometry.cpp
similarity index 86%
rename from solvers/iterateGeometry/iterateGeometry.C
rename to solvers/iterateGeometry/iterateGeometry.cpp
index b777d442..0fc5a75b 100755
--- a/solvers/iterateGeometry/iterateGeometry.C
+++ b/solvers/iterateGeometry/iterateGeometry.cpp
@@ -18,10 +18,10 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#include "systemControl.H"
-#include "geometryMotion.H"
-#include "commandLine.H"
-#include "readControlDict.H"
+#include "systemControl.hpp"
+#include "geometryMotion.hpp"
+#include "commandLine.hpp"
+#include "readControlDict.hpp"
 
 using pFlow::commandLine;
 
@@ -43,10 +43,10 @@ commandLine cmds(
    
 
 // this should be palced in each main 
-#include "initialize_Control.H"
+#include "initialize_Control.hpp"
 	
-	#include "setProperty.H"
-	#include "setSurfaceGeometry.H"
+	#include "setProperty.hpp"
+	#include "setSurfaceGeometry.hpp"
 
 	
 	do
@@ -56,7 +56,7 @@ commandLine cmds(
 	}while( Control++);
 
 // this should be palced in each main 
-#include "finalize.H"
+#include "finalize.hpp"
 
 }
 
diff --git a/solvers/sphereGranFlow/CMakeLists.txt b/solvers/sphereGranFlow/CMakeLists.txt
index e1bc5486..f927bb95 100644
--- a/solvers/sphereGranFlow/CMakeLists.txt
+++ b/solvers/sphereGranFlow/CMakeLists.txt
@@ -1,6 +1,6 @@
 
 set(source_files
-sphereGranFlow.C
+sphereGranFlow.cpp
 )
 set(link_lib Kokkos::kokkos phasicFlow Particles Geometry Property Interaction Interaction Utilities)
 
diff --git a/solvers/sphereGranFlow/createDEMComponents.H b/solvers/sphereGranFlow/createDEMComponents.hpp
similarity index 100%
rename from solvers/sphereGranFlow/createDEMComponents.H
rename to solvers/sphereGranFlow/createDEMComponents.hpp
diff --git a/solvers/sphereGranFlow/sphereGranFlow.C b/solvers/sphereGranFlow/sphereGranFlow.cpp
similarity index 84%
rename from solvers/sphereGranFlow/sphereGranFlow.C
rename to solvers/sphereGranFlow/sphereGranFlow.cpp
index 2cf94601..e00020fc 100755
--- a/solvers/sphereGranFlow/sphereGranFlow.C
+++ b/solvers/sphereGranFlow/sphereGranFlow.cpp
@@ -18,15 +18,15 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#include "property.H"
-#include "geometry.H"
-#include "sphereParticles.H"
-#include "Insertions.H"
-#include "systemControl.H"
-#include "contactSearch.H"
-#include "sphereInteraction.H"
-#include "commandLine.H"
-#include "readControlDict.H"
+#include "property.hpp"
+#include "geometry.hpp"
+#include "sphereParticles.hpp"
+#include "Insertions.hpp"
+#include "systemControl.hpp"
+#include "contactSearch.hpp"
+#include "sphereInteraction.hpp"
+#include "commandLine.hpp"
+#include "readControlDict.hpp"
 
 using pFlow::output;
 using pFlow::endl;
@@ -53,13 +53,13 @@ bool isCoupling = false;
 if(!cmds.parse(argc, argv)) return 0;
 
 // this should be palced in each main 
-#include "initialize_Control.H"
+#include "initialize_Control.hpp"
 	
-	#include "setProperty.H"
-	#include "setSurfaceGeometry.H"
+	#include "setProperty.hpp"
+	#include "setSurfaceGeometry.hpp"
 	
 
-	#include "createDEMComponents.H"
+	#include "createDEMComponents.hpp"
 	
 	Report(0)<<"\nStart of time loop . . .\n"<<endReport;
 
@@ -101,7 +101,7 @@ if(!cmds.parse(argc, argv)) return 0;
 	Report(0)<<"\nEnd of time loop.\n"<<endReport;
 
 // this should be palced in each main 
-#include "finalize.H"
+#include "finalize.hpp"
 
 
 }	
diff --git a/src/Geometry/CMakeLists.txt b/src/Geometry/CMakeLists.txt
index e077dc46..f4d3a308 100644
--- a/src/Geometry/CMakeLists.txt
+++ b/src/Geometry/CMakeLists.txt
@@ -1,7 +1,7 @@
 
 list(APPEND SourceFiles 
-geometry/geometry.C
-geometryMotion/geometryMotions.C
+geometry/geometry.cpp
+geometryMotion/geometryMotions.cpp
 )
 
 set(link_libs Kokkos::kokkos phasicFlow MotionModel Property)
diff --git a/src/Geometry/geometry/demGeometry.H b/src/Geometry/geometry/demGeometry.hpp
similarity index 93%
rename from src/Geometry/geometry/demGeometry.H
rename to src/Geometry/geometry/demGeometry.hpp
index e44f4dd2..86652bbd 100644
--- a/src/Geometry/geometry/demGeometry.H
+++ b/src/Geometry/geometry/demGeometry.hpp
@@ -19,10 +19,10 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __demGeometry_H__
-#define __demGeometry_H__
+#ifndef __demGeometry_hpp__
+#define __demGeometry_hpp__
 
-#include "demComponent.H"
+#include "demComponent.hpp"
 
 namespace pFlow
 {
diff --git a/src/Geometry/geometry/geometry.C b/src/Geometry/geometry/geometry.cpp
similarity index 99%
rename from src/Geometry/geometry/geometry.C
rename to src/Geometry/geometry/geometry.cpp
index 723acd0f..03d7fd4d 100644
--- a/src/Geometry/geometry/geometry.C
+++ b/src/Geometry/geometry/geometry.cpp
@@ -18,8 +18,8 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#include "geometry.H"
-#include "vocabs.H"
+#include "geometry.hpp"
+#include "vocabs.hpp"
 
 
 bool pFlow::geometry::findPropertyId()
diff --git a/src/Geometry/geometry/geometry.H b/src/Geometry/geometry/geometry.hpp
similarity index 94%
rename from src/Geometry/geometry/geometry.H
rename to src/Geometry/geometry/geometry.hpp
index ab29c9ac..d526bde3 100644
--- a/src/Geometry/geometry/geometry.H
+++ b/src/Geometry/geometry/geometry.hpp
@@ -18,18 +18,18 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __geometry_H__
-#define __geometry_H__
+#ifndef __geometry_hpp__
+#define __geometry_hpp__
 
 
-#include "virtualConstructor.H"
-#include "demGeometry.H"
-#include "property.H"
-#include "Fields.H"
-#include "Vectors.H"
-#include "multiTriSurface.H"
-#include "triSurfaceFields.H"
-#include "dictionary.H"
+#include "virtualConstructor.hpp"
+#include "demGeometry.hpp"
+#include "property.hpp"
+#include "Fields.hpp"
+#include "Vectors.hpp"
+#include "multiTriSurface.hpp"
+#include "triSurfaceFields.hpp"
+#include "dictionary.hpp"
 
 namespace pFlow
 {
@@ -71,7 +71,7 @@ protected:
 public:
 
 	// - type info
-	TypeName("geometry");
+	TypeInfo("geometry");
 
 	//// - Constructors 
 		
diff --git a/src/Geometry/geometryMotion/geometryMotion.C b/src/Geometry/geometryMotion/geometryMotion.cpp
similarity index 100%
rename from src/Geometry/geometryMotion/geometryMotion.C
rename to src/Geometry/geometryMotion/geometryMotion.cpp
diff --git a/src/Geometry/geometryMotion/geometryMotion.H b/src/Geometry/geometryMotion/geometryMotion.hpp
similarity index 91%
rename from src/Geometry/geometryMotion/geometryMotion.H
rename to src/Geometry/geometryMotion/geometryMotion.hpp
index cdfad213..d162e78e 100644
--- a/src/Geometry/geometryMotion/geometryMotion.H
+++ b/src/Geometry/geometryMotion/geometryMotion.hpp
@@ -19,12 +19,12 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __geometryMotion_H__
-#define __geometryMotion_H__
+#ifndef __geometryMotion_hpp__
+#define __geometryMotion_hpp__
 
 
-#include "geometry.H"
-#include "VectorDuals.H"
+#include "geometry.hpp"
+#include "VectorDuals.hpp"
 
 namespace pFlow
 {
@@ -62,7 +62,7 @@ protected:
 public:
 
 	// type info
-	TypeNameTemplate("geometry", MotionModel);
+	TypeInfoTemplate("geometry", MotionModel);
 
 	//// - Constructors
 		
@@ -145,11 +145,11 @@ public:
 
 }
 
-#include "geometryMotion.C"
+#include "geometryMotion.cpp"
 
 #ifndef BUILD_SHARED_LIBS
-	#include "geometryMotionsInstantiate.C"
+	#include "geometryMotionsInstantiate.cpp"
 #endif
 
 
-#endif  //__geometryMotion_H__
+#endif  //__geometryMotion_hpp__
diff --git a/src/Geometry/geometryMotion/geometryMotions.C b/src/Geometry/geometryMotion/geometryMotions.cpp
similarity index 93%
rename from src/Geometry/geometryMotion/geometryMotions.C
rename to src/Geometry/geometryMotion/geometryMotions.cpp
index c79e8565..4eaa179a 100644
--- a/src/Geometry/geometryMotion/geometryMotions.C
+++ b/src/Geometry/geometryMotion/geometryMotions.cpp
@@ -18,8 +18,8 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#include "geometryMotions.H"
+#include "geometryMotions.hpp"
 
 #ifdef BUILD_SHARED_LIBS
-#include "geometryMotionsInstantiate.C"
+#include "geometryMotionsInstantiate.cpp"
 #endif
diff --git a/src/Geometry/geometryMotion/geometryMotions.H b/src/Geometry/geometryMotion/geometryMotions.hpp
similarity index 87%
rename from src/Geometry/geometryMotion/geometryMotions.H
rename to src/Geometry/geometryMotion/geometryMotions.hpp
index d7e6d704..496e2dd0 100644
--- a/src/Geometry/geometryMotion/geometryMotions.H
+++ b/src/Geometry/geometryMotion/geometryMotions.hpp
@@ -18,12 +18,12 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __geometryMotions_H__
-#define __geometryMotions_H__
+#ifndef __geometryMotions_hpp__
+#define __geometryMotions_hpp__
 
-#include "geometryMotion.H"
-#include "fixedWall.H"
-#include "rotatingAxisMotion.H"
+#include "geometryMotion.hpp"
+#include "fixedWall.hpp"
+#include "rotatingAxisMotion.hpp"
 
 
 namespace pFlow
diff --git a/src/Geometry/geometryMotion/geometryMotionsInstantiate.C b/src/Geometry/geometryMotion/geometryMotionsInstantiate.cpp
similarity index 94%
rename from src/Geometry/geometryMotion/geometryMotionsInstantiate.C
rename to src/Geometry/geometryMotion/geometryMotionsInstantiate.cpp
index 2e700db0..9d980f69 100644
--- a/src/Geometry/geometryMotion/geometryMotionsInstantiate.C
+++ b/src/Geometry/geometryMotion/geometryMotionsInstantiate.cpp
@@ -18,8 +18,8 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#include "fixedWall.H"
-#include "rotatingAxisMotion.H"
+#include "fixedWall.hpp"
+#include "rotatingAxisMotion.hpp"
 
 template class pFlow::geometryMotion<pFlow::fixedWall>;
 
diff --git a/src/Integration/AdamsBashforth2/AdamsBashforth2.C b/src/Integration/AdamsBashforth2/AdamsBashforth2.cpp
similarity index 98%
rename from src/Integration/AdamsBashforth2/AdamsBashforth2.C
rename to src/Integration/AdamsBashforth2/AdamsBashforth2.cpp
index 7739e219..09a4eaa0 100644
--- a/src/Integration/AdamsBashforth2/AdamsBashforth2.C
+++ b/src/Integration/AdamsBashforth2/AdamsBashforth2.cpp
@@ -18,7 +18,7 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#include "AdamsBashforth2.H"
+#include "AdamsBashforth2.hpp"
 
 //const real AB2_coef[] = { 3.0 / 2.0, 1.0 / 2.0};
 
diff --git a/src/Integration/AdamsBashforth2/AdamsBashforth2.H b/src/Integration/AdamsBashforth2/AdamsBashforth2.hpp
similarity index 94%
rename from src/Integration/AdamsBashforth2/AdamsBashforth2.H
rename to src/Integration/AdamsBashforth2/AdamsBashforth2.hpp
index aa191f4c..43fb9500 100644
--- a/src/Integration/AdamsBashforth2/AdamsBashforth2.H
+++ b/src/Integration/AdamsBashforth2/AdamsBashforth2.hpp
@@ -18,12 +18,12 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __AdamsBashforth2_H__
-#define __AdamsBashforth2_H__
+#ifndef __AdamsBashforth2_hpp__
+#define __AdamsBashforth2_hpp__
 
 
-#include "integration.H"
-#include "pointFields.H"
+#include "integration.hpp"
+#include "pointFields.hpp"
 
 namespace pFlow
 {
@@ -45,7 +45,7 @@ protected:
 public:
 
 	// type info
-	TypeName("AdamsBashforth2");
+	TypeInfo("AdamsBashforth2");
 
 	//// - Constructors
 		AdamsBashforth2(
@@ -120,4 +120,4 @@ bool pFlow::AdamsBashforth2::intRange(
 
 } // pFlow
 
-#endif //__integration_H__
+#endif //__integration_hpp__
diff --git a/src/Integration/AdamsBashforth3/AdamsBashforth3.C b/src/Integration/AdamsBashforth3/AdamsBashforth3.cpp
similarity index 98%
rename from src/Integration/AdamsBashforth3/AdamsBashforth3.C
rename to src/Integration/AdamsBashforth3/AdamsBashforth3.cpp
index fa8e9927..e120941a 100644
--- a/src/Integration/AdamsBashforth3/AdamsBashforth3.C
+++ b/src/Integration/AdamsBashforth3/AdamsBashforth3.cpp
@@ -18,7 +18,7 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#include "AdamsBashforth3.H"
+#include "AdamsBashforth3.hpp"
 
 //const real AB3_coef[] = { 23.0 / 12.0, 16.0 / 12.0, 5.0 / 12.0 };
 
diff --git a/src/Integration/AdamsBashforth3/AdamsBashforth3.H b/src/Integration/AdamsBashforth3/AdamsBashforth3.hpp
similarity index 94%
rename from src/Integration/AdamsBashforth3/AdamsBashforth3.H
rename to src/Integration/AdamsBashforth3/AdamsBashforth3.hpp
index d9baecb7..11c93d5c 100644
--- a/src/Integration/AdamsBashforth3/AdamsBashforth3.H
+++ b/src/Integration/AdamsBashforth3/AdamsBashforth3.hpp
@@ -18,12 +18,12 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __AdamsBashforth3_H__
-#define __AdamsBashforth3_H__
+#ifndef __AdamsBashforth3_hpp__
+#define __AdamsBashforth3_hpp__
 
 
-#include "integration.H"
-#include "pointFields.H"
+#include "integration.hpp"
+#include "pointFields.hpp"
 
 namespace pFlow
 {
@@ -33,7 +33,7 @@ struct AB3History
 	realx3 dy1_={0,0,0};
 	realx3 dy2_={0,0,0};
 
-	TypeNameNV("AB3History");
+	TypeInfoNV("AB3History");
 };
 
 
@@ -89,7 +89,7 @@ protected:
 public:
 
 	// type info
-	TypeName("AdamsBashforth3");
+	TypeInfo("AdamsBashforth3");
 
 	//// - Constructors
 		AdamsBashforth3(
@@ -177,4 +177,4 @@ bool pFlow::AdamsBashforth3::intRange(
 
 } // pFlow
 
-#endif //__integration_H__
+#endif //__integration_hpp__
diff --git a/src/Integration/AdamsBashforth4/AdamsBashforth4.C b/src/Integration/AdamsBashforth4/AdamsBashforth4.cpp
similarity index 98%
rename from src/Integration/AdamsBashforth4/AdamsBashforth4.C
rename to src/Integration/AdamsBashforth4/AdamsBashforth4.cpp
index 313eb58c..0a713ffb 100644
--- a/src/Integration/AdamsBashforth4/AdamsBashforth4.C
+++ b/src/Integration/AdamsBashforth4/AdamsBashforth4.cpp
@@ -18,7 +18,7 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#include "AdamsBashforth4.H"
+#include "AdamsBashforth4.hpp"
 
 
 
diff --git a/src/Integration/AdamsBashforth4/AdamsBashforth4.H b/src/Integration/AdamsBashforth4/AdamsBashforth4.hpp
similarity index 95%
rename from src/Integration/AdamsBashforth4/AdamsBashforth4.H
rename to src/Integration/AdamsBashforth4/AdamsBashforth4.hpp
index 7cb31e88..909d93ba 100644
--- a/src/Integration/AdamsBashforth4/AdamsBashforth4.H
+++ b/src/Integration/AdamsBashforth4/AdamsBashforth4.hpp
@@ -18,12 +18,12 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __AdamsBashforth4_H__
-#define __AdamsBashforth4_H__
+#ifndef __AdamsBashforth4_hpp__
+#define __AdamsBashforth4_hpp__
 
 
-#include "integration.H"
-#include "pointFields.H"
+#include "integration.hpp"
+#include "pointFields.hpp"
 
 namespace pFlow
 {
@@ -34,7 +34,7 @@ struct AB4History
 	realx3 dy2_={0,0,0};
 	realx3 dy3_={0,0,0};
 
-	TypeNameNV("AB4History");
+	TypeInfoNV("AB4History");
 };
 
 
@@ -94,7 +94,7 @@ protected:
 public:
 
 	// type info
-	TypeName("AdamsBashforth4");
+	TypeInfo("AdamsBashforth4");
 
 	//// - Constructors
 		AdamsBashforth4(
@@ -187,4 +187,4 @@ bool pFlow::AdamsBashforth4::intRange(
 
 } // pFlow
 
-#endif //__integration_H__
+#endif //__integration_hpp__
diff --git a/src/Integration/AdamsBashforth5/AdamsBashforth5.C b/src/Integration/AdamsBashforth5/AdamsBashforth5.cpp
similarity index 98%
rename from src/Integration/AdamsBashforth5/AdamsBashforth5.C
rename to src/Integration/AdamsBashforth5/AdamsBashforth5.cpp
index 23f7fc09..327b5f2b 100644
--- a/src/Integration/AdamsBashforth5/AdamsBashforth5.C
+++ b/src/Integration/AdamsBashforth5/AdamsBashforth5.cpp
@@ -18,7 +18,7 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#include "AdamsBashforth5.H"
+#include "AdamsBashforth5.hpp"
 
 
 
diff --git a/src/Integration/AdamsBashforth5/AdamsBashforth5.H b/src/Integration/AdamsBashforth5/AdamsBashforth5.hpp
similarity index 95%
rename from src/Integration/AdamsBashforth5/AdamsBashforth5.H
rename to src/Integration/AdamsBashforth5/AdamsBashforth5.hpp
index aee15244..ce8a5d19 100644
--- a/src/Integration/AdamsBashforth5/AdamsBashforth5.H
+++ b/src/Integration/AdamsBashforth5/AdamsBashforth5.hpp
@@ -18,12 +18,12 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __AdamsBashforth5_H__
-#define __AdamsBashforth5_H__
+#ifndef __AdamsBashforth5_hpp__
+#define __AdamsBashforth5_hpp__
 
 
-#include "integration.H"
-#include "pointFields.H"
+#include "integration.hpp"
+#include "pointFields.hpp"
 
 namespace pFlow
 {
@@ -35,7 +35,7 @@ struct AB5History
 	realx3 dy3_={0,0,0};
 	realx3 dy4_={0,0,0};
 
-	TypeNameNV("AB5History");
+	TypeInfoNV("AB5History");
 };
 
 
@@ -92,7 +92,7 @@ protected:
 public:
 
 	// type info
-	TypeName("AdamsBashforth5");
+	TypeInfo("AdamsBashforth5");
 
 	//// - Constructors
 		AdamsBashforth5(
@@ -184,4 +184,4 @@ bool pFlow::AdamsBashforth5::intRange(
 
 } // pFlow
 
-#endif //__integration_H__
+#endif //__integration_hpp__
diff --git a/src/Integration/AdamsMoulton3/AdamsMoulton3.C b/src/Integration/AdamsMoulton3/AdamsMoulton3.cpp
similarity index 99%
rename from src/Integration/AdamsMoulton3/AdamsMoulton3.C
rename to src/Integration/AdamsMoulton3/AdamsMoulton3.cpp
index 7c7cbe58..cb819c7c 100644
--- a/src/Integration/AdamsMoulton3/AdamsMoulton3.C
+++ b/src/Integration/AdamsMoulton3/AdamsMoulton3.cpp
@@ -18,7 +18,7 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#include "AdamsMoulton3.H"
+#include "AdamsMoulton3.hpp"
 
 //const real AB2_coef[] = { 3.0 / 2.0, 1.0 / 2.0};
 
diff --git a/src/Integration/AdamsMoulton3/AdamsMoulton3.H b/src/Integration/AdamsMoulton3/AdamsMoulton3.hpp
similarity index 95%
rename from src/Integration/AdamsMoulton3/AdamsMoulton3.H
rename to src/Integration/AdamsMoulton3/AdamsMoulton3.hpp
index c0cbb2ee..2e33ae11 100644
--- a/src/Integration/AdamsMoulton3/AdamsMoulton3.H
+++ b/src/Integration/AdamsMoulton3/AdamsMoulton3.hpp
@@ -18,12 +18,12 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __AdamsMoulton3_H__
-#define __AdamsMoulton3_H__
+#ifndef __AdamsMoulton3_hpp__
+#define __AdamsMoulton3_hpp__
 
 
-#include "integration.H"
-#include "pointFields.H"
+#include "integration.hpp"
+#include "pointFields.hpp"
 
 namespace pFlow
 {
@@ -49,7 +49,7 @@ protected:
 public:
 
 	// type info
-	TypeName("AdamsMoulton3");
+	TypeInfo("AdamsMoulton3");
 
 	//// - Constructors
 		AdamsMoulton3(
@@ -176,4 +176,4 @@ bool pFlow::AdamsMoulton3::intRange(
 
 } // pFlow
 
-#endif //__integration_H__
+#endif //__integration_hpp__
diff --git a/src/Integration/AdamsMoulton4/AdamsMoulton4.C b/src/Integration/AdamsMoulton4/AdamsMoulton4.cpp
similarity index 99%
rename from src/Integration/AdamsMoulton4/AdamsMoulton4.C
rename to src/Integration/AdamsMoulton4/AdamsMoulton4.cpp
index be3242e7..ec735ac8 100644
--- a/src/Integration/AdamsMoulton4/AdamsMoulton4.C
+++ b/src/Integration/AdamsMoulton4/AdamsMoulton4.cpp
@@ -18,7 +18,7 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#include "AdamsMoulton4.H"
+#include "AdamsMoulton4.hpp"
 
 //const real AB2_coef[] = { 3.0 / 2.0, 1.0 / 2.0};
 
diff --git a/src/Integration/AdamsMoulton4/AdamsMoulton4.H b/src/Integration/AdamsMoulton4/AdamsMoulton4.hpp
similarity index 96%
rename from src/Integration/AdamsMoulton4/AdamsMoulton4.H
rename to src/Integration/AdamsMoulton4/AdamsMoulton4.hpp
index b54750f1..1e3863a7 100644
--- a/src/Integration/AdamsMoulton4/AdamsMoulton4.H
+++ b/src/Integration/AdamsMoulton4/AdamsMoulton4.hpp
@@ -18,12 +18,12 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __AdamsMoulton4_H__
-#define __AdamsMoulton4_H__
+#ifndef __AdamsMoulton4_hpp__
+#define __AdamsMoulton4_hpp__
 
 
-#include "integration.H"
-#include "pointFields.H"
+#include "integration.hpp"
+#include "pointFields.hpp"
 
 namespace pFlow
 {
@@ -51,7 +51,7 @@ protected:
 public:
 
 	// type info
-	TypeName("AdamsMoulton4");
+	TypeInfo("AdamsMoulton4");
 
 	//// - Constructors
 		AdamsMoulton4(
@@ -182,4 +182,4 @@ bool pFlow::AdamsMoulton4::intRange(
 
 } // pFlow
 
-#endif //__integration_H__
+#endif //__integration_hpp__
diff --git a/src/Integration/AdamsMoulton5/AdamsMoulton5.C b/src/Integration/AdamsMoulton5/AdamsMoulton5.cpp
similarity index 99%
rename from src/Integration/AdamsMoulton5/AdamsMoulton5.C
rename to src/Integration/AdamsMoulton5/AdamsMoulton5.cpp
index aa26e408..c3f62f18 100644
--- a/src/Integration/AdamsMoulton5/AdamsMoulton5.C
+++ b/src/Integration/AdamsMoulton5/AdamsMoulton5.cpp
@@ -18,7 +18,7 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#include "AdamsMoulton5.H"
+#include "AdamsMoulton5.hpp"
 
 
 pFlow::AdamsMoulton5::AdamsMoulton5
diff --git a/src/Integration/AdamsMoulton5/AdamsMoulton5.H b/src/Integration/AdamsMoulton5/AdamsMoulton5.hpp
similarity index 96%
rename from src/Integration/AdamsMoulton5/AdamsMoulton5.H
rename to src/Integration/AdamsMoulton5/AdamsMoulton5.hpp
index 263ec120..bcfe9035 100644
--- a/src/Integration/AdamsMoulton5/AdamsMoulton5.H
+++ b/src/Integration/AdamsMoulton5/AdamsMoulton5.hpp
@@ -18,12 +18,12 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __AdamsMoulton5_H__
-#define __AdamsMoulton5_H__
+#ifndef __AdamsMoulton5_hpp__
+#define __AdamsMoulton5_hpp__
 
 
-#include "integration.H"
-#include "pointFields.H"
+#include "integration.hpp"
+#include "pointFields.hpp"
 
 namespace pFlow
 {
@@ -53,7 +53,7 @@ protected:
 public:
 
 	// type info
-	TypeName("AdamsMoulton5");
+	TypeInfo("AdamsMoulton5");
 
 	//// - Constructors
 		AdamsMoulton5(
@@ -188,4 +188,4 @@ bool pFlow::AdamsMoulton5::intRange(
 
 } // pFlow
 
-#endif //__integration_H__
+#endif //__integration_hpp__
diff --git a/src/Integration/CMakeLists.txt b/src/Integration/CMakeLists.txt
index 81f2766e..f3a03112 100644
--- a/src/Integration/CMakeLists.txt
+++ b/src/Integration/CMakeLists.txt
@@ -1,13 +1,13 @@
 
 list(APPEND SourceFiles 
-integration/integration.C 
-AdamsBashforth5/AdamsBashforth5.C
-AdamsBashforth4/AdamsBashforth4.C
-AdamsBashforth3/AdamsBashforth3.C
-AdamsBashforth2/AdamsBashforth2.C
-AdamsMoulton3/AdamsMoulton3.C
-AdamsMoulton4/AdamsMoulton4.C
-AdamsMoulton5/AdamsMoulton5.C
+integration/integration.cpp 
+AdamsBashforth5/AdamsBashforth5.cpp
+AdamsBashforth4/AdamsBashforth4.cpp
+AdamsBashforth3/AdamsBashforth3.cpp
+AdamsBashforth2/AdamsBashforth2.cpp
+AdamsMoulton3/AdamsMoulton3.cpp
+AdamsMoulton4/AdamsMoulton4.cpp
+AdamsMoulton5/AdamsMoulton5.cpp
 )
 
 set(link_libs Kokkos::kokkos phasicFlow)
diff --git a/src/Integration/integration/integration.C b/src/Integration/integration/integration.cpp
similarity index 98%
rename from src/Integration/integration/integration.C
rename to src/Integration/integration/integration.cpp
index 7a704a0c..6e48ddaf 100644
--- a/src/Integration/integration/integration.C
+++ b/src/Integration/integration/integration.cpp
@@ -18,7 +18,7 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#include "integration.H"
+#include "integration.hpp"
 
 pFlow::integration::integration
 (
diff --git a/src/Integration/integration/integration.H b/src/Integration/integration/integration.hpp
similarity index 90%
rename from src/Integration/integration/integration.H
rename to src/Integration/integration/integration.hpp
index d9b2f14d..a076039b 100644
--- a/src/Integration/integration/integration.H
+++ b/src/Integration/integration/integration.hpp
@@ -18,14 +18,14 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __integration_H__
-#define __integration_H__
+#ifndef __integration_hpp__
+#define __integration_hpp__
 
 
-#include "virtualConstructor.H"
-#include "Vectors.H"
-#include "pointStructure.H"
-#include "repository.H"
+#include "virtualConstructor.hpp"
+#include "Vectors.hpp"
+#include "pointStructure.hpp"
+#include "repository.hpp"
 
 
 namespace pFlow
@@ -45,7 +45,7 @@ protected:
 public:
 
 	// type info
-	TypeName("integration");
+	TypeInfo("integration");
 
 	//// - Constructors
 		integration(
@@ -108,4 +108,4 @@ public:
 } // pFlow
 
 
-#endif //__integration_H__
+#endif //__integration_hpp__
diff --git a/src/Integration/integration/integrations.H b/src/Integration/integration/integrations.hpp
similarity index 86%
rename from src/Integration/integration/integrations.H
rename to src/Integration/integration/integrations.hpp
index ba777359..428656c2 100644
--- a/src/Integration/integration/integrations.H
+++ b/src/Integration/integration/integrations.hpp
@@ -18,11 +18,11 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __integrations_H__
-#define __integrations_H__
+#ifndef __integrations_hpp__
+#define __integrations_hpp__
 
-#include "integration.H"
-#include "AdamsBashforth2.H"
-#include "AdamsBashforth3.H"
+#include "integration.hpp"
+#include "AdamsBashforth2.hpp"
+#include "AdamsBashforth3.hpp"
 
 #endif
\ No newline at end of file
diff --git a/src/Interaction/CMakeLists.txt b/src/Interaction/CMakeLists.txt
index 122f2091..25d43014 100644
--- a/src/Interaction/CMakeLists.txt
+++ b/src/Interaction/CMakeLists.txt
@@ -1,9 +1,9 @@
 
 set(SourceFiles 
-contactSearch/contactSearch/contactSearch.C
-contactSearch/ContactSearch/ContactSearchs.C
-interaction/interaction.C
-sphereInteraction/sphereInteractions.C
+contactSearch/contactSearch/contactSearch.cpp
+contactSearch/ContactSearch/ContactSearchs.cpp
+interaction/interaction.cpp
+sphereInteraction/sphereInteractions.cpp
 )
 
 set(link_libs Kokkos::kokkos phasicFlow Property Particles Geometry)
diff --git a/src/Interaction/Models/contactForce/linearCF.H b/src/Interaction/Models/contactForce/linearCF.hpp
similarity index 97%
rename from src/Interaction/Models/contactForce/linearCF.H
rename to src/Interaction/Models/contactForce/linearCF.hpp
index 57b1b46a..6f70489f 100644
--- a/src/Interaction/Models/contactForce/linearCF.H
+++ b/src/Interaction/Models/contactForce/linearCF.hpp
@@ -18,11 +18,11 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __linearCF_H__
-#define __linearCF_H__
+#ifndef __linearCF_hpp__
+#define __linearCF_hpp__
 
-#include "types.H"
-#include "symArrays.H"
+#include "types.hpp"
+#include "symArrays.hpp"
 
 namespace pFlow::cfModels
 {
@@ -172,7 +172,7 @@ protected:
 public:
 
 
-	TypeNameNV(modelName());
+	TypeInfoNV(modelName());
 
 	INLINE_FUNCTION_HD
 	linear(){}
diff --git a/src/Interaction/Models/contactForce/nonLinearCF.H b/src/Interaction/Models/contactForce/nonLinearCF.hpp
similarity index 98%
rename from src/Interaction/Models/contactForce/nonLinearCF.H
rename to src/Interaction/Models/contactForce/nonLinearCF.hpp
index dee111ea..5e7f27f3 100644
--- a/src/Interaction/Models/contactForce/nonLinearCF.H
+++ b/src/Interaction/Models/contactForce/nonLinearCF.hpp
@@ -18,10 +18,10 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __nonLinearCF_H__
-#define __nonLinearCF_H__
+#ifndef __nonLinearCF_hpp__
+#define __nonLinearCF_hpp__
 
-#include "types.H"
+#include "types.hpp"
 
 namespace pFlow::cfModels
 {
@@ -164,7 +164,7 @@ protected:
 
 public:
 
-	TypeNameNV(modelName());
+	TypeInfoNV(modelName());
 
 	INLINE_FUNCTION_HD
 	nonLinear(){}
diff --git a/src/Interaction/Models/contactForce/nonLinearMod.H b/src/Interaction/Models/contactForce/nonLinearMod.hpp
similarity index 97%
rename from src/Interaction/Models/contactForce/nonLinearMod.H
rename to src/Interaction/Models/contactForce/nonLinearMod.hpp
index c471f7b0..c9dbdfa9 100644
--- a/src/Interaction/Models/contactForce/nonLinearMod.H
+++ b/src/Interaction/Models/contactForce/nonLinearMod.hpp
@@ -18,10 +18,10 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __nonLinearModCF_H__
-#define __nonLinearModCF_H__
+#ifndef __nonLinearModCF_hpp__
+#define __nonLinearModCF_hpp__
 
-#include "types.H"
+#include "types.hpp"
 
 namespace pFlow::cfModels
 {
@@ -148,7 +148,7 @@ protected:
 
 public:
 
-	TypeNameNV(modelName());
+	TypeInfoNV(modelName());
 
 	INLINE_FUNCTION_HD
 	nonLinearMod(){}
@@ -266,4 +266,4 @@ public:
 
 } //pFlow::CFModels
 
-#endif //__nonLinearModCF_H__
+#endif //__nonLinearModCF_hpp__
diff --git a/src/Interaction/Models/contactForceModels.H b/src/Interaction/Models/contactForceModels.hpp
similarity index 87%
rename from src/Interaction/Models/contactForceModels.H
rename to src/Interaction/Models/contactForceModels.hpp
index de2117b3..a6b94a44 100644
--- a/src/Interaction/Models/contactForceModels.H
+++ b/src/Interaction/Models/contactForceModels.hpp
@@ -18,14 +18,14 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __contactForceModels_H__
-#define __contactForceModels_H__
+#ifndef __contactForceModels_hpp__
+#define __contactForceModels_hpp__
 
 
-#include "linearCF.H"
-#include "nonLinearCF.H"
-#include "normalRolling.H"
-#include "nonLinearMod.H"
+#include "linearCF.hpp"
+#include "nonLinearCF.hpp"
+#include "normalRolling.hpp"
+#include "nonLinearMod.hpp"
 
 
 namespace pFlow::cfModels 
@@ -45,4 +45,4 @@ using nonLimitedNonLinearModNormalRolling  = normalRolling<nonLinearMod<false>>;
 
 
 
-#endif //__contactForceModels_H__
\ No newline at end of file
+#endif //__contactForceModels_hpp__
\ No newline at end of file
diff --git a/src/Interaction/Models/rolling/normalRolling.H b/src/Interaction/Models/rolling/normalRolling.hpp
similarity index 95%
rename from src/Interaction/Models/rolling/normalRolling.H
rename to src/Interaction/Models/rolling/normalRolling.hpp
index ce602838..de850e3c 100644
--- a/src/Interaction/Models/rolling/normalRolling.H
+++ b/src/Interaction/Models/rolling/normalRolling.hpp
@@ -18,8 +18,8 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __normalRolling_H__
-#define __normalRolling_H__
+#ifndef __normalRolling_hpp__
+#define __normalRolling_hpp__
 
 
 namespace pFlow::cfModels
@@ -58,7 +58,7 @@ public:
 
 public:
 
-	TypeNameNV(word("normal<"+contactForceModel::TYPENAME()+">"));
+	TypeInfoNV(word("normal<"+contactForceModel::TYPENAME()+">"));
 	
 
 	normalRolling(int32 nMaterial, const ViewType1D<real>& rho, const dictionary& dict)
diff --git a/src/Interaction/contactLists/sortedContactList.H b/src/Interaction/contactLists/sortedContactList.hpp
similarity index 95%
rename from src/Interaction/contactLists/sortedContactList.H
rename to src/Interaction/contactLists/sortedContactList.hpp
index 0c9a44fb..45c8e4b0 100644
--- a/src/Interaction/contactLists/sortedContactList.H
+++ b/src/Interaction/contactLists/sortedContactList.hpp
@@ -18,10 +18,10 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __sortedContactList_H__ 
-#define __sortedContactList_H__
+#ifndef __sortedContactList_hpp__ 
+#define __sortedContactList_hpp__
 
-#include "sortedPairs.H"
+#include "sortedPairs.hpp"
 
 namespace pFlow
 {
@@ -78,7 +78,7 @@ protected:
 
 public:
 
-	TypeNameNV("sortedContactList");
+	TypeInfoNV("sortedContactList");
 
 
 	sortedContactList(int32 initialSize =1)
@@ -168,4 +168,4 @@ public:
 
 
 
-#endif //__sortedContactList_H__
+#endif //__sortedContactList_hpp__
diff --git a/src/Interaction/contactLists/sortedPairs.H b/src/Interaction/contactLists/sortedPairs.hpp
similarity index 96%
rename from src/Interaction/contactLists/sortedPairs.H
rename to src/Interaction/contactLists/sortedPairs.hpp
index e127fcfe..d8b74a50 100644
--- a/src/Interaction/contactLists/sortedPairs.H
+++ b/src/Interaction/contactLists/sortedPairs.hpp
@@ -19,11 +19,11 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __sortedPairs_H__
-#define __sortedPairs_H__
+#ifndef __sortedPairs_hpp__
+#define __sortedPairs_hpp__
 
-#include "unsortedPairs.H"
-#include "KokkosUtilities.H"
+#include "unsortedPairs.hpp"
+#include "KokkosUtilities.hpp"
 
 namespace pFlow
 {
@@ -106,7 +106,7 @@ protected:
 public:
 	
 	// - type info
-	TypeNameNV("sortedPairs");
+	TypeInfoNV("sortedPairs");
 
 
 	// constructors
@@ -255,4 +255,4 @@ public:
 
 }
 
-#endif //__sortedPairs_H__
+#endif //__sortedPairs_hpp__
diff --git a/src/Interaction/contactLists/unsortedContactList.H b/src/Interaction/contactLists/unsortedContactList.hpp
similarity index 96%
rename from src/Interaction/contactLists/unsortedContactList.H
rename to src/Interaction/contactLists/unsortedContactList.hpp
index f83960c6..f2200fd9 100644
--- a/src/Interaction/contactLists/unsortedContactList.H
+++ b/src/Interaction/contactLists/unsortedContactList.hpp
@@ -18,8 +18,8 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __unsortedContactList_H__
-#define __unsortedContactList_H__ 
+#ifndef __unsortedContactList_hpp__
+#define __unsortedContactList_hpp__ 
 
 namespace pFlow
 {
@@ -78,7 +78,7 @@ protected:
 
 public:
 
-	TypeNameNV("unsortedContactList");
+	TypeInfoNV("unsortedContactList");
 
 	unsortedContactList(int32 capacity=1)
 	:
@@ -172,4 +172,4 @@ public:
 } // pFlow
 
 
-#endif //__unsortedContactList_H__
+#endif //__unsortedContactList_hpp__
diff --git a/src/Interaction/contactLists/unsortedPairs.H b/src/Interaction/contactLists/unsortedPairs.hpp
similarity index 96%
rename from src/Interaction/contactLists/unsortedPairs.H
rename to src/Interaction/contactLists/unsortedPairs.hpp
index 4905f1c3..e9434751 100644
--- a/src/Interaction/contactLists/unsortedPairs.H
+++ b/src/Interaction/contactLists/unsortedPairs.hpp
@@ -18,11 +18,11 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __unsortedPairs_H__
-#define __unsortedPairs_H__
+#ifndef __unsortedPairs_hpp__
+#define __unsortedPairs_hpp__
 
-#include "KokkosTypes.H"
-#include "types.H"
+#include "KokkosTypes.hpp"
+#include "types.hpp"
 
 namespace pFlow
 {
@@ -81,7 +81,7 @@ protected:
 public:
 	
 	// - type info
-	TypeNameNV("unsorderedPairs");
+	TypeInfoNV("unsorderedPairs");
 
 	// constructor
 	unsortedPairs(int32 capacity=1)
@@ -213,4 +213,4 @@ public:
 
 }
 
-#endif //__unsortedPairs_H__
\ No newline at end of file
+#endif //__unsortedPairs_hpp__
\ No newline at end of file
diff --git a/src/Interaction/contactSearch/ContactSearch/ContactSearch.H b/src/Interaction/contactSearch/ContactSearch/ContactSearch.hpp
similarity index 96%
rename from src/Interaction/contactSearch/ContactSearch/ContactSearch.H
rename to src/Interaction/contactSearch/ContactSearch/ContactSearch.hpp
index 21f03934..d8065d94 100644
--- a/src/Interaction/contactSearch/ContactSearch/ContactSearch.H
+++ b/src/Interaction/contactSearch/ContactSearch/ContactSearch.hpp
@@ -19,12 +19,12 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __ContactSearch_H__
-#define __ContactSearch_H__
+#ifndef __ContactSearch_hpp__
+#define __ContactSearch_hpp__
 
 
-#include "contactSearch.H"
-#include "box.H"
+#include "contactSearch.hpp"
+#include "box.hpp"
 
 namespace pFlow
 {
@@ -64,7 +64,7 @@ protected:
 
 public:
 
-	TypeNameTemplate2("ContactSearch", ParticleContactSearchType, WallMappingType);
+	TypeInfoTemplate2("ContactSearch", ParticleContactSearchType, WallMappingType);
 
 	ContactSearch(
 		const dictionary& csDict,
@@ -245,4 +245,4 @@ public:
 }
 
 
-#endif //__ContactSearch_H__
+#endif //__ContactSearch_hpp__
diff --git a/src/Interaction/contactSearch/ContactSearch/ContactSearchs.C b/src/Interaction/contactSearch/ContactSearch/ContactSearchs.cpp
similarity index 89%
rename from src/Interaction/contactSearch/ContactSearch/ContactSearchs.C
rename to src/Interaction/contactSearch/ContactSearch/ContactSearchs.cpp
index 7d617155..043e9b78 100644
--- a/src/Interaction/contactSearch/ContactSearch/ContactSearchs.C
+++ b/src/Interaction/contactSearch/ContactSearch/ContactSearchs.cpp
@@ -18,12 +18,12 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#include "ContactSearch.H"
+#include "ContactSearch.hpp"
 
-#include "cellMapping.H"
-#include "NBS.H"
-#include "multiGridNBS.H"
-#include "multiGridMapping.H"
+#include "cellMapping.hpp"
+#include "NBS.hpp"
+#include "multiGridNBS.hpp"
+#include "multiGridMapping.hpp"
 
 
 template class pFlow::ContactSearch<pFlow::NBS, pFlow::cellMapping>;
diff --git a/src/Interaction/contactSearch/cells.H b/src/Interaction/contactSearch/cells.hpp
similarity index 98%
rename from src/Interaction/contactSearch/cells.H
rename to src/Interaction/contactSearch/cells.hpp
index 230ba2d8..c77b1a69 100644
--- a/src/Interaction/contactSearch/cells.H
+++ b/src/Interaction/contactSearch/cells.hpp
@@ -18,12 +18,12 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __cells_H__
-#define __cells_H__
+#ifndef __cells_hpp__
+#define __cells_hpp__
 
 
-#include "types.H"
-#include "box.H"
+#include "types.hpp"
+#include "box.hpp"
 
 namespace pFlow
 {
diff --git a/src/Interaction/contactSearch/contactSearch/contactSearch.C b/src/Interaction/contactSearch/contactSearch/contactSearch.cpp
similarity index 98%
rename from src/Interaction/contactSearch/contactSearch/contactSearch.C
rename to src/Interaction/contactSearch/contactSearch/contactSearch.cpp
index 8c05a03e..b26215b4 100644
--- a/src/Interaction/contactSearch/contactSearch/contactSearch.C
+++ b/src/Interaction/contactSearch/contactSearch/contactSearch.cpp
@@ -18,7 +18,7 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#include "contactSearch.H"
+#include "contactSearch.hpp"
 
 
 
diff --git a/src/Interaction/contactSearch/contactSearch/contactSearch.H b/src/Interaction/contactSearch/contactSearch/contactSearch.hpp
similarity index 91%
rename from src/Interaction/contactSearch/contactSearch/contactSearch.H
rename to src/Interaction/contactSearch/contactSearch/contactSearch.hpp
index 63e9153f..7725f7e6 100644
--- a/src/Interaction/contactSearch/contactSearch/contactSearch.H
+++ b/src/Interaction/contactSearch/contactSearch/contactSearch.hpp
@@ -19,14 +19,14 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __contactSearch_H__
-#define __contactSearch_H__
+#ifndef __contactSearch_hpp__
+#define __contactSearch_hpp__
 
 
-#include "interactionBase.H"
-#include "unsortedPairs.H"
-#include "box.H"
-#include "dictionary.H"
+#include "interactionBase.hpp"
+#include "unsortedPairs.hpp"
+#include "box.hpp"
+#include "dictionary.hpp"
 
 namespace pFlow
 {
@@ -62,7 +62,7 @@ protected:
 	
 public:
 
-	TypeName("contactSearch");
+	TypeInfo("contactSearch");
 
 	contactSearch(
 		const dictionary& dict,
@@ -132,4 +132,4 @@ public:
 }
 
 
-#endif //__ContactSearch_H__
+#endif //__ContactSearch_hpp__
diff --git a/src/Interaction/contactSearch/contactSearchFunctions.H b/src/Interaction/contactSearch/contactSearchFunctions.hpp
similarity index 95%
rename from src/Interaction/contactSearch/contactSearchFunctions.H
rename to src/Interaction/contactSearch/contactSearchFunctions.hpp
index 10eadce1..55879c95 100644
--- a/src/Interaction/contactSearch/contactSearchFunctions.H
+++ b/src/Interaction/contactSearch/contactSearchFunctions.hpp
@@ -18,11 +18,11 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __broadSearchFunctions_H__
-#define __broadSearchFunctions_H__
+#ifndef __broadSearchFunctions_hpp__
+#define __broadSearchFunctions_hpp__
 
-#include "types.H"
-#include "iBox.H"
+#include "types.hpp"
+#include "iBox.hpp"
 
 namespace pFlow
 {
@@ -109,4 +109,4 @@ bool sphereSphereCheck(const realx3& p1, const realx3 p2, real d1, real d2)
 
 }
 
-#endif //__broadSearchFunctions_H__
+#endif //__broadSearchFunctions_hpp__
diff --git a/src/Interaction/contactSearch/methods/NBS.H b/src/Interaction/contactSearch/methods/NBS.hpp
similarity index 98%
rename from src/Interaction/contactSearch/methods/NBS.H
rename to src/Interaction/contactSearch/methods/NBS.hpp
index 4fe46272..fb3cc4f8 100644
--- a/src/Interaction/contactSearch/methods/NBS.H
+++ b/src/Interaction/contactSearch/methods/NBS.hpp
@@ -19,10 +19,10 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __NBS_H__
-#define __NBS_H__
+#ifndef __NBS_hpp__
+#define __NBS_hpp__
 
-#include "NBSLevel0.H"
+#include "NBSLevel0.hpp"
 
 namespace pFlow
 {
@@ -80,7 +80,7 @@ private:
 
 public:
 
-	TypeNameNV("NBS");
+	TypeInfoNV("NBS");
 
 		NBS(
 			const dictionary& dict,
diff --git a/src/Interaction/contactSearch/methods/NBSCrossLoop.H b/src/Interaction/contactSearch/methods/NBSCrossLoop.hpp
similarity index 100%
rename from src/Interaction/contactSearch/methods/NBSCrossLoop.H
rename to src/Interaction/contactSearch/methods/NBSCrossLoop.hpp
diff --git a/src/Interaction/contactSearch/methods/NBSLevel.H b/src/Interaction/contactSearch/methods/NBSLevel.hpp
similarity index 94%
rename from src/Interaction/contactSearch/methods/NBSLevel.H
rename to src/Interaction/contactSearch/methods/NBSLevel.hpp
index 2a1c6aaa..f355d566 100644
--- a/src/Interaction/contactSearch/methods/NBSLevel.H
+++ b/src/Interaction/contactSearch/methods/NBSLevel.hpp
@@ -1,8 +1,8 @@
-#ifndef __NBSLevel_H__
-#define __NBSLevel_H__
+#ifndef __NBSLevel_hpp__
+#define __NBSLevel_hpp__
 
 
-#include "NBSLevel0.H"
+#include "NBSLevel0.hpp"
 
 
 namespace pFlow
@@ -51,7 +51,7 @@ protected:
 	
 public:
 	
-	TypeNameNV("NBSLevel0");
+	TypeInfoNV("NBSLevel0");
 
 	INLINE_FUNCTION_HD
 	NBSLevel(){}
@@ -105,7 +105,7 @@ public:
 			"NBSLevel::findPairsCountCross",
 			mdrPolicy,
 			CLASS_LAMBDA_HD(int32 i, int32 j, int32 k, int32& getFullUpdate){
-				#include "NBSCrossLoop.H"
+				#include "NBSCrossLoop.hpp"
 			}, notInsertedPairs);
 			
 		return notInsertedPairs;	
diff --git a/src/Interaction/contactSearch/methods/NBSLevel0.H b/src/Interaction/contactSearch/methods/NBSLevel0.hpp
similarity index 97%
rename from src/Interaction/contactSearch/methods/NBSLevel0.H
rename to src/Interaction/contactSearch/methods/NBSLevel0.hpp
index af313402..2e23f961 100644
--- a/src/Interaction/contactSearch/methods/NBSLevel0.H
+++ b/src/Interaction/contactSearch/methods/NBSLevel0.hpp
@@ -19,10 +19,10 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __NBSLevel0_H__
-#define __NBSLevel0_H__
+#ifndef __NBSLevel0_hpp__
+#define __NBSLevel0_hpp__
 
-#include "mapperNBS.H"
+#include "mapperNBS.hpp"
 
 namespace pFlow
 {
@@ -82,7 +82,7 @@ protected:
 
 public:
 
-	TypeNameNV("NBSLevel0");
+	TypeInfoNV("NBSLevel0");
 
 		INLINE_FUNCTION_HD
 		NBSLevel0(){}
@@ -226,7 +226,7 @@ public:
 			"NBSLevel0::findPairs",
 			mdrPolicy,
 			CLASS_LAMBDA_HD(int32 i, int32 j, int32 k, int32& getFullUpdate){
-				#include "NBSLoop.H"
+				#include "NBSLoop.hpp"
 			}, notInsertedPairs);
 			
 		return notInsertedPairs;
@@ -237,4 +237,4 @@ public:
 
 } // pFlow
 
-#endif // __NBSLevel0_H__
+#endif // __NBSLevel0_hpp__
diff --git a/src/Interaction/contactSearch/methods/NBSLevels.H b/src/Interaction/contactSearch/methods/NBSLevels.hpp
similarity index 98%
rename from src/Interaction/contactSearch/methods/NBSLevels.H
rename to src/Interaction/contactSearch/methods/NBSLevels.hpp
index d30a1ec4..ca7bd730 100644
--- a/src/Interaction/contactSearch/methods/NBSLevels.H
+++ b/src/Interaction/contactSearch/methods/NBSLevels.hpp
@@ -1,9 +1,9 @@
-#ifndef __NBSLevels_H__
-#define __NBSLevels_H__
+#ifndef __NBSLevels_hpp__
+#define __NBSLevels_hpp__
 
-#include "NBSLevel.H"
-#include "NBSLevel0.H"
-#include "KokkosTypes.H"
+#include "NBSLevel.hpp"
+#include "NBSLevel0.hpp"
+#include "KokkosTypes.hpp"
 
 namespace pFlow
 {
diff --git a/src/Interaction/contactSearch/methods/NBSLoop.H b/src/Interaction/contactSearch/methods/NBSLoop.hpp
similarity index 100%
rename from src/Interaction/contactSearch/methods/NBSLoop.H
rename to src/Interaction/contactSearch/methods/NBSLoop.hpp
diff --git a/src/Interaction/contactSearch/methods/mapperNBS.H b/src/Interaction/contactSearch/methods/mapperNBS.hpp
similarity index 97%
rename from src/Interaction/contactSearch/methods/mapperNBS.H
rename to src/Interaction/contactSearch/methods/mapperNBS.hpp
index 4677bbde..41b47068 100644
--- a/src/Interaction/contactSearch/methods/mapperNBS.H
+++ b/src/Interaction/contactSearch/methods/mapperNBS.hpp
@@ -19,12 +19,13 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __mapperNBS_H__
-#define __mapperNBS_H__
+#ifndef __mapperNBS_hpp__
+#define __mapperNBS_hpp__
 
-#include "cells.H"
-#include "contactSearchFunctions.H"
-#include "baseAlgorithms.H"
+#include "cells.hpp"
+#include "contactSearchFunctions.hpp"
+#include "baseAlgorithms.hpp"
+#include "ViewAlgorithms.hpp"
 
 namespace pFlow
 {
@@ -156,7 +157,7 @@ protected:
 	
 public:
 
-	TypeNameNV("mapperNBS");
+	TypeInfoNV("mapperNBS");
 
 		INLINE_FUNCTION_HD
 		mapperNBS(){}
@@ -385,4 +386,4 @@ public:
 
 } // pFlow
 
-#endif // __mapperNBS_H__
\ No newline at end of file
+#endif // __mapperNBS_hpp__
\ No newline at end of file
diff --git a/src/Interaction/contactSearch/methods/multiGridNBS.H b/src/Interaction/contactSearch/methods/multiGridNBS.hpp
similarity index 97%
rename from src/Interaction/contactSearch/methods/multiGridNBS.H
rename to src/Interaction/contactSearch/methods/multiGridNBS.hpp
index bdbf60dd..dbce390b 100644
--- a/src/Interaction/contactSearch/methods/multiGridNBS.H
+++ b/src/Interaction/contactSearch/methods/multiGridNBS.hpp
@@ -19,10 +19,10 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __multiGridNBS_H__
-#define __multiGridNBS_H__
+#ifndef __multiGridNBS_hpp__
+#define __multiGridNBS_hpp__
 
-#include "NBSLevels.H"
+#include "NBSLevels.hpp"
 
 namespace pFlow
 {
@@ -80,7 +80,7 @@ private:
 
 public:
 
-	TypeNameNV("multiGridNBS");
+	TypeInfoNV("multiGridNBS");
 
 		multiGridNBS(
 			const 	dictionary& dict,
diff --git a/src/Interaction/contactSearch/wallMappings/cellMapping.H b/src/Interaction/contactSearch/wallMappings/cellMapping.hpp
similarity index 95%
rename from src/Interaction/contactSearch/wallMappings/cellMapping.H
rename to src/Interaction/contactSearch/wallMappings/cellMapping.hpp
index baaaaf9d..5a10c248 100644
--- a/src/Interaction/contactSearch/wallMappings/cellMapping.H
+++ b/src/Interaction/contactSearch/wallMappings/cellMapping.hpp
@@ -18,11 +18,11 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __cellMapping_H__
-#define __cellMapping_H__
+#ifndef __cellMapping_hpp__
+#define __cellMapping_hpp__
 
-#include "cellsWallLevel0.H"
-#include "dictionary.H"
+#include "cellsWallLevel0.hpp"
+#include "dictionary.hpp"
 
 
 namespace pFlow
@@ -84,7 +84,7 @@ private:
 
 public:
 
-	TypeNameNV("cellMapping");
+	TypeInfoNV("cellMapping");
 
 	cellMapping(
 		const dictionary&  		dict,
diff --git a/src/Interaction/contactSearch/wallMappings/cellsWallLevel0.H b/src/Interaction/contactSearch/wallMappings/cellsWallLevel0.hpp
similarity index 96%
rename from src/Interaction/contactSearch/wallMappings/cellsWallLevel0.H
rename to src/Interaction/contactSearch/wallMappings/cellsWallLevel0.hpp
index 309fe149..9ea9ce67 100644
--- a/src/Interaction/contactSearch/wallMappings/cellsWallLevel0.H
+++ b/src/Interaction/contactSearch/wallMappings/cellsWallLevel0.hpp
@@ -18,13 +18,13 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __cellsWallLevel0_H__
-#define __cellsWallLevel0_H__
+#ifndef __cellsWallLevel0_hpp__
+#define __cellsWallLevel0_hpp__
 
-#include "types.H"
-#include "KokkosTypes.H"	
-#include "cells.H"
-#include "iBox.H"
+#include "types.hpp"
+#include "KokkosTypes.hpp"	
+#include "cells.hpp"
+#include "iBox.hpp"
 
 
 
@@ -95,7 +95,7 @@ protected:
 
 public:
 
-	TypeNameNV("cellsWallLevel0");
+	TypeInfoNV("cellsWallLevel0");
 
 	INLINE_FUNCTION_HD
 	cellsWallLevel0(){}
@@ -282,4 +282,4 @@ public:
 } // pFlow
 
 
-#endif // __cellsWallLevel0_H__
+#endif // __cellsWallLevel0_hpp__
diff --git a/src/Interaction/contactSearch/wallMappings/cellsWallLevels.H b/src/Interaction/contactSearch/wallMappings/cellsWallLevels.hpp
similarity index 95%
rename from src/Interaction/contactSearch/wallMappings/cellsWallLevels.H
rename to src/Interaction/contactSearch/wallMappings/cellsWallLevels.hpp
index 276ed058..56f39461 100644
--- a/src/Interaction/contactSearch/wallMappings/cellsWallLevels.H
+++ b/src/Interaction/contactSearch/wallMappings/cellsWallLevels.hpp
@@ -18,10 +18,10 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __cellsWallLevels_H__
-#define __cellsWallLevels_H__
+#ifndef __cellsWallLevels_hpp__
+#define __cellsWallLevels_hpp__
 
-#include "cellsWallLevel0.H"
+#include "cellsWallLevel0.hpp"
 
 namespace pFlow
 {
@@ -58,7 +58,7 @@ protected:
 
 public:
 
-	TypeNameNV("cellsWallLevels");
+	TypeInfoNV("cellsWallLevels");
 
 	FUNCTION_H
 	cellsWallLevels(
@@ -149,4 +149,4 @@ public:
 } // pFlow
 
 
-#endif // __cellsWallLevels_H__
+#endif // __cellsWallLevels_hpp__
diff --git a/src/Interaction/contactSearch/wallMappings/multiGridMapping.H b/src/Interaction/contactSearch/wallMappings/multiGridMapping.hpp
similarity index 95%
rename from src/Interaction/contactSearch/wallMappings/multiGridMapping.H
rename to src/Interaction/contactSearch/wallMappings/multiGridMapping.hpp
index cc442ab0..10a55001 100644
--- a/src/Interaction/contactSearch/wallMappings/multiGridMapping.H
+++ b/src/Interaction/contactSearch/wallMappings/multiGridMapping.hpp
@@ -18,11 +18,11 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __multiGridMapping_H__
-#define __multiGridMapping_H__
+#ifndef __multiGridMapping_hpp__
+#define __multiGridMapping_hpp__
 
-#include "cellsWallLevels.H"
-#include "dictionary.H"
+#include "cellsWallLevels.hpp"
+#include "dictionary.hpp"
 
 
 namespace pFlow
@@ -84,7 +84,7 @@ private:
 
 public:
 
-	TypeNameNV("multiGridMapping");
+	TypeInfoNV("multiGridMapping");
 
 	multiGridMapping(
 		const dictionary&  			dict,
diff --git a/src/Interaction/interaction/demInteraction.H b/src/Interaction/interaction/demInteraction.hpp
similarity index 86%
rename from src/Interaction/interaction/demInteraction.H
rename to src/Interaction/interaction/demInteraction.hpp
index b6b3efaf..8c74639c 100644
--- a/src/Interaction/interaction/demInteraction.H
+++ b/src/Interaction/interaction/demInteraction.hpp
@@ -18,13 +18,13 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __demInteraction_H__
-#define __demInteraction_H__
+#ifndef __demInteraction_hpp__
+#define __demInteraction_hpp__
 
-#include "property.H"
-#include "demComponent.H"
-#include "pointFields.H"
-#include "triSurfaceFields.H"
+#include "property.hpp"
+#include "demComponent.hpp"
+#include "pointFields.hpp"
+#include "triSurfaceFields.hpp"
 
 namespace pFlow
 {
@@ -56,4 +56,4 @@ public:
 
 }
 
-#endif //__interaction_H__ 
+#endif //__interaction_hpp__ 
diff --git a/src/Interaction/interaction/interaction.C b/src/Interaction/interaction/interaction.cpp
similarity index 99%
rename from src/Interaction/interaction/interaction.C
rename to src/Interaction/interaction/interaction.cpp
index 4675cd28..63e797e7 100644
--- a/src/Interaction/interaction/interaction.C
+++ b/src/Interaction/interaction/interaction.cpp
@@ -18,7 +18,7 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#include "interaction.H"
+#include "interaction.hpp"
 
 
 pFlow::interaction::interaction
diff --git a/src/Interaction/interaction/interaction.H b/src/Interaction/interaction/interaction.hpp
similarity index 90%
rename from src/Interaction/interaction/interaction.H
rename to src/Interaction/interaction/interaction.hpp
index cf8971fd..97372bcc 100644
--- a/src/Interaction/interaction/interaction.H
+++ b/src/Interaction/interaction/interaction.hpp
@@ -18,13 +18,13 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __interaction_H__
-#define __interaction_H__
+#ifndef __interaction_hpp__
+#define __interaction_hpp__
 
-#include "demInteraction.H"
-#include "eventObserver.H"
-#include "interactionBase.H"
-#include "contactSearch.H"
+#include "demInteraction.hpp"
+#include "eventObserver.hpp"
+#include "interactionBase.hpp"
+#include "contactSearch.hpp"
 
 
 
@@ -55,7 +55,7 @@ protected:
 
 public:
 
-	TypeName("interaction");
+	TypeInfo("interaction");
 
 
 	//// - constructors 
@@ -106,4 +106,4 @@ public:
 
 }
 
-#endif //__interaction_H__ 
+#endif //__interaction_hpp__ 
diff --git a/src/Interaction/interaction/interactionBase.H b/src/Interaction/interaction/interactionBase.hpp
similarity index 90%
rename from src/Interaction/interaction/interactionBase.H
rename to src/Interaction/interaction/interactionBase.hpp
index dce5ece9..b5c9651e 100644
--- a/src/Interaction/interaction/interactionBase.H
+++ b/src/Interaction/interaction/interactionBase.hpp
@@ -18,12 +18,12 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __interactionBase_H__ 
-#define __interactionBase_H__
+#ifndef __interactionBase_hpp__ 
+#define __interactionBase_hpp__
 
-#include "interactionTypes.H"
-#include "particles.H"
-#include "geometry.H"
+#include "interactionTypes.hpp"
+#include "particles.hpp"
+#include "geometry.hpp"
 
 namespace pFlow
 {
@@ -81,4 +81,4 @@ public:
 }
 
 
-#endif //__interactionBase_H__
+#endif //__interactionBase_hpp__
diff --git a/src/Interaction/interaction/interactionTypes.H b/src/Interaction/interaction/interactionTypes.hpp
similarity index 91%
rename from src/Interaction/interaction/interactionTypes.H
rename to src/Interaction/interaction/interactionTypes.hpp
index a907018d..041eddc2 100644
--- a/src/Interaction/interaction/interactionTypes.H
+++ b/src/Interaction/interaction/interactionTypes.hpp
@@ -18,12 +18,12 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __interactionTypes_H__
-#define __interactionTypes_H__
+#ifndef __interactionTypes_hpp__
+#define __interactionTypes_hpp__
 
 
 
-#include "types.H"
+#include "types.hpp"
 
 
 namespace pFlow
@@ -42,4 +42,4 @@ using ID_TYPE 			= int32;
 }
 
 
-#endif //__interactionTypes_H__
+#endif //__interactionTypes_hpp__
diff --git a/src/Interaction/sphereInteraction/pLine.H b/src/Interaction/sphereInteraction/pLine.hpp
similarity index 97%
rename from src/Interaction/sphereInteraction/pLine.H
rename to src/Interaction/sphereInteraction/pLine.hpp
index 2b4ad9aa..5f1a0548 100644
--- a/src/Interaction/sphereInteraction/pLine.H
+++ b/src/Interaction/sphereInteraction/pLine.hpp
@@ -18,10 +18,10 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __pLine_H__
-#define __pLine_H__
+#ifndef __pLine_hpp__
+#define __pLine_hpp__
 
-#include "types.H"
+#include "types.hpp"
 
 namespace pFlow::sphTriInteraction
 {
diff --git a/src/Interaction/sphereInteraction/sphereInteraction.C b/src/Interaction/sphereInteraction/sphereInteraction.cpp
similarity index 100%
rename from src/Interaction/sphereInteraction/sphereInteraction.C
rename to src/Interaction/sphereInteraction/sphereInteraction.cpp
diff --git a/src/Interaction/sphereInteraction/sphereInteraction.H b/src/Interaction/sphereInteraction/sphereInteraction.hpp
similarity index 94%
rename from src/Interaction/sphereInteraction/sphereInteraction.H
rename to src/Interaction/sphereInteraction/sphereInteraction.hpp
index db085645..b256c452 100644
--- a/src/Interaction/sphereInteraction/sphereInteraction.H
+++ b/src/Interaction/sphereInteraction/sphereInteraction.hpp
@@ -18,13 +18,13 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __sphereInteraction_H__ 
-#define __sphereInteraction_H__
+#ifndef __sphereInteraction_hpp__ 
+#define __sphereInteraction_hpp__
 
-#include "interaction.H"
-#include "sphereParticles.H"
+#include "interaction.hpp"
+#include "sphereParticles.hpp"
 
-#include "sphereInteractionKernels.H"
+#include "sphereInteractionKernels.hpp"
 
 namespace pFlow
 {
@@ -97,7 +97,7 @@ protected:
 
 public:
 
-	TypeNameTemplate3("sphereInteraction", ContactForceModel, MotionModel, ContactListType);
+	TypeInfoTemplate3("sphereInteraction", ContactForceModel, MotionModel, ContactListType);
 
 	// constructor
 
@@ -221,6 +221,6 @@ public:
 
 }
 
-#include "sphereInteraction.C"
+#include "sphereInteraction.cpp"
 
-#endif //__sphereInteraction_H__
+#endif //__sphereInteraction_hpp__
diff --git a/src/Interaction/sphereInteraction/sphereInteractionKernels.H b/src/Interaction/sphereInteraction/sphereInteractionKernels.hpp
similarity index 97%
rename from src/Interaction/sphereInteraction/sphereInteractionKernels.H
rename to src/Interaction/sphereInteraction/sphereInteractionKernels.hpp
index d6fdc553..cef5fa72 100644
--- a/src/Interaction/sphereInteraction/sphereInteractionKernels.H
+++ b/src/Interaction/sphereInteraction/sphereInteractionKernels.hpp
@@ -18,11 +18,11 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __sphereInteractionKernels_H__
-#define __sphereInteractionKernels_H__
+#ifndef __sphereInteractionKernels_hpp__
+#define __sphereInteractionKernels_hpp__
 
 
-#include "sphereTriSurfaceContact.H"
+#include "sphereTriSurfaceContact.hpp"
 
 namespace pFlow::sphereInteractionKernels
 {
@@ -322,4 +322,4 @@ struct pwInteractionFunctor
 
 } 
 
-#endif //__sphereInteractionKernels_H__
\ No newline at end of file
+#endif //__sphereInteractionKernels_hpp__
\ No newline at end of file
diff --git a/src/Interaction/sphereInteraction/sphereInteractions.C b/src/Interaction/sphereInteraction/sphereInteractions.cpp
similarity index 96%
rename from src/Interaction/sphereInteraction/sphereInteractions.C
rename to src/Interaction/sphereInteraction/sphereInteractions.cpp
index 04ef878e..d8fbbebd 100644
--- a/src/Interaction/sphereInteraction/sphereInteractions.C
+++ b/src/Interaction/sphereInteraction/sphereInteractions.cpp
@@ -18,13 +18,13 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#include "sphereInteraction.H"
+#include "sphereInteraction.hpp"
 
-#include "geometryMotions.H"
+#include "geometryMotions.hpp"
 
-#include "contactForceModels.H"
-#include "unsortedContactList.H"
-#include "sortedContactList.H"
+#include "contactForceModels.hpp"
+#include "unsortedContactList.hpp"
+#include "sortedContactList.hpp"
 
 template class pFlow::sphereInteraction<
 	pFlow::cfModels::limitedLinearNormalRolling,
diff --git a/src/Interaction/sphereInteraction/sphereTriSurfaceContact.H b/src/Interaction/sphereInteraction/sphereTriSurfaceContact.hpp
similarity index 96%
rename from src/Interaction/sphereInteraction/sphereTriSurfaceContact.H
rename to src/Interaction/sphereInteraction/sphereTriSurfaceContact.hpp
index 7a5b611a..22a82ce2 100644
--- a/src/Interaction/sphereInteraction/sphereTriSurfaceContact.H
+++ b/src/Interaction/sphereInteraction/sphereTriSurfaceContact.hpp
@@ -19,11 +19,11 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __sphereTriSurfaceContact_H__
-#define __sphereTriSurfaceContact_H__
+#ifndef __sphereTriSurfaceContact_hpp__
+#define __sphereTriSurfaceContact_hpp__
 
-#include "triWall.H"
-#include "pLine.H"
+#include "triWall.hpp"
+#include "pLine.hpp"
 
 namespace pFlow::sphTriInteraction
 {
@@ -228,4 +228,4 @@ bool isSphereInContactBothSides(
 } // pFlow::sphTriInteraction
 
 
-#endif //__sphereTriSurfaceContact_H__
\ No newline at end of file
+#endif //__sphereTriSurfaceContact_hpp__
\ No newline at end of file
diff --git a/src/Interaction/sphereInteraction/triWall.H b/src/Interaction/sphereInteraction/triWall.hpp
similarity index 97%
rename from src/Interaction/sphereInteraction/triWall.H
rename to src/Interaction/sphereInteraction/triWall.hpp
index 36ca12f9..47d845fb 100644
--- a/src/Interaction/sphereInteraction/triWall.H
+++ b/src/Interaction/sphereInteraction/triWall.hpp
@@ -18,10 +18,10 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __triWall_H__
-#define __triWall_H__
+#ifndef __triWall_hpp__
+#define __triWall_hpp__
 
-#include "types.H"
+#include "types.hpp"
 
 namespace pFlow::sphTriInteraction
 {
diff --git a/src/MotionModel/CMakeLists.txt b/src/MotionModel/CMakeLists.txt
index fdc69ecb..83eb1415 100644
--- a/src/MotionModel/CMakeLists.txt
+++ b/src/MotionModel/CMakeLists.txt
@@ -1,8 +1,8 @@
 
 list(APPEND SourceFiles 
-entities/rotatingAxis/rotatingAxis.C
-fixedWall/fixedWall.C
-rotatingAxisMotion/rotatingAxisMotion.C
+entities/rotatingAxis/rotatingAxis.cpp
+fixedWall/fixedWall.cpp
+rotatingAxisMotion/rotatingAxisMotion.cpp
 )
 
 set(link_libs Kokkos::kokkos phasicFlow)
diff --git a/src/MotionModel/entities/rotatingAxis/rotatingAxis.C b/src/MotionModel/entities/rotatingAxis/rotatingAxis.cpp
similarity index 98%
rename from src/MotionModel/entities/rotatingAxis/rotatingAxis.C
rename to src/MotionModel/entities/rotatingAxis/rotatingAxis.cpp
index edf14ae5..34fc5f6b 100644
--- a/src/MotionModel/entities/rotatingAxis/rotatingAxis.C
+++ b/src/MotionModel/entities/rotatingAxis/rotatingAxis.cpp
@@ -18,8 +18,8 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#include "rotatingAxis.H"
-#include "dictionary.H"
+#include "rotatingAxis.hpp"
+#include "dictionary.hpp"
 
 /*FUNCTION_HD
 pFlow::rotatingAxis::rotatingAxis()
diff --git a/src/MotionModel/entities/rotatingAxis/rotatingAxis.H b/src/MotionModel/entities/rotatingAxis/rotatingAxis.hpp
similarity index 93%
rename from src/MotionModel/entities/rotatingAxis/rotatingAxis.H
rename to src/MotionModel/entities/rotatingAxis/rotatingAxis.hpp
index c9c69c7f..833fcff7 100644
--- a/src/MotionModel/entities/rotatingAxis/rotatingAxis.H
+++ b/src/MotionModel/entities/rotatingAxis/rotatingAxis.hpp
@@ -18,10 +18,10 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __rotatingAxis_H__
-#define __rotatingAxis_H__
+#ifndef __rotatingAxis_hpp__
+#define __rotatingAxis_hpp__
 
-#include "line.H"
+#include "line.hpp"
 
 namespace pFlow
 {
@@ -29,7 +29,7 @@ namespace pFlow
 class dictionary;
 class rotatingAxis;
 
-#include "rotatingAxisFwd.H"
+#include "rotatingAxisFwd.hpp"
 
 class rotatingAxis
 :
@@ -107,6 +107,6 @@ inline iIstream& operator >>(iIstream& is, rotatingAxis& ax)
 }
 
 
-#include "rotatingAxisI.H"
+#include "rotatingAxisI.hpp"
 
 #endif
diff --git a/src/MotionModel/entities/rotatingAxis/rotatingAxisFwd.H b/src/MotionModel/entities/rotatingAxis/rotatingAxisFwd.hpp
similarity index 100%
rename from src/MotionModel/entities/rotatingAxis/rotatingAxisFwd.H
rename to src/MotionModel/entities/rotatingAxis/rotatingAxisFwd.hpp
diff --git a/src/MotionModel/entities/rotatingAxis/rotatingAxisI.H b/src/MotionModel/entities/rotatingAxis/rotatingAxisI.hpp
similarity index 100%
rename from src/MotionModel/entities/rotatingAxis/rotatingAxisI.H
rename to src/MotionModel/entities/rotatingAxis/rotatingAxisI.hpp
diff --git a/src/MotionModel/fixedWall/fixedWall.C b/src/MotionModel/fixedWall/fixedWall.cpp
similarity index 96%
rename from src/MotionModel/fixedWall/fixedWall.C
rename to src/MotionModel/fixedWall/fixedWall.cpp
index 8f90b4f1..6c3dba2e 100644
--- a/src/MotionModel/fixedWall/fixedWall.C
+++ b/src/MotionModel/fixedWall/fixedWall.cpp
@@ -18,9 +18,9 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#include "fixedWall.H"
-#include "dictionary.H"
-#include "vocabs.H"
+#include "fixedWall.hpp"
+#include "dictionary.hpp"
+#include "vocabs.hpp"
 
 bool pFlow::fixedWall::readDictionary
 (
diff --git a/src/MotionModel/fixedWall/fixedWall.H b/src/MotionModel/fixedWall/fixedWall.hpp
similarity index 93%
rename from src/MotionModel/fixedWall/fixedWall.H
rename to src/MotionModel/fixedWall/fixedWall.hpp
index 2401eecb..fddeb95d 100644
--- a/src/MotionModel/fixedWall/fixedWall.H
+++ b/src/MotionModel/fixedWall/fixedWall.hpp
@@ -18,14 +18,14 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __fixedWall_H__
-#define __fixedWall_H__
+#ifndef __fixedWall_hpp__
+#define __fixedWall_hpp__
 
 
-#include "types.H"
-#include "typeInfo.H"
-#include "Vectors.H"
-#include "uniquePtr.H"
+#include "types.hpp"
+#include "typeInfo.hpp"
+#include "Vectors.hpp"
+#include "uniquePtr.hpp"
 
 
 
@@ -89,7 +89,7 @@ protected:
 
 public:
 	
-	TypeNameNV("fixedWall");
+	TypeInfoNV("fixedWall");
 
 	// empty
 	fixedWall();
@@ -167,4 +167,4 @@ public:
 
 } // pFlow
 
-#endif //__fixed_H__
+#endif //__fixed_hpp__
diff --git a/src/MotionModel/rotatingAxisMotion/rotatingAxisMotion.C b/src/MotionModel/rotatingAxisMotion/rotatingAxisMotion.cpp
similarity index 97%
rename from src/MotionModel/rotatingAxisMotion/rotatingAxisMotion.C
rename to src/MotionModel/rotatingAxisMotion/rotatingAxisMotion.cpp
index e0b907f0..8d8fa3c7 100644
--- a/src/MotionModel/rotatingAxisMotion/rotatingAxisMotion.C
+++ b/src/MotionModel/rotatingAxisMotion/rotatingAxisMotion.cpp
@@ -18,9 +18,9 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#include "rotatingAxisMotion.H"
-#include "dictionary.H"
-#include "vocabs.H"
+#include "rotatingAxisMotion.hpp"
+#include "dictionary.hpp"
+#include "vocabs.hpp"
 
 
 bool pFlow::rotatingAxisMotion::readDictionary
diff --git a/src/MotionModel/rotatingAxisMotion/rotatingAxisMotion.H b/src/MotionModel/rotatingAxisMotion/rotatingAxisMotion.hpp
similarity index 93%
rename from src/MotionModel/rotatingAxisMotion/rotatingAxisMotion.H
rename to src/MotionModel/rotatingAxisMotion/rotatingAxisMotion.hpp
index 7de5dcc3..cb478614 100644
--- a/src/MotionModel/rotatingAxisMotion/rotatingAxisMotion.H
+++ b/src/MotionModel/rotatingAxisMotion/rotatingAxisMotion.hpp
@@ -18,16 +18,16 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __rotatingAxisMotion_H__
-#define __rotatingAxisMotion_H__
+#ifndef __rotatingAxisMotion_hpp__
+#define __rotatingAxisMotion_hpp__
 
 
-#include "types.H"
-#include "typeInfo.H"
-#include "VectorDual.H"
-#include "Vectors.H"
-#include "List.H"
-#include "rotatingAxis.H"
+#include "types.hpp"
+#include "typeInfo.hpp"
+#include "VectorDual.hpp"
+#include "Vectors.hpp"
+#include "List.hpp"
+#include "rotatingAxis.hpp"
 
 
 namespace pFlow
@@ -104,7 +104,7 @@ protected:
 
 public:
 	
-	TypeNameNV("rotatingAxisMotion");
+	TypeInfoNV("rotatingAxisMotion");
 
 	// empty
 	FUNCTION_H
@@ -215,4 +215,4 @@ public:
 
 } // pFlow
 
-#endif //__rotatingAxisMotion_H__
+#endif //__rotatingAxisMotion_hpp__
diff --git a/src/Particles/CMakeLists.txt b/src/Particles/CMakeLists.txt
index 725c425f..09257ef9 100644
--- a/src/Particles/CMakeLists.txt
+++ b/src/Particles/CMakeLists.txt
@@ -1,14 +1,14 @@
 
 set(SourceFiles 
-dynamicPointStructure/dynamicPointStructure.C
-particles/particles.C
-SphereParticles/sphereShape/sphereShape.C
-SphereParticles/sphereParticles/sphereParticles.C
-Insertion/shapeMixture/shapeMixture.C
-Insertion/insertion/insertion.C
-Insertion/Insertion/Insertions.C
-Insertion/insertionRegion/insertionRegion.C
-Insertion/insertionRegion/timeFlowControl.C
+dynamicPointStructure/dynamicPointStructure.cpp
+particles/particles.cpp
+SphereParticles/sphereShape/sphereShape.cpp
+SphereParticles/sphereParticles/sphereParticles.cpp
+Insertion/shapeMixture/shapeMixture.cpp
+Insertion/insertion/insertion.cpp
+Insertion/Insertion/Insertions.cpp
+Insertion/insertionRegion/insertionRegion.cpp
+Insertion/insertionRegion/timeFlowControl.cpp
 )
 
 set(link_libs Kokkos::kokkos phasicFlow Integration Property)
diff --git a/src/Particles/Insertion/Insertion/Insertion.C b/src/Particles/Insertion/Insertion/Insertion.cpp
similarity index 100%
rename from src/Particles/Insertion/Insertion/Insertion.C
rename to src/Particles/Insertion/Insertion/Insertion.cpp
diff --git a/src/Particles/Insertion/Insertion/Insertion.H b/src/Particles/Insertion/Insertion/Insertion.hpp
similarity index 87%
rename from src/Particles/Insertion/Insertion/Insertion.H
rename to src/Particles/Insertion/Insertion/Insertion.hpp
index 69c3e416..c6fad5b5 100644
--- a/src/Particles/Insertion/Insertion/Insertion.H
+++ b/src/Particles/Insertion/Insertion/Insertion.hpp
@@ -19,14 +19,14 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __Insertion_H__
-#define __Insertion_H__
+#ifndef __Insertion_hpp__
+#define __Insertion_hpp__
 
 
-#include "insertion.H"
-#include "ListPtr.H"
-#include "InsertionRegion.H"
-#include "particles.H"
+#include "insertion.hpp"
+#include "ListPtr.hpp"
+#include "InsertionRegion.hpp"
+#include "particles.hpp"
 
 namespace pFlow
 {
@@ -50,7 +50,7 @@ protected:
 
 public:
 
-	TypeNameTemplateNV("Insertion",ShapeType);
+	TypeInfoTemplateNV("Insertion",ShapeType);
 
 	Insertion(particles& prtcl, const ShapeType& shapes);
 
@@ -65,6 +65,6 @@ public:
 
 }
 
-#include "Insertion.C"
+#include "Insertion.cpp"
 
 #endif
diff --git a/src/Particles/Insertion/Insertion/Insertions.C b/src/Particles/Insertion/Insertion/Insertions.cpp
similarity index 92%
rename from src/Particles/Insertion/Insertion/Insertions.C
rename to src/Particles/Insertion/Insertion/Insertions.cpp
index 5951a090..2bc3bd92 100644
--- a/src/Particles/Insertion/Insertion/Insertions.C
+++ b/src/Particles/Insertion/Insertion/Insertions.cpp
@@ -19,6 +19,6 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#include "Insertions.H"
+#include "Insertions.hpp"
 
 template class pFlow::Insertion<pFlow::sphereShape>;
\ No newline at end of file
diff --git a/src/Particles/Insertion/Insertion/Insertions.H b/src/Particles/Insertion/Insertion/Insertions.hpp
similarity index 91%
rename from src/Particles/Insertion/Insertion/Insertions.H
rename to src/Particles/Insertion/Insertion/Insertions.hpp
index 299df6c9..deaafba2 100644
--- a/src/Particles/Insertion/Insertion/Insertions.H
+++ b/src/Particles/Insertion/Insertion/Insertions.hpp
@@ -18,12 +18,12 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __Insertions_H__
-#define __Insertions_H__
+#ifndef __Insertions_hpp__
+#define __Insertions_hpp__
 
 
-#include "Insertion.H"
-#include "sphereShape.H"
+#include "Insertion.hpp"
+#include "sphereShape.hpp"
 
 namespace pFlow
 {
diff --git a/src/Particles/Insertion/InsertionRegion/InsertionRegion.C b/src/Particles/Insertion/InsertionRegion/InsertionRegion.cpp
similarity index 100%
rename from src/Particles/Insertion/InsertionRegion/InsertionRegion.C
rename to src/Particles/Insertion/InsertionRegion/InsertionRegion.cpp
diff --git a/src/Particles/Insertion/InsertionRegion/InsertionRegion.H b/src/Particles/Insertion/InsertionRegion/InsertionRegion.hpp
similarity index 91%
rename from src/Particles/Insertion/InsertionRegion/InsertionRegion.H
rename to src/Particles/Insertion/InsertionRegion/InsertionRegion.hpp
index bae48646..d7bdbf0a 100644
--- a/src/Particles/Insertion/InsertionRegion/InsertionRegion.H
+++ b/src/Particles/Insertion/InsertionRegion/InsertionRegion.hpp
@@ -18,12 +18,12 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __InsertionRegion_H__
-#define __InsertionRegion_H__
+#ifndef __InsertionRegion_hpp__
+#define __InsertionRegion_hpp__
 
 
-#include "insertionRegion.H"
-#include "dictionary.H"
+#include "insertionRegion.hpp"
+#include "dictionary.hpp"
 
 namespace pFlow
 {
@@ -46,7 +46,7 @@ protected:
 public:
 
 	// - type info
-	TypeNameTemplateNV("insertionRegion", ShapeType);
+	TypeInfoTemplateNV("insertionRegion", ShapeType);
 
 	InsertionRegion(const dictionary& dict, const ShapeType& shapes);
 
@@ -90,6 +90,6 @@ public:
 } // pFlow
 
 
-#include "InsertionRegion.C"
+#include "InsertionRegion.cpp"
 
 #endif
diff --git a/src/Particles/Insertion/insertion/insertion.C b/src/Particles/Insertion/insertion/insertion.cpp
similarity index 94%
rename from src/Particles/Insertion/insertion/insertion.C
rename to src/Particles/Insertion/insertion/insertion.cpp
index b5c4e12d..441eb9ab 100644
--- a/src/Particles/Insertion/insertion/insertion.C
+++ b/src/Particles/Insertion/insertion/insertion.cpp
@@ -19,10 +19,10 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#include "particles.H"
-#include "dictionary.H"
-#include "insertion.H"
-#include "streams.H"
+#include "particles.hpp"
+#include "dictionary.hpp"
+#include "insertion.hpp"
+#include "streams.hpp"
 
 bool pFlow::insertion::readInsertionDict
 (
diff --git a/src/Particles/Insertion/insertion/insertion.H b/src/Particles/Insertion/insertion/insertion.hpp
similarity index 94%
rename from src/Particles/Insertion/insertion/insertion.H
rename to src/Particles/Insertion/insertion/insertion.hpp
index a71d246f..2a813937 100644
--- a/src/Particles/Insertion/insertion/insertion.H
+++ b/src/Particles/Insertion/insertion/insertion.hpp
@@ -18,11 +18,11 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __insertion_H__
-#define __insertion_H__
+#ifndef __insertion_hpp__
+#define __insertion_hpp__
 
 
-#include "streams.H"
+#include "streams.hpp"
 
 namespace pFlow
 {
@@ -50,7 +50,7 @@ protected:
 public:
 
 	// type info
-	TypeName("insertion");
+	TypeInfo("insertion");
 
 	insertion(particles& prtcl);
 
diff --git a/src/Particles/Insertion/insertionRegion/insertionRegion.C b/src/Particles/Insertion/insertionRegion/insertionRegion.cpp
similarity index 98%
rename from src/Particles/Insertion/insertionRegion/insertionRegion.C
rename to src/Particles/Insertion/insertionRegion/insertionRegion.cpp
index f344042b..bce4ac48 100644
--- a/src/Particles/Insertion/insertionRegion/insertionRegion.C
+++ b/src/Particles/Insertion/insertionRegion/insertionRegion.cpp
@@ -19,8 +19,8 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#include "insertionRegion.H"
-#include "dictionary.H"
+#include "insertionRegion.hpp"
+#include "dictionary.hpp"
 
 bool pFlow::insertionRegion::readInsertionRegion
 (
diff --git a/src/Particles/Insertion/insertionRegion/insertionRegion.H b/src/Particles/Insertion/insertionRegion/insertionRegion.hpp
similarity index 90%
rename from src/Particles/Insertion/insertionRegion/insertionRegion.H
rename to src/Particles/Insertion/insertionRegion/insertionRegion.hpp
index b20b3116..04a1bf7e 100644
--- a/src/Particles/Insertion/insertionRegion/insertionRegion.H
+++ b/src/Particles/Insertion/insertionRegion/insertionRegion.hpp
@@ -18,13 +18,13 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __insertionRegion_H__
-#define __insertionRegion_H__
+#ifndef __insertionRegion_hpp__
+#define __insertionRegion_hpp__
 
-#include "timeFlowControl.H"
-#include "shapeMixture.H"
-#include "peakableRegions.H"
-#include "setFieldList.H"
+#include "timeFlowControl.hpp"
+#include "shapeMixture.hpp"
+#include "peakableRegions.hpp"
+#include "setFieldList.hpp"
 
 namespace pFlow
 {
@@ -60,7 +60,7 @@ protected:
 
 public:
 
-	TypeNameNV("insertionRegion");
+	TypeInfoNV("insertionRegion");
 
 	//// - Constructors
 
@@ -111,4 +111,4 @@ public:
 
 } //pFlow
 
-#endif //__insertionRegion_H__
+#endif //__insertionRegion_hpp__
diff --git a/src/Particles/Insertion/insertionRegion/timeFlowControl.C b/src/Particles/Insertion/insertionRegion/timeFlowControl.cpp
similarity index 96%
rename from src/Particles/Insertion/insertionRegion/timeFlowControl.C
rename to src/Particles/Insertion/insertionRegion/timeFlowControl.cpp
index 98ce99d6..1f510b17 100644
--- a/src/Particles/Insertion/insertionRegion/timeFlowControl.C
+++ b/src/Particles/Insertion/insertionRegion/timeFlowControl.cpp
@@ -18,8 +18,8 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#include "timeFlowControl.H"
-#include "dictionary.H"
+#include "timeFlowControl.hpp"
+#include "dictionary.hpp"
 
 bool pFlow::timeFlowControl::readTimeFlowControl
 (
diff --git a/src/Particles/Insertion/insertionRegion/timeFlowControl.H b/src/Particles/Insertion/insertionRegion/timeFlowControl.hpp
similarity index 93%
rename from src/Particles/Insertion/insertionRegion/timeFlowControl.H
rename to src/Particles/Insertion/insertionRegion/timeFlowControl.hpp
index e29e150b..e03b8b53 100644
--- a/src/Particles/Insertion/insertionRegion/timeFlowControl.H
+++ b/src/Particles/Insertion/insertionRegion/timeFlowControl.hpp
@@ -18,11 +18,11 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __timeFlowControl_H__ 
-#define __timeFlowControl_H__ 
+#ifndef __timeFlowControl_hpp__ 
+#define __timeFlowControl_hpp__ 
 
-#include "types.H"
-#include "streams.H"
+#include "types.hpp"
+#include "streams.hpp"
 
 namespace pFlow
 {
@@ -95,4 +95,4 @@ public:
 
 }
 
-#endif //__timeFlowControl_H__ 
+#endif //__timeFlowControl_hpp__ 
diff --git a/src/Particles/Insertion/shapeMixture/shapeMixture.C b/src/Particles/Insertion/shapeMixture/shapeMixture.cpp
similarity index 98%
rename from src/Particles/Insertion/shapeMixture/shapeMixture.C
rename to src/Particles/Insertion/shapeMixture/shapeMixture.cpp
index 1a79285a..3f04b069 100755
--- a/src/Particles/Insertion/shapeMixture/shapeMixture.C
+++ b/src/Particles/Insertion/shapeMixture/shapeMixture.cpp
@@ -19,8 +19,8 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#include "shapeMixture.H"
-#include "dictionary.H"
+#include "shapeMixture.hpp"
+#include "dictionary.hpp"
 
 
 pFlow::shapeMixture::shapeMixture
diff --git a/src/Particles/Insertion/shapeMixture/shapeMixture.H b/src/Particles/Insertion/shapeMixture/shapeMixture.hpp
similarity index 93%
rename from src/Particles/Insertion/shapeMixture/shapeMixture.H
rename to src/Particles/Insertion/shapeMixture/shapeMixture.hpp
index 3f68909f..83d5d1c5 100755
--- a/src/Particles/Insertion/shapeMixture/shapeMixture.H
+++ b/src/Particles/Insertion/shapeMixture/shapeMixture.hpp
@@ -18,11 +18,11 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __shapeMixture_H__
-#define __shapeMixture_H__
+#ifndef __shapeMixture_hpp__
+#define __shapeMixture_hpp__
 
 
-#include "Vectors.H"
+#include "Vectors.hpp"
 
 namespace pFlow
 {
@@ -47,7 +47,7 @@ protected:
 public:
 
 	//- type Info
-	TypeNameNV("shapeMixture");
+	TypeInfoNV("shapeMixture");
 
 	//// - constrcutores 
 		
@@ -101,4 +101,4 @@ public:
 
 } // pFlow
 
-#endif //__shapeMixture_H__
\ No newline at end of file
+#endif //__shapeMixture_hpp__
\ No newline at end of file
diff --git a/src/Particles/SphereParticles/sphereParticles/sphereParticles.C b/src/Particles/SphereParticles/sphereParticles/sphereParticles.cpp
similarity index 98%
rename from src/Particles/SphereParticles/sphereParticles/sphereParticles.C
rename to src/Particles/SphereParticles/sphereParticles/sphereParticles.cpp
index 122a10d0..13cbe20a 100644
--- a/src/Particles/SphereParticles/sphereParticles/sphereParticles.C
+++ b/src/Particles/SphereParticles/sphereParticles/sphereParticles.cpp
@@ -18,9 +18,9 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#include "sphereParticles.H"
-#include "setFieldList.H"
-#include "sphereParticlesKernels.H"
+#include "sphereParticles.hpp"
+#include "setFieldList.hpp"
+#include "sphereParticlesKernels.hpp"
 
 pFlow::uniquePtr<pFlow::List<pFlow::eventObserver*>> 
 pFlow::sphereParticles::getFieldObjectList()const
diff --git a/src/Particles/SphereParticles/sphereParticles/sphereParticles.H b/src/Particles/SphereParticles/sphereParticles/sphereParticles.hpp
similarity index 94%
rename from src/Particles/SphereParticles/sphereParticles/sphereParticles.H
rename to src/Particles/SphereParticles/sphereParticles/sphereParticles.hpp
index 0b208844..9dfa54b6 100644
--- a/src/Particles/SphereParticles/sphereParticles/sphereParticles.H
+++ b/src/Particles/SphereParticles/sphereParticles/sphereParticles.hpp
@@ -27,14 +27,14 @@ Licence:
    defining spherical prticles in a DEM simulation.
  */
 
-#ifndef __sphereParticles_H__
-#define __sphereParticles_H__ 
+#ifndef __sphereParticles_hpp__
+#define __sphereParticles_hpp__ 
 
-#include "systemControl.H"
-#include "particles.H"
-#include "sphereShape.H"
-#include "property.H"
-#include "indexContainer.H"
+#include "systemControl.hpp"
+#include "particles.hpp"
+#include "sphereShape.hpp"
+#include "property.hpp"
+#include "indexContainer.hpp"
 
 
 
@@ -185,4 +185,4 @@ public:
 
 } // pFlow
 
-#endif //__sphereParticles_H__
+#endif //__sphereParticles_hpp__
diff --git a/src/Particles/SphereParticles/sphereParticles/sphereParticlesKernels.H b/src/Particles/SphereParticles/sphereParticles/sphereParticlesKernels.hpp
similarity index 96%
rename from src/Particles/SphereParticles/sphereParticles/sphereParticlesKernels.H
rename to src/Particles/SphereParticles/sphereParticles/sphereParticlesKernels.hpp
index 0bab1397..2edeff2b 100644
--- a/src/Particles/SphereParticles/sphereParticles/sphereParticlesKernels.H
+++ b/src/Particles/SphereParticles/sphereParticles/sphereParticlesKernels.hpp
@@ -18,8 +18,8 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __sphereParticlesKernels_H__
-#define __sphereParticlesKernels_H__
+#ifndef __sphereParticlesKernels_hpp__
+#define __sphereParticlesKernels_hpp__
 
 namespace pFlow::sphereParticlesKernels
 {
diff --git a/src/Particles/SphereParticles/sphereShape/sphereShape.C b/src/Particles/SphereParticles/sphereShape/sphereShape.cpp
similarity index 97%
rename from src/Particles/SphereParticles/sphereShape/sphereShape.C
rename to src/Particles/SphereParticles/sphereShape/sphereShape.cpp
index 833d4748..7723f039 100644
--- a/src/Particles/SphereParticles/sphereShape/sphereShape.C
+++ b/src/Particles/SphereParticles/sphereShape/sphereShape.cpp
@@ -18,10 +18,10 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#include "sphereShape.H"
-#include "dictionary.H"
-#include "vocabs.H"
-#include "streams.H"
+#include "sphereShape.hpp"
+#include "dictionary.hpp"
+#include "vocabs.hpp"
+#include "streams.hpp"
 
 
 bool pFlow::sphereShape::insertNames
diff --git a/src/Particles/SphereParticles/sphereShape/sphereShape.H b/src/Particles/SphereParticles/sphereShape/sphereShape.hpp
similarity index 95%
rename from src/Particles/SphereParticles/sphereShape/sphereShape.H
rename to src/Particles/SphereParticles/sphereShape/sphereShape.hpp
index 30540e68..f6357558 100644
--- a/src/Particles/SphereParticles/sphereShape/sphereShape.H
+++ b/src/Particles/SphereParticles/sphereShape/sphereShape.hpp
@@ -18,11 +18,11 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __sphereShape_H__
-#define __sphereShape_H__
+#ifndef __sphereShape_hpp__
+#define __sphereShape_hpp__
 
-#include "Vectors.H"
-#include "hashMap.H"
+#include "Vectors.hpp"
+#include "hashMap.hpp"
 
 namespace pFlow
 {
@@ -54,7 +54,7 @@ protected:
 public:
 
 	// - type info
-	TypeNameNV("sphereShape");
+	TypeInfoNV("sphereShape");
 
 
 		sphereShape(){}
@@ -174,4 +174,4 @@ public:
 
 } // pFlow
 
-#endif //__sphereShape_H__
+#endif //__sphereShape_hpp__
diff --git a/src/Particles/dynamicPointStructure/dynamicPointStructure.C b/src/Particles/dynamicPointStructure/dynamicPointStructure.cpp
similarity index 99%
rename from src/Particles/dynamicPointStructure/dynamicPointStructure.C
rename to src/Particles/dynamicPointStructure/dynamicPointStructure.cpp
index 606ba9e1..7f2bba65 100644
--- a/src/Particles/dynamicPointStructure/dynamicPointStructure.C
+++ b/src/Particles/dynamicPointStructure/dynamicPointStructure.cpp
@@ -18,7 +18,7 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#include "dynamicPointStructure.H"
+#include "dynamicPointStructure.hpp"
 
 
 pFlow::dynamicPointStructure::dynamicPointStructure
diff --git a/src/Particles/dynamicPointStructure/dynamicPointStructure.H b/src/Particles/dynamicPointStructure/dynamicPointStructure.hpp
similarity index 93%
rename from src/Particles/dynamicPointStructure/dynamicPointStructure.H
rename to src/Particles/dynamicPointStructure/dynamicPointStructure.hpp
index 9a7c8649..da3ecf85 100644
--- a/src/Particles/dynamicPointStructure/dynamicPointStructure.H
+++ b/src/Particles/dynamicPointStructure/dynamicPointStructure.hpp
@@ -19,13 +19,13 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __dynamicPointStructure_H__
-#define __dynamicPointStructure_H__
+#ifndef __dynamicPointStructure_hpp__
+#define __dynamicPointStructure_hpp__
 
-#include "Time.H"
-#include "pointFields.H"
-#include "integrations.H"
-#include "uniquePtr.H"
+#include "Time.hpp"
+#include "pointFields.hpp"
+#include "integrations.hpp"
+#include "uniquePtr.hpp"
 
 namespace pFlow
 {
@@ -51,7 +51,7 @@ protected:
 
 public:
 
-	TypeName("dynamicPointStructure");
+	TypeInfo("dynamicPointStructure");
 
 	dynamicPointStructure(Time& time, const word& integrationMethod);
 
diff --git a/src/Particles/particles/demParticles.H b/src/Particles/particles/demParticles.hpp
similarity index 93%
rename from src/Particles/particles/demParticles.H
rename to src/Particles/particles/demParticles.hpp
index 4e5f0191..9afd2f62 100644
--- a/src/Particles/particles/demParticles.H
+++ b/src/Particles/particles/demParticles.hpp
@@ -19,10 +19,10 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __demParticles_H__ 
-#define __demParticles_H__
+#ifndef __demParticles_hpp__ 
+#define __demParticles_hpp__
 
-#include "demComponent.H"
+#include "demComponent.hpp"
 
 namespace pFlow
 {
diff --git a/src/Particles/particles/particleIdHandler.H b/src/Particles/particles/particleIdHandler.hpp
similarity index 94%
rename from src/Particles/particles/particleIdHandler.H
rename to src/Particles/particles/particleIdHandler.hpp
index 15edda24..1e2e6d33 100644
--- a/src/Particles/particles/particleIdHandler.H
+++ b/src/Particles/particles/particleIdHandler.hpp
@@ -18,11 +18,11 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __particleIdHandler_H__
-#define __particleIdHandler_H__
+#ifndef __particleIdHandler_hpp__
+#define __particleIdHandler_hpp__
 
 
-#include "pointFields.H"
+#include "pointFields.hpp"
 
 namespace pFlow
 {
diff --git a/src/Particles/particles/particles.C b/src/Particles/particles/particles.cpp
similarity index 99%
rename from src/Particles/particles/particles.C
rename to src/Particles/particles/particles.cpp
index ae8c3a68..ae6e89c1 100644
--- a/src/Particles/particles/particles.C
+++ b/src/Particles/particles/particles.cpp
@@ -19,7 +19,7 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#include "particles.H"
+#include "particles.hpp"
 
 
 pFlow::particles::particles
diff --git a/src/Particles/particles/particles.H b/src/Particles/particles/particles.hpp
similarity index 96%
rename from src/Particles/particles/particles.H
rename to src/Particles/particles/particles.hpp
index 4c13d24a..d2337c5d 100644
--- a/src/Particles/particles/particles.H
+++ b/src/Particles/particles/particles.hpp
@@ -19,12 +19,12 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __particles_H__
-#define __particles_H__
+#ifndef __particles_hpp__
+#define __particles_hpp__
 
-#include "dynamicPointStructure.H"
-#include "particleIdHandler.H"
-#include "demParticles.H"
+#include "dynamicPointStructure.hpp"
+#include "particleIdHandler.hpp"
+#include "demParticles.hpp"
 namespace pFlow
 {
 
@@ -88,7 +88,7 @@ protected:
 public:
 
 	// type info
-	TypeName("particles");
+	TypeInfo("particles");
 
 	particles(systemControl& control, const word& integrationMethod);
 
@@ -288,4 +288,4 @@ public:
 
 } // pFlow
 
-#endif //__particles_H__
+#endif //__particles_hpp__
diff --git a/src/Property/CMakeLists.txt b/src/Property/CMakeLists.txt
index 7c36a2c1..b3f63fcd 100644
--- a/src/Property/CMakeLists.txt
+++ b/src/Property/CMakeLists.txt
@@ -1,6 +1,6 @@
 
 set(SourceFiles 
-property.C
+property.cpp
 )
 
 set(link_libs Kokkos::kokkos phasicFlow)
diff --git a/src/Property/property.C b/src/Property/property.cpp
similarity index 98%
rename from src/Property/property.C
rename to src/Property/property.cpp
index 6a68adb0..b2745e10 100644
--- a/src/Property/property.C
+++ b/src/Property/property.cpp
@@ -19,8 +19,8 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#include "property.H"
-#include "dictionary.H"
+#include "property.hpp"
+#include "dictionary.hpp"
 
 bool pFlow::property::readDictionary
 (
diff --git a/src/Property/property.H b/src/Property/property.hpp
similarity index 95%
rename from src/Property/property.H
rename to src/Property/property.hpp
index d78a93be..02600ab2 100644
--- a/src/Property/property.H
+++ b/src/Property/property.hpp
@@ -19,11 +19,11 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __property_H__
-#define __property_H__
+#ifndef __property_hpp__
+#define __property_hpp__
 
-#include "Vectors.H"
-#include "hashMap.H"
+#include "Vectors.hpp"
+#include "hashMap.hpp"
 
 namespace pFlow
 {
@@ -57,7 +57,7 @@ protected:
 public:
 
 	// type info
-	TypeNameNV("property");
+	TypeInfoNV("property");
 
 		// - emptry, for reading from file 
 		property(){}
@@ -169,4 +169,4 @@ public:
 
 }
 
-#endif // __property_H__
+#endif // __property_hpp__
diff --git a/src/demComponent/demComponent.H b/src/demComponent/demComponent.hpp
similarity index 93%
rename from src/demComponent/demComponent.H
rename to src/demComponent/demComponent.hpp
index 60e094dc..08b16edc 100644
--- a/src/demComponent/demComponent.H
+++ b/src/demComponent/demComponent.hpp
@@ -18,10 +18,10 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __demComponent_H__ 
-#define __demComponent_H__
+#ifndef __demComponent_hpp__ 
+#define __demComponent_hpp__
 
-#include "systemControl.H"
+#include "systemControl.hpp"
 
 
 
@@ -42,7 +42,7 @@ protected:
 
 public:
 
-	TypeName("demComponent");
+	TypeInfo("demComponent");
 
 	demComponent(const word& name, systemControl& control)
 	:
diff --git a/src/phasicFlow/CMakeLists.txt b/src/phasicFlow/CMakeLists.txt
index 6f9b3f5f..27f5944f 100644
--- a/src/phasicFlow/CMakeLists.txt
+++ b/src/phasicFlow/CMakeLists.txt
@@ -1,80 +1,80 @@
 
 list(APPEND SourceFiles 
-types/basicTypes/bTypesFunctions.C
-types/basicTypes/Logical.C
-types/types.C
+types/basicTypes/bTypesFunctions.cpp
+types/basicTypes/Logical.cpp
+types/types.cpp
 
-globals/error.C
+globals/error.cpp
 
-streams/token/tokenIO.C
-streams/token/token.C
-streams/iStream/IOstream.C
-streams/iStream/iIstream.C
-streams/iStream/iOstream.C
-streams/Stream/Istream.C
-streams/Stream/Ostream.C
-streams/Fstream/iFstream.C
-streams/Fstream/oFstream.C
-streams/Fstream/fileStream.C 
-streams/TStream/iTstream.C
-streams/TStream/oTstream.C
-streams/streams.C 
+streams/token/tokenIO.cpp
+streams/token/token.cpp
+streams/iStream/IOstream.cpp
+streams/iStream/iIstream.cpp
+streams/iStream/iOstream.cpp
+streams/Stream/Istream.cpp
+streams/Stream/Ostream.cpp
+streams/Fstream/iFstream.cpp
+streams/Fstream/oFstream.cpp
+streams/Fstream/fileStream.cpp 
+streams/TStream/iTstream.cpp
+streams/TStream/oTstream.cpp
+streams/streams.cpp 
 
-dictionary/dictionary.C
-dictionary/entry/iEntry.C
-dictionary/entry/dataEntry.C 
-dictionary/twoPartEntry/twoPartEntry.C
+dictionary/dictionary.cpp
+dictionary/entry/iEntry.cpp
+dictionary/entry/dataEntry.cpp 
+dictionary/twoPartEntry/twoPartEntry.cpp
 
-fileSystem/fileSystem.C
+fileSystem/fileSystem.cpp
 
-commandLine/commandLine.C
+commandLine/commandLine.cpp
 
-random/randomReal/randomReal.C
-random/randomReal/randomReals.C
+random/randomReal/randomReal.cpp
+random/randomReal/randomReals.cpp
 
-Timer/Timer.C
-Timer/Timers.C
+Timer/Timer.cpp
+Timer/Timers.cpp
 
-repository/Time/Time.C
-repository/Time/timeControl.C
-repository/systemControl/systemControl.C
-repository/repository/repository.C
-repository/IOobject/objectFile.C
-repository/IOobject/IOobject.C
-repository/IOobject/IOfileHeader.C
+repository/Time/Time.cpp
+repository/Time/timeControl.cpp
+repository/systemControl/systemControl.cpp
+repository/repository/repository.cpp
+repository/IOobject/objectFile.cpp
+repository/IOobject/IOobject.cpp
+repository/IOobject/IOfileHeader.cpp
 
-structuredData/box/box.C
-structuredData/cylinder/cylinder.C
-structuredData/sphere/sphere.C
-structuredData/iBox/iBoxs.C
-structuredData/line/line.C
-structuredData/zAxis/zAxis.C
-structuredData/pointStructure/pointStructure.C
-structuredData/pointStructure/selectors/pStructSelector/pStructSelector.C
-structuredData/pointStructure/selectors/selectBox/selectBox.C
-structuredData/pointStructure/selectors/selectRange/selectRange.C 
-structuredData/pointStructure/selectors/selectRandom/selectRandom.C
-structuredData/trisurfaceStructure/triSurface.C
-structuredData/trisurfaceStructure/multiTriSurface.C
-structuredData/trisurfaceStructure/stlFile.C
-structuredData/peakableRegion/sphereRegion/sphereRegion.C
-structuredData/peakableRegion/cylinderRegion/cylinderRegion.C
-structuredData/peakableRegion/boxRegion/boxRegion.C
-structuredData/peakableRegion/peakableRegion/peakableRegion.C
-structuredData/peakableRegion/peakableRegions.C
+structuredData/box/box.cpp
+structuredData/cylinder/cylinder.cpp
+structuredData/sphere/sphere.cpp
+structuredData/iBox/iBoxs.cpp
+structuredData/line/line.cpp
+structuredData/zAxis/zAxis.cpp
+structuredData/pointStructure/pointStructure.cpp
+structuredData/pointStructure/selectors/pStructSelector/pStructSelector.cpp
+structuredData/pointStructure/selectors/selectBox/selectBox.cpp
+structuredData/pointStructure/selectors/selectRange/selectRange.cpp 
+structuredData/pointStructure/selectors/selectRandom/selectRandom.cpp
+structuredData/trisurfaceStructure/triSurface.cpp
+structuredData/trisurfaceStructure/multiTriSurface.cpp
+structuredData/trisurfaceStructure/stlFile.cpp
+structuredData/peakableRegion/sphereRegion/sphereRegion.cpp
+structuredData/peakableRegion/cylinderRegion/cylinderRegion.cpp
+structuredData/peakableRegion/boxRegion/boxRegion.cpp
+structuredData/peakableRegion/peakableRegion/peakableRegion.cpp
+structuredData/peakableRegion/peakableRegions.cpp
 
-containers/Vector/Vectors.C
-containers/Field/Fields.C
-containers/symArrayHD/symArrays.C
-containers/triSurfaceField/triSurfaceFields.C
-containers/bitsetHD/bitsetHDs.C
-containers/indexContainer/indexContainer.C
+containers/Vector/Vectors.cpp
+containers/Field/Fields.cpp
+containers/symArrayHD/symArrays.cpp
+containers/triSurfaceField/triSurfaceFields.cpp
+containers/bitsetHD/bitsetHDs.cpp
+containers/indexContainer/indexContainer.cpp
 
-setFieldList/setFieldList.C
-setFieldList/setFieldEntry.C
+setFieldList/setFieldList.cpp
+setFieldList/setFieldEntry.cpp
 
-eventSubscriber/eventSubscriber.C
-eventSubscriber/eventObserver.C)
+eventSubscriber/eventSubscriber.cpp
+eventSubscriber/eventObserver.cpp)
 
 set(link_libs Kokkos::kokkos tbb)
 
diff --git a/src/phasicFlow/Kokkos/KokkosTypes.H b/src/phasicFlow/Kokkos/KokkosTypes.hpp
similarity index 97%
rename from src/phasicFlow/Kokkos/KokkosTypes.H
rename to src/phasicFlow/Kokkos/KokkosTypes.hpp
index a2742609..74bca64f 100644
--- a/src/phasicFlow/Kokkos/KokkosTypes.H
+++ b/src/phasicFlow/Kokkos/KokkosTypes.hpp
@@ -18,8 +18,8 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __KokkosTypes_H__
-#define __KokkosTypes_H__
+#ifndef __KokkosTypes_hpp__
+#define __KokkosTypes_hpp__
 
 
 #include <Kokkos_Core.hpp>
@@ -135,4 +135,4 @@ using deviceAtomicViewType3D =
 
 } // pFlow
 
-#endif  //__KokkosTypes_H__
+#endif  //__KokkosTypes_hpp__
diff --git a/src/phasicFlow/Kokkos/KokkosUtilities.H b/src/phasicFlow/Kokkos/KokkosUtilities.hpp
similarity index 94%
rename from src/phasicFlow/Kokkos/KokkosUtilities.H
rename to src/phasicFlow/Kokkos/KokkosUtilities.hpp
index 05d11a9e..34e6aa2f 100644
--- a/src/phasicFlow/Kokkos/KokkosUtilities.H
+++ b/src/phasicFlow/Kokkos/KokkosUtilities.hpp
@@ -18,11 +18,13 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __KokkosUtilities_H__
-#define __KokkosUtilities_H__
+#ifndef __KokkosUtilities_hpp__
+#define __KokkosUtilities_hpp__
 
 
-#include "KokkosTypes.H"
+#include "KokkosTypes.hpp"
+#include "pFlowMacros.hpp"
+#include "types.hpp"
 
 
 namespace pFlow
@@ -125,4 +127,4 @@ void swapViews(ViewType& v1, ViewType &v2)
 
 } // pFlow
 
-#endif  //__KokkosUtilities_H__
+#endif  //__KokkosUtilities_hpp__
diff --git a/src/phasicFlow/Kokkos/ViewAlgorithms.H b/src/phasicFlow/Kokkos/ViewAlgorithms.hpp
similarity index 98%
rename from src/phasicFlow/Kokkos/ViewAlgorithms.H
rename to src/phasicFlow/Kokkos/ViewAlgorithms.hpp
index 4d944a87..2e94cc3c 100644
--- a/src/phasicFlow/Kokkos/ViewAlgorithms.H
+++ b/src/phasicFlow/Kokkos/ViewAlgorithms.hpp
@@ -18,15 +18,15 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __ViewAlgorithms_H__
-#define __ViewAlgorithms_H__
+#ifndef __ViewAlgorithms_hpp__
+#define __ViewAlgorithms_hpp__
 
 
-#include "numericConstants.H"
-#include "KokkosUtilities.H"
-#include "kokkosAlgorithms.H"
-#include "stdAlgorithms.H"
-#include "cudaAlgorithms.H"
+#include "numericConstants.hpp"
+#include "KokkosUtilities.hpp"
+#include "kokkosAlgorithms.hpp"
+#include "stdAlgorithms.hpp"
+#include "cudaAlgorithms.hpp"
 
 
 namespace pFlow
diff --git a/src/phasicFlow/Kokkos/baseAlgorithms.H b/src/phasicFlow/Kokkos/baseAlgorithms.hpp
similarity index 97%
rename from src/phasicFlow/Kokkos/baseAlgorithms.H
rename to src/phasicFlow/Kokkos/baseAlgorithms.hpp
index 2446509c..70f1f76f 100644
--- a/src/phasicFlow/Kokkos/baseAlgorithms.H
+++ b/src/phasicFlow/Kokkos/baseAlgorithms.hpp
@@ -18,11 +18,12 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __baseAlgorithms_H__
-#define __baseAlgorithms_H__
+#ifndef __baseAlgorithms_hpp__
+#define __baseAlgorithms_hpp__
 
 
-#include "numericConstants.H"
+#include "numericConstants.hpp"
+#include "KokkosUtilities.hpp"
 
 inline const size_t sizeToSerial__ = 64;
 
@@ -242,4 +243,4 @@ void fill
 }
 
 
-#endif // __VectorSingleMath_H__
+#endif // __VectorSingleMath_hpp__
diff --git a/src/phasicFlow/Kokkos/baseAlgorithmsFwd.H b/src/phasicFlow/Kokkos/baseAlgorithmsFwd.hpp
similarity index 100%
rename from src/phasicFlow/Kokkos/baseAlgorithmsFwd.H
rename to src/phasicFlow/Kokkos/baseAlgorithmsFwd.hpp
diff --git a/src/phasicFlow/Timer/Timer.C b/src/phasicFlow/Timer/Timer.cpp
similarity index 96%
rename from src/phasicFlow/Timer/Timer.C
rename to src/phasicFlow/Timer/Timer.cpp
index 160fe163..9031104e 100644
--- a/src/phasicFlow/Timer/Timer.C
+++ b/src/phasicFlow/Timer/Timer.cpp
@@ -18,9 +18,9 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#include "Timer.H"
-#include "Timers.H"
-#include "streams.H"
+#include "Timer.hpp"
+#include "Timers.hpp"
+#include "streams.hpp"
 
 pFlow::Timer::Timer(const word name, Timers* parrent)
 :
diff --git a/src/phasicFlow/Timer/Timer.H b/src/phasicFlow/Timer/Timer.hpp
similarity index 96%
rename from src/phasicFlow/Timer/Timer.H
rename to src/phasicFlow/Timer/Timer.hpp
index e0c805b4..76ada3eb 100644
--- a/src/phasicFlow/Timer/Timer.H
+++ b/src/phasicFlow/Timer/Timer.hpp
@@ -19,13 +19,13 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __Timer_H__
-#define __Timer_H__
+#ifndef __Timer_hpp__
+#define __Timer_hpp__
 
 
 #include <chrono>
 
-#include "types.H"
+#include "types.hpp"
 
 
 
@@ -61,7 +61,7 @@ protected:
 
 public:
 
-	TypeName("Timer");
+	TypeInfo("Timer");
 
 	Timer(){}
 
@@ -160,4 +160,4 @@ inline iIstream& operator>>(iIstream& is, Timer& t)
 }
 
 
-#endif //__Timer_H__
+#endif //__Timer_hpp__
diff --git a/src/phasicFlow/Timer/Timers.C b/src/phasicFlow/Timer/Timers.cpp
similarity index 98%
rename from src/phasicFlow/Timer/Timers.C
rename to src/phasicFlow/Timer/Timers.cpp
index a30e3ead..16db7b0c 100644
--- a/src/phasicFlow/Timer/Timers.C
+++ b/src/phasicFlow/Timer/Timers.cpp
@@ -19,7 +19,7 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#include "Timers.H"
+#include "Timers.hpp"
 
 
 bool pFlow::Timers::write(iOstream& os, bool subTree)const
diff --git a/src/phasicFlow/Timer/Timers.H b/src/phasicFlow/Timer/Timers.hpp
similarity index 93%
rename from src/phasicFlow/Timer/Timers.H
rename to src/phasicFlow/Timer/Timers.hpp
index f0ae3711..087b37ea 100644
--- a/src/phasicFlow/Timer/Timers.H
+++ b/src/phasicFlow/Timer/Timers.hpp
@@ -18,12 +18,12 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __Timers_H__ 
-#define __Timers_H__
+#ifndef __Timers_hpp__ 
+#define __Timers_hpp__
 
 
-#include "Timer.H"
-#include "List.H"
+#include "Timer.hpp"
+#include "List.hpp"
 
 namespace pFlow
 {
@@ -40,7 +40,7 @@ protected:
 
 public:
 
-	TypeName("Timers");
+	TypeInfo("Timers");
 
 
 	Timers(const word& name)
@@ -117,4 +117,4 @@ inline iIstream& operator>>(iIstream& is, Timers& t)
 }
 
 
-#endif //__Timers_H__
+#endif //__Timers_hpp__
diff --git a/src/phasicFlow/algorithms/algorithmFunctions.H b/src/phasicFlow/algorithms/algorithmFunctions.hpp
similarity index 94%
rename from src/phasicFlow/algorithms/algorithmFunctions.H
rename to src/phasicFlow/algorithms/algorithmFunctions.hpp
index 70ece7aa..44778caf 100644
--- a/src/phasicFlow/algorithms/algorithmFunctions.H
+++ b/src/phasicFlow/algorithms/algorithmFunctions.hpp
@@ -19,10 +19,10 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __algorithmFunctions_H__
-#define __algorithmFunctions_H__
+#ifndef __algorithmFunctions_hpp__
+#define __algorithmFunctions_hpp__
 
-#include "pFlowMacros.H"
+#include "pFlowMacros.hpp"
 
 namespace pFlow::algorithms
 {
@@ -93,4 +93,4 @@ int binarySearch(const T* array, int length, const T& val)
 
 } 
 
-#endif // __algorithmFunctions_H__
\ No newline at end of file
+#endif // __algorithmFunctions_hpp__
\ No newline at end of file
diff --git a/src/phasicFlow/algorithms/cudaAlgorithms.H b/src/phasicFlow/algorithms/cudaAlgorithms.hpp
similarity index 95%
rename from src/phasicFlow/algorithms/cudaAlgorithms.H
rename to src/phasicFlow/algorithms/cudaAlgorithms.hpp
index b6621980..c60e4c8f 100644
--- a/src/phasicFlow/algorithms/cudaAlgorithms.H
+++ b/src/phasicFlow/algorithms/cudaAlgorithms.hpp
@@ -19,8 +19,8 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __cudaAlgorithms_H__ 
-#define __cudaAlgorithms_H__
+#ifndef __cudaAlgorithms_hpp__ 
+#define __cudaAlgorithms_hpp__
 
 
 #ifdef __CUDACC__
@@ -33,9 +33,9 @@ Licence:
 #include <thrust/execution_policy.h>
 
 
-#include "pFlowMacros.H"
-#include "algorithmFunctions.H"
-#include "types.H"
+#include "pFlowMacros.hpp"
+#include "algorithmFunctions.hpp"
+#include "types.hpp"
 
 namespace pFlow::algorithms::CUDA
 {
@@ -179,4 +179,4 @@ void inclusiveScan(Type* first, DestType* dFirst, int32 numElems)
 #endif //__CUDA__
 
 
-#endif //__cudaAlgorithms_H__
\ No newline at end of file
+#endif //__cudaAlgorithms_hpp__
\ No newline at end of file
diff --git a/src/phasicFlow/algorithms/kokkosAlgorithms.H b/src/phasicFlow/algorithms/kokkosAlgorithms.hpp
similarity index 97%
rename from src/phasicFlow/algorithms/kokkosAlgorithms.H
rename to src/phasicFlow/algorithms/kokkosAlgorithms.hpp
index be5101cc..218e6e6d 100644
--- a/src/phasicFlow/algorithms/kokkosAlgorithms.H
+++ b/src/phasicFlow/algorithms/kokkosAlgorithms.hpp
@@ -19,10 +19,10 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __kokkosAlgorithms_H__ 
-#define __kokkosAlgorithms_H__
+#ifndef __kokkosAlgorithms_hpp__ 
+#define __kokkosAlgorithms_hpp__
 
-#include "KokkosTypes.H"
+#include "KokkosTypes.hpp"
 
 
 namespace pFlow::algorithms::KOKKOS
@@ -185,4 +185,4 @@ void inclusiveScan(Type* first, DestType* dFirst, int32 numElems)
 } //pFlow::algorithms::KOKKOS
 
 
-#endif //__kokkosAlgorithms_H__
+#endif //__kokkosAlgorithms_hpp__
diff --git a/src/phasicFlow/algorithms/stdAlgorithms.H b/src/phasicFlow/algorithms/stdAlgorithms.hpp
similarity index 96%
rename from src/phasicFlow/algorithms/stdAlgorithms.H
rename to src/phasicFlow/algorithms/stdAlgorithms.hpp
index 2754eec1..0f8c75a8 100644
--- a/src/phasicFlow/algorithms/stdAlgorithms.H
+++ b/src/phasicFlow/algorithms/stdAlgorithms.hpp
@@ -18,15 +18,15 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __stdAlgorithms_H__ 
-#define __stdAlgorithms_H__
+#ifndef __stdAlgorithms_hpp__ 
+#define __stdAlgorithms_hpp__
 
 #include <algorithm>
 #include <execution>
 
-#include "pFlowMacros.H"
-#include "algorithmFunctions.H"
-#include "types.H"
+#include "pFlowMacros.hpp"
+#include "algorithmFunctions.hpp"
+#include "types.hpp"
 
 namespace pFlow::algorithms::STD
 {
@@ -240,4 +240,4 @@ void inclusiveScan(Type* first, DestType* dFirst, int32 numElems)
 }
 
 
-#endif //__stdAlgorithms_H__
\ No newline at end of file
+#endif //__stdAlgorithms_hpp__
\ No newline at end of file
diff --git a/src/phasicFlow/commandLine/commandLine.C b/src/phasicFlow/commandLine/commandLine.cpp
similarity index 98%
rename from src/phasicFlow/commandLine/commandLine.C
rename to src/phasicFlow/commandLine/commandLine.cpp
index 55f7c756..d2002570 100644
--- a/src/phasicFlow/commandLine/commandLine.C
+++ b/src/phasicFlow/commandLine/commandLine.cpp
@@ -18,7 +18,7 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#include "commandLine.H"
+#include "commandLine.hpp"
 
 
 pFlow::commandLine::commandLine(word appName)
diff --git a/src/phasicFlow/commandLine/commandLine.H b/src/phasicFlow/commandLine/commandLine.hpp
similarity index 96%
rename from src/phasicFlow/commandLine/commandLine.H
rename to src/phasicFlow/commandLine/commandLine.hpp
index 9aebc6b3..d23c63a4 100644
--- a/src/phasicFlow/commandLine/commandLine.H
+++ b/src/phasicFlow/commandLine/commandLine.hpp
@@ -19,15 +19,15 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __commandLine_H__
-#define __commandLine_H__
+#ifndef __commandLine_hpp__
+#define __commandLine_hpp__
 
 #include <any>
 #include "CLI.hpp"
 
-#include "types.H"
-#include "Lists.H"
-#include "streams.H"
+#include "types.hpp"
+#include "Lists.hpp"
+#include "streams.hpp"
 
 namespace pFlow
 {
diff --git a/src/phasicFlow/containers/Field/Field.C b/src/phasicFlow/containers/Field/Field.cpp
similarity index 100%
rename from src/phasicFlow/containers/Field/Field.C
rename to src/phasicFlow/containers/Field/Field.cpp
diff --git a/src/phasicFlow/containers/Field/Field.H b/src/phasicFlow/containers/Field/Field.hpp
similarity index 96%
rename from src/phasicFlow/containers/Field/Field.H
rename to src/phasicFlow/containers/Field/Field.hpp
index 512f3339..a0f7020e 100644
--- a/src/phasicFlow/containers/Field/Field.H
+++ b/src/phasicFlow/containers/Field/Field.hpp
@@ -18,11 +18,11 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __Field_H__
-#define __Field_H__
+#ifndef __Field_hpp__
+#define __Field_hpp__
 
-#include "VectorSingle.H"
-#include "vocabs.H"
+#include "VectorSingle.hpp"
+#include "vocabs.hpp"
 
 namespace pFlow
 {
@@ -69,7 +69,7 @@ protected:
 public:
 
 	// - type info
-	TypeNameTemplateNV2("Field", T, VectorType::memoerySpaceName());
+	TypeInfoTemplateNV2("Field", T, VectorType::memoerySpaceName());
 
 	//// - Constructors
 
@@ -264,7 +264,7 @@ inline iOstream& operator << (iOstream& os, const Field<VectorField, T, PropType
 
 }
 
-#include "Field.C"
+#include "Field.cpp"
 
 
-#endif  //__Field_H__
+#endif  //__Field_hpp__
diff --git a/src/phasicFlow/containers/Field/Fields.C b/src/phasicFlow/containers/Field/Fields.cpp
similarity index 99%
rename from src/phasicFlow/containers/Field/Fields.C
rename to src/phasicFlow/containers/Field/Fields.cpp
index de4628a2..28779371 100644
--- a/src/phasicFlow/containers/Field/Fields.C
+++ b/src/phasicFlow/containers/Field/Fields.cpp
@@ -18,7 +18,7 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#include "Fields.H"
+#include "Fields.hpp"
 
 
 template class pFlow::Field<pFlow::VectorSingle, pFlow::int8>;
diff --git a/src/phasicFlow/containers/Field/Fields.H b/src/phasicFlow/containers/Field/Fields.hpp
similarity index 95%
rename from src/phasicFlow/containers/Field/Fields.H
rename to src/phasicFlow/containers/Field/Fields.hpp
index a15cb00b..8b2ff92c 100644
--- a/src/phasicFlow/containers/Field/Fields.H
+++ b/src/phasicFlow/containers/Field/Fields.hpp
@@ -18,13 +18,13 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __Fields_H__
-#define __Fields_H__
+#ifndef __Fields_hpp__
+#define __Fields_hpp__
 
-#include "types.H"
-#include "Field.H"
-#include "VectorSingle.H"
-#include "VectorDual.H"
+#include "types.hpp"
+#include "Field.hpp"
+#include "VectorSingle.hpp"
+#include "VectorDual.hpp"
 
 
 namespace pFlow
@@ -123,4 +123,4 @@ using wordField 		= Field<Vector, word , vecAllocator<word>>;
 
 
 
-#endif  //__Fields_H__
+#endif  //__Fields_hpp__
diff --git a/src/phasicFlow/containers/List/List/List.H b/src/phasicFlow/containers/List/List/List.hpp
similarity index 95%
rename from src/phasicFlow/containers/List/List/List.H
rename to src/phasicFlow/containers/List/List/List.hpp
index d880a99f..e416ae92 100644
--- a/src/phasicFlow/containers/List/List/List.H
+++ b/src/phasicFlow/containers/List/List/List.hpp
@@ -19,16 +19,16 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __List_H__
-#define __List_H__
+#ifndef __List_hpp__
+#define __List_hpp__
 
 #include <list>
 
-#include "types.H"
-#include "typeInfo.H"
-#include "uniquePtr.H"
-#include "iOstream.H"
-#include "iIstream.H"
+#include "types.hpp"
+#include "typeInfo.hpp"
+#include "uniquePtr.hpp"
+#include "iOstream.hpp"
+#include "iIstream.hpp"
 
 namespace pFlow
 {
@@ -86,7 +86,7 @@ protected:
 public:
 
 	// - Type info
-	TypeNameTemplateNV("List", T);
+	TypeInfoTemplateNV("List", T);
 
 	//// - Constructors
 
@@ -245,6 +245,6 @@ using wordList 		= List<word>;
 } // pFlow
 
 
-#include "ListI.H"
+#include "ListI.hpp"
 
-#endif //__List_H__
+#endif //__List_hpp__
diff --git a/src/phasicFlow/containers/List/List/ListI.H b/src/phasicFlow/containers/List/List/ListI.hpp
similarity index 100%
rename from src/phasicFlow/containers/List/List/ListI.H
rename to src/phasicFlow/containers/List/List/ListI.hpp
diff --git a/src/phasicFlow/containers/List/ListPtr/ListPtr.H b/src/phasicFlow/containers/List/ListPtr/ListPtr.hpp
similarity index 95%
rename from src/phasicFlow/containers/List/ListPtr/ListPtr.H
rename to src/phasicFlow/containers/List/ListPtr/ListPtr.hpp
index 1987c026..8d12d1a6 100644
--- a/src/phasicFlow/containers/List/ListPtr/ListPtr.H
+++ b/src/phasicFlow/containers/List/ListPtr/ListPtr.hpp
@@ -18,17 +18,17 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __ListPtr_H__
-#define __ListPtr_H__
+#ifndef __ListPtr_hpp__
+#define __ListPtr_hpp__
 
 
 #include <list>
 
 
-#include "types.H"
-#include "uniquePtr.H"
-#include "error.H"
-#include "iOstream.H"
+#include "types.hpp"
+#include "uniquePtr.hpp"
+#include "error.hpp"
+#include "iOstream.hpp"
 
 
 namespace pFlow
@@ -78,7 +78,7 @@ protected:
 public:
 
 	// - Type info
-	TypeNameTemplateNV("ListPtr", T);
+	TypeInfoTemplateNV("ListPtr", T);
 	
 	//// - Contructors 
 
@@ -192,6 +192,6 @@ public:
 } // pFlow
 
 
-#include "ListPtrI.H"
+#include "ListPtrI.hpp"
 
 #endif
diff --git a/src/phasicFlow/containers/List/ListPtr/ListPtrI.H b/src/phasicFlow/containers/List/ListPtr/ListPtrI.hpp
similarity index 100%
rename from src/phasicFlow/containers/List/ListPtr/ListPtrI.H
rename to src/phasicFlow/containers/List/ListPtr/ListPtrI.hpp
diff --git a/src/phasicFlow/containers/List/Lists.H b/src/phasicFlow/containers/List/Lists.hpp
similarity index 90%
rename from src/phasicFlow/containers/List/Lists.H
rename to src/phasicFlow/containers/List/Lists.hpp
index cdf72ca3..1b7bd7b1 100644
--- a/src/phasicFlow/containers/List/Lists.H
+++ b/src/phasicFlow/containers/List/Lists.hpp
@@ -19,17 +19,17 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __Lists_H__
-#define __Lists_H__
+#ifndef __Lists_hpp__
+#define __Lists_hpp__
 
 
-#include "List.H"
+#include "List.hpp"
 
 
-#include "ListPtr.H"
+#include "ListPtr.hpp"
 
 
 
 
 
-#endif //__Lists_H__
+#endif //__Lists_hpp__
diff --git a/src/phasicFlow/containers/Map/Map/Map.H b/src/phasicFlow/containers/Map/Map/Map.hpp
similarity index 96%
rename from src/phasicFlow/containers/Map/Map/Map.H
rename to src/phasicFlow/containers/Map/Map/Map.hpp
index 80294558..16c0b9d3 100644
--- a/src/phasicFlow/containers/Map/Map/Map.H
+++ b/src/phasicFlow/containers/Map/Map/Map.hpp
@@ -19,14 +19,14 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __Map_H__
-#define __Map_H__
+#ifndef __Map_hpp__
+#define __Map_hpp__
 
 
 #include <map>
 
-#include "types.H"
-#include "iOstream.H"
+#include "types.hpp"
+#include "iOstream.hpp"
 
 
 namespace pFlow
@@ -60,7 +60,7 @@ public:
 	using valueType 	= typename mapType::value_type;
 
 	// - type info 
-	TypeNameTemplateNV("Map", Key);
+	TypeInfoTemplateNV("Map", Key);
 
 	//// - Constructors
 
@@ -167,7 +167,7 @@ template<typename T>
 inline iOstream& printKeys(iOstream& os, const int64Map<T> & m);
 
 
-#include "MapI.H"
+#include "MapI.hpp"
 
 } // pFlow
 
diff --git a/src/phasicFlow/containers/Map/Map/MapI.H b/src/phasicFlow/containers/Map/Map/MapI.hpp
similarity index 100%
rename from src/phasicFlow/containers/Map/Map/MapI.H
rename to src/phasicFlow/containers/Map/Map/MapI.hpp
diff --git a/src/phasicFlow/containers/Map/MapPtr/MapPtr.H b/src/phasicFlow/containers/Map/MapPtr/MapPtr.hpp
similarity index 97%
rename from src/phasicFlow/containers/Map/MapPtr/MapPtr.H
rename to src/phasicFlow/containers/Map/MapPtr/MapPtr.hpp
index 7ffb1a44..ad9dfed4 100644
--- a/src/phasicFlow/containers/Map/MapPtr/MapPtr.H
+++ b/src/phasicFlow/containers/Map/MapPtr/MapPtr.hpp
@@ -18,18 +18,18 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __MapPtr_H__
-#define __MapPtr_H__
+#ifndef __MapPtr_hpp__
+#define __MapPtr_hpp__
 
 
 #include <typeinfo>
 #include <map>
 #include <unordered_map>
 
-#include "types.H"
-#include "uniquePtr.H"
-#include "error.H"
-#include "iOstream.H"
+#include "types.hpp"
+#include "uniquePtr.hpp"
+#include "error.hpp"
+#include "iOstream.hpp"
 
 
 namespace pFlow
@@ -84,7 +84,7 @@ protected:
 public:
 
 	// - type info
-	TypeNameTemplateNV("MapPtr", Key);
+	TypeInfoTemplateNV("MapPtr", Key);
 
 	//// Contructors 
 	
@@ -268,6 +268,6 @@ inline iOstream& printKeys(iOstream& os, const wordOrderedMapPtr<T> & m)
 } // pFlow
 
 
-#include "MapPtrI.H"
+#include "MapPtrI.hpp"
 
 #endif
diff --git a/src/phasicFlow/containers/Map/MapPtr/MapPtrI.H b/src/phasicFlow/containers/Map/MapPtr/MapPtrI.hpp
similarity index 100%
rename from src/phasicFlow/containers/Map/MapPtr/MapPtrI.H
rename to src/phasicFlow/containers/Map/MapPtr/MapPtrI.hpp
diff --git a/src/phasicFlow/containers/Map/Maps.H b/src/phasicFlow/containers/Map/Maps.hpp
similarity index 90%
rename from src/phasicFlow/containers/Map/Maps.H
rename to src/phasicFlow/containers/Map/Maps.hpp
index c1a974e4..7f117133 100644
--- a/src/phasicFlow/containers/Map/Maps.H
+++ b/src/phasicFlow/containers/Map/Maps.hpp
@@ -19,12 +19,12 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __Maps_H__
-#define __Maps_H__
+#ifndef __Maps_hpp__
+#define __Maps_hpp__
 
-#include "Map.H"
-#include "hashMap.H"
-#include "MapPtr.H"
+#include "Map.hpp"
+#include "hashMap.hpp"
+#include "MapPtr.hpp"
 
 
 #endif
diff --git a/src/phasicFlow/containers/Map/hashMap/hashMap.H b/src/phasicFlow/containers/Map/hashMap/hashMap.hpp
similarity index 95%
rename from src/phasicFlow/containers/Map/hashMap/hashMap.H
rename to src/phasicFlow/containers/Map/hashMap/hashMap.hpp
index 28c00a5f..b6eabc69 100644
--- a/src/phasicFlow/containers/Map/hashMap/hashMap.H
+++ b/src/phasicFlow/containers/Map/hashMap/hashMap.hpp
@@ -19,14 +19,14 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __hashMap_H__
-#define __hashMap_H__
+#ifndef __hashMap_hpp__
+#define __hashMap_hpp__
 
 #include <unordered_map>
 
-#include "types.H"
-#include "typeInfo.H"
-#include "iOstream.H"
+#include "types.hpp"
+#include "typeInfo.hpp"
+#include "iOstream.hpp"
 
 
 namespace pFlow
@@ -60,7 +60,7 @@ public:
 	using valueType 	= typename hashmapType::value_type;
 
 	
-	TypeNameTemplateNV("hashMap", Key);
+	TypeInfoTemplateNV("hashMap", Key);
 
 	//// - Constructors
 
@@ -167,7 +167,7 @@ template<typename T>
 inline iOstream& printKeys(iOstream& os, const int32HashMap<T> & m);
 
 
-#include "hashMapI.H"
+#include "hashMapI.hpp"
 
 } // pFlow
 
diff --git a/src/phasicFlow/containers/Map/hashMap/hashMapI.H b/src/phasicFlow/containers/Map/hashMap/hashMapI.hpp
similarity index 100%
rename from src/phasicFlow/containers/Map/hashMap/hashMapI.H
rename to src/phasicFlow/containers/Map/hashMap/hashMapI.hpp
diff --git a/src/phasicFlow/containers/Set/Set.H b/src/phasicFlow/containers/Set/Set.hpp
similarity index 96%
rename from src/phasicFlow/containers/Set/Set.H
rename to src/phasicFlow/containers/Set/Set.hpp
index c235d814..3b6ea999 100644
--- a/src/phasicFlow/containers/Set/Set.H
+++ b/src/phasicFlow/containers/Set/Set.hpp
@@ -18,8 +18,8 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __Set_H__
-#define __Set_H__
+#ifndef __Set_hpp__
+#define __Set_hpp__
 
 #include <set>
 
diff --git a/src/phasicFlow/containers/Vector/Vector.C b/src/phasicFlow/containers/Vector/Vector.cpp
similarity index 99%
rename from src/phasicFlow/containers/Vector/Vector.C
rename to src/phasicFlow/containers/Vector/Vector.cpp
index 808a399e..80c942c6 100644
--- a/src/phasicFlow/containers/Vector/Vector.C
+++ b/src/phasicFlow/containers/Vector/Vector.cpp
@@ -84,7 +84,7 @@ bool pFlow::Vector<T, Allocator>::readVector
 	return true;
 }
 
-#include "streams.H"
+#include "streams.hpp"
 
 template<typename T, typename Allocator>
 bool pFlow::Vector<T, Allocator>::writeVector
diff --git a/src/phasicFlow/containers/Vector/Vector.H b/src/phasicFlow/containers/Vector/Vector.hpp
similarity index 95%
rename from src/phasicFlow/containers/Vector/Vector.H
rename to src/phasicFlow/containers/Vector/Vector.hpp
index de7a8360..c0b1f17a 100644
--- a/src/phasicFlow/containers/Vector/Vector.H
+++ b/src/phasicFlow/containers/Vector/Vector.hpp
@@ -19,19 +19,19 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __Vector_H__
-#define __Vector_H__
+#ifndef __Vector_hpp__
+#define __Vector_hpp__
 
 #include <vector>
 #include <algorithm>
 
-#include "typeInfo.H"
-#include "error.H"
-#include "uniquePtr.H"
-#include "stdAlgorithms.H"
-#include "indexContainer.H"
-#include "iOstream.H"
-#include "iIstream.H"
+#include "typeInfo.hpp"
+#include "error.hpp"
+#include "uniquePtr.hpp"
+#include "stdAlgorithms.hpp"
+#include "indexContainer.hpp"
+#include "iOstream.hpp"
+#include "iIstream.hpp"
 
 #ifndef __RESERVE__
 #define __RESERVE__
@@ -45,7 +45,7 @@ namespace pFlow
 template<typename T, typename Allocator>
 class Vector;
 
-#include "VectorFwd.H"
+#include "VectorFwd.hpp"
 
 
 template <class T>
@@ -115,7 +115,7 @@ protected:
 public:
 
 	// - Type info
-	TypeNameTemplateNV2("Vector", T, memoerySpaceName());
+	TypeInfoTemplateNV2("Vector", T, memoerySpaceName());
 
 	//// - Constructors
 
@@ -417,9 +417,9 @@ inline iOstream& operator << (iOstream& os, const Vector<T, Allocator>& ovec )
 } // pFlow
 
 
-#include "VectorI.H"
-#include "Vector.C"
-#include "VectorMath.H"
-#include "VectorAlgorithm.H"
+#include "VectorI.hpp"
+#include "Vector.cpp"
+#include "VectorMath.hpp"
+#include "VectorAlgorithm.hpp"
 
 #endif
diff --git a/src/phasicFlow/containers/Vector/VectorAlgorithm.H b/src/phasicFlow/containers/Vector/VectorAlgorithm.hpp
similarity index 100%
rename from src/phasicFlow/containers/Vector/VectorAlgorithm.H
rename to src/phasicFlow/containers/Vector/VectorAlgorithm.hpp
diff --git a/src/phasicFlow/containers/Vector/VectorFwd.H b/src/phasicFlow/containers/Vector/VectorFwd.hpp
similarity index 100%
rename from src/phasicFlow/containers/Vector/VectorFwd.H
rename to src/phasicFlow/containers/Vector/VectorFwd.hpp
diff --git a/src/phasicFlow/containers/Vector/VectorI.H b/src/phasicFlow/containers/Vector/VectorI.hpp
similarity index 100%
rename from src/phasicFlow/containers/Vector/VectorI.H
rename to src/phasicFlow/containers/Vector/VectorI.hpp
diff --git a/src/phasicFlow/containers/Vector/VectorMath.H b/src/phasicFlow/containers/Vector/VectorMath.hpp
similarity index 100%
rename from src/phasicFlow/containers/Vector/VectorMath.H
rename to src/phasicFlow/containers/Vector/VectorMath.hpp
diff --git a/src/phasicFlow/containers/Vector/Vectors.C b/src/phasicFlow/containers/Vector/Vectors.cpp
similarity index 98%
rename from src/phasicFlow/containers/Vector/Vectors.C
rename to src/phasicFlow/containers/Vector/Vectors.cpp
index ea8ee972..dd958b08 100644
--- a/src/phasicFlow/containers/Vector/Vectors.C
+++ b/src/phasicFlow/containers/Vector/Vectors.cpp
@@ -18,7 +18,7 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#include "Vectors.H"
+#include "Vectors.hpp"
 
 // instantiation just for numeral types 
 template class pFlow::Vector<pFlow::int8>;
diff --git a/src/phasicFlow/containers/Vector/Vectors.H b/src/phasicFlow/containers/Vector/Vectors.hpp
similarity index 95%
rename from src/phasicFlow/containers/Vector/Vectors.H
rename to src/phasicFlow/containers/Vector/Vectors.hpp
index 1c681ff3..8eba5863 100644
--- a/src/phasicFlow/containers/Vector/Vectors.H
+++ b/src/phasicFlow/containers/Vector/Vectors.hpp
@@ -18,12 +18,12 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __Vectors_H__
-#define __Vectors_H__
+#ifndef __Vectors_hpp__
+#define __Vectors_hpp__
 
 
-#include "types.H"
-#include "Vector.H"
+#include "types.hpp"
+#include "Vector.hpp"
 
 namespace pFlow
 {
@@ -98,4 +98,4 @@ typedef Vector<sint> 	sintVector;*/
 }
 
 
-#endif //__Vectors_H__
\ No newline at end of file
+#endif //__Vectors_hpp__
\ No newline at end of file
diff --git a/src/phasicFlow/containers/VectorHD/VectorDual.H b/src/phasicFlow/containers/VectorHD/VectorDual.hpp
similarity index 98%
rename from src/phasicFlow/containers/VectorHD/VectorDual.H
rename to src/phasicFlow/containers/VectorHD/VectorDual.hpp
index 1575aaff..a5310bd7 100644
--- a/src/phasicFlow/containers/VectorHD/VectorDual.H
+++ b/src/phasicFlow/containers/VectorHD/VectorDual.hpp
@@ -18,17 +18,17 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __VectorDual_H__
-#define __VectorDual_H__
+#ifndef __VectorDual_hpp__
+#define __VectorDual_hpp__
 
-#include "globalSettings.H"
-#include "types.H"
-#include "typeInfo.H"
-#include "Vector.H"
-#include "streams.H"
+#include "globalSettings.hpp"
+#include "types.hpp"
+#include "typeInfo.hpp"
+#include "Vector.hpp"
+#include "streams.hpp"
 
-#include "KokkosTypes.H"
-#include "ViewAlgorithms.H"
+#include "KokkosTypes.hpp"
+#include "ViewAlgorithms.hpp"
 
 #ifndef __RESERVE__
 #define __RESERVE__
@@ -165,7 +165,7 @@ protected:
 public:
 
 	// - type info
-	TypeNameTemplateNV2("VectorDual", T, memoerySpaceName());
+	TypeInfoTemplateNV2("VectorDual", T, memoerySpaceName());
 
 	//// - Constructors
 
@@ -958,8 +958,8 @@ inline iOstream& operator << (iOstream& os, const VectorDual<T, memory_space>& o
 
 } // pFlow
 
-#include "VectorDualAlgorithms.H"
+#include "VectorDualAlgorithms.hpp"
 
 
-#endif //__VectorDual_H__
+#endif //__VectorDual_hpp__
 
diff --git a/src/phasicFlow/containers/VectorHD/VectorDualAlgorithms.H b/src/phasicFlow/containers/VectorHD/VectorDualAlgorithms.hpp
similarity index 95%
rename from src/phasicFlow/containers/VectorHD/VectorDualAlgorithms.H
rename to src/phasicFlow/containers/VectorHD/VectorDualAlgorithms.hpp
index ea67bc8d..a1191675 100644
--- a/src/phasicFlow/containers/VectorHD/VectorDualAlgorithms.H
+++ b/src/phasicFlow/containers/VectorHD/VectorDualAlgorithms.hpp
@@ -19,12 +19,12 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __VectorDualMath_H__
-#define __VectorDualMath_H__
+#ifndef __VectorDualMath_hpp__
+#define __VectorDualMath_hpp__
 
 
 
-#include "baseAlgorithms.H"
+#include "baseAlgorithms.hpp"
 
 
 namespace pFlow
@@ -110,4 +110,4 @@ int64 max(const VectorDual<T,MemorySpace>& vec)
 } // pFlow
 
 
-#endif // __VectorSingleMath_H__
+#endif // __VectorSingleMath_hpp__
diff --git a/src/phasicFlow/containers/VectorHD/VectorDuals.H b/src/phasicFlow/containers/VectorHD/VectorDuals.hpp
similarity index 92%
rename from src/phasicFlow/containers/VectorHD/VectorDuals.H
rename to src/phasicFlow/containers/VectorHD/VectorDuals.hpp
index 9b07fb85..8cac0a72 100644
--- a/src/phasicFlow/containers/VectorHD/VectorDuals.H
+++ b/src/phasicFlow/containers/VectorHD/VectorDuals.hpp
@@ -18,12 +18,12 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __VectorDuals_H__
-#define __VectorDuals_H__
+#ifndef __VectorDuals_hpp__
+#define __VectorDuals_hpp__
 
 
-#include "types.H"
-#include "VectorDual.H"
+#include "types.hpp"
+#include "VectorDual.hpp"
 
 namespace pFlow
 {
diff --git a/src/phasicFlow/containers/VectorHD/VectorSingle.H b/src/phasicFlow/containers/VectorHD/VectorSingle.hpp
similarity index 97%
rename from src/phasicFlow/containers/VectorHD/VectorSingle.H
rename to src/phasicFlow/containers/VectorHD/VectorSingle.hpp
index 80bdbd81..ab6df542 100644
--- a/src/phasicFlow/containers/VectorHD/VectorSingle.H
+++ b/src/phasicFlow/containers/VectorHD/VectorSingle.hpp
@@ -19,17 +19,17 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __VectorSingle_H__
-#define __VectorSingle_H__
+#ifndef __VectorSingle_hpp__
+#define __VectorSingle_hpp__
 
-#include "globalSettings.H"
-#include "types.H"
-#include "typeInfo.H"
-#include "Vector.H"
-#include "indexContainer.H"
+#include "globalSettings.hpp"
+#include "types.hpp"
+#include "typeInfo.hpp"
+#include "Vector.hpp"
+#include "indexContainer.hpp"
 
-#include "KokkosTypes.H"
-#include "ViewAlgorithms.H"
+#include "KokkosTypes.hpp"
+#include "ViewAlgorithms.hpp"
 
 
 #ifndef __RESERVE__
@@ -141,7 +141,7 @@ protected:
 public:
 
 	// - type info
-	TypeNameTemplateNV2("VectorSingle", T, memoerySpaceName());
+	TypeInfoTemplateNV2("VectorSingle", T, memoerySpaceName());
 
 	//// - Constructors
 
@@ -843,8 +843,8 @@ inline iOstream& operator << (iOstream& os, const VectorSingle<T, MemorySpace>&
 
 } // - pFlow
 
-#include "VectorSingleAlgorithms.H"
+#include "VectorSingleAlgorithms.hpp"
 
 
-#endif //__VectorSingle_H__
+#endif //__VectorSingle_hpp__
 
diff --git a/src/phasicFlow/containers/VectorHD/VectorSingleAlgorithms.H b/src/phasicFlow/containers/VectorHD/VectorSingleAlgorithms.hpp
similarity index 93%
rename from src/phasicFlow/containers/VectorHD/VectorSingleAlgorithms.H
rename to src/phasicFlow/containers/VectorHD/VectorSingleAlgorithms.hpp
index df14ab5c..bdd5c521 100644
--- a/src/phasicFlow/containers/VectorHD/VectorSingleAlgorithms.H
+++ b/src/phasicFlow/containers/VectorHD/VectorSingleAlgorithms.hpp
@@ -19,8 +19,8 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __VectorSingleMath_H__
-#define __VectorSingleMath_H__
+#ifndef __VectorSingleMath_hpp__
+#define __VectorSingleMath_hpp__
 
 
 
@@ -58,4 +58,4 @@ INLINE_FUNCTION_H T max( const VectorSingle<T, MemorySpace>& vec)
 }
 
 
-#endif // __VectorSingleMath_H__
+#endif // __VectorSingleMath_hpp__
diff --git a/src/phasicFlow/containers/VectorHD/VectorSingles.H b/src/phasicFlow/containers/VectorHD/VectorSingles.hpp
similarity index 95%
rename from src/phasicFlow/containers/VectorHD/VectorSingles.H
rename to src/phasicFlow/containers/VectorHD/VectorSingles.hpp
index 506953ad..ecae1398 100644
--- a/src/phasicFlow/containers/VectorHD/VectorSingles.H
+++ b/src/phasicFlow/containers/VectorHD/VectorSingles.hpp
@@ -19,12 +19,12 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __VectorSingles_H__
-#define __VectorSingles_H__
+#ifndef __VectorSingles_hpp__
+#define __VectorSingles_hpp__
 
 
-#include "types.H"
-#include "VectorSingle.H"
+#include "types.hpp"
+#include "VectorSingle.hpp"
 
 namespace pFlow
 {
diff --git a/src/phasicFlow/containers/bitsetHD/bitsetHD.H b/src/phasicFlow/containers/bitsetHD/bitsetHD.hpp
similarity index 97%
rename from src/phasicFlow/containers/bitsetHD/bitsetHD.H
rename to src/phasicFlow/containers/bitsetHD/bitsetHD.hpp
index 21e945b4..e69fdb76 100644
--- a/src/phasicFlow/containers/bitsetHD/bitsetHD.H
+++ b/src/phasicFlow/containers/bitsetHD/bitsetHD.hpp
@@ -19,12 +19,12 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __bitsetHD_H__ 
-#define __bitsetHD_H__
+#ifndef __bitsetHD_hpp__ 
+#define __bitsetHD_hpp__
 
 
-#include "KokkosTypes.H"
-#include "types.H"
+#include "KokkosTypes.hpp"
+#include "types.hpp"
 
 // a lightweight container for holding bits on host or device 
 // it is NOT concurrent and it does not used atommic operation on memory
@@ -220,4 +220,4 @@ using bitset64_H = bitsetHD<unsigned long, HostSpace>;
 } // namespace pFlow
 
 
-#endif //__bitsetHD_H__
+#endif //__bitsetHD_hpp__
diff --git a/src/phasicFlow/containers/bitsetHD/bitsetHDs.C b/src/phasicFlow/containers/bitsetHD/bitsetHDs.cpp
similarity index 97%
rename from src/phasicFlow/containers/bitsetHD/bitsetHDs.C
rename to src/phasicFlow/containers/bitsetHD/bitsetHDs.cpp
index ec486d54..7ed64bc3 100644
--- a/src/phasicFlow/containers/bitsetHD/bitsetHDs.C
+++ b/src/phasicFlow/containers/bitsetHD/bitsetHDs.cpp
@@ -19,7 +19,7 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#include "bitsetHD.H" 
+#include "bitsetHD.hpp" 
 
 
 
diff --git a/src/phasicFlow/containers/indexContainer/indexContainer.C b/src/phasicFlow/containers/indexContainer/indexContainer.cpp
similarity index 97%
rename from src/phasicFlow/containers/indexContainer/indexContainer.C
rename to src/phasicFlow/containers/indexContainer/indexContainer.cpp
index 888899f0..15d717b2 100644
--- a/src/phasicFlow/containers/indexContainer/indexContainer.C
+++ b/src/phasicFlow/containers/indexContainer/indexContainer.cpp
@@ -18,4 +18,4 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#include "indexContainer.H"
\ No newline at end of file
+#include "indexContainer.hpp"
\ No newline at end of file
diff --git a/src/phasicFlow/containers/indexContainer/indexContainer.H b/src/phasicFlow/containers/indexContainer/indexContainer.hpp
similarity index 95%
rename from src/phasicFlow/containers/indexContainer/indexContainer.H
rename to src/phasicFlow/containers/indexContainer/indexContainer.hpp
index 00d97b4b..ddb3ccb8 100644
--- a/src/phasicFlow/containers/indexContainer/indexContainer.H
+++ b/src/phasicFlow/containers/indexContainer/indexContainer.hpp
@@ -18,13 +18,13 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __indexContainer_H__ 
-#define __indexContainer_H__
+#ifndef __indexContainer_hpp__ 
+#define __indexContainer_hpp__
 
-#include "span.H"
-#include "KokkosTypes.H"
-#include "KokkosUtilities.H"
-#include "ViewAlgorithms.H"
+#include "span.hpp"
+#include "KokkosTypes.hpp"
+#include "KokkosUtilities.hpp"
+#include "ViewAlgorithms.hpp"
 
 namespace pFlow
 {
diff --git a/src/phasicFlow/containers/pointField/pointField.C b/src/phasicFlow/containers/pointField/pointField.cpp
similarity index 100%
rename from src/phasicFlow/containers/pointField/pointField.C
rename to src/phasicFlow/containers/pointField/pointField.cpp
diff --git a/src/phasicFlow/containers/pointField/pointField.H b/src/phasicFlow/containers/pointField/pointField.hpp
similarity index 94%
rename from src/phasicFlow/containers/pointField/pointField.H
rename to src/phasicFlow/containers/pointField/pointField.hpp
index 304412b2..5c074243 100644
--- a/src/phasicFlow/containers/pointField/pointField.H
+++ b/src/phasicFlow/containers/pointField/pointField.hpp
@@ -18,13 +18,13 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __pointField_H__
-#define __pointField_H__
+#ifndef __pointField_hpp__
+#define __pointField_hpp__
 
 
-#include "Field.H"
-#include "pointStructure.H"
-#include "error.H"
+#include "Field.hpp"
+#include "pointStructure.hpp"
+#include "error.hpp"
 
 namespace pFlow
 {
@@ -71,7 +71,7 @@ protected:
 public:
  
 	// - type info
-	TypeNameTemplateNV2("pointField", T, VectorType::memoerySpaceName());
+	TypeInfoTemplateNV2("pointField", T, VectorType::memoerySpaceName());
 
 	
 	//// - Constructors
@@ -190,7 +190,7 @@ iOstream& operator << (iOstream& os, const pointField<VectorField, T, MemorySpac
 
 }
 
-#include "pointField.C"
-#include "pointFieldAlgorithms.H"
+#include "pointField.cpp"
+#include "pointFieldAlgorithms.hpp"
 
-#endif //  __pointField_H__
+#endif //  __pointField_hpp__
diff --git a/src/phasicFlow/containers/pointField/pointFieldAlgorithms.H b/src/phasicFlow/containers/pointField/pointFieldAlgorithms.hpp
similarity index 100%
rename from src/phasicFlow/containers/pointField/pointFieldAlgorithms.H
rename to src/phasicFlow/containers/pointField/pointFieldAlgorithms.hpp
diff --git a/src/phasicFlow/containers/pointField/pointFields.C b/src/phasicFlow/containers/pointField/pointFields.cpp
similarity index 98%
rename from src/phasicFlow/containers/pointField/pointFields.C
rename to src/phasicFlow/containers/pointField/pointFields.cpp
index d4ed99ec..da0084b7 100644
--- a/src/phasicFlow/containers/pointField/pointFields.C
+++ b/src/phasicFlow/containers/pointField/pointFields.cpp
@@ -19,7 +19,7 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#include "pointFields.H"
+#include "pointFields.hpp"
 
 
 template class pFlow::pointField<pFlow::VectorSingle, pFlow::int8>; 
diff --git a/src/phasicFlow/containers/pointField/pointFields.H b/src/phasicFlow/containers/pointField/pointFields.hpp
similarity index 95%
rename from src/phasicFlow/containers/pointField/pointFields.H
rename to src/phasicFlow/containers/pointField/pointFields.hpp
index 2b5e095b..a3183143 100644
--- a/src/phasicFlow/containers/pointField/pointFields.H
+++ b/src/phasicFlow/containers/pointField/pointFields.hpp
@@ -19,12 +19,12 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __pointFields_H__
-#define __pointFields_H__
+#ifndef __pointFields_hpp__
+#define __pointFields_hpp__
 
-#include "VectorSingle.H"
-#include "pointField.H"
-#include "types.H"
+#include "VectorSingle.hpp"
+#include "pointField.hpp"
+#include "types.hpp"
 
 namespace pFlow
 {
diff --git a/src/phasicFlow/containers/span/span.H b/src/phasicFlow/containers/span/span.hpp
similarity index 96%
rename from src/phasicFlow/containers/span/span.H
rename to src/phasicFlow/containers/span/span.hpp
index 788e7270..5e68603e 100644
--- a/src/phasicFlow/containers/span/span.H
+++ b/src/phasicFlow/containers/span/span.hpp
@@ -18,10 +18,10 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __span_H__
-#define __span_H__
+#ifndef __span_hpp__
+#define __span_hpp__
 
-#include "types.H"
+#include "types.hpp"
 
 namespace pFlow {
 
@@ -54,7 +54,7 @@ protected:
 
 public:
     
-    TypeNameTemplateNV("span", T);
+    TypeInfoTemplateNV("span", T);
 
     /// Constructor
     INLINE_FUNCTION_HD
@@ -158,4 +158,4 @@ public:
 
 } // pFlow
 
-#endif //__span_H__
+#endif //__span_hpp__
diff --git a/src/phasicFlow/containers/symArrayHD/symArrayHD.H b/src/phasicFlow/containers/symArrayHD/symArrayHD.hpp
similarity index 95%
rename from src/phasicFlow/containers/symArrayHD/symArrayHD.H
rename to src/phasicFlow/containers/symArrayHD/symArrayHD.hpp
index f46fcc2b..d1d0ddd7 100644
--- a/src/phasicFlow/containers/symArrayHD/symArrayHD.H
+++ b/src/phasicFlow/containers/symArrayHD/symArrayHD.hpp
@@ -18,15 +18,15 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __symArray_H__
-#define __symArray_H__
+#ifndef __symArray_hpp__
+#define __symArray_hpp__
 
-#include "KokkosTypes.H"
+#include "KokkosTypes.hpp"
 
 
-#include "types.H"
-#include "typeInfo.H"
-#include "Vector.H"
+#include "types.hpp"
+#include "typeInfo.hpp"
+#include "Vector.hpp"
 
 
 /*
@@ -97,7 +97,7 @@ protected:
 public:
 
 	// - type info
-	TypeNameTemplateNV2("symArray", T, memoerySpaceName());
+	TypeInfoTemplateNV2("symArray", T, memoerySpaceName());
 
 	//// constructors 
 	INLINE_FUNCTION_H
@@ -275,4 +275,4 @@ inline iOstream& operator << (iOstream& os, const symArray<T, MemorySpace>& oArr
 
 }
 
-#endif //__symArray_H__
+#endif //__symArray_hpp__
diff --git a/src/phasicFlow/containers/symArrayHD/symArrays.C b/src/phasicFlow/containers/symArrayHD/symArrays.cpp
similarity index 97%
rename from src/phasicFlow/containers/symArrayHD/symArrays.C
rename to src/phasicFlow/containers/symArrayHD/symArrays.cpp
index 3f1aabec..13b42d42 100644
--- a/src/phasicFlow/containers/symArrayHD/symArrays.C
+++ b/src/phasicFlow/containers/symArrayHD/symArrays.cpp
@@ -18,7 +18,7 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#include "symArrays.H"
+#include "symArrays.hpp"
 
 template class pFlow::symArray<pFlow::real>;
 
diff --git a/src/phasicFlow/containers/symArrayHD/symArrays.H b/src/phasicFlow/containers/symArrayHD/symArrays.hpp
similarity index 97%
rename from src/phasicFlow/containers/symArrayHD/symArrays.H
rename to src/phasicFlow/containers/symArrayHD/symArrays.hpp
index b5c99021..05373359 100644
--- a/src/phasicFlow/containers/symArrayHD/symArrays.H
+++ b/src/phasicFlow/containers/symArrayHD/symArrays.hpp
@@ -18,7 +18,7 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#include "symArrayHD.H"
+#include "symArrayHD.hpp"
 
 namespace pFlow
 {
diff --git a/src/phasicFlow/containers/triSurfaceField/triSurfaceField.C b/src/phasicFlow/containers/triSurfaceField/triSurfaceField.cpp
similarity index 100%
rename from src/phasicFlow/containers/triSurfaceField/triSurfaceField.C
rename to src/phasicFlow/containers/triSurfaceField/triSurfaceField.cpp
diff --git a/src/phasicFlow/containers/triSurfaceField/triSurfaceField.H b/src/phasicFlow/containers/triSurfaceField/triSurfaceField.hpp
similarity index 94%
rename from src/phasicFlow/containers/triSurfaceField/triSurfaceField.H
rename to src/phasicFlow/containers/triSurfaceField/triSurfaceField.hpp
index dfecf8e3..8dc2899b 100644
--- a/src/phasicFlow/containers/triSurfaceField/triSurfaceField.H
+++ b/src/phasicFlow/containers/triSurfaceField/triSurfaceField.hpp
@@ -18,12 +18,12 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __trieSurfaceField_H__ 
-#define __trieSurfaceField_H__
+#ifndef __trieSurfaceField_hpp__ 
+#define __trieSurfaceField_hpp__
 
-#include "Field.H"
-#include "triSurface.H"
-#include "error.H"
+#include "Field.hpp"
+#include "triSurface.hpp"
+#include "error.hpp"
 
 
 namespace pFlow
@@ -70,7 +70,7 @@ protected:
 public:
 	
 	// - type info
-	TypeNameTemplateNV2("triSurfaceField", T, VectorType::memoerySpaceName());
+	TypeInfoTemplateNV2("triSurfaceField", T, VectorType::memoerySpaceName());
 
 	
 	//// CONSTRUCTORS
@@ -172,6 +172,6 @@ iOstream& operator << (iOstream& os, const triSurfaceField<VectorField, T, Memor
 
 }
 
-#include "triSurfaceField.C"
+#include "triSurfaceField.cpp"
 
-#endif //__trieSurfaceField_H__
+#endif //__trieSurfaceField_hpp__
diff --git a/src/phasicFlow/containers/triSurfaceField/triSurfaceFields.C b/src/phasicFlow/containers/triSurfaceField/triSurfaceFields.cpp
similarity index 97%
rename from src/phasicFlow/containers/triSurfaceField/triSurfaceFields.C
rename to src/phasicFlow/containers/triSurfaceField/triSurfaceFields.cpp
index fb8f6704..742b7aaa 100644
--- a/src/phasicFlow/containers/triSurfaceField/triSurfaceFields.C
+++ b/src/phasicFlow/containers/triSurfaceField/triSurfaceFields.cpp
@@ -18,7 +18,7 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#include "triSurfaceFields.H"
+#include "triSurfaceFields.hpp"
 
 
 template class pFlow::triSurfaceField<pFlow::VectorSingle, pFlow::real>;
diff --git a/src/phasicFlow/containers/triSurfaceField/triSurfaceFields.H b/src/phasicFlow/containers/triSurfaceField/triSurfaceFields.hpp
similarity index 90%
rename from src/phasicFlow/containers/triSurfaceField/triSurfaceFields.H
rename to src/phasicFlow/containers/triSurfaceField/triSurfaceFields.hpp
index dd0d1163..c3cd6bd9 100644
--- a/src/phasicFlow/containers/triSurfaceField/triSurfaceFields.H
+++ b/src/phasicFlow/containers/triSurfaceField/triSurfaceFields.hpp
@@ -18,13 +18,13 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __triSurfaceFields_H__ 
-#define __triSurfaceFields_H__
+#ifndef __triSurfaceFields_hpp__ 
+#define __triSurfaceFields_hpp__
 
-#include "VectorSingle.H"
-#include "VectorDual.H"
-#include "triSurfaceField.H"
-#include "types.H"
+#include "VectorSingle.hpp"
+#include "VectorDual.hpp"
+#include "triSurfaceField.hpp"
+#include "types.hpp"
 
 namespace pFlow
 {
@@ -56,4 +56,4 @@ using int8TriSurfaceField 		= triSurfaceField<Vector, int8, vecAllocator<real>>
 
 }
 
-#endif //__trieSurfaceField_H__
+#endif //__trieSurfaceField_hpp__
diff --git a/src/phasicFlow/dictionary/dictionary.C b/src/phasicFlow/dictionary/dictionary.cpp
similarity index 99%
rename from src/phasicFlow/dictionary/dictionary.C
rename to src/phasicFlow/dictionary/dictionary.cpp
index 9540e5b1..4d9f5464 100644
--- a/src/phasicFlow/dictionary/dictionary.C
+++ b/src/phasicFlow/dictionary/dictionary.cpp
@@ -21,10 +21,10 @@ Licence:
 // to be tailored to our needs
 
 
-#include "dictionary.H"
-#include "uniquePtr.H"
-#include "error.H"
-#include "streams.H"
+#include "dictionary.hpp"
+#include "uniquePtr.hpp"
+#include "error.hpp"
+#include "streams.hpp"
 
 
 
diff --git a/src/phasicFlow/dictionary/dictionary.H b/src/phasicFlow/dictionary/dictionary.hpp
similarity index 97%
rename from src/phasicFlow/dictionary/dictionary.H
rename to src/phasicFlow/dictionary/dictionary.hpp
index e1f39fbe..3ad26c06 100644
--- a/src/phasicFlow/dictionary/dictionary.H
+++ b/src/phasicFlow/dictionary/dictionary.hpp
@@ -21,15 +21,15 @@ Licence:
 // to be tailored to our needs
 
 
-#ifndef __dictionary_H__
-#define __dictionary_H__
+#ifndef __dictionary_hpp__
+#define __dictionary_hpp__
 
-#include "types.H"
-#include "iEntry.H"
-#include "dataEntry.H"
-#include "MapPtr.H"
-#include "List.H"
-#include "fileSystem.H"
+#include "types.hpp"
+#include "iEntry.hpp"
+#include "dataEntry.hpp"
+#include "MapPtr.hpp"
+#include "List.hpp"
+#include "fileSystem.hpp"
 
 namespace pFlow
 {
@@ -84,7 +84,7 @@ public:
 	// null dictionary object, to be used for references 
 	static dictionary nullDict;
 
-	TypeName("dictionary");
+	TypeInfo("dictionary");
 
 	//// - Constructors
 
@@ -341,4 +341,4 @@ T dictionary::getValOrSet
 }
 
 
-#endif // __dictionary_H__
+#endif // __dictionary_hpp__
diff --git a/src/phasicFlow/dictionary/entry/dataEntry.C b/src/phasicFlow/dictionary/entry/dataEntry.cpp
similarity index 97%
rename from src/phasicFlow/dictionary/entry/dataEntry.C
rename to src/phasicFlow/dictionary/entry/dataEntry.cpp
index 29202c08..8eb33525 100644
--- a/src/phasicFlow/dictionary/entry/dataEntry.C
+++ b/src/phasicFlow/dictionary/entry/dataEntry.cpp
@@ -21,13 +21,13 @@ Licence:
 // to be tailored to our needs
 
 
-#include "dataEntry.H"
-#include "dictionary.H"
-#include "error.H"
-#include "iIstream.H"
-#include "iOstream.H"
-#include "iTstream.H"
-#include "oTstream.H"
+#include "dataEntry.hpp"
+#include "dictionary.hpp"
+#include "error.hpp"
+#include "iIstream.hpp"
+#include "iOstream.hpp"
+#include "iTstream.hpp"
+#include "oTstream.hpp"
 
 pFlow::dataEntry pFlow::dataEntry::nullDataEntry;
 
diff --git a/src/phasicFlow/dictionary/entry/dataEntry.H b/src/phasicFlow/dictionary/entry/dataEntry.hpp
similarity index 96%
rename from src/phasicFlow/dictionary/entry/dataEntry.H
rename to src/phasicFlow/dictionary/entry/dataEntry.hpp
index 2c22f9f2..76a6d793 100644
--- a/src/phasicFlow/dictionary/entry/dataEntry.H
+++ b/src/phasicFlow/dictionary/entry/dataEntry.hpp
@@ -21,13 +21,13 @@ Licence:
 // to be tailored to our needs
 
 
-#ifndef __dataEntry_H__
-#define __dataEntry_H__
+#ifndef __dataEntry_hpp__
+#define __dataEntry_hpp__
 
 
-#include "iEntry.H"
-#include "iTstream.H"
-#include "oTstream.H"
+#include "iEntry.hpp"
+#include "iTstream.hpp"
+#include "oTstream.hpp"
 
 
 
@@ -160,4 +160,4 @@ dataEntry::dataEntry(const word& keyword, const dictionary& parDict, const T& v)
 } // pFlow
 
 
-#endif //__dataEntry_H__
+#endif //__dataEntry_hpp__
diff --git a/src/phasicFlow/dictionary/entry/iEntry.C b/src/phasicFlow/dictionary/entry/iEntry.cpp
similarity index 96%
rename from src/phasicFlow/dictionary/entry/iEntry.C
rename to src/phasicFlow/dictionary/entry/iEntry.cpp
index 1be43760..471ce31c 100644
--- a/src/phasicFlow/dictionary/entry/iEntry.C
+++ b/src/phasicFlow/dictionary/entry/iEntry.cpp
@@ -20,12 +20,12 @@ Licence:
 // based on OpenFOAM dictionary, with some modifications/simplifications
 // to be tailored to our needs
 
-#include "iEntry.H"
-#include "dictionary.H"
-#include "dataEntry.H"
-#include "error.H"
-#include "iOstream.H"
-#include "iIstream.H"
+#include "iEntry.hpp"
+#include "dictionary.hpp"
+#include "dataEntry.hpp"
+#include "error.hpp"
+#include "iOstream.hpp"
+#include "iIstream.hpp"
 
 
 bool pFlow::iEntry::readKeyword
diff --git a/src/phasicFlow/dictionary/entry/iEntry.H b/src/phasicFlow/dictionary/entry/iEntry.hpp
similarity index 95%
rename from src/phasicFlow/dictionary/entry/iEntry.H
rename to src/phasicFlow/dictionary/entry/iEntry.hpp
index 4d8d7572..c2e3bfa4 100644
--- a/src/phasicFlow/dictionary/entry/iEntry.H
+++ b/src/phasicFlow/dictionary/entry/iEntry.hpp
@@ -20,13 +20,13 @@ Licence:
 // based on OpenFOAM dictionary, with some modifications/simplifications
 // to be tailored to our needs
 
-#ifndef __iEntry_H__
-#define __iEntry_H__
+#ifndef __iEntry_hpp__
+#define __iEntry_hpp__
 
 
-#include "types.H"
-#include "typeInfo.H"
-#include "uniquePtr.H"
+#include "types.hpp"
+#include "typeInfo.hpp"
+#include "uniquePtr.hpp"
 
 
 namespace pFlow
@@ -58,7 +58,7 @@ protected:
 public:
 	
 
-	TypeName("iEntry");
+	TypeInfo("iEntry");
 
 	//// - Constructors
 
@@ -157,4 +157,4 @@ iIstream& operator >> (iIstream& is, iEntry& e);
 }
 
 
-#endif //__iEntry_H__
+#endif //__iEntry_hpp__
diff --git a/src/phasicFlow/dictionary/twoPartEntry/twoPartEntry.C b/src/phasicFlow/dictionary/twoPartEntry/twoPartEntry.cpp
similarity index 98%
rename from src/phasicFlow/dictionary/twoPartEntry/twoPartEntry.C
rename to src/phasicFlow/dictionary/twoPartEntry/twoPartEntry.cpp
index 04bad294..5366d8ab 100644
--- a/src/phasicFlow/dictionary/twoPartEntry/twoPartEntry.C
+++ b/src/phasicFlow/dictionary/twoPartEntry/twoPartEntry.cpp
@@ -21,7 +21,7 @@ Licence:
 // to be tailored to our needs
 
 
-#include "twoPartEntry.H"
+#include "twoPartEntry.hpp"
 
 
 pFlow::twoPartEntry::twoPartEntry
diff --git a/src/phasicFlow/dictionary/twoPartEntry/twoPartEntry.H b/src/phasicFlow/dictionary/twoPartEntry/twoPartEntry.hpp
similarity index 95%
rename from src/phasicFlow/dictionary/twoPartEntry/twoPartEntry.H
rename to src/phasicFlow/dictionary/twoPartEntry/twoPartEntry.hpp
index 1f680e43..de66ca60 100644
--- a/src/phasicFlow/dictionary/twoPartEntry/twoPartEntry.H
+++ b/src/phasicFlow/dictionary/twoPartEntry/twoPartEntry.hpp
@@ -21,12 +21,12 @@ Licence:
 // to be tailored to our needs
 
 
-#ifndef __twoPartEntry_H__
-#define __twoPartEntry_H__
+#ifndef __twoPartEntry_hpp__
+#define __twoPartEntry_hpp__
 
 
 
-#include "dataEntry.H"
+#include "dataEntry.hpp"
 
 
 namespace pFlow
diff --git a/src/phasicFlow/eventSubscriber/eventMessage.H b/src/phasicFlow/eventSubscriber/eventMessage.hpp
similarity index 96%
rename from src/phasicFlow/eventSubscriber/eventMessage.H
rename to src/phasicFlow/eventSubscriber/eventMessage.hpp
index 6e84edd6..cfd57ab6 100644
--- a/src/phasicFlow/eventSubscriber/eventMessage.H
+++ b/src/phasicFlow/eventSubscriber/eventMessage.hpp
@@ -19,8 +19,8 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __eventMessage_H__
-#define __eventMessage_H__
+#ifndef __eventMessage_hpp__
+#define __eventMessage_hpp__
 
 
 namespace pFlow
@@ -113,4 +113,4 @@ public:
 
 }
 
-#endif // __eventMessage_H__
+#endif // __eventMessage_hpp__
diff --git a/src/phasicFlow/eventSubscriber/eventObserver.C b/src/phasicFlow/eventSubscriber/eventObserver.cpp
similarity index 96%
rename from src/phasicFlow/eventSubscriber/eventObserver.C
rename to src/phasicFlow/eventSubscriber/eventObserver.cpp
index 69d117e9..0010aefc 100644
--- a/src/phasicFlow/eventSubscriber/eventObserver.C
+++ b/src/phasicFlow/eventSubscriber/eventObserver.cpp
@@ -18,8 +18,8 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#include "eventObserver.H"
-#include "eventSubscriber.H" 
+#include "eventObserver.hpp"
+#include "eventSubscriber.hpp" 
 
 pFlow::eventObserver::eventObserver():
 	subscriber_(nullptr),
diff --git a/src/phasicFlow/eventSubscriber/eventObserver.H b/src/phasicFlow/eventSubscriber/eventObserver.hpp
similarity index 92%
rename from src/phasicFlow/eventSubscriber/eventObserver.H
rename to src/phasicFlow/eventSubscriber/eventObserver.hpp
index 9ef0891f..aa4efd08 100644
--- a/src/phasicFlow/eventSubscriber/eventObserver.H
+++ b/src/phasicFlow/eventSubscriber/eventObserver.hpp
@@ -19,10 +19,10 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __eventObserver_H__
-#define __eventObserver_H__
+#ifndef __eventObserver_hpp__
+#define __eventObserver_hpp__
 
-#include "eventMessage.H"
+#include "eventMessage.hpp"
 
 namespace pFlow
 {
@@ -62,4 +62,4 @@ public:
 } // pFlow
 
 
-#endif // __eventObserver_H__
+#endif // __eventObserver_hpp__
diff --git a/src/phasicFlow/eventSubscriber/eventSubscriber.C b/src/phasicFlow/eventSubscriber/eventSubscriber.cpp
similarity index 97%
rename from src/phasicFlow/eventSubscriber/eventSubscriber.C
rename to src/phasicFlow/eventSubscriber/eventSubscriber.cpp
index 0a804b4d..2b187cde 100644
--- a/src/phasicFlow/eventSubscriber/eventSubscriber.C
+++ b/src/phasicFlow/eventSubscriber/eventSubscriber.cpp
@@ -19,8 +19,8 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#include "eventSubscriber.H"
-#include "Set.H"
+#include "eventSubscriber.hpp"
+#include "Set.hpp"
 
 pFlow::eventSubscriber::~eventSubscriber()
 {
diff --git a/src/phasicFlow/eventSubscriber/eventSubscriber.H b/src/phasicFlow/eventSubscriber/eventSubscriber.hpp
similarity index 89%
rename from src/phasicFlow/eventSubscriber/eventSubscriber.H
rename to src/phasicFlow/eventSubscriber/eventSubscriber.hpp
index 6d2d112b..26e98e2c 100644
--- a/src/phasicFlow/eventSubscriber/eventSubscriber.H
+++ b/src/phasicFlow/eventSubscriber/eventSubscriber.hpp
@@ -19,12 +19,12 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __eventSubscriber_H__
-#define __eventSubscriber_H__
+#ifndef __eventSubscriber_hpp__
+#define __eventSubscriber_hpp__
 
-#include "List.H"
-#include "eventObserver.H"
-#include "eventMessage.H"
+#include "List.hpp"
+#include "eventObserver.hpp"
+#include "eventMessage.hpp"
 
 namespace pFlow
 {
@@ -61,4 +61,4 @@ public:
 
 
 
-#endif // __eventSubscriber_H__
+#endif // __eventSubscriber_hpp__
diff --git a/src/phasicFlow/fileSystem/fileSystem.C b/src/phasicFlow/fileSystem/fileSystem.cpp
similarity index 98%
rename from src/phasicFlow/fileSystem/fileSystem.C
rename to src/phasicFlow/fileSystem/fileSystem.cpp
index 689dc1a0..0e82fe80 100644
--- a/src/phasicFlow/fileSystem/fileSystem.C
+++ b/src/phasicFlow/fileSystem/fileSystem.cpp
@@ -19,9 +19,9 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#include "fileSystem.H"
-#include "error.H"
-#include "iOstream.H"
+#include "fileSystem.hpp"
+#include "error.hpp"
+#include "iOstream.hpp"
 
 
 bool pFlow::fileSystem::checkFileName(const word& name)
diff --git a/src/phasicFlow/fileSystem/fileSystem.H b/src/phasicFlow/fileSystem/fileSystem.hpp
similarity index 97%
rename from src/phasicFlow/fileSystem/fileSystem.H
rename to src/phasicFlow/fileSystem/fileSystem.hpp
index c039ba07..655bc0e8 100644
--- a/src/phasicFlow/fileSystem/fileSystem.H
+++ b/src/phasicFlow/fileSystem/fileSystem.hpp
@@ -18,12 +18,12 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __fileSystem_H__
-#define __fileSystem_H__
+#ifndef __fileSystem_hpp__
+#define __fileSystem_hpp__
 
 #include <filesystem>
-#include "bTypes.H"
-#include "List.H"
+#include "bTypes.hpp"
+#include "List.hpp"
 
 
 namespace pFlow
diff --git a/src/phasicFlow/globals/error.C b/src/phasicFlow/globals/error.cpp
similarity index 98%
rename from src/phasicFlow/globals/error.C
rename to src/phasicFlow/globals/error.cpp
index f725f9e5..0f9cde3d 100644
--- a/src/phasicFlow/globals/error.C
+++ b/src/phasicFlow/globals/error.cpp
@@ -21,8 +21,8 @@ Licence:
 #include <iostream>
 #include <stdlib.h>
 
-#include "error.H"
-#include "streams.H"
+#include "error.hpp"
+#include "streams.hpp"
 
 
 static pFlow::Ostream& errorStream   = pFlow::errReport;
diff --git a/src/phasicFlow/globals/error.H b/src/phasicFlow/globals/error.hpp
similarity index 97%
rename from src/phasicFlow/globals/error.H
rename to src/phasicFlow/globals/error.hpp
index a18580b6..0a375725 100644
--- a/src/phasicFlow/globals/error.H
+++ b/src/phasicFlow/globals/error.hpp
@@ -19,11 +19,11 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __error_H__
-#define __error_H__
+#ifndef __error_hpp__
+#define __error_hpp__
 
 
-#include "builtinTypes.H"
+#include "builtinTypes.hpp"
 
 
 namespace pFlow
diff --git a/src/phasicFlow/globals/globalSettings.H b/src/phasicFlow/globals/globalSettings.hpp
similarity index 91%
rename from src/phasicFlow/globals/globalSettings.H
rename to src/phasicFlow/globals/globalSettings.hpp
index 2a1c35f5..64a17455 100755
--- a/src/phasicFlow/globals/globalSettings.H
+++ b/src/phasicFlow/globals/globalSettings.hpp
@@ -18,8 +18,8 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __globalSettings_H__
-#define __globalSettings_H__
+#ifndef __globalSettings_hpp__
+#define __globalSettings_hpp__
 
 
 
@@ -32,4 +32,4 @@ const inline double vectorGrowthFactor__ = 1.1;
 }
 
 
-#endif // __globalSettings_H__
+#endif // __globalSettings_hpp__
diff --git a/src/phasicFlow/globals/pFlowMacros.H b/src/phasicFlow/globals/pFlowMacros.hpp
similarity index 96%
rename from src/phasicFlow/globals/pFlowMacros.H
rename to src/phasicFlow/globals/pFlowMacros.hpp
index ccd1db28..f0f78229 100755
--- a/src/phasicFlow/globals/pFlowMacros.H
+++ b/src/phasicFlow/globals/pFlowMacros.hpp
@@ -18,8 +18,8 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __pFlowMacros_H__
-#define __pFlowMacros_H__
+#ifndef __pFlowMacros_hpp__
+#define __pFlowMacros_hpp__
 
 #include "phasicFlowConfig.H"
 
@@ -77,4 +77,4 @@ static inline const bool useStdParallel__ = false;
 #endif
 
 
-#endif //__pFlowMacros_H__
+#endif //__pFlowMacros_hpp__
diff --git a/src/phasicFlow/globals/vocabs.H b/src/phasicFlow/globals/vocabs.hpp
similarity index 96%
rename from src/phasicFlow/globals/vocabs.H
rename to src/phasicFlow/globals/vocabs.hpp
index e3a576a2..8ac68538 100755
--- a/src/phasicFlow/globals/vocabs.H
+++ b/src/phasicFlow/globals/vocabs.hpp
@@ -18,8 +18,8 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __vocabs_H__
-#define __vocabs_H__
+#ifndef __vocabs_hpp__
+#define __vocabs_hpp__
 
 
 namespace pFlow
@@ -56,4 +56,4 @@ const inline char* nonUniform__		= "nonUniform";
 }
 
 
-#endif // __vocabs_H__
+#endif // __vocabs_hpp__
diff --git a/src/phasicFlow/random/randomInt32/uniformRandomInt32.H b/src/phasicFlow/random/randomInt32/uniformRandomInt32.hpp
similarity index 92%
rename from src/phasicFlow/random/randomInt32/uniformRandomInt32.H
rename to src/phasicFlow/random/randomInt32/uniformRandomInt32.hpp
index 32013599..86408dcf 100644
--- a/src/phasicFlow/random/randomInt32/uniformRandomInt32.H
+++ b/src/phasicFlow/random/randomInt32/uniformRandomInt32.hpp
@@ -18,13 +18,13 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __uniformRandomInt32_H__
-#define __uniformRandomInt32_H__
+#ifndef __uniformRandomInt32_hpp__
+#define __uniformRandomInt32_hpp__
 
 #include <random>
 
-#include "types.H"
-#include "typeInfo.H"
+#include "types.hpp"
+#include "typeInfo.hpp"
 
 namespace pFlow
 {
@@ -40,7 +40,7 @@ protected:
 public:
 
 	// type info
-	TypeNameNV("uniform");
+	TypeInfoNV("uniform");
 
 	explicit uniformRandomInt32(int32 min, int32 max)
 	:
diff --git a/src/phasicFlow/random/randomReal/RandomReal.C b/src/phasicFlow/random/randomReal/RandomReal.cpp
similarity index 98%
rename from src/phasicFlow/random/randomReal/RandomReal.C
rename to src/phasicFlow/random/randomReal/RandomReal.cpp
index e3e0e7c8..ba8abdc1 100644
--- a/src/phasicFlow/random/randomReal/RandomReal.C
+++ b/src/phasicFlow/random/randomReal/RandomReal.cpp
@@ -18,7 +18,7 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#include "RandomReal.H"
+#include "RandomReal.hpp"
 
 
 template<typename DistributionType>
diff --git a/src/phasicFlow/random/randomReal/RandomReal.H b/src/phasicFlow/random/randomReal/RandomReal.hpp
similarity index 88%
rename from src/phasicFlow/random/randomReal/RandomReal.H
rename to src/phasicFlow/random/randomReal/RandomReal.hpp
index 7c03264b..3800afdc 100644
--- a/src/phasicFlow/random/randomReal/RandomReal.H
+++ b/src/phasicFlow/random/randomReal/RandomReal.hpp
@@ -18,13 +18,13 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __RandomReal_H__
-#define __RandomReal_H__
+#ifndef __RandomReal_hpp__
+#define __RandomReal_hpp__
 
 //#include <random>
 
-#include "randomReal.H"
-#include "uniformRandomReal.H"
+#include "randomReal.hpp"
+#include "uniformRandomReal.hpp"
 
 
 namespace pFlow
@@ -42,7 +42,7 @@ protected:
 public:
 
 	// type info
-	TypeNameTemplate("randomReal", DistributionType);
+	TypeInfoTemplate("randomReal", DistributionType);
 
 
 	RandomReal(word distribution);
@@ -66,7 +66,7 @@ public:
 
 }
 
-#include "RandomReal.C"
+#include "RandomReal.cpp"
 
 
 
diff --git a/src/phasicFlow/random/randomReal/randomReal.C b/src/phasicFlow/random/randomReal/randomReal.cpp
similarity index 98%
rename from src/phasicFlow/random/randomReal/randomReal.C
rename to src/phasicFlow/random/randomReal/randomReal.cpp
index 1425929e..2f3392e0 100644
--- a/src/phasicFlow/random/randomReal/randomReal.C
+++ b/src/phasicFlow/random/randomReal/randomReal.cpp
@@ -19,7 +19,7 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#include "randomReal.H"
+#include "randomReal.hpp"
 
 
 pFlow::uniquePtr<pFlow::randomReal> pFlow::randomReal::create
diff --git a/src/phasicFlow/random/randomReal/randomReal.H b/src/phasicFlow/random/randomReal/randomReal.hpp
similarity index 91%
rename from src/phasicFlow/random/randomReal/randomReal.H
rename to src/phasicFlow/random/randomReal/randomReal.hpp
index a9e1ccbe..45ca0522 100644
--- a/src/phasicFlow/random/randomReal/randomReal.H
+++ b/src/phasicFlow/random/randomReal/randomReal.hpp
@@ -18,11 +18,11 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __randomReal_H__
-#define __randomReal_H__
+#ifndef __randomReal_hpp__
+#define __randomReal_hpp__
 
-#include "types.H"
-#include "virtualConstructor.H"
+#include "types.hpp"
+#include "virtualConstructor.hpp"
 
 namespace pFlow
 {
@@ -35,7 +35,7 @@ protected:
 
 public:
 
-	TypeName("randomReal");
+	TypeInfo("randomReal");
 
 	randomReal(word UNUSED(distribution)){}
 
diff --git a/src/phasicFlow/random/randomReal/randomReals.C b/src/phasicFlow/random/randomReal/randomReals.cpp
similarity index 92%
rename from src/phasicFlow/random/randomReal/randomReals.C
rename to src/phasicFlow/random/randomReal/randomReals.cpp
index 34b71ca7..6fc2523b 100644
--- a/src/phasicFlow/random/randomReal/randomReals.C
+++ b/src/phasicFlow/random/randomReal/randomReals.cpp
@@ -18,6 +18,6 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#include "randomReals.H"
+#include "randomReals.hpp"
 
 template class pFlow::RandomReal<pFlow::uniformRandomReal>;
\ No newline at end of file
diff --git a/src/phasicFlow/random/randomReal/randomReals.H b/src/phasicFlow/random/randomReal/randomReals.hpp
similarity index 90%
rename from src/phasicFlow/random/randomReal/randomReals.H
rename to src/phasicFlow/random/randomReal/randomReals.hpp
index d8b4381d..700bd390 100644
--- a/src/phasicFlow/random/randomReal/randomReals.H
+++ b/src/phasicFlow/random/randomReal/randomReals.hpp
@@ -18,11 +18,11 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __randomReals_H__
-#define __randomReals_H__
+#ifndef __randomReals_hpp__
+#define __randomReals_hpp__
 
-#include "RandomReal.H"
-#include "uniformRandomReal.H"
+#include "RandomReal.hpp"
+#include "uniformRandomReal.hpp"
 
 namespace pFlow
 {
diff --git a/src/phasicFlow/random/randomReal/uniformRandomReal.H b/src/phasicFlow/random/randomReal/uniformRandomReal.hpp
similarity index 92%
rename from src/phasicFlow/random/randomReal/uniformRandomReal.H
rename to src/phasicFlow/random/randomReal/uniformRandomReal.hpp
index 37fab81b..7f991606 100644
--- a/src/phasicFlow/random/randomReal/uniformRandomReal.H
+++ b/src/phasicFlow/random/randomReal/uniformRandomReal.hpp
@@ -18,13 +18,13 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __uniformRandomReal_H__
-#define __uniformRandomReal_H__
+#ifndef __uniformRandomReal_hpp__
+#define __uniformRandomReal_hpp__
 
 #include <random>
 
-#include "types.H"
-#include "typeInfo.H"
+#include "types.hpp"
+#include "typeInfo.hpp"
 
 namespace pFlow
 {
@@ -40,7 +40,7 @@ protected:
 public:
 
 	// type info
-	TypeNameNV("uniform");
+	TypeInfoNV("uniform");
 
 	explicit uniformRandomReal()
 	:
diff --git a/src/phasicFlow/ranges/combinedRange.H b/src/phasicFlow/ranges/combinedRange.hpp
similarity index 89%
rename from src/phasicFlow/ranges/combinedRange.H
rename to src/phasicFlow/ranges/combinedRange.hpp
index c5891dd9..d01b3b5d 100644
--- a/src/phasicFlow/ranges/combinedRange.H
+++ b/src/phasicFlow/ranges/combinedRange.hpp
@@ -18,15 +18,16 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __combinedRange_H__
-#define __combinedRange_H__
+#ifndef __combinedRange_hpp__
+#define __combinedRange_hpp__
 
+#include <vector>
 
-#include "stridedRange.H"
-#include "intervalRange.H"
-#include "Lists.H"
-#include "Vectors.H"
-#include "Set.H"
+#include "stridedRange.hpp"
+#include "intervalRange.hpp"
+#include "Lists.hpp"
+
+#include "Set.hpp"
 
 namespace pFlow
 {
@@ -52,7 +53,7 @@ public:
 	
 	combinedRange(){}
 
-	combinedRange(const wordVector& strRanges)
+	combinedRange(const std::vector<word>& strRanges)
 	{
 		if(!addRanges(strRanges))
 		{
@@ -60,7 +61,7 @@ public:
 		}
 	}
 
-	bool addRanges(const wordVector& strRanges)
+	bool addRanges(const std::vector<word>& strRanges)
 	{
 		for(auto& sR: strRanges)
 		{
@@ -148,4 +149,4 @@ public:
 }
 
 
-#endif //__combinedRange_H__
+#endif //__combinedRange_hpp__
diff --git a/src/phasicFlow/ranges/intervalRange.H b/src/phasicFlow/ranges/intervalRange.hpp
similarity index 93%
rename from src/phasicFlow/ranges/intervalRange.H
rename to src/phasicFlow/ranges/intervalRange.hpp
index 7279b93b..ca40826f 100644
--- a/src/phasicFlow/ranges/intervalRange.H
+++ b/src/phasicFlow/ranges/intervalRange.hpp
@@ -19,11 +19,11 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __intervalRange_H__
-#define __intervalRange_H__ 
+#ifndef __intervalRange_hpp__
+#define __intervalRange_hpp__ 
 
-#include "types.H"
-#include "typeInfo.H"
+#include "types.hpp"
+#include "typeInfo.hpp"
 
 
 namespace pFlow
@@ -43,7 +43,7 @@ protected:
 	static inline const T minVal = largestNegative<T>();
 public:
 
-	TypeNameTemplateNV("intervalRange",T);
+	TypeInfoTemplateNV("intervalRange",T);
 
 	intervalRange(T begin, T end)
 	:
@@ -115,4 +115,4 @@ public:
 
 }
 
-#endif  //__stridedRange_H__ 
+#endif  //__stridedRange_hpp__ 
diff --git a/src/phasicFlow/ranges/ranges.H b/src/phasicFlow/ranges/ranges.hpp
similarity index 90%
rename from src/phasicFlow/ranges/ranges.H
rename to src/phasicFlow/ranges/ranges.hpp
index d930c88d..69b09f60 100644
--- a/src/phasicFlow/ranges/ranges.H
+++ b/src/phasicFlow/ranges/ranges.hpp
@@ -18,12 +18,12 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __ranges_H__ 
-#define __ranges_H__
+#ifndef __ranges_hpp__ 
+#define __ranges_hpp__
 
-#include "stridedRange.H"
-#include "intervalRange.H"
-#include "combinedRange.H"
+#include "stridedRange.hpp"
+#include "intervalRange.hpp"
+#include "combinedRange.hpp"
 
 namespace pFlow
 {
@@ -42,4 +42,4 @@ using realCombinedRange  = combinedRange<real>;
 
 }
 
-#endif //__ranges_H__
+#endif //__ranges_hpp__
diff --git a/src/phasicFlow/ranges/stridedRange.H b/src/phasicFlow/ranges/stridedRange.hpp
similarity index 93%
rename from src/phasicFlow/ranges/stridedRange.H
rename to src/phasicFlow/ranges/stridedRange.hpp
index 57d2e725..5ecf7367 100644
--- a/src/phasicFlow/ranges/stridedRange.H
+++ b/src/phasicFlow/ranges/stridedRange.hpp
@@ -18,12 +18,12 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __stridedRange_H__
-#define __stridedRange_H__ 
+#ifndef __stridedRange_hpp__
+#define __stridedRange_hpp__ 
 
-#include "types.H"
-#include "typeInfo.H"
-#include "dictionary.H"
+#include "types.hpp"
+#include "typeInfo.hpp"
+#include "dictionary.hpp"
 
 
 namespace pFlow
@@ -46,7 +46,7 @@ protected:
 
 public:
 
-	TypeNameTemplateNV("stridedRange",T);
+	TypeInfoTemplateNV("stridedRange",T);
 
 	stridedRange(T begin, T end, T stride)
 	:
@@ -139,4 +139,4 @@ public:
 
 }
 
-#endif  //__stridedRange_H__ 
+#endif  //__stridedRange_hpp__ 
diff --git a/src/phasicFlow/repository/IOobject/IOfileHeader.C b/src/phasicFlow/repository/IOobject/IOfileHeader.cpp
similarity index 98%
rename from src/phasicFlow/repository/IOobject/IOfileHeader.C
rename to src/phasicFlow/repository/IOobject/IOfileHeader.cpp
index e4a568e6..980835d1 100644
--- a/src/phasicFlow/repository/IOobject/IOfileHeader.C
+++ b/src/phasicFlow/repository/IOobject/IOfileHeader.cpp
@@ -18,8 +18,8 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#include "IOfileHeader.H"
-#include "repository.H"
+#include "IOfileHeader.hpp"
+#include "repository.hpp"
 
 pFlow::uniquePtr<pFlow::iFstream> pFlow::IOfileHeader::inStream()const
 {
diff --git a/src/phasicFlow/repository/IOobject/IOfileHeader.H b/src/phasicFlow/repository/IOobject/IOfileHeader.hpp
similarity index 94%
rename from src/phasicFlow/repository/IOobject/IOfileHeader.H
rename to src/phasicFlow/repository/IOobject/IOfileHeader.hpp
index 5279d408..99042afc 100644
--- a/src/phasicFlow/repository/IOobject/IOfileHeader.H
+++ b/src/phasicFlow/repository/IOobject/IOfileHeader.hpp
@@ -19,13 +19,13 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __IOfileHeader_H__
-#define __IOfileHeader_H__
+#ifndef __IOfileHeader_hpp__
+#define __IOfileHeader_hpp__
 
 
-#include "uniquePtr.H"
-#include "objectFile.H"
-#include "streams.H"
+#include "uniquePtr.hpp"
+#include "objectFile.hpp"
+#include "streams.hpp"
 
 namespace pFlow
 {
@@ -120,4 +120,4 @@ public:
 
 }
 
-#endif //__objectFile_H__
+#endif //__objectFile_hpp__
diff --git a/src/phasicFlow/repository/IOobject/IOobject.C b/src/phasicFlow/repository/IOobject/IOobject.cpp
similarity index 97%
rename from src/phasicFlow/repository/IOobject/IOobject.C
rename to src/phasicFlow/repository/IOobject/IOobject.cpp
index ccf4668c..73984949 100644
--- a/src/phasicFlow/repository/IOobject/IOobject.C
+++ b/src/phasicFlow/repository/IOobject/IOobject.cpp
@@ -18,8 +18,8 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#include "IOobject.H"
-#include "repository.H"
+#include "IOobject.hpp"
+#include "repository.hpp"
 
 
 pFlow::IOobject::IOobject
diff --git a/src/phasicFlow/repository/IOobject/IOobject.H b/src/phasicFlow/repository/IOobject/IOobject.hpp
similarity index 96%
rename from src/phasicFlow/repository/IOobject/IOobject.H
rename to src/phasicFlow/repository/IOobject/IOobject.hpp
index 494377d4..7b2ab200 100644
--- a/src/phasicFlow/repository/IOobject/IOobject.H
+++ b/src/phasicFlow/repository/IOobject/IOobject.hpp
@@ -19,12 +19,12 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __IOobject_H__
-#define __IOobject_H__
+#ifndef __IOobject_hpp__
+#define __IOobject_hpp__
 
 
 
-#include "IOfileHeader.H"
+#include "IOfileHeader.hpp"
 
 
 namespace pFlow
@@ -179,6 +179,6 @@ public:
 
 }
 
-#include "IOobjectTemplates.C"
+#include "IOobjectTemplates.cpp"
 
-#endif //__IOobject_H__
+#endif //__IOobject_hpp__
diff --git a/src/phasicFlow/repository/IOobject/IOobjectTemplates.C b/src/phasicFlow/repository/IOobject/IOobjectTemplates.cpp
similarity index 100%
rename from src/phasicFlow/repository/IOobject/IOobjectTemplates.C
rename to src/phasicFlow/repository/IOobject/IOobjectTemplates.cpp
diff --git a/src/phasicFlow/repository/IOobject/objectFile.C b/src/phasicFlow/repository/IOobject/objectFile.cpp
similarity index 98%
rename from src/phasicFlow/repository/IOobject/objectFile.C
rename to src/phasicFlow/repository/IOobject/objectFile.cpp
index 34d53d6f..55776975 100644
--- a/src/phasicFlow/repository/IOobject/objectFile.C
+++ b/src/phasicFlow/repository/IOobject/objectFile.cpp
@@ -18,7 +18,7 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#include "objectFile.H"
+#include "objectFile.hpp"
 
 pFlow::objectFile::objectFile
 (
diff --git a/src/phasicFlow/repository/IOobject/objectFile.H b/src/phasicFlow/repository/IOobject/objectFile.hpp
similarity index 95%
rename from src/phasicFlow/repository/IOobject/objectFile.H
rename to src/phasicFlow/repository/IOobject/objectFile.hpp
index 4d561de5..7ab6f153 100644
--- a/src/phasicFlow/repository/IOobject/objectFile.H
+++ b/src/phasicFlow/repository/IOobject/objectFile.hpp
@@ -18,11 +18,11 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __objectFile_H__
-#define __objectFile_H__
+#ifndef __objectFile_hpp__
+#define __objectFile_hpp__
 
-#include "types.H"
-#include "fileSystem.H"
+#include "types.hpp"
+#include "fileSystem.hpp"
 
 
 namespace pFlow
@@ -150,4 +150,4 @@ public:
 
 }
 
-#endif //__objectFile_H__
+#endif //__objectFile_hpp__
diff --git a/src/phasicFlow/repository/Time/Time.C b/src/phasicFlow/repository/Time/Time.cpp
similarity index 96%
rename from src/phasicFlow/repository/Time/Time.C
rename to src/phasicFlow/repository/Time/Time.cpp
index 4808adee..ebddd80c 100644
--- a/src/phasicFlow/repository/Time/Time.C
+++ b/src/phasicFlow/repository/Time/Time.cpp
@@ -19,9 +19,9 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#include "Time.H"
-#include "dictionary.H"
-#include "vocabs.H"
+#include "Time.hpp"
+#include "dictionary.hpp"
+#include "vocabs.hpp"
 
 pFlow::Time::Time
 (
diff --git a/src/phasicFlow/repository/Time/Time.H b/src/phasicFlow/repository/Time/Time.hpp
similarity index 92%
rename from src/phasicFlow/repository/Time/Time.H
rename to src/phasicFlow/repository/Time/Time.hpp
index 0cb3fd43..b4f49d07 100644
--- a/src/phasicFlow/repository/Time/Time.H
+++ b/src/phasicFlow/repository/Time/Time.hpp
@@ -19,15 +19,15 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __Time_H__
-#define __Time_H__
+#ifndef __Time_hpp__
+#define __Time_hpp__
 
 
-#include "types.H"
-#include "error.H"
+#include "types.hpp"
+#include "error.hpp"
 
-#include "timeControl.H"
-#include "repository.H"
+#include "timeControl.hpp"
+#include "repository.hpp"
 
 
 
@@ -99,4 +99,4 @@ public:
 
 } // pFlow
 
-#endif // __Time_H__
+#endif // __Time_hpp__
diff --git a/src/phasicFlow/repository/Time/timeControl.C b/src/phasicFlow/repository/Time/timeControl.cpp
similarity index 98%
rename from src/phasicFlow/repository/Time/timeControl.C
rename to src/phasicFlow/repository/Time/timeControl.cpp
index ba05a744..7c5fd087 100644
--- a/src/phasicFlow/repository/Time/timeControl.C
+++ b/src/phasicFlow/repository/Time/timeControl.cpp
@@ -19,8 +19,8 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#include "timeControl.H"
-#include "dictionary.H"
+#include "timeControl.hpp"
+#include "dictionary.hpp"
 
 
 bool pFlow::timeControl::screenReport()const
diff --git a/src/phasicFlow/repository/Time/timeControl.H b/src/phasicFlow/repository/Time/timeControl.hpp
similarity index 95%
rename from src/phasicFlow/repository/Time/timeControl.H
rename to src/phasicFlow/repository/Time/timeControl.hpp
index a8d393b9..4a7eb94f 100644
--- a/src/phasicFlow/repository/Time/timeControl.H
+++ b/src/phasicFlow/repository/Time/timeControl.hpp
@@ -19,12 +19,12 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __timeControl_H__
-#define __timeControl_H__
+#ifndef __timeControl_hpp__
+#define __timeControl_hpp__
 
-#include "types.H"
-#include "ranges.H"
-#include "streams.H"
+#include "types.hpp"
+#include "ranges.hpp"
+#include "streams.hpp"
 
 
 namespace pFlow
@@ -183,4 +183,4 @@ public:
 
 } // pFlow
 
-#endif // __timeControl_H__
+#endif // __timeControl_hpp__
diff --git a/src/phasicFlow/repository/repository/repository.C b/src/phasicFlow/repository/repository/repository.cpp
similarity index 99%
rename from src/phasicFlow/repository/repository/repository.C
rename to src/phasicFlow/repository/repository/repository.cpp
index a962a809..79944974 100644
--- a/src/phasicFlow/repository/repository/repository.C
+++ b/src/phasicFlow/repository/repository/repository.cpp
@@ -19,7 +19,7 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#include "repository.H"
+#include "repository.hpp"
 
 
 pFlow::repository::repository
diff --git a/src/phasicFlow/repository/repository/repository.H b/src/phasicFlow/repository/repository/repository.hpp
similarity index 96%
rename from src/phasicFlow/repository/repository/repository.H
rename to src/phasicFlow/repository/repository/repository.hpp
index 67c55e2d..251a6af4 100644
--- a/src/phasicFlow/repository/repository/repository.H
+++ b/src/phasicFlow/repository/repository/repository.hpp
@@ -19,14 +19,14 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __repository_H__
-#define __repository_H__
+#ifndef __repository_hpp__
+#define __repository_hpp__
 
 
-#include "fileSystem.H"
-#include "Maps.H"
-#include "Lists.H"
-#include "IOobject.H"
+#include "fileSystem.hpp"
+#include "Maps.hpp"
+#include "Lists.hpp"
+#include "IOobject.hpp"
 
 namespace pFlow
 {
@@ -60,7 +60,7 @@ protected:
 
 public:
 
-	TypeName("repository");
+	TypeInfo("repository");
 	
 	//// - Constructors
 
@@ -199,6 +199,6 @@ public:
 
 }
 
-#include "repositoryTemplates.C"
+#include "repositoryTemplates.cpp"
 
-#endif //__repository_H__
+#endif //__repository_hpp__
diff --git a/src/phasicFlow/repository/repository/repositoryTemplates.C b/src/phasicFlow/repository/repository/repositoryTemplates.cpp
similarity index 100%
rename from src/phasicFlow/repository/repository/repositoryTemplates.C
rename to src/phasicFlow/repository/repository/repositoryTemplates.cpp
diff --git a/src/phasicFlow/repository/systemControl/Control.H b/src/phasicFlow/repository/systemControl/Control.hpp
similarity index 91%
rename from src/phasicFlow/repository/systemControl/Control.H
rename to src/phasicFlow/repository/systemControl/Control.hpp
index d9aa3018..58df40a4 100644
--- a/src/phasicFlow/repository/systemControl/Control.H
+++ b/src/phasicFlow/repository/systemControl/Control.hpp
@@ -19,8 +19,8 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __Control_H__
-#define __Control_H__
+#ifndef __Control_hpp__
+#define __Control_hpp__
 
 
 // top-level entity repository for the whole application 
@@ -28,8 +28,8 @@ Licence:
 // settings/systemControl file in it. 
 // This  repository holds two main repositories: Time and settings 
 
-#include "systemControl.H"
-#include "timeFolder.H"
+#include "systemControl.hpp"
+#include "timeFolder.hpp"
 
 namespace pFlow
 {
@@ -44,4 +44,4 @@ inline systemControl& Control()
 } // pFlow
 
 
-#endif // __Control_H__
+#endif // __Control_hpp__
diff --git a/src/phasicFlow/repository/systemControl/systemControl.C b/src/phasicFlow/repository/systemControl/systemControl.cpp
similarity index 97%
rename from src/phasicFlow/repository/systemControl/systemControl.C
rename to src/phasicFlow/repository/systemControl/systemControl.cpp
index e3742dd5..3f673137 100644
--- a/src/phasicFlow/repository/systemControl/systemControl.C
+++ b/src/phasicFlow/repository/systemControl/systemControl.cpp
@@ -19,11 +19,11 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#include "types.H"
-#include "iOstream.H"
-#include "error.H"
-#include "systemControl.H"
-#include "vocabs.H"
+#include "types.hpp"
+#include "iOstream.hpp"
+#include "error.hpp"
+#include "systemControl.hpp"
+#include "vocabs.hpp"
 
 
 pFlow::word pFlow::systemControl::getRunName
diff --git a/src/phasicFlow/repository/systemControl/systemControl.H b/src/phasicFlow/repository/systemControl/systemControl.hpp
similarity index 94%
rename from src/phasicFlow/repository/systemControl/systemControl.H
rename to src/phasicFlow/repository/systemControl/systemControl.hpp
index 9c4afa08..ac894ebb 100644
--- a/src/phasicFlow/repository/systemControl/systemControl.H
+++ b/src/phasicFlow/repository/systemControl/systemControl.hpp
@@ -19,8 +19,8 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __systemControl_H__
-#define __systemControl_H__
+#ifndef __systemControl_hpp__
+#define __systemControl_hpp__
 
 
 // top-level entity repository for the whole application 
@@ -28,11 +28,11 @@ Licence:
 // settings/systemControl file in it. 
 
 
-#include "types.H"
-#include "Time.H"
-#include "dictionary.H"
-#include "box.H"
-#include "Timers.H"
+#include "types.hpp"
+#include "Time.hpp"
+#include "dictionary.hpp"
+#include "box.hpp"
+#include "Timers.hpp"
 
 namespace pFlow
 {
@@ -185,4 +185,4 @@ public:
 } // pFlow
 
 
-#endif // __systemControl_H__
+#endif // __systemControl_hpp__
diff --git a/src/phasicFlow/repository/systemControl/timeFolder.H b/src/phasicFlow/repository/systemControl/timeFolder.hpp
similarity index 96%
rename from src/phasicFlow/repository/systemControl/timeFolder.H
rename to src/phasicFlow/repository/systemControl/timeFolder.hpp
index e605158a..15c01e4e 100644
--- a/src/phasicFlow/repository/systemControl/timeFolder.H
+++ b/src/phasicFlow/repository/systemControl/timeFolder.hpp
@@ -18,11 +18,11 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __timeFolder_H__
-#define __timeFolder_H__
+#ifndef __timeFolder_hpp__
+#define __timeFolder_hpp__
 
 
-#include "systemControl.H"
+#include "systemControl.hpp"
 
 namespace pFlow
 {
@@ -145,4 +145,4 @@ Map<real, fileSystem> getTimeFolders(const fileSystem& path)
 } // pFlow
 
 
-#endif // __Control_H__
+#endif // __Control_hpp__
diff --git a/src/phasicFlow/setFieldList/setFieldEntry.C b/src/phasicFlow/setFieldList/setFieldEntry.cpp
similarity index 99%
rename from src/phasicFlow/setFieldList/setFieldEntry.C
rename to src/phasicFlow/setFieldList/setFieldEntry.cpp
index 8ceb9b14..8cb0c24f 100644
--- a/src/phasicFlow/setFieldList/setFieldEntry.C
+++ b/src/phasicFlow/setFieldList/setFieldEntry.cpp
@@ -19,7 +19,7 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#include "setFieldEntry.H"
+#include "setFieldEntry.hpp"
 
 pFlow::setFieldEntry::setFieldEntry
 (
diff --git a/src/phasicFlow/setFieldList/setFieldEntry.H b/src/phasicFlow/setFieldList/setFieldEntry.hpp
similarity index 92%
rename from src/phasicFlow/setFieldList/setFieldEntry.H
rename to src/phasicFlow/setFieldList/setFieldEntry.hpp
index 07fdae6a..214d9d57 100644
--- a/src/phasicFlow/setFieldList/setFieldEntry.H
+++ b/src/phasicFlow/setFieldList/setFieldEntry.hpp
@@ -19,13 +19,13 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __setFieldEntry_H__
-#define __setFieldEntry_H__
+#ifndef __setFieldEntry_hpp__
+#define __setFieldEntry_hpp__
 
-#include "twoPartEntry.H"
-#include "pointFields.H"
-#include "repository.H"
-#include "indexContainer.H"
+#include "twoPartEntry.hpp"
+#include "pointFields.hpp"
+#include "repository.hpp"
+#include "indexContainer.hpp"
 
 namespace pFlow
 {
@@ -115,6 +115,6 @@ public:
 } // pFlow
 
 
-#include "setFieldEntryTemplates.C"
+#include "setFieldEntryTemplates.cpp"
 
 #endif
diff --git a/src/phasicFlow/setFieldList/setFieldEntryTemplates.C b/src/phasicFlow/setFieldList/setFieldEntryTemplates.cpp
similarity index 100%
rename from src/phasicFlow/setFieldList/setFieldEntryTemplates.C
rename to src/phasicFlow/setFieldList/setFieldEntryTemplates.cpp
diff --git a/src/phasicFlow/setFieldList/setFieldList.C b/src/phasicFlow/setFieldList/setFieldList.cpp
similarity index 98%
rename from src/phasicFlow/setFieldList/setFieldList.C
rename to src/phasicFlow/setFieldList/setFieldList.cpp
index adc28259..ec02dd37 100644
--- a/src/phasicFlow/setFieldList/setFieldList.C
+++ b/src/phasicFlow/setFieldList/setFieldList.cpp
@@ -19,7 +19,7 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#include "setFieldList.H"
+#include "setFieldList.hpp"
 
 bool pFlow::setFieldList::readSetFieldList(const dictionary& dict)
 {
diff --git a/src/phasicFlow/setFieldList/setFieldList.H b/src/phasicFlow/setFieldList/setFieldList.hpp
similarity index 91%
rename from src/phasicFlow/setFieldList/setFieldList.H
rename to src/phasicFlow/setFieldList/setFieldList.hpp
index 2827cf28..41288a7e 100644
--- a/src/phasicFlow/setFieldList/setFieldList.H
+++ b/src/phasicFlow/setFieldList/setFieldList.hpp
@@ -19,12 +19,12 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __setFieldList_H__
-#define __setFieldList_H__
+#ifndef __setFieldList_hpp__
+#define __setFieldList_hpp__
 
-#include "List.H"
-#include "setFieldEntry.H"
-#include "dictionary.H"
+#include "List.hpp"
+#include "setFieldEntry.hpp"
+#include "dictionary.hpp"
 
 namespace pFlow
 {
@@ -77,4 +77,4 @@ public:
 
 
 
-#endif //__setFieldList_H__
+#endif //__setFieldList_hpp__
diff --git a/src/phasicFlow/smartPointers/uniquePtr.H b/src/phasicFlow/smartPointers/uniquePtr.hpp
similarity index 96%
rename from src/phasicFlow/smartPointers/uniquePtr.H
rename to src/phasicFlow/smartPointers/uniquePtr.hpp
index 0f164af1..9375d15c 100644
--- a/src/phasicFlow/smartPointers/uniquePtr.H
+++ b/src/phasicFlow/smartPointers/uniquePtr.hpp
@@ -19,15 +19,15 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __uniquePtr_H__
-#define __uniquePtr_H__
+#ifndef __uniquePtr_hpp__
+#define __uniquePtr_hpp__
 
 
 #include <memory>
 #include <typeinfo>
 
-#include "pFlowMacros.H"
-#include "error.H"
+#include "pFlowMacros.hpp"
+#include "error.hpp"
 
 // just for preventing the use of std namespace and adding some minor functionalities
 
diff --git a/src/phasicFlow/streams/Fstream/fileStream.C b/src/phasicFlow/streams/Fstream/fileStream.cpp
similarity index 98%
rename from src/phasicFlow/streams/Fstream/fileStream.C
rename to src/phasicFlow/streams/Fstream/fileStream.cpp
index 530bee0f..3a39783a 100755
--- a/src/phasicFlow/streams/Fstream/fileStream.C
+++ b/src/phasicFlow/streams/Fstream/fileStream.cpp
@@ -21,8 +21,8 @@ Licence:
 // to be tailored to our needs
 
 
-#include "fileStream.H"
-#include "error.H"
+#include "fileStream.hpp"
+#include "error.hpp"
 
 
 
diff --git a/src/phasicFlow/streams/Fstream/fileStream.H b/src/phasicFlow/streams/Fstream/fileStream.hpp
similarity index 94%
rename from src/phasicFlow/streams/Fstream/fileStream.H
rename to src/phasicFlow/streams/Fstream/fileStream.hpp
index 6e7cdd61..560da9ee 100755
--- a/src/phasicFlow/streams/Fstream/fileStream.H
+++ b/src/phasicFlow/streams/Fstream/fileStream.hpp
@@ -21,14 +21,14 @@ Licence:
 // to be tailored to our needs
 
 
-#ifndef __fileStream_H__
-#define __fileStream_H__
+#ifndef __fileStream_hpp__
+#define __fileStream_hpp__
 
 
 #include <fstream>
 
-#include "fileSystem.H"
-#include "uniquePtr.H"
+#include "fileSystem.hpp"
+#include "uniquePtr.hpp"
 
 namespace pFlow
 {
diff --git a/src/phasicFlow/streams/Fstream/iFstream.C b/src/phasicFlow/streams/Fstream/iFstream.cpp
similarity index 97%
rename from src/phasicFlow/streams/Fstream/iFstream.C
rename to src/phasicFlow/streams/Fstream/iFstream.cpp
index 30ee47cb..09008735 100755
--- a/src/phasicFlow/streams/Fstream/iFstream.C
+++ b/src/phasicFlow/streams/Fstream/iFstream.cpp
@@ -21,7 +21,7 @@ Licence:
 // to be tailored to our needs
 
 
-#include "iFstream.H"
+#include "iFstream.hpp"
 
 
 pFlow::iFstream::iFstream (const fileSystem& path)
diff --git a/src/phasicFlow/streams/Fstream/iFstream.H b/src/phasicFlow/streams/Fstream/iFstream.hpp
similarity index 92%
rename from src/phasicFlow/streams/Fstream/iFstream.H
rename to src/phasicFlow/streams/Fstream/iFstream.hpp
index 6db2e664..253a4a36 100755
--- a/src/phasicFlow/streams/Fstream/iFstream.H
+++ b/src/phasicFlow/streams/Fstream/iFstream.hpp
@@ -20,13 +20,13 @@ Licence:
 // based on OpenFOAM stream, with some modifications/simplifications
 // to be tailored to our needs
 
-#ifndef __iFstream_H__
-#define __iFstream_H__
+#ifndef __iFstream_hpp__
+#define __iFstream_hpp__
 
 
-#include "fileSystem.H"
-#include "fileStream.H"
-#include "Istream.H"
+#include "fileSystem.hpp"
+#include "fileStream.hpp"
+#include "Istream.hpp"
 
 namespace pFlow
 {
diff --git a/src/phasicFlow/streams/Fstream/oFstream.C b/src/phasicFlow/streams/Fstream/oFstream.cpp
similarity index 98%
rename from src/phasicFlow/streams/Fstream/oFstream.C
rename to src/phasicFlow/streams/Fstream/oFstream.cpp
index a26ed597..3d1cbe9a 100755
--- a/src/phasicFlow/streams/Fstream/oFstream.C
+++ b/src/phasicFlow/streams/Fstream/oFstream.cpp
@@ -21,7 +21,7 @@ Licence:
 // to be tailored to our needs
 
 
-#include "oFstream.H"
+#include "oFstream.hpp"
 
 
 pFlow::oFstream::oFstream (const fileSystem& path)
diff --git a/src/phasicFlow/streams/Fstream/oFstream.H b/src/phasicFlow/streams/Fstream/oFstream.hpp
similarity index 91%
rename from src/phasicFlow/streams/Fstream/oFstream.H
rename to src/phasicFlow/streams/Fstream/oFstream.hpp
index 516dd093..2a25e5de 100755
--- a/src/phasicFlow/streams/Fstream/oFstream.H
+++ b/src/phasicFlow/streams/Fstream/oFstream.hpp
@@ -21,13 +21,13 @@ Licence:
 // to be tailored to our needs
 
 
-#ifndef __oFstream_H__
-#define __oFstream_H__
+#ifndef __oFstream_hpp__
+#define __oFstream_hpp__
 
 
-#include "fileSystem.H"
-#include "fileStream.H"
-#include "Ostream.H"
+#include "fileSystem.hpp"
+#include "fileStream.hpp"
+#include "Ostream.hpp"
 
 namespace pFlow
 {
diff --git a/src/phasicFlow/streams/Stream/Istream.C b/src/phasicFlow/streams/Stream/Istream.cpp
similarity index 99%
rename from src/phasicFlow/streams/Stream/Istream.C
rename to src/phasicFlow/streams/Stream/Istream.cpp
index 6986c0cc..748ae06f 100755
--- a/src/phasicFlow/streams/Stream/Istream.C
+++ b/src/phasicFlow/streams/Stream/Istream.cpp
@@ -21,9 +21,9 @@ Licence:
 // to be tailored to our needs
 
 
-#include "Istream.H"
-#include "token.H"
-#include "error.H"
+#include "Istream.hpp"
+#include "token.hpp"
+#include "error.hpp"
 
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
diff --git a/src/phasicFlow/streams/Stream/Istream.H b/src/phasicFlow/streams/Stream/Istream.hpp
similarity index 98%
rename from src/phasicFlow/streams/Stream/Istream.H
rename to src/phasicFlow/streams/Stream/Istream.hpp
index b8941518..a65d080b 100755
--- a/src/phasicFlow/streams/Stream/Istream.H
+++ b/src/phasicFlow/streams/Stream/Istream.hpp
@@ -21,13 +21,13 @@ Licence:
 // to be tailored to our needs
 
 
-#ifndef __Istream_H__
-#define __Istream_H__
+#ifndef __Istream_hpp__
+#define __Istream_hpp__
 
 #include <limits>
 #include <iostream>
 
-#include "iIstream.H"
+#include "iIstream.hpp"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/phasicFlow/streams/Stream/Ostream.C b/src/phasicFlow/streams/Stream/Ostream.cpp
similarity index 98%
rename from src/phasicFlow/streams/Stream/Ostream.C
rename to src/phasicFlow/streams/Stream/Ostream.cpp
index 48edcf91..75e4f477 100755
--- a/src/phasicFlow/streams/Stream/Ostream.C
+++ b/src/phasicFlow/streams/Stream/Ostream.cpp
@@ -20,9 +20,9 @@ Licence:
 // based on OpenFOAM stream, with some modifications/simplifications
 // to be tailored to our needs
 
-#include "error.H"
-#include "token.H"
-#include "Ostream.H"
+#include "error.hpp"
+#include "token.hpp"
+#include "Ostream.hpp"
 
 
 pFlow::Ostream::Ostream
diff --git a/src/phasicFlow/streams/Stream/Ostream.H b/src/phasicFlow/streams/Stream/Ostream.hpp
similarity index 98%
rename from src/phasicFlow/streams/Stream/Ostream.H
rename to src/phasicFlow/streams/Stream/Ostream.hpp
index aff7faf8..e34c521b 100755
--- a/src/phasicFlow/streams/Stream/Ostream.H
+++ b/src/phasicFlow/streams/Stream/Ostream.hpp
@@ -20,10 +20,10 @@ Licence:
 // based on OpenFOAM stream, with some modifications/simplifications
 // to be tailored to our needs
 
-#ifndef __Ostream_H__
-#define __Ostream_H__
+#ifndef __Ostream_hpp__
+#define __Ostream_hpp__
 
-#include "iOstream.H"
+#include "iOstream.hpp"
 #include <iostream>
 
 
diff --git a/src/phasicFlow/streams/TStream/helperTstream.H b/src/phasicFlow/streams/TStream/helperTstream.hpp
similarity index 93%
rename from src/phasicFlow/streams/TStream/helperTstream.H
rename to src/phasicFlow/streams/TStream/helperTstream.hpp
index 22571f60..6a43874c 100755
--- a/src/phasicFlow/streams/TStream/helperTstream.H
+++ b/src/phasicFlow/streams/TStream/helperTstream.hpp
@@ -1,5 +1,5 @@
-#ifndef __helperTstream_H__
-#define __helperTstream_H__
+#ifndef __helperTstream_hpp__
+#define __helperTstream_hpp__
 
 
 
diff --git a/src/phasicFlow/streams/TStream/iTstream.C b/src/phasicFlow/streams/TStream/iTstream.cpp
similarity index 98%
rename from src/phasicFlow/streams/TStream/iTstream.C
rename to src/phasicFlow/streams/TStream/iTstream.cpp
index cf9f8b0b..28e7cf6c 100755
--- a/src/phasicFlow/streams/TStream/iTstream.C
+++ b/src/phasicFlow/streams/TStream/iTstream.cpp
@@ -1,7 +1,7 @@
 
-#include "iTstream.H"
-#include "error.H"
-#include "iOstream.H"
+#include "iTstream.hpp"
+#include "error.hpp"
+#include "iOstream.hpp"
 
 bool pFlow::iTstream::isLastToken()
 {
diff --git a/src/phasicFlow/streams/TStream/iTstream.H b/src/phasicFlow/streams/TStream/iTstream.hpp
similarity index 96%
rename from src/phasicFlow/streams/TStream/iTstream.H
rename to src/phasicFlow/streams/TStream/iTstream.hpp
index 61d739e1..8b2fecd8 100755
--- a/src/phasicFlow/streams/TStream/iTstream.H
+++ b/src/phasicFlow/streams/TStream/iTstream.hpp
@@ -1,9 +1,9 @@
 
-#ifndef __iTstream_H__
-#define __iTstream_H__
+#ifndef __iTstream_hpp__
+#define __iTstream_hpp__
 
-#include "iIstream.H"
-#include "tokenList.H"
+#include "iIstream.hpp"
+#include "tokenList.hpp"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -159,7 +159,7 @@ public:
 
 };
 
-#include "helperTstream.H"
+#include "helperTstream.hpp"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/phasicFlow/streams/TStream/oTstream.C b/src/phasicFlow/streams/TStream/oTstream.cpp
similarity index 98%
rename from src/phasicFlow/streams/TStream/oTstream.C
rename to src/phasicFlow/streams/TStream/oTstream.cpp
index 6113040e..a3a67911 100755
--- a/src/phasicFlow/streams/TStream/oTstream.C
+++ b/src/phasicFlow/streams/TStream/oTstream.cpp
@@ -1,6 +1,6 @@
 
-#include "oTstream.H"
-#include "error.H"
+#include "oTstream.hpp"
+#include "error.hpp"
 
 pFlow::oTstream::oTstream
 (
diff --git a/src/phasicFlow/streams/TStream/oTstream.H b/src/phasicFlow/streams/TStream/oTstream.hpp
similarity index 97%
rename from src/phasicFlow/streams/TStream/oTstream.H
rename to src/phasicFlow/streams/TStream/oTstream.hpp
index 5fa660b6..12d60322 100755
--- a/src/phasicFlow/streams/TStream/oTstream.H
+++ b/src/phasicFlow/streams/TStream/oTstream.hpp
@@ -1,9 +1,9 @@
 
-#ifndef __oTstream_H__
-#define __oTstream_H__
+#ifndef __oTstream_hpp__
+#define __oTstream_hpp__
 
-#include "tokenList.H"
-#include "iOstream.H"
+#include "tokenList.hpp"
+#include "iOstream.hpp"
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -183,7 +183,7 @@ public:
 
 };
 
-#include "helperTstream.H"
+#include "helperTstream.hpp"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/phasicFlow/streams/iStream/IOstream.C b/src/phasicFlow/streams/iStream/IOstream.cpp
similarity index 95%
rename from src/phasicFlow/streams/iStream/IOstream.C
rename to src/phasicFlow/streams/iStream/IOstream.cpp
index 048cc2ed..33a1cc47 100644
--- a/src/phasicFlow/streams/iStream/IOstream.C
+++ b/src/phasicFlow/streams/iStream/IOstream.cpp
@@ -18,9 +18,9 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#include "IOstream.H"
-#include "iOstream.H"
-#include "error.H"
+#include "IOstream.hpp"
+#include "iOstream.hpp"
+#include "error.hpp"
 
 
 unsigned int pFlow::IOstream::precision_ = 6;
diff --git a/src/phasicFlow/streams/iStream/IOstream.H b/src/phasicFlow/streams/iStream/IOstream.hpp
similarity index 98%
rename from src/phasicFlow/streams/iStream/IOstream.H
rename to src/phasicFlow/streams/iStream/IOstream.hpp
index 11941111..e44b394c 100644
--- a/src/phasicFlow/streams/iStream/IOstream.H
+++ b/src/phasicFlow/streams/iStream/IOstream.hpp
@@ -19,15 +19,15 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __IOstream_H__
-#define __IOstream_H__
+#ifndef __IOstream_hpp__
+#define __IOstream_hpp__
 
 // based on OpenFOAM stream, with some modifications/simplifications
 // to be tailored to our needs
 
 #include <iostream>
 
-#include "bTypesFunctions.H"
+#include "bTypesFunctions.hpp"
 
 using std::ios_base;
 using std::istream;
@@ -306,4 +306,4 @@ inline IOstream& scientific(IOstream& io)
 
 } // pFlow
 
-#endif  //  __IOstream__H__
+#endif  //  __IOstream__hpp__
diff --git a/src/phasicFlow/streams/iStream/iIstream.C b/src/phasicFlow/streams/iStream/iIstream.cpp
similarity index 99%
rename from src/phasicFlow/streams/iStream/iIstream.C
rename to src/phasicFlow/streams/iStream/iIstream.cpp
index fc7a7feb..7877bd58 100755
--- a/src/phasicFlow/streams/iStream/iIstream.C
+++ b/src/phasicFlow/streams/iStream/iIstream.cpp
@@ -1,5 +1,5 @@
 
-#include "iIstream.H"
+#include "iIstream.hpp"
 
 
 void pFlow::iIstream::putBack(const token& tok)
diff --git a/src/phasicFlow/streams/iStream/iIstream.H b/src/phasicFlow/streams/iStream/iIstream.hpp
similarity index 97%
rename from src/phasicFlow/streams/iStream/iIstream.H
rename to src/phasicFlow/streams/iStream/iIstream.hpp
index 50d5fb6e..a3618127 100755
--- a/src/phasicFlow/streams/iStream/iIstream.H
+++ b/src/phasicFlow/streams/iStream/iIstream.hpp
@@ -18,13 +18,13 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __iIstream_H__
-#define __iIstream_H__
+#ifndef __iIstream_hpp__
+#define __iIstream_hpp__
 
-#include "IOstream.H"
-#include "token.H"
-#include "error.H"
-#include "iOstream.H"
+#include "IOstream.hpp"
+#include "token.hpp"
+#include "error.hpp"
+#include "iOstream.hpp"
 
 namespace pFlow
 {
@@ -244,7 +244,7 @@ inline iIstream& operator>>( iIstream& is, double& val);
 } // pFlow
 
 
-#include "iIstreamI.H"
+#include "iIstreamI.hpp"
 
 
 #endif
diff --git a/src/phasicFlow/streams/iStream/iIstreamI.H b/src/phasicFlow/streams/iStream/iIstreamI.hpp
similarity index 100%
rename from src/phasicFlow/streams/iStream/iIstreamI.H
rename to src/phasicFlow/streams/iStream/iIstreamI.hpp
diff --git a/src/phasicFlow/streams/iStream/iOstream.C b/src/phasicFlow/streams/iStream/iOstream.cpp
similarity index 98%
rename from src/phasicFlow/streams/iStream/iOstream.C
rename to src/phasicFlow/streams/iStream/iOstream.cpp
index ef82a6ba..622ff494 100644
--- a/src/phasicFlow/streams/iStream/iOstream.C
+++ b/src/phasicFlow/streams/iStream/iOstream.cpp
@@ -19,8 +19,8 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#include "iOstream.H"
-#include "token.H"
+#include "iOstream.hpp"
+#include "token.hpp"
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
diff --git a/src/phasicFlow/streams/iStream/iOstream.H b/src/phasicFlow/streams/iStream/iOstream.hpp
similarity index 99%
rename from src/phasicFlow/streams/iStream/iOstream.H
rename to src/phasicFlow/streams/iStream/iOstream.hpp
index b1e1ffc1..59f00768 100644
--- a/src/phasicFlow/streams/iStream/iOstream.H
+++ b/src/phasicFlow/streams/iStream/iOstream.hpp
@@ -19,14 +19,14 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __iOstream_H__
-#define __iOstream_H__
+#ifndef __iOstream_hpp__
+#define __iOstream_hpp__
 
 // based on OpenFOAM stream, with some modifications/simplifications
 // to be tailored to our needs
 
 
-#include "IOstream.H"
+#include "IOstream.hpp"
 
 const inline char* defaultColor = "\033[0m";
 const inline char* blackColor   = "\033[30m";
diff --git a/src/phasicFlow/streams/streams.C b/src/phasicFlow/streams/streams.cpp
similarity index 89%
rename from src/phasicFlow/streams/streams.C
rename to src/phasicFlow/streams/streams.cpp
index 7da2819a..337b7e81 100755
--- a/src/phasicFlow/streams/streams.C
+++ b/src/phasicFlow/streams/streams.cpp
@@ -1,4 +1,4 @@
-#include "streams.H"
+#include "streams.hpp"
 
 
 pFlow::Ostream pFlow::output(std::cout, "pFlow Ostream");
diff --git a/src/phasicFlow/streams/streams.H b/src/phasicFlow/streams/streams.hpp
similarity index 83%
rename from src/phasicFlow/streams/streams.H
rename to src/phasicFlow/streams/streams.hpp
index ea52ed2d..29307da4 100755
--- a/src/phasicFlow/streams/streams.H
+++ b/src/phasicFlow/streams/streams.hpp
@@ -1,17 +1,17 @@
-#ifndef __streams_H__
-#define __streams_H__
+#ifndef __streams_hpp__
+#define __streams_hpp__
 
-#include "Istream.H"
+#include "Istream.hpp"
 
-#include "Ostream.H"
+#include "Ostream.hpp"
 
-#include "iFstream.H"
+#include "iFstream.hpp"
 
-#include "oFstream.H"
+#include "oFstream.hpp"
 
-#include "oTstream.H"
+#include "oTstream.hpp"
 
-#include "iTstream.H"
+#include "iTstream.hpp"
 
 namespace pFlow
 {
diff --git a/src/phasicFlow/streams/token/token.C b/src/phasicFlow/streams/token/token.cpp
similarity index 95%
rename from src/phasicFlow/streams/token/token.C
rename to src/phasicFlow/streams/token/token.cpp
index 7921a742..dc501a32 100755
--- a/src/phasicFlow/streams/token/token.C
+++ b/src/phasicFlow/streams/token/token.cpp
@@ -21,9 +21,9 @@ Licence:
 // to be tailored to our needs
 
 
-#include "token.H"
-#include "error.H"
-#include "iOstream.H"
+#include "token.hpp"
+#include "error.hpp"
+#include "iOstream.hpp"
 
 
 
diff --git a/src/phasicFlow/streams/token/token.H b/src/phasicFlow/streams/token/token.hpp
similarity index 99%
rename from src/phasicFlow/streams/token/token.H
rename to src/phasicFlow/streams/token/token.hpp
index dadde2d6..5dd3ebaa 100755
--- a/src/phasicFlow/streams/token/token.H
+++ b/src/phasicFlow/streams/token/token.hpp
@@ -21,11 +21,11 @@ Licence:
 // to be tailored to our needs
 
 
-#ifndef __token_H__
-#define __token_H__
+#ifndef __token_hpp__
+#define __token_hpp__
 
 
-#include "bTypes.H"
+#include "bTypes.hpp"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -534,7 +534,7 @@ inline token newLineToken()
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#include "tokenI.H"
+#include "tokenI.hpp"
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/phasicFlow/streams/token/tokenI.H b/src/phasicFlow/streams/token/tokenI.hpp
similarity index 100%
rename from src/phasicFlow/streams/token/tokenI.H
rename to src/phasicFlow/streams/token/tokenI.hpp
diff --git a/src/phasicFlow/streams/token/tokenIO.C b/src/phasicFlow/streams/token/tokenIO.cpp
similarity index 98%
rename from src/phasicFlow/streams/token/tokenIO.C
rename to src/phasicFlow/streams/token/tokenIO.cpp
index 2caeefbd..0cd82458 100755
--- a/src/phasicFlow/streams/token/tokenIO.C
+++ b/src/phasicFlow/streams/token/tokenIO.cpp
@@ -20,10 +20,10 @@ Licence:
 // based on OpenFOAM stream, with some modifications/simplifications
 // to be tailored to our needs
 
-#include "error.H"
-#include "token.H"
-#include "iIstream.H"
-#include "iOstream.H"
+#include "error.hpp"
+#include "token.hpp"
+#include "iIstream.hpp"
+#include "iOstream.hpp"
 
 namespace pFlow
 {
diff --git a/src/phasicFlow/streams/token/tokenList.H b/src/phasicFlow/streams/token/tokenList.hpp
similarity index 93%
rename from src/phasicFlow/streams/token/tokenList.H
rename to src/phasicFlow/streams/token/tokenList.hpp
index 30d499a6..7c1ea676 100755
--- a/src/phasicFlow/streams/token/tokenList.H
+++ b/src/phasicFlow/streams/token/tokenList.hpp
@@ -18,11 +18,11 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __tokenFList_H__
-#define __tokenFList_H__
+#ifndef __tokenFList_hpp__
+#define __tokenFList_hpp__
 
-#include "token.H"
-#include "List.H"
+#include "token.hpp"
+#include "List.hpp"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/phasicFlow/structuredData/box/box.C b/src/phasicFlow/structuredData/box/box.cpp
similarity index 99%
rename from src/phasicFlow/structuredData/box/box.C
rename to src/phasicFlow/structuredData/box/box.cpp
index 652d76d1..7f16f754 100644
--- a/src/phasicFlow/structuredData/box/box.C
+++ b/src/phasicFlow/structuredData/box/box.cpp
@@ -19,7 +19,7 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#include "box.H"
+#include "box.hpp"
 
 
 FUNCTION_H
diff --git a/src/phasicFlow/structuredData/box/box.H b/src/phasicFlow/structuredData/box/box.hpp
similarity index 93%
rename from src/phasicFlow/structuredData/box/box.H
rename to src/phasicFlow/structuredData/box/box.hpp
index b8d790f6..04eeb2df 100644
--- a/src/phasicFlow/structuredData/box/box.H
+++ b/src/phasicFlow/structuredData/box/box.hpp
@@ -18,13 +18,13 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __box_H__
-#define __box_H__
+#ifndef __box_hpp__
+#define __box_hpp__
 
-#include "types.H"
-#include "dictionary.H"
-#include "iIstream.H"
-#include "iOstream.H"
+#include "types.hpp"
+#include "dictionary.hpp"
+#include "iIstream.hpp"
+#include "iOstream.hpp"
 
 namespace pFlow
 {
@@ -42,7 +42,7 @@ protected:
 public:
 
 	// - type info
-	TypeNameNV("box");
+	TypeInfoNV("box");
 
 	//// - Constructors 
 		INLINE_FUNCTION_HD 
diff --git a/src/phasicFlow/structuredData/cylinder/cylinder.C b/src/phasicFlow/structuredData/cylinder/cylinder.cpp
similarity index 98%
rename from src/phasicFlow/structuredData/cylinder/cylinder.C
rename to src/phasicFlow/structuredData/cylinder/cylinder.cpp
index 30123bd8..e034fc44 100644
--- a/src/phasicFlow/structuredData/cylinder/cylinder.C
+++ b/src/phasicFlow/structuredData/cylinder/cylinder.cpp
@@ -19,8 +19,8 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#include "cylinder.H"
-#include "zAxis.H"
+#include "cylinder.hpp"
+#include "zAxis.hpp"
 
 FUNCTION_H
 bool pFlow::cylinder::calculateParams()
diff --git a/src/phasicFlow/structuredData/cylinder/cylinder.H b/src/phasicFlow/structuredData/cylinder/cylinder.hpp
similarity index 93%
rename from src/phasicFlow/structuredData/cylinder/cylinder.H
rename to src/phasicFlow/structuredData/cylinder/cylinder.hpp
index 8b81de20..cc3617ad 100644
--- a/src/phasicFlow/structuredData/cylinder/cylinder.H
+++ b/src/phasicFlow/structuredData/cylinder/cylinder.hpp
@@ -18,13 +18,13 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __cylinder_H__
-#define __cylinder_H__
+#ifndef __cylinder_hpp__
+#define __cylinder_hpp__
 
-#include "types.H"
-#include "dictionary.H"
-#include "iIstream.H"
-#include "iOstream.H"
+#include "types.hpp"
+#include "dictionary.hpp"
+#include "iIstream.hpp"
+#include "iOstream.hpp"
 
 namespace pFlow
 {
@@ -56,7 +56,7 @@ protected:
 public:
 
 	// - type info
-	TypeNameNV("cylinder");
+	TypeInfoNV("cylinder");
 
 	//// - Constructors 
 		FUNCTION_H 
@@ -159,4 +159,4 @@ iOstream& operator << (iOstream& os, const cylinder& b);
 } // pFlow
 
 
-#endif // __cylinder_H__
+#endif // __cylinder_hpp__
diff --git a/src/phasicFlow/structuredData/iBox/iBox.C b/src/phasicFlow/structuredData/iBox/iBox.cpp
similarity index 100%
rename from src/phasicFlow/structuredData/iBox/iBox.C
rename to src/phasicFlow/structuredData/iBox/iBox.cpp
diff --git a/src/phasicFlow/structuredData/iBox/iBox.H b/src/phasicFlow/structuredData/iBox/iBox.hpp
similarity index 92%
rename from src/phasicFlow/structuredData/iBox/iBox.H
rename to src/phasicFlow/structuredData/iBox/iBox.hpp
index 8c4e8853..89e7b225 100644
--- a/src/phasicFlow/structuredData/iBox/iBox.H
+++ b/src/phasicFlow/structuredData/iBox/iBox.hpp
@@ -18,13 +18,13 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __iBox_H__
-#define __iBox_H__
+#ifndef __iBox_hpp__
+#define __iBox_hpp__
 
-#include "types.H"
-#include "dictionary.H"
-#include "iIstream.H"
-#include "iOstream.H"
+#include "types.hpp"
+#include "dictionary.hpp"
+#include "iIstream.hpp"
+#include "iOstream.hpp"
 
 namespace pFlow
 {
@@ -43,7 +43,7 @@ protected:
 public:
 
 	// - type info
-	TypeNameTemplateNV("iBox", intType);
+	TypeInfoTemplateNV("iBox", intType);
 
 	//// - Constructors 
 		INLINE_FUNCTION_HD 
@@ -116,7 +116,7 @@ iOstream& operator << (iOstream& os, const iBox<intType>& b);
 }
 
 
-#include "iBox.C"
+#include "iBox.cpp"
 
 
 #endif
diff --git a/src/phasicFlow/structuredData/iBox/iBoxs.C b/src/phasicFlow/structuredData/iBox/iBoxs.cpp
similarity index 95%
rename from src/phasicFlow/structuredData/iBox/iBoxs.C
rename to src/phasicFlow/structuredData/iBox/iBoxs.cpp
index 47cc0622..a2410c70 100644
--- a/src/phasicFlow/structuredData/iBox/iBoxs.C
+++ b/src/phasicFlow/structuredData/iBox/iBoxs.cpp
@@ -18,7 +18,7 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#include "iBox.H"
+#include "iBox.hpp"
 
 
 template class pFlow::iBox<pFlow::uint16>;
diff --git a/src/phasicFlow/structuredData/line/line.C b/src/phasicFlow/structuredData/line/line.cpp
similarity index 98%
rename from src/phasicFlow/structuredData/line/line.C
rename to src/phasicFlow/structuredData/line/line.cpp
index a94386a3..2285ecae 100755
--- a/src/phasicFlow/structuredData/line/line.C
+++ b/src/phasicFlow/structuredData/line/line.cpp
@@ -19,8 +19,8 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#include "line.H"
-#include "dictionary.H"
+#include "line.hpp"
+#include "dictionary.hpp"
 
 
 FUNCTION_HD
diff --git a/src/phasicFlow/structuredData/line/line.H b/src/phasicFlow/structuredData/line/line.hpp
similarity index 95%
rename from src/phasicFlow/structuredData/line/line.H
rename to src/phasicFlow/structuredData/line/line.hpp
index 56e5bb97..a8a302e2 100755
--- a/src/phasicFlow/structuredData/line/line.H
+++ b/src/phasicFlow/structuredData/line/line.hpp
@@ -19,11 +19,11 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __line_H__
-#define __line_H__
+#ifndef __line_hpp__
+#define __line_hpp__
 
-#include "types.H"
-#include "typeInfo.H"
+#include "types.hpp"
+#include "typeInfo.hpp"
 
 namespace pFlow
 {
@@ -45,7 +45,7 @@ protected:
 
 public:
 
-	TypeNameNV("line");
+	TypeInfoNV("line");
 
 	//// - Constructors 
 		FUNCTION_HD
diff --git a/src/phasicFlow/structuredData/peakableRegion/PeakableRegion/PeakableRegion.C b/src/phasicFlow/structuredData/peakableRegion/PeakableRegion/PeakableRegion.cpp
similarity index 100%
rename from src/phasicFlow/structuredData/peakableRegion/PeakableRegion/PeakableRegion.C
rename to src/phasicFlow/structuredData/peakableRegion/PeakableRegion/PeakableRegion.cpp
diff --git a/src/phasicFlow/structuredData/peakableRegion/PeakableRegion/PeakableRegion.H b/src/phasicFlow/structuredData/peakableRegion/PeakableRegion/PeakableRegion.hpp
similarity index 90%
rename from src/phasicFlow/structuredData/peakableRegion/PeakableRegion/PeakableRegion.H
rename to src/phasicFlow/structuredData/peakableRegion/PeakableRegion/PeakableRegion.hpp
index bab2f04d..eefecc19 100644
--- a/src/phasicFlow/structuredData/peakableRegion/PeakableRegion/PeakableRegion.H
+++ b/src/phasicFlow/structuredData/peakableRegion/PeakableRegion/PeakableRegion.hpp
@@ -19,12 +19,12 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __PeakableRegion_H__
-#define __PeakableRegion_H__
+#ifndef __PeakableRegion_hpp__
+#define __PeakableRegion_hpp__
 
 
-#include "peakableRegion.H"
-#include "dictionary.H"
+#include "peakableRegion.hpp"
+#include "dictionary.hpp"
 
 namespace pFlow
 {
@@ -44,7 +44,7 @@ protected:
 public:
 
 	// type info
-	TypeNameTemplate("peakableRegion", RegionType);
+	TypeInfoTemplate("peakableRegion", RegionType);
 
 	//// - Constructors 
 		PeakableRegion(const word& type, const dictionary& dict);
@@ -85,6 +85,6 @@ public:
 
 } // pFlow
 
-#include "PeakableRegion.C"
+#include "PeakableRegion.cpp"
 
 #endif
diff --git a/src/phasicFlow/structuredData/peakableRegion/boxRegion/boxRegion.C b/src/phasicFlow/structuredData/peakableRegion/boxRegion/boxRegion.cpp
similarity index 98%
rename from src/phasicFlow/structuredData/peakableRegion/boxRegion/boxRegion.C
rename to src/phasicFlow/structuredData/peakableRegion/boxRegion/boxRegion.cpp
index 375046f2..46db3330 100644
--- a/src/phasicFlow/structuredData/peakableRegion/boxRegion/boxRegion.C
+++ b/src/phasicFlow/structuredData/peakableRegion/boxRegion/boxRegion.cpp
@@ -18,7 +18,7 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#include "boxRegion.H"
+#include "boxRegion.hpp"
 
 
 pFlow::boxRegion::boxRegion
diff --git a/src/phasicFlow/structuredData/peakableRegion/boxRegion/boxRegion.H b/src/phasicFlow/structuredData/peakableRegion/boxRegion/boxRegion.hpp
similarity index 91%
rename from src/phasicFlow/structuredData/peakableRegion/boxRegion/boxRegion.H
rename to src/phasicFlow/structuredData/peakableRegion/boxRegion/boxRegion.hpp
index ef04f36b..027757d7 100644
--- a/src/phasicFlow/structuredData/peakableRegion/boxRegion/boxRegion.H
+++ b/src/phasicFlow/structuredData/peakableRegion/boxRegion/boxRegion.hpp
@@ -19,11 +19,11 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __boxRegion_H__
-#define __boxRegion_H__
+#ifndef __boxRegion_hpp__
+#define __boxRegion_hpp__
 
-#include "box.H"
-#include "uniformRandomReal.H"
+#include "box.hpp"
+#include "uniformRandomReal.hpp"
 
 namespace pFlow
 {
@@ -37,7 +37,7 @@ protected:
 public:
 
 	// - type info
-	TypeNameNV("boxRegion");
+	TypeInfoNV("boxRegion");
 
 	boxRegion(const dictionary& dict);
 
diff --git a/src/phasicFlow/structuredData/peakableRegion/cylinderRegion/cylinderRegion.C b/src/phasicFlow/structuredData/peakableRegion/cylinderRegion/cylinderRegion.cpp
similarity index 98%
rename from src/phasicFlow/structuredData/peakableRegion/cylinderRegion/cylinderRegion.C
rename to src/phasicFlow/structuredData/peakableRegion/cylinderRegion/cylinderRegion.cpp
index a664c08a..45bc494d 100644
--- a/src/phasicFlow/structuredData/peakableRegion/cylinderRegion/cylinderRegion.C
+++ b/src/phasicFlow/structuredData/peakableRegion/cylinderRegion/cylinderRegion.cpp
@@ -18,7 +18,7 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#include "cylinderRegion.H"
+#include "cylinderRegion.hpp"
 
 
 pFlow::cylinderRegion::cylinderRegion
diff --git a/src/phasicFlow/structuredData/peakableRegion/cylinderRegion/cylinderRegion.H b/src/phasicFlow/structuredData/peakableRegion/cylinderRegion/cylinderRegion.hpp
similarity index 90%
rename from src/phasicFlow/structuredData/peakableRegion/cylinderRegion/cylinderRegion.H
rename to src/phasicFlow/structuredData/peakableRegion/cylinderRegion/cylinderRegion.hpp
index bb6a69d2..aa37525f 100644
--- a/src/phasicFlow/structuredData/peakableRegion/cylinderRegion/cylinderRegion.H
+++ b/src/phasicFlow/structuredData/peakableRegion/cylinderRegion/cylinderRegion.hpp
@@ -19,11 +19,11 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __cylinderRegion_H__
-#define __cylinderRegion_H__
+#ifndef __cylinderRegion_hpp__
+#define __cylinderRegion_hpp__
 
-#include "cylinder.H"
-#include "uniformRandomReal.H"
+#include "cylinder.hpp"
+#include "uniformRandomReal.hpp"
 
 namespace pFlow
 {
@@ -37,7 +37,7 @@ protected:
 public:
 
 	// - type info
-	TypeNameNV("cylinderRegion");
+	TypeInfoNV("cylinderRegion");
 
 	cylinderRegion(const dictionary& dict);
 
diff --git a/src/phasicFlow/structuredData/peakableRegion/peakableRegion/peakableRegion.C b/src/phasicFlow/structuredData/peakableRegion/peakableRegion/peakableRegion.cpp
similarity index 96%
rename from src/phasicFlow/structuredData/peakableRegion/peakableRegion/peakableRegion.C
rename to src/phasicFlow/structuredData/peakableRegion/peakableRegion/peakableRegion.cpp
index 7ab3bee6..fb36b661 100644
--- a/src/phasicFlow/structuredData/peakableRegion/peakableRegion/peakableRegion.C
+++ b/src/phasicFlow/structuredData/peakableRegion/peakableRegion/peakableRegion.cpp
@@ -19,8 +19,8 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#include "peakableRegion.H"
-#include "dictionary.H"
+#include "peakableRegion.hpp"
+#include "dictionary.hpp"
 
 pFlow::peakableRegion::peakableRegion
 (
diff --git a/src/phasicFlow/structuredData/peakableRegion/peakableRegion/peakableRegion.H b/src/phasicFlow/structuredData/peakableRegion/peakableRegion/peakableRegion.hpp
similarity index 92%
rename from src/phasicFlow/structuredData/peakableRegion/peakableRegion/peakableRegion.H
rename to src/phasicFlow/structuredData/peakableRegion/peakableRegion/peakableRegion.hpp
index ae673906..7f573572 100644
--- a/src/phasicFlow/structuredData/peakableRegion/peakableRegion/peakableRegion.H
+++ b/src/phasicFlow/structuredData/peakableRegion/peakableRegion/peakableRegion.hpp
@@ -19,11 +19,11 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __peakableRegion_H__
-#define __peakableRegion_H__
+#ifndef __peakableRegion_hpp__
+#define __peakableRegion_hpp__
 
-#include "types.H"
-#include "virtualConstructor.H"
+#include "types.hpp"
+#include "virtualConstructor.hpp"
 
 
 namespace pFlow
@@ -40,7 +40,7 @@ protected:
 public:
 
 	// type info
-	TypeName("peakableRegion");
+	TypeInfo("peakableRegion");
 
 		peakableRegion(const word& type, const dictionary& dict);
 
diff --git a/src/phasicFlow/structuredData/peakableRegion/peakableRegionInstantiate.C b/src/phasicFlow/structuredData/peakableRegion/peakableRegionInstantiate.cpp
similarity index 88%
rename from src/phasicFlow/structuredData/peakableRegion/peakableRegionInstantiate.C
rename to src/phasicFlow/structuredData/peakableRegion/peakableRegionInstantiate.cpp
index 7e6106e5..7a669618 100644
--- a/src/phasicFlow/structuredData/peakableRegion/peakableRegionInstantiate.C
+++ b/src/phasicFlow/structuredData/peakableRegion/peakableRegionInstantiate.cpp
@@ -18,9 +18,9 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#include "boxRegion.H"
-#include "sphereRegion.H"
-#include "cylinderRegion.H"
+#include "boxRegion.hpp"
+#include "sphereRegion.hpp"
+#include "cylinderRegion.hpp"
 
 
 template class pFlow::PeakableRegion<pFlow::boxRegion>;
diff --git a/src/phasicFlow/structuredData/peakableRegion/peakableRegions.C b/src/phasicFlow/structuredData/peakableRegion/peakableRegions.cpp
similarity index 93%
rename from src/phasicFlow/structuredData/peakableRegion/peakableRegions.C
rename to src/phasicFlow/structuredData/peakableRegion/peakableRegions.cpp
index 4413a63b..32476038 100644
--- a/src/phasicFlow/structuredData/peakableRegion/peakableRegions.C
+++ b/src/phasicFlow/structuredData/peakableRegion/peakableRegions.cpp
@@ -19,9 +19,9 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#include "peakableRegions.H"
+#include "peakableRegions.hpp"
 
  
 #ifdef BUILD_SHARED_LIBS
-	#include "peakableRegionInstantiate.C"
+	#include "peakableRegionInstantiate.cpp"
 #endif
diff --git a/src/phasicFlow/structuredData/peakableRegion/peakableRegions.H b/src/phasicFlow/structuredData/peakableRegion/peakableRegions.hpp
similarity index 86%
rename from src/phasicFlow/structuredData/peakableRegion/peakableRegions.H
rename to src/phasicFlow/structuredData/peakableRegion/peakableRegions.hpp
index d96859e7..a7c6784f 100644
--- a/src/phasicFlow/structuredData/peakableRegion/peakableRegions.H
+++ b/src/phasicFlow/structuredData/peakableRegion/peakableRegions.hpp
@@ -19,12 +19,12 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __peakableRegions_H__
-#define __peakableRegions_H__
+#ifndef __peakableRegions_hpp__
+#define __peakableRegions_hpp__
 
-#include "PeakableRegion.H"
-#include "boxRegion.H"
-#include "sphereRegion.H"
+#include "PeakableRegion.hpp"
+#include "boxRegion.hpp"
+#include "sphereRegion.hpp"
 
 namespace pFlow
 {
@@ -37,7 +37,7 @@ typedef PeakableRegion<sphereRegion> spherePeakableRegion;
 } // pFlow
 
 #ifndef BUILD_SHARED_LIBS
-	#include "peakableRegionInstantiate.C"
+	#include "peakableRegionInstantiate.cpp"
 #endif
 
 
diff --git a/src/phasicFlow/structuredData/peakableRegion/sphereRegion/sphereRegion.C b/src/phasicFlow/structuredData/peakableRegion/sphereRegion/sphereRegion.cpp
similarity index 97%
rename from src/phasicFlow/structuredData/peakableRegion/sphereRegion/sphereRegion.C
rename to src/phasicFlow/structuredData/peakableRegion/sphereRegion/sphereRegion.cpp
index c05df7e9..4816f983 100644
--- a/src/phasicFlow/structuredData/peakableRegion/sphereRegion/sphereRegion.C
+++ b/src/phasicFlow/structuredData/peakableRegion/sphereRegion/sphereRegion.cpp
@@ -18,8 +18,8 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#include "sphereRegion.H"
-#include "dictionary.H"
+#include "sphereRegion.hpp"
+#include "dictionary.hpp"
 
 pFlow::sphereRegion::sphereRegion
 (
diff --git a/src/phasicFlow/structuredData/peakableRegion/sphereRegion/sphereRegion.H b/src/phasicFlow/structuredData/peakableRegion/sphereRegion/sphereRegion.hpp
similarity index 89%
rename from src/phasicFlow/structuredData/peakableRegion/sphereRegion/sphereRegion.H
rename to src/phasicFlow/structuredData/peakableRegion/sphereRegion/sphereRegion.hpp
index d0a07f01..de58c3ba 100644
--- a/src/phasicFlow/structuredData/peakableRegion/sphereRegion/sphereRegion.H
+++ b/src/phasicFlow/structuredData/peakableRegion/sphereRegion/sphereRegion.hpp
@@ -18,12 +18,12 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __sphereRegion_H__
-#define __sphereRegion_H__
+#ifndef __sphereRegion_hpp__
+#define __sphereRegion_hpp__
 
-#include "types.H"
-#include "sphere.H"
-#include "uniformRandomReal.H"
+#include "types.hpp"
+#include "sphere.hpp"
+#include "uniformRandomReal.hpp"
 
 namespace pFlow
 {
@@ -40,7 +40,7 @@ protected:
 public:
 
 	// - type info
-	TypeNameNV("sphereRegion");
+	TypeInfoNV("sphereRegion");
 
 	sphereRegion(const dictionary& dict);
 
diff --git a/src/phasicFlow/structuredData/pointStructure/pointStructure.C b/src/phasicFlow/structuredData/pointStructure/pointStructure.cpp
similarity index 98%
rename from src/phasicFlow/structuredData/pointStructure/pointStructure.C
rename to src/phasicFlow/structuredData/pointStructure/pointStructure.cpp
index 37c19f7b..6d1bf57c 100644
--- a/src/phasicFlow/structuredData/pointStructure/pointStructure.C
+++ b/src/phasicFlow/structuredData/pointStructure/pointStructure.cpp
@@ -19,12 +19,12 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#include "pointStructure.H"
-#include "pointStructureKernels.H"
-#include "setFieldList.H"
-#include "error.H"
-#include "iOstream.H"
-#include "Time.H"
+#include "pointStructure.hpp"
+#include "pointStructureKernels.hpp"
+#include "setFieldList.hpp"
+#include "error.hpp"
+#include "iOstream.hpp"
+#include "Time.hpp"
 
 FUNCTION_H
 bool pFlow::pointStructure::evaluatePointStructure()
diff --git a/src/phasicFlow/structuredData/pointStructure/pointStructure.H b/src/phasicFlow/structuredData/pointStructure/pointStructure.hpp
similarity index 96%
rename from src/phasicFlow/structuredData/pointStructure/pointStructure.H
rename to src/phasicFlow/structuredData/pointStructure/pointStructure.hpp
index 1cf74045..70c19be5 100644
--- a/src/phasicFlow/structuredData/pointStructure/pointStructure.H
+++ b/src/phasicFlow/structuredData/pointStructure/pointStructure.hpp
@@ -19,17 +19,17 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __pointStructure_H__
-#define __pointStructure_H__
+#ifndef __pointStructure_hpp__
+#define __pointStructure_hpp__
 
 
 
-#include "Vectors.H"
-#include "VectorSingles.H"
-#include "VectorDuals.H"
-#include "Fields.H"
-#include "eventSubscriber.H"
-#include "indexContainer.H"
+#include "Vectors.hpp"
+#include "VectorSingles.hpp"
+#include "VectorDuals.hpp"
+#include "Fields.hpp"
+#include "eventSubscriber.hpp"
+#include "indexContainer.hpp"
 
 
 
@@ -191,7 +191,7 @@ public:
 	friend class dynamicPointStructure;
 	
 	// - type info
-	TypeName("pointStructure");
+	TypeInfo("pointStructure");
 	
 
 	//// - Constructors 
@@ -358,4 +358,4 @@ public:
 
 
 
-#endif //__pointStructure_H__
+#endif //__pointStructure_hpp__
diff --git a/src/phasicFlow/structuredData/pointStructure/pointStructureKernels.H b/src/phasicFlow/structuredData/pointStructure/pointStructureKernels.hpp
similarity index 96%
rename from src/phasicFlow/structuredData/pointStructure/pointStructureKernels.H
rename to src/phasicFlow/structuredData/pointStructure/pointStructureKernels.hpp
index 6bf027bb..f59b8d12 100644
--- a/src/phasicFlow/structuredData/pointStructure/pointStructureKernels.H
+++ b/src/phasicFlow/structuredData/pointStructure/pointStructureKernels.hpp
@@ -19,11 +19,11 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __pointStructureKernels_H__
-#define __pointStructureKernels_H__
+#ifndef __pointStructureKernels_hpp__
+#define __pointStructureKernels_hpp__
 
-#include "pointStructure.H"
-#include "box.H"
+#include "pointStructure.hpp"
+#include "box.hpp"
 
 namespace pFlow::pointStructureKernels
 {
diff --git a/src/phasicFlow/structuredData/pointStructure/selectors/pStructSelector/pStructSelector.C b/src/phasicFlow/structuredData/pointStructure/selectors/pStructSelector/pStructSelector.cpp
similarity index 95%
rename from src/phasicFlow/structuredData/pointStructure/selectors/pStructSelector/pStructSelector.C
rename to src/phasicFlow/structuredData/pointStructure/selectors/pStructSelector/pStructSelector.cpp
index f52f6b18..71bb2716 100644
--- a/src/phasicFlow/structuredData/pointStructure/selectors/pStructSelector/pStructSelector.C
+++ b/src/phasicFlow/structuredData/pointStructure/selectors/pStructSelector/pStructSelector.cpp
@@ -19,9 +19,9 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#include "pStructSelector.H"
-#include "pointStructure.H"
-#include "dictionary.H"
+#include "pStructSelector.hpp"
+#include "pointStructure.hpp"
+#include "dictionary.hpp"
 
 pFlow::pStructSelector::pStructSelector
 (
diff --git a/src/phasicFlow/structuredData/pointStructure/selectors/pStructSelector/pStructSelector.H b/src/phasicFlow/structuredData/pointStructure/selectors/pStructSelector/pStructSelector.hpp
similarity index 90%
rename from src/phasicFlow/structuredData/pointStructure/selectors/pStructSelector/pStructSelector.H
rename to src/phasicFlow/structuredData/pointStructure/selectors/pStructSelector/pStructSelector.hpp
index b0871950..ee8b099b 100644
--- a/src/phasicFlow/structuredData/pointStructure/selectors/pStructSelector/pStructSelector.H
+++ b/src/phasicFlow/structuredData/pointStructure/selectors/pStructSelector/pStructSelector.hpp
@@ -19,12 +19,12 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __pStructSelector_H__
-#define __pStructSelector_H__
+#ifndef __pStructSelector_hpp__
+#define __pStructSelector_hpp__
 
 
-#include "Vectors.H"
-#include "virtualConstructor.H"
+#include "Vectors.hpp"
+#include "virtualConstructor.hpp"
 
 namespace pFlow
 {
@@ -42,7 +42,7 @@ protected:
 public:
 
 	// - type info
-	TypeName("pStructSelector");
+	TypeInfo("pStructSelector");
 
 
 		pStructSelector(const pointStructure& pStruct, const dictionary& UNUSED(dict));
@@ -75,4 +75,4 @@ public:
 } // pFlow
 
 
-#endif //__pStructSelector_H__
+#endif //__pStructSelector_hpp__
diff --git a/src/phasicFlow/structuredData/pointStructure/selectors/selectBox/selectBox.C b/src/phasicFlow/structuredData/pointStructure/selectors/selectBox/selectBox.cpp
similarity index 98%
rename from src/phasicFlow/structuredData/pointStructure/selectors/selectBox/selectBox.C
rename to src/phasicFlow/structuredData/pointStructure/selectors/selectBox/selectBox.cpp
index 433ceb19..6dd22236 100644
--- a/src/phasicFlow/structuredData/pointStructure/selectors/selectBox/selectBox.C
+++ b/src/phasicFlow/structuredData/pointStructure/selectors/selectBox/selectBox.cpp
@@ -19,7 +19,7 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#include "selectBox.H"
+#include "selectBox.hpp"
 
 
 void pFlow::selectBox::selectAllPointsInBox()
diff --git a/src/phasicFlow/structuredData/pointStructure/selectors/selectBox/selectBox.H b/src/phasicFlow/structuredData/pointStructure/selectors/selectBox/selectBox.hpp
similarity index 89%
rename from src/phasicFlow/structuredData/pointStructure/selectors/selectBox/selectBox.H
rename to src/phasicFlow/structuredData/pointStructure/selectors/selectBox/selectBox.hpp
index 11b78192..cacc8afa 100644
--- a/src/phasicFlow/structuredData/pointStructure/selectors/selectBox/selectBox.H
+++ b/src/phasicFlow/structuredData/pointStructure/selectors/selectBox/selectBox.hpp
@@ -19,12 +19,12 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __selectBox_H__
-#define __selectBox_H__
+#ifndef __selectBox_hpp__
+#define __selectBox_hpp__
 
-#include "pStructSelector.H"
-#include "pointStructure.H"
-#include "box.H"
+#include "pStructSelector.hpp"
+#include "pointStructure.hpp"
+#include "box.hpp"
 
 
 namespace pFlow
@@ -47,7 +47,7 @@ protected:
 public:
 
 	// - type info
-	TypeName("selectBox");
+	TypeInfo("selectBox");
 
 
 		selectBox(const pointStructure& pStruct, const dictionary& dict);
@@ -78,4 +78,4 @@ public:
 } // pFlow
 
 
-#endif //__pStructSelector_H__
+#endif //__pStructSelector_hpp__
diff --git a/src/phasicFlow/structuredData/pointStructure/selectors/selectRandom/selectRandom.C b/src/phasicFlow/structuredData/pointStructure/selectors/selectRandom/selectRandom.cpp
similarity index 95%
rename from src/phasicFlow/structuredData/pointStructure/selectors/selectRandom/selectRandom.C
rename to src/phasicFlow/structuredData/pointStructure/selectors/selectRandom/selectRandom.cpp
index c872ec98..f25ef4c2 100644
--- a/src/phasicFlow/structuredData/pointStructure/selectors/selectRandom/selectRandom.C
+++ b/src/phasicFlow/structuredData/pointStructure/selectors/selectRandom/selectRandom.cpp
@@ -19,10 +19,10 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#include "selectRandom.H"
-#include "dictionary.H"
-#include "uniformRandomInt32.H"
-#include "Set.H"
+#include "selectRandom.hpp"
+#include "dictionary.hpp"
+#include "uniformRandomInt32.hpp"
+#include "Set.hpp"
 
 
 bool pFlow::selectRandom::selectAllPointsInRange()
diff --git a/src/phasicFlow/structuredData/pointStructure/selectors/selectRandom/selectRandom.H b/src/phasicFlow/structuredData/pointStructure/selectors/selectRandom/selectRandom.hpp
similarity index 90%
rename from src/phasicFlow/structuredData/pointStructure/selectors/selectRandom/selectRandom.H
rename to src/phasicFlow/structuredData/pointStructure/selectors/selectRandom/selectRandom.hpp
index d0736143..48a7cd1c 100644
--- a/src/phasicFlow/structuredData/pointStructure/selectors/selectRandom/selectRandom.H
+++ b/src/phasicFlow/structuredData/pointStructure/selectors/selectRandom/selectRandom.hpp
@@ -19,11 +19,11 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __selectRandom_H__
-#define __selectRandom_H__
+#ifndef __selectRandom_hpp__
+#define __selectRandom_hpp__
 
-#include "pStructSelector.H"
-#include "pointStructure.H"
+#include "pStructSelector.hpp"
+#include "pointStructure.hpp"
 
 
 namespace pFlow
@@ -53,7 +53,7 @@ protected:
 public:
 
 	// - type info
-	TypeName("selectRandom");
+	TypeInfo("selectRandom");
 
 
 		selectRandom(const pointStructure& pStruct, const dictionary& dict);
@@ -84,4 +84,4 @@ public:
 } // pFlow
 
 
-#endif //__pStructSelector_H__
+#endif //__pStructSelector_hpp__
diff --git a/src/phasicFlow/structuredData/pointStructure/selectors/selectRange/selectRange.C b/src/phasicFlow/structuredData/pointStructure/selectors/selectRange/selectRange.cpp
similarity index 97%
rename from src/phasicFlow/structuredData/pointStructure/selectors/selectRange/selectRange.C
rename to src/phasicFlow/structuredData/pointStructure/selectors/selectRange/selectRange.cpp
index cc4bd3ef..09315952 100644
--- a/src/phasicFlow/structuredData/pointStructure/selectors/selectRange/selectRange.C
+++ b/src/phasicFlow/structuredData/pointStructure/selectors/selectRange/selectRange.cpp
@@ -19,8 +19,8 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#include "selectRange.H"
-#include "dictionary.H"
+#include "selectRange.hpp"
+#include "dictionary.hpp"
 
 void pFlow::selectRange::selectAllPointsInRange()
 {
diff --git a/src/phasicFlow/structuredData/pointStructure/selectors/selectRange/selectRange.H b/src/phasicFlow/structuredData/pointStructure/selectors/selectRange/selectRange.hpp
similarity index 90%
rename from src/phasicFlow/structuredData/pointStructure/selectors/selectRange/selectRange.H
rename to src/phasicFlow/structuredData/pointStructure/selectors/selectRange/selectRange.hpp
index f995a815..842b3278 100644
--- a/src/phasicFlow/structuredData/pointStructure/selectors/selectRange/selectRange.H
+++ b/src/phasicFlow/structuredData/pointStructure/selectors/selectRange/selectRange.hpp
@@ -19,11 +19,11 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __selectRange_H__
-#define __selectRange_H__
+#ifndef __selectRange_hpp__
+#define __selectRange_hpp__
 
-#include "pStructSelector.H"
-#include "pointStructure.H"
+#include "pStructSelector.hpp"
+#include "pointStructure.hpp"
 
 
 namespace pFlow
@@ -53,7 +53,7 @@ protected:
 public:
 
 	// - type info
-	TypeName("selectRange");
+	TypeInfo("selectRange");
 
 
 		selectRange(const pointStructure& pStruct, const dictionary& dict);
@@ -84,4 +84,4 @@ public:
 } // pFlow
 
 
-#endif //__pStructSelector_H__
+#endif //__pStructSelector_hpp__
diff --git a/src/phasicFlow/structuredData/sphere/sphere.C b/src/phasicFlow/structuredData/sphere/sphere.cpp
similarity index 99%
rename from src/phasicFlow/structuredData/sphere/sphere.C
rename to src/phasicFlow/structuredData/sphere/sphere.cpp
index f3a0cb44..12881db0 100644
--- a/src/phasicFlow/structuredData/sphere/sphere.C
+++ b/src/phasicFlow/structuredData/sphere/sphere.cpp
@@ -19,7 +19,7 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#include "sphere.H"
+#include "sphere.hpp"
 
 
 FUNCTION_H
diff --git a/src/phasicFlow/structuredData/sphere/sphere.H b/src/phasicFlow/structuredData/sphere/sphere.hpp
similarity index 92%
rename from src/phasicFlow/structuredData/sphere/sphere.H
rename to src/phasicFlow/structuredData/sphere/sphere.hpp
index cce94370..1a8236b1 100644
--- a/src/phasicFlow/structuredData/sphere/sphere.H
+++ b/src/phasicFlow/structuredData/sphere/sphere.hpp
@@ -18,13 +18,13 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __sphere_H__
-#define __sphere_H__
+#ifndef __sphere_hpp__
+#define __sphere_hpp__
 
-#include "types.H"
-#include "dictionary.H"
-#include "iIstream.H"
-#include "iOstream.H"
+#include "types.hpp"
+#include "dictionary.hpp"
+#include "iIstream.hpp"
+#include "iOstream.hpp"
 
 namespace pFlow
 {
@@ -43,7 +43,7 @@ protected:
 public:
 
 	// - type info
-	TypeNameNV("sphere");
+	TypeInfoNV("sphere");
 
 	//// - Constructors 
 		FUNCTION_H 
@@ -129,4 +129,4 @@ iOstream& operator << (iOstream& os, const sphere& b);
 } // pFlow
 
 
-#endif // __sphere_H__
+#endif // __sphere_hpp__
diff --git a/src/phasicFlow/structuredData/trisurfaceStructure/bitTransfer.H b/src/phasicFlow/structuredData/trisurfaceStructure/bitTransfer.hpp
similarity index 94%
rename from src/phasicFlow/structuredData/trisurfaceStructure/bitTransfer.H
rename to src/phasicFlow/structuredData/trisurfaceStructure/bitTransfer.hpp
index f65d3202..720a2eb3 100644
--- a/src/phasicFlow/structuredData/trisurfaceStructure/bitTransfer.H
+++ b/src/phasicFlow/structuredData/trisurfaceStructure/bitTransfer.hpp
@@ -19,12 +19,12 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __bitTransfer_H__
-#define __bitTransfer_H__
+#ifndef __bitTransfer_hpp__
+#define __bitTransfer_hpp__
 
 
-#include "types.H"
-#include "Vectors.H"
+#include "types.hpp"
+#include "Vectors.hpp"
 
 namespace pFlow
 {
diff --git a/src/phasicFlow/structuredData/trisurfaceStructure/multiTriSurface.C b/src/phasicFlow/structuredData/trisurfaceStructure/multiTriSurface.cpp
similarity index 99%
rename from src/phasicFlow/structuredData/trisurfaceStructure/multiTriSurface.C
rename to src/phasicFlow/structuredData/trisurfaceStructure/multiTriSurface.cpp
index e7b8a85f..56abdb60 100644
--- a/src/phasicFlow/structuredData/trisurfaceStructure/multiTriSurface.C
+++ b/src/phasicFlow/structuredData/trisurfaceStructure/multiTriSurface.cpp
@@ -19,7 +19,7 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#include "multiTriSurface.H"
+#include "multiTriSurface.hpp"
 
 void pFlow::multiTriSurface::calculateVars()
 {
diff --git a/src/phasicFlow/structuredData/trisurfaceStructure/multiTriSurface.H b/src/phasicFlow/structuredData/trisurfaceStructure/multiTriSurface.hpp
similarity index 95%
rename from src/phasicFlow/structuredData/trisurfaceStructure/multiTriSurface.H
rename to src/phasicFlow/structuredData/trisurfaceStructure/multiTriSurface.hpp
index 032a0ecb..8791be86 100644
--- a/src/phasicFlow/structuredData/trisurfaceStructure/multiTriSurface.H
+++ b/src/phasicFlow/structuredData/trisurfaceStructure/multiTriSurface.hpp
@@ -19,12 +19,12 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __multiTriSurface_H__
-#define __multiTriSurface_H__
+#ifndef __multiTriSurface_hpp__
+#define __multiTriSurface_hpp__
 
 
-#include "triSurface.H"
-#include "VectorDuals.H"
+#include "triSurface.hpp"
+#include "VectorDuals.hpp"
 
 namespace pFlow
 {
@@ -60,7 +60,7 @@ protected:
 public:
 
 	// - type info
-	TypeNameNV("multiTriSurface");
+	TypeInfoNV("multiTriSurface");
 
 	//// - Constructors
 
diff --git a/src/phasicFlow/structuredData/trisurfaceStructure/stlFile.C b/src/phasicFlow/structuredData/trisurfaceStructure/stlFile.cpp
similarity index 98%
rename from src/phasicFlow/structuredData/trisurfaceStructure/stlFile.C
rename to src/phasicFlow/structuredData/trisurfaceStructure/stlFile.cpp
index b1527396..4e9f8d14 100644
--- a/src/phasicFlow/structuredData/trisurfaceStructure/stlFile.C
+++ b/src/phasicFlow/structuredData/trisurfaceStructure/stlFile.cpp
@@ -19,10 +19,10 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#include "stlFile.H"
-#include "iFstream.H"
-#include "oFstream.H"
-#include "error.H"
+#include "stlFile.hpp"
+#include "iFstream.hpp"
+#include "oFstream.hpp"
+#include "error.hpp"
 
 namespace pFlow
 {
diff --git a/src/phasicFlow/structuredData/trisurfaceStructure/stlFile.H b/src/phasicFlow/structuredData/trisurfaceStructure/stlFile.hpp
similarity index 94%
rename from src/phasicFlow/structuredData/trisurfaceStructure/stlFile.H
rename to src/phasicFlow/structuredData/trisurfaceStructure/stlFile.hpp
index f162b688..b072690f 100644
--- a/src/phasicFlow/structuredData/trisurfaceStructure/stlFile.H
+++ b/src/phasicFlow/structuredData/trisurfaceStructure/stlFile.hpp
@@ -19,13 +19,13 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __stlFile_H__
-#define __stlFile_H__
+#ifndef __stlFile_hpp__
+#define __stlFile_hpp__
 
-#include "types.H"
-#include "Vectors.H"
-#include "Lists.H"
-#include "fileSystem.H"
+#include "types.hpp"
+#include "Vectors.hpp"
+#include "Lists.hpp"
+#include "fileSystem.hpp"
 
 
 
@@ -116,4 +116,4 @@ public:
 
 } // pFlow
 
-#endif //__stlFile_H__
+#endif //__stlFile_hpp__
diff --git a/src/phasicFlow/structuredData/trisurfaceStructure/triSurface.C b/src/phasicFlow/structuredData/trisurfaceStructure/triSurface.cpp
similarity index 97%
rename from src/phasicFlow/structuredData/trisurfaceStructure/triSurface.C
rename to src/phasicFlow/structuredData/trisurfaceStructure/triSurface.cpp
index 42b48898..eb292aa8 100644
--- a/src/phasicFlow/structuredData/trisurfaceStructure/triSurface.C
+++ b/src/phasicFlow/structuredData/trisurfaceStructure/triSurface.cpp
@@ -19,10 +19,10 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#include "triSurface.H"
-#include "error.H"
-#include "iOstream.H"
-#include "triSurfaceKernels.H"
+#include "triSurface.hpp"
+#include "error.hpp"
+#include "iOstream.hpp"
+#include "triSurfaceKernels.hpp"
 
 
 pFlow::int32  pFlow::triSurface::addTriangle
diff --git a/src/phasicFlow/structuredData/trisurfaceStructure/triSurface.H b/src/phasicFlow/structuredData/trisurfaceStructure/triSurface.hpp
similarity index 96%
rename from src/phasicFlow/structuredData/trisurfaceStructure/triSurface.H
rename to src/phasicFlow/structuredData/trisurfaceStructure/triSurface.hpp
index ded33fca..0583b353 100644
--- a/src/phasicFlow/structuredData/trisurfaceStructure/triSurface.H
+++ b/src/phasicFlow/structuredData/trisurfaceStructure/triSurface.hpp
@@ -19,14 +19,14 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __triSurface_H__
-#define __triSurface_H__
+#ifndef __triSurface_hpp__
+#define __triSurface_hpp__
 
-#include "eventSubscriber.H"
-#include "types.H"
-#include "Vectors.H"
-#include "VectorSingles.H"
-#include "Fields.H"
+#include "eventSubscriber.hpp"
+#include "types.hpp"
+#include "Vectors.hpp"
+#include "VectorSingles.hpp"
+#include "Fields.hpp"
 
 namespace pFlow
 {
@@ -130,7 +130,7 @@ protected:
 public:
 
 	// - type info
-	TypeName("triSurface");
+	TypeInfo("triSurface");
 
 	//// - Constructors
 
diff --git a/src/phasicFlow/structuredData/trisurfaceStructure/triSurfaceKernels.H b/src/phasicFlow/structuredData/trisurfaceStructure/triSurfaceKernels.hpp
similarity index 92%
rename from src/phasicFlow/structuredData/trisurfaceStructure/triSurfaceKernels.H
rename to src/phasicFlow/structuredData/trisurfaceStructure/triSurfaceKernels.hpp
index c26aaa9a..f9cba450 100644
--- a/src/phasicFlow/structuredData/trisurfaceStructure/triSurfaceKernels.H
+++ b/src/phasicFlow/structuredData/trisurfaceStructure/triSurfaceKernels.hpp
@@ -19,11 +19,11 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __triSurfaceKernels_H__
-#define __triSurfaceKernels_H__
+#ifndef __triSurfaceKernels_hpp__
+#define __triSurfaceKernels_hpp__
 
-#include "Fields.H"
-#include "triangleFunctions.H"
+#include "Fields.hpp"
+#include "triangleFunctions.hpp"
 
 namespace pFlow::triSurfaceKernels
 {
diff --git a/src/phasicFlow/structuredData/trisurfaceStructure/triangleFunctions.H b/src/phasicFlow/structuredData/trisurfaceStructure/triangleFunctions.hpp
similarity index 93%
rename from src/phasicFlow/structuredData/trisurfaceStructure/triangleFunctions.H
rename to src/phasicFlow/structuredData/trisurfaceStructure/triangleFunctions.hpp
index 3bf58e42..a78e555c 100644
--- a/src/phasicFlow/structuredData/trisurfaceStructure/triangleFunctions.H
+++ b/src/phasicFlow/structuredData/trisurfaceStructure/triangleFunctions.hpp
@@ -18,10 +18,10 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __triangleFunctions_H__
-#define __triangleFunctions_H__
+#ifndef __triangleFunctions_hpp__
+#define __triangleFunctions_hpp__
 
-#include "types.H"
+#include "types.hpp"
 
 namespace pFlow::triangleFunctions
 {
diff --git a/src/phasicFlow/structuredData/zAxis/zAxis.C b/src/phasicFlow/structuredData/zAxis/zAxis.cpp
similarity index 94%
rename from src/phasicFlow/structuredData/zAxis/zAxis.C
rename to src/phasicFlow/structuredData/zAxis/zAxis.cpp
index af1b0725..ee906c8f 100644
--- a/src/phasicFlow/structuredData/zAxis/zAxis.C
+++ b/src/phasicFlow/structuredData/zAxis/zAxis.cpp
@@ -19,7 +19,7 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#include "zAxis.H"
+#include "zAxis.hpp"
 
 
 pFlow::zAxis::zAxis(const realx3 &p1, const realx3 &p2) :
diff --git a/src/phasicFlow/structuredData/zAxis/zAxis.H b/src/phasicFlow/structuredData/zAxis/zAxis.hpp
similarity index 93%
rename from src/phasicFlow/structuredData/zAxis/zAxis.H
rename to src/phasicFlow/structuredData/zAxis/zAxis.hpp
index d0a455b0..7dabf7cc 100644
--- a/src/phasicFlow/structuredData/zAxis/zAxis.H
+++ b/src/phasicFlow/structuredData/zAxis/zAxis.hpp
@@ -25,10 +25,10 @@ a class for transfering points to a cylinderical coordinates defined by points
 p1 and p2
 */
 
-#ifndef __zAxis_H__
-#define __zAxis_H__
+#ifndef __zAxis_hpp__
+#define __zAxis_hpp__
 
-#include "types.H"
+#include "types.hpp"
 
 namespace pFlow
 {
diff --git a/src/phasicFlow/typeSelection/typeInfo.H b/src/phasicFlow/typeSelection/typeInfo.hpp
similarity index 92%
rename from src/phasicFlow/typeSelection/typeInfo.H
rename to src/phasicFlow/typeSelection/typeInfo.hpp
index b23eaa02..31614d9a 100644
--- a/src/phasicFlow/typeSelection/typeInfo.H
+++ b/src/phasicFlow/typeSelection/typeInfo.hpp
@@ -19,13 +19,13 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __typeInfo_H__
-#define __typeInfo_H__
+#ifndef __typeInfo_hpp__
+#define __typeInfo_hpp__
 
 #include <typeinfo>
 #include <cxxabi.h>
 
-#include "bTypes.H"
+#include "bTypes.hpp"
 
 
 #define has_static_member(name)		 								\
@@ -45,16 +45,16 @@ Licence:
 
 
 
-#define TypeName(tName)  \
+#define TypeInfo(tName)  \
 	inline static word TYPENAME() {return tName; } \
 	virtual word typeName() const {return TYPENAME();} 
 
-#define TypeNameNV(tName)  \
+#define TypeInfoNV(tName)  \
 	inline static word TYPENAME() {return tName; } \
 	word typeName() const {return TYPENAME();} 
 
 
-#define TypeNameTemplate(tName, Type)										\
+#define TypeInfoTemplate(tName, Type)										\
 	has_static_member(TYPENAME);											\
 	inline static word TYPENAME()											\
 	{ 																		\
@@ -66,7 +66,7 @@ Licence:
 	}																		\
 	virtual word typeName() const { return TYPENAME();}
 
-#define TypeNameTemplate2(tName, Type1, Type2)								\
+#define TypeInfoTemplate2(tName, Type1, Type2)								\
 	has_static_member(TYPENAME);											\
 	inline static word TYPENAME()											\
 	{ 																		\
@@ -78,7 +78,7 @@ Licence:
 	}																		\
 	virtual word typeName() const { return TYPENAME();}
 
-#define TypeNameTemplate3(tName, Type1, Type2, Type3)						\
+#define TypeInfoTemplate3(tName, Type1, Type2, Type3)						\
 	inline static word TYPENAME()											\
 	{ 																		\
 		return word(tName)+"<"+Type1::TYPENAME()+","+Type2::TYPENAME()+","+Type3::TYPENAME()+">";\
@@ -86,7 +86,7 @@ Licence:
 	virtual word typeName() const { return TYPENAME();}
 
 // this is the non-virtual version
-#define TypeNameTemplateNV(tName, Type)										\
+#define TypeInfoTemplateNV(tName, Type)										\
 	has_static_member(TYPENAME);											\
 	inline static word TYPENAME()											\
 	{ 																		\
@@ -99,7 +99,7 @@ Licence:
 	inline word typeName() const { return TYPENAME();}
 
 
-#define TypeNameTemplateNV2(tName, Type, tName2)							\
+#define TypeInfoTemplateNV2(tName, Type, tName2)							\
 	has_static_member(TYPENAME);											\
 	inline static word TYPENAME()											\
 	{ 																		\
diff --git a/src/phasicFlow/typeSelection/virtualConstructor.H b/src/phasicFlow/typeSelection/virtualConstructor.hpp
similarity index 93%
rename from src/phasicFlow/typeSelection/virtualConstructor.H
rename to src/phasicFlow/typeSelection/virtualConstructor.hpp
index 5926c4a3..573f7d31 100644
--- a/src/phasicFlow/typeSelection/virtualConstructor.H
+++ b/src/phasicFlow/typeSelection/virtualConstructor.hpp
@@ -18,15 +18,15 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __virtualConstructor_H__
-#define __virtualConstructor_H__
+#ifndef __virtualConstructor_hpp__
+#define __virtualConstructor_hpp__
 
 #include <functional>
 
-#include "types.H"
-#include "error.H"
-#include "Map.H"
-#include "uniquePtr.H"
+#include "types.hpp"
+#include "error.hpp"
+#include "Map.hpp"
+#include "uniquePtr.hpp"
 
 #define create_vCtor(baseClass,selectorName,argList,args) 								\
 																						\
@@ -79,4 +79,4 @@ inline static baseClass::create##selectorName##Callback<derivedClass> baseClass#
 
 
 
-#endif // __virtualConstructor_H__
+#endif // __virtualConstructor_hpp__
diff --git a/src/phasicFlow/types/basicTypes/Logical.C b/src/phasicFlow/types/basicTypes/Logical.cpp
similarity index 96%
rename from src/phasicFlow/types/basicTypes/Logical.C
rename to src/phasicFlow/types/basicTypes/Logical.cpp
index 29c450b1..b07f8470 100755
--- a/src/phasicFlow/types/basicTypes/Logical.C
+++ b/src/phasicFlow/types/basicTypes/Logical.cpp
@@ -18,10 +18,10 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#include "Logical.H"
-#include "error.H"
-#include "iIstream.H"
-#include "iOstream.H"
+#include "Logical.hpp"
+#include "error.hpp"
+#include "iIstream.hpp"
+#include "iOstream.hpp"
 
 
 pFlow::Logical::Logical(const word& l)
diff --git a/src/phasicFlow/types/basicTypes/Logical.H b/src/phasicFlow/types/basicTypes/Logical.hpp
similarity index 92%
rename from src/phasicFlow/types/basicTypes/Logical.H
rename to src/phasicFlow/types/basicTypes/Logical.hpp
index 22b8511b..69770936 100755
--- a/src/phasicFlow/types/basicTypes/Logical.H
+++ b/src/phasicFlow/types/basicTypes/Logical.hpp
@@ -18,12 +18,12 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __Logical_H__
-#define __Logical_H__
+#ifndef __Logical_hpp__
+#define __Logical_hpp__
 
-#include "builtinTypes.H"
-#include "bTypesFunctions.H"
-#include "typeInfo.H"
+#include "builtinTypes.hpp"
+#include "bTypesFunctions.hpp"
+#include "typeInfo.hpp"
 
 namespace pFlow
 {
@@ -49,7 +49,7 @@ protected:
 
 public:
 
-	TypeNameNV("Logical");
+	TypeInfoNV("Logical");
 	
 
 	inline Logical(){}
@@ -111,4 +111,4 @@ iOstream& operator<<( iOstream& os, const Logical& L);
 
 } // pFlow
 
-#endif // __Logical_H__
+#endif // __Logical_hpp__
diff --git a/src/phasicFlow/types/basicTypes/bTypes.H b/src/phasicFlow/types/basicTypes/bTypes.hpp
similarity index 87%
rename from src/phasicFlow/types/basicTypes/bTypes.H
rename to src/phasicFlow/types/basicTypes/bTypes.hpp
index 8ed4a398..67e966c1 100755
--- a/src/phasicFlow/types/basicTypes/bTypes.H
+++ b/src/phasicFlow/types/basicTypes/bTypes.hpp
@@ -19,13 +19,13 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __bTypes_H__
-#define __bTypes_H__
+#ifndef __bTypes_hpp__
+#define __bTypes_hpp__
 
-#include "builtinTypes.H"
-#include "bTypesFunctions.H"
-#include "Logical.H"
-#include "math.H"
+#include "builtinTypes.hpp"
+#include "bTypesFunctions.hpp"
+#include "Logical.hpp"
+#include "math.hpp"
 
 
 
diff --git a/src/phasicFlow/types/basicTypes/bTypesFunctions.C b/src/phasicFlow/types/basicTypes/bTypesFunctions.cpp
similarity index 99%
rename from src/phasicFlow/types/basicTypes/bTypesFunctions.C
rename to src/phasicFlow/types/basicTypes/bTypesFunctions.cpp
index f3c7012d..50dcafb3 100755
--- a/src/phasicFlow/types/basicTypes/bTypesFunctions.C
+++ b/src/phasicFlow/types/basicTypes/bTypesFunctions.cpp
@@ -22,7 +22,7 @@ Licence:
 #include <sstream>
 #include <iomanip>
 
-#include "bTypesFunctions.H"
+#include "bTypesFunctions.hpp"
 
 
 pFlow::int32 pFlow::countChar(const word& s, const char c)
diff --git a/src/phasicFlow/types/basicTypes/bTypesFunctions.H b/src/phasicFlow/types/basicTypes/bTypesFunctions.hpp
similarity index 95%
rename from src/phasicFlow/types/basicTypes/bTypesFunctions.H
rename to src/phasicFlow/types/basicTypes/bTypesFunctions.hpp
index e4e9c3ac..de3e746e 100755
--- a/src/phasicFlow/types/basicTypes/bTypesFunctions.H
+++ b/src/phasicFlow/types/basicTypes/bTypesFunctions.hpp
@@ -18,13 +18,13 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __bTypesFunctions_H__
-#define __bTypesFunctions_H__
+#ifndef __bTypesFunctions_hpp__
+#define __bTypesFunctions_hpp__
 
-#include "pFlowMacros.H"
-#include "numericConstants.H"
-#include "builtinTypes.H"
-#include "math.H"
+#include "pFlowMacros.hpp"
+#include "numericConstants.hpp"
+#include "builtinTypes.hpp"
+#include "math.hpp"
 
 
 // helper functions and constants for basic types 
@@ -240,4 +240,4 @@ INLINE_FUNCTION_HD real radian2Degree(const real &phi)
 } // end of pFlow
 
 
-#endif //__bTypesFunctions_H__
+#endif //__bTypesFunctions_hpp__
diff --git a/src/phasicFlow/types/basicTypes/builtinTypes.H b/src/phasicFlow/types/basicTypes/builtinTypes.hpp
similarity index 96%
rename from src/phasicFlow/types/basicTypes/builtinTypes.H
rename to src/phasicFlow/types/basicTypes/builtinTypes.hpp
index 6896231f..52adf430 100755
--- a/src/phasicFlow/types/basicTypes/builtinTypes.H
+++ b/src/phasicFlow/types/basicTypes/builtinTypes.hpp
@@ -18,8 +18,8 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __builtinTypes_H__
-#define __builtinTypes_H__
+#ifndef __builtinTypes_hpp__
+#define __builtinTypes_hpp__
 
 #include <string>
 
diff --git a/src/phasicFlow/types/basicTypes/math.H b/src/phasicFlow/types/basicTypes/math.hpp
similarity index 98%
rename from src/phasicFlow/types/basicTypes/math.H
rename to src/phasicFlow/types/basicTypes/math.hpp
index 95a3254c..6c2b0f64 100755
--- a/src/phasicFlow/types/basicTypes/math.H
+++ b/src/phasicFlow/types/basicTypes/math.hpp
@@ -18,8 +18,8 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __math_H__
-#define __math_H__
+#ifndef __math_hpp__
+#define __math_hpp__
 
 #include <cmath>
 
@@ -27,7 +27,7 @@ Licence:
 #include "math.h"
 #endif
 
-#include "builtinTypes.H"
+#include "builtinTypes.hpp"
 
 //* * * * * * * * * * *  List of functinos * * * * * * * * //
 // abs, mod, exp, log, log10, pow, sqrt, cbrt
@@ -407,4 +407,4 @@ INLINE_FUNCTION_HD uint32 max(uint16 x, uint16 y)
 
 
 
-#endif // __math_H__
+#endif // __math_hpp__
diff --git a/src/phasicFlow/types/basicTypes/numericConstants.H b/src/phasicFlow/types/basicTypes/numericConstants.hpp
similarity index 94%
rename from src/phasicFlow/types/basicTypes/numericConstants.H
rename to src/phasicFlow/types/basicTypes/numericConstants.hpp
index 2fba1538..434d541e 100755
--- a/src/phasicFlow/types/basicTypes/numericConstants.H
+++ b/src/phasicFlow/types/basicTypes/numericConstants.hpp
@@ -18,12 +18,12 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __numericConstants_H__
-#define __numericConstants_H__
+#ifndef __numericConstants_hpp__
+#define __numericConstants_hpp__
 
 
 #include <limits>
-#include "builtinTypes.H"
+#include "builtinTypes.hpp"
 
 
 namespace pFlow
@@ -69,4 +69,4 @@ namespace pFlow
 
 } // end of pFlow
 
-#endif //__numericConstants_H__
+#endif //__numericConstants_hpp__
diff --git a/src/phasicFlow/types/quadruple/quadruple.H b/src/phasicFlow/types/quadruple/quadruple.hpp
similarity index 95%
rename from src/phasicFlow/types/quadruple/quadruple.H
rename to src/phasicFlow/types/quadruple/quadruple.hpp
index 7263d76a..b64c553c 100644
--- a/src/phasicFlow/types/quadruple/quadruple.H
+++ b/src/phasicFlow/types/quadruple/quadruple.hpp
@@ -18,16 +18,16 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __quadruple_H__
-#define __quadruple_H__
+#ifndef __quadruple_hpp__
+#define __quadruple_hpp__
 
 
-#include "uniquePtr.H"
-#include "triple.H"
-#include "iOstream.H"
-#include "iIstream.H"
-#include "token.H"
-#include "error.H"
+#include "uniquePtr.hpp"
+#include "triple.hpp"
+#include "iOstream.hpp"
+#include "iIstream.hpp"
+#include "token.hpp"
+#include "error.hpp"
 
 
 namespace pFlow
@@ -37,7 +37,7 @@ namespace pFlow
 template<typename T> class quadruple;
 class iIstream;
 
-#include "quadrupleFwd.H"
+#include "quadrupleFwd.hpp"
 
 // you can see it as a sequence of four elements (w,x,y,z) or an (scalar and vector)
 template<typename T>
@@ -234,7 +234,7 @@ public:
 } // pFlow
 
 
-#include "quadrupleI.H"
-//#include "quadrupleMath.H"
+#include "quadrupleI.hpp"
+//#include "quadrupleMath.hpp"
 
 #endif
diff --git a/src/phasicFlow/types/quadruple/quadrupleFwd.H b/src/phasicFlow/types/quadruple/quadrupleFwd.hpp
similarity index 100%
rename from src/phasicFlow/types/quadruple/quadrupleFwd.H
rename to src/phasicFlow/types/quadruple/quadrupleFwd.hpp
diff --git a/src/phasicFlow/types/quadruple/quadrupleI.H b/src/phasicFlow/types/quadruple/quadrupleI.hpp
similarity index 100%
rename from src/phasicFlow/types/quadruple/quadrupleI.H
rename to src/phasicFlow/types/quadruple/quadrupleI.hpp
diff --git a/src/phasicFlow/types/quadruple/quadrupleMath.H b/src/phasicFlow/types/quadruple/quadrupleMath.hpp
similarity index 100%
rename from src/phasicFlow/types/quadruple/quadrupleMath.H
rename to src/phasicFlow/types/quadruple/quadrupleMath.hpp
diff --git a/src/phasicFlow/types/triple/triple.H b/src/phasicFlow/types/triple/triple.hpp
similarity index 95%
rename from src/phasicFlow/types/triple/triple.H
rename to src/phasicFlow/types/triple/triple.hpp
index b2029080..50c6e83b 100644
--- a/src/phasicFlow/types/triple/triple.H
+++ b/src/phasicFlow/types/triple/triple.hpp
@@ -18,15 +18,15 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __triple_H__
-#define __triple_H__
+#ifndef __triple_hpp__
+#define __triple_hpp__
 
-#include "pFlowMacros.H"
-#include "numericConstants.H"
-#include "uniquePtr.H"
-#include "iOstream.H"
-#include "iIstream.H"
-#include "error.H"
+#include "pFlowMacros.hpp"
+#include "numericConstants.hpp"
+#include "uniquePtr.hpp"
+#include "iOstream.hpp"
+#include "iIstream.hpp"
+#include "error.hpp"
 
 
 
@@ -37,7 +37,7 @@ namespace pFlow
 template<typename T> class triple;
 
 
-#include "tripleFwd.H"
+#include "tripleFwd.hpp"
 
 
 // for 3D vectors
@@ -229,8 +229,8 @@ bool INLINE_FUNCTION_HD equal( const triple<T>& opr1, const triple<T>& opr2 );
 
 } // end of pFlow
 
-#include "tripleI.H"
-#include "tripleMath.H"
+#include "tripleI.hpp"
+#include "tripleMath.hpp"
 
 
 #endif
diff --git a/src/phasicFlow/types/triple/tripleFwd.H b/src/phasicFlow/types/triple/tripleFwd.hpp
similarity index 100%
rename from src/phasicFlow/types/triple/tripleFwd.H
rename to src/phasicFlow/types/triple/tripleFwd.hpp
diff --git a/src/phasicFlow/types/triple/tripleI.H b/src/phasicFlow/types/triple/tripleI.hpp
similarity index 100%
rename from src/phasicFlow/types/triple/tripleI.H
rename to src/phasicFlow/types/triple/tripleI.hpp
diff --git a/src/phasicFlow/types/triple/tripleMath.H b/src/phasicFlow/types/triple/tripleMath.hpp
similarity index 100%
rename from src/phasicFlow/types/triple/tripleMath.H
rename to src/phasicFlow/types/triple/tripleMath.hpp
diff --git a/src/phasicFlow/types/types.C b/src/phasicFlow/types/types.cpp
similarity index 97%
rename from src/phasicFlow/types/types.C
rename to src/phasicFlow/types/types.cpp
index 6ebef81b..d5d77bbc 100644
--- a/src/phasicFlow/types/types.C
+++ b/src/phasicFlow/types/types.cpp
@@ -18,7 +18,7 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#include "types.H"
+#include "types.hpp"
 
 namespace pFlow
 {
diff --git a/src/phasicFlow/types/types.H b/src/phasicFlow/types/types.hpp
similarity index 93%
rename from src/phasicFlow/types/types.H
rename to src/phasicFlow/types/types.hpp
index e6d95268..e4523725 100644
--- a/src/phasicFlow/types/types.H
+++ b/src/phasicFlow/types/types.hpp
@@ -18,19 +18,19 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __types_H__
-#define __types_H__
+#ifndef __types_hpp__
+#define __types_hpp__
 
 
-#include "bTypes.H"
+#include "bTypes.hpp"
 
-#include "bTypesFunctions.H"
+#include "bTypesFunctions.hpp"
 
-#include "triple.H"
+#include "triple.hpp"
 
-#include "quadruple.H"
+#include "quadruple.hpp"
 
-#include "typeInfo.H"
+#include "typeInfo.hpp"
 
 
 namespace pFlow
@@ -109,4 +109,4 @@ extern const uint32x3x3 oneU33;
 } // pFlow
 
 
-#endif //__types_H__
\ No newline at end of file
+#endif //__types_hpp__
\ No newline at end of file
diff --git a/src/setHelpers/finalize.H b/src/setHelpers/finalize.hpp
similarity index 95%
rename from src/setHelpers/finalize.H
rename to src/setHelpers/finalize.hpp
index 109e04a2..f98c8069 100644
--- a/src/setHelpers/finalize.H
+++ b/src/setHelpers/finalize.hpp
@@ -18,8 +18,8 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __finalize_H__
-#define __finalize_H__
+#ifndef __finalize_hpp__
+#define __finalize_hpp__
 
 // initilized and finalize should be placed in onc scope 
 }
diff --git a/src/setHelpers/initialize.H b/src/setHelpers/initialize.hpp
similarity index 96%
rename from src/setHelpers/initialize.H
rename to src/setHelpers/initialize.hpp
index 277db444..0b970dfe 100644
--- a/src/setHelpers/initialize.H
+++ b/src/setHelpers/initialize.hpp
@@ -18,8 +18,8 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __initialize_H__
-#define __initialize_H__
+#ifndef __initialize_hpp__
+#define __initialize_hpp__
 
 // initilized and finalize should be placed in onc scope 
 Report(0)<<"Initializing host/device execution spaces . . . \n";
diff --git a/src/setHelpers/initialize_Control.H b/src/setHelpers/initialize_Control.hpp
similarity index 94%
rename from src/setHelpers/initialize_Control.H
rename to src/setHelpers/initialize_Control.hpp
index 7a9046a4..a231a566 100644
--- a/src/setHelpers/initialize_Control.H
+++ b/src/setHelpers/initialize_Control.hpp
@@ -18,11 +18,11 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __initializedControl_H__
-#define __initializedControl_H__
+#ifndef __initializedControl_hpp__
+#define __initializedControl_hpp__
 
 // initilized and finalize should be placed in onc scope 
-#include "initialize.H"
+#include "initialize.hpp"
 
 Report(0)<<"\nCreating Control repository . . ."<<endReport;
 pFlow::uniquePtr<pFlow::systemControl> ControlPtr = nullptr;
diff --git a/src/setHelpers/setPointStructure.H b/src/setHelpers/setPointStructure.hpp
similarity index 94%
rename from src/setHelpers/setPointStructure.H
rename to src/setHelpers/setPointStructure.hpp
index bf80a2ce..fe78ad2f 100644
--- a/src/setHelpers/setPointStructure.H
+++ b/src/setHelpers/setPointStructure.hpp
@@ -18,8 +18,8 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __setPointStructure_H__
-#define __setPointStructure_H__
+#ifndef __setPointStructure_hpp__
+#define __setPointStructure_hpp__
 
 auto& pStruct = Control().time().emplaceObject<pointStructure>(
 		objectFile(
diff --git a/src/setHelpers/setProperty.H b/src/setHelpers/setProperty.hpp
similarity index 95%
rename from src/setHelpers/setProperty.H
rename to src/setHelpers/setProperty.hpp
index 0116c9f3..5c85adda 100644
--- a/src/setHelpers/setProperty.H
+++ b/src/setHelpers/setProperty.hpp
@@ -19,8 +19,8 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __setProperty_H__
-#define __setProperty_H__
+#ifndef __setProperty_hpp__
+#define __setProperty_hpp__
 
 Report(0)<<"\nReading proprties . . . "<<endReport;
 
diff --git a/src/setHelpers/setSurfaceGeometry.H b/src/setHelpers/setSurfaceGeometry.hpp
similarity index 94%
rename from src/setHelpers/setSurfaceGeometry.H
rename to src/setHelpers/setSurfaceGeometry.hpp
index e0515076..53a646ea 100644
--- a/src/setHelpers/setSurfaceGeometry.H
+++ b/src/setHelpers/setSurfaceGeometry.hpp
@@ -18,8 +18,8 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __setSurfaceGeometry_H__
-#define __setSurfaceGeometry_H__
+#ifndef __setSurfaceGeometry_hpp__
+#define __setSurfaceGeometry_hpp__
 
 Report(0)<< "\nCreating surface geometry . . . "<<endReport;
 auto surfGeometryPtr = pFlow::geometry::create(Control, proprties);
diff --git a/utilities/Utilities/CMakeLists.txt b/utilities/Utilities/CMakeLists.txt
index 25dc5f36..44c0d092 100644
--- a/utilities/Utilities/CMakeLists.txt
+++ b/utilities/Utilities/CMakeLists.txt
@@ -1,8 +1,8 @@
 
 set(SourceFiles 
-vtkFile.C
-readFromTimeFolder.C
-readControlDict.C
+vtkFile.cpp
+readFromTimeFolder.cpp
+readControlDict.cpp
 )
 
 set(link_libs Kokkos::kokkos phasicFlow Particles Geometry)
diff --git a/utilities/Utilities/readControlDict.C b/utilities/Utilities/readControlDict.cpp
similarity index 97%
rename from utilities/Utilities/readControlDict.C
rename to utilities/Utilities/readControlDict.cpp
index 32ea1974..2788dffb 100644
--- a/utilities/Utilities/readControlDict.C
+++ b/utilities/Utilities/readControlDict.cpp
@@ -17,9 +17,9 @@ Licence:
   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 -----------------------------------------------------------------------------*/
-#include "readControlDict.H"
-#include "iFstream.H"
-#include "timeFolder.H"
+#include "readControlDict.hpp"
+#include "iFstream.hpp"
+#include "timeFolder.hpp"
 
 pFlow::word pFlow::readControlDict::convertTimeToName(
 	const real t, 
diff --git a/utilities/Utilities/readControlDict.H b/utilities/Utilities/readControlDict.hpp
similarity index 93%
rename from utilities/Utilities/readControlDict.H
rename to utilities/Utilities/readControlDict.hpp
index 3ff6bab8..90b1fffb 100644
--- a/utilities/Utilities/readControlDict.H
+++ b/utilities/Utilities/readControlDict.hpp
@@ -18,10 +18,10 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __readControlDict_H__
-#define __readControlDict_H__
+#ifndef __readControlDict_hpp__
+#define __readControlDict_hpp__
 
-#include "fileSystem.H"
+#include "fileSystem.hpp"
 
 
 namespace pFlow
@@ -83,5 +83,5 @@ public:
 
 }
 
-#endif //__readControlDict_H__
+#endif //__readControlDict_hpp__
 
diff --git a/utilities/Utilities/readFromTimeFolder.C b/utilities/Utilities/readFromTimeFolder.cpp
similarity index 98%
rename from utilities/Utilities/readFromTimeFolder.C
rename to utilities/Utilities/readFromTimeFolder.cpp
index 8ef1bd04..84cfce4f 100644
--- a/utilities/Utilities/readFromTimeFolder.C
+++ b/utilities/Utilities/readFromTimeFolder.cpp
@@ -18,7 +18,7 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#include "readFromTimeFolder.H"
+#include "readFromTimeFolder.hpp"
  
 pFlow::readFromTimeFolder::readFromTimeFolder(repository& rep)
 :
diff --git a/utilities/Utilities/readFromTimeFolder.H b/utilities/Utilities/readFromTimeFolder.hpp
similarity index 95%
rename from utilities/Utilities/readFromTimeFolder.H
rename to utilities/Utilities/readFromTimeFolder.hpp
index c4012187..9294929f 100644
--- a/utilities/Utilities/readFromTimeFolder.H
+++ b/utilities/Utilities/readFromTimeFolder.hpp
@@ -17,13 +17,13 @@ Licence:
   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 -----------------------------------------------------------------------------*/
-#ifndef __readFromTimeFolder_H__
-#define __readFromTimeFolder_H__
+#ifndef __readFromTimeFolder_hpp__
+#define __readFromTimeFolder_hpp__
 
 
-#include "repository.H"
-#include "pointFields.H"
-#include "utilityFunctions.H"
+#include "repository.hpp"
+#include "pointFields.hpp"
+#include "utilityFunctions.hpp"
 
 namespace pFlow
 {
@@ -198,4 +198,4 @@ public:
 
 
 
-#endif //__readFromTimeFolder_H__ 
+#endif //__readFromTimeFolder_hpp__ 
diff --git a/utilities/Utilities/utilityFunctions.H b/utilities/Utilities/utilityFunctions.hpp
similarity index 93%
rename from utilities/Utilities/utilityFunctions.H
rename to utilities/Utilities/utilityFunctions.hpp
index e31d16bb..7081b1bf 100644
--- a/utilities/Utilities/utilityFunctions.H
+++ b/utilities/Utilities/utilityFunctions.hpp
@@ -18,8 +18,8 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __utilityFunctions_H__
-#define __utilityFunctions_H__
+#ifndef __utilityFunctions_hpp__
+#define __utilityFunctions_hpp__
 
 #include <regex>
 
@@ -42,4 +42,4 @@ bool inline pointFieldGetType(std::string TYPENAME, std::string& fieldType, std:
 }
 
 
-#endif //__utilityFunctions_H__
\ No newline at end of file
+#endif //__utilityFunctions_hpp__
\ No newline at end of file
diff --git a/utilities/Utilities/vtkFile.C b/utilities/Utilities/vtkFile.cpp
similarity index 98%
rename from utilities/Utilities/vtkFile.C
rename to utilities/Utilities/vtkFile.cpp
index d6388a6b..fe0755f4 100755
--- a/utilities/Utilities/vtkFile.C
+++ b/utilities/Utilities/vtkFile.cpp
@@ -19,7 +19,7 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#include "vtkFile.H"
+#include "vtkFile.hpp"
 
 bool pFlow::vtkFile::openStream()
 {
diff --git a/utilities/Utilities/vtkFile.H b/utilities/Utilities/vtkFile.hpp
similarity index 91%
rename from utilities/Utilities/vtkFile.H
rename to utilities/Utilities/vtkFile.hpp
index 0d5861bf..8c4cab36 100755
--- a/utilities/Utilities/vtkFile.H
+++ b/utilities/Utilities/vtkFile.hpp
@@ -18,13 +18,13 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __vtkFile_H__
-#define __vtkFile_H__ 
+#ifndef __vtkFile_hpp__
+#define __vtkFile_hpp__ 
 
-#include "types.H"
-#include "uniquePtr.H"
-#include "fileSystem.H"
-#include "streams.H"
+#include "types.hpp"
+#include "uniquePtr.hpp"
+#include "fileSystem.hpp"
+#include "streams.hpp"
 
 namespace pFlow
 {
@@ -87,4 +87,4 @@ public:
 
 }
 
-#endif //__vtkFile_H__
+#endif //__vtkFile_hpp__
diff --git a/utilities/checkPhasicFlow/CMakeLists.txt b/utilities/checkPhasicFlow/CMakeLists.txt
index ac1161a4..1864b2a2 100644
--- a/utilities/checkPhasicFlow/CMakeLists.txt
+++ b/utilities/checkPhasicFlow/CMakeLists.txt
@@ -1,6 +1,6 @@
 
 set(source_files 
-checkPhasicFlow.C
+checkPhasicFlow.cpp
 )
 set(link_lib phasicFlow Kokkos::kokkos)
 
diff --git a/utilities/checkPhasicFlow/checkPhasicFlow.C b/utilities/checkPhasicFlow/checkPhasicFlow.cpp
similarity index 92%
rename from utilities/checkPhasicFlow/checkPhasicFlow.C
rename to utilities/checkPhasicFlow/checkPhasicFlow.cpp
index 83e1b031..9af45a33 100755
--- a/utilities/checkPhasicFlow/checkPhasicFlow.C
+++ b/utilities/checkPhasicFlow/checkPhasicFlow.cpp
@@ -18,9 +18,9 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-
-#include "systemControl.H"
-#include "commandLine.H"
+#include "KokkosTypes.hpp"
+#include "systemControl.hpp"
+#include "commandLine.hpp"
 
 
 using pFlow::output;
@@ -37,7 +37,7 @@ int main( int argc, char* argv[] )
 if(!cmds.parse(argc, argv)) return 0;
 
 // this should be palced in each main 
-#include "initialize.H"
+#include "initialize.hpp"
 
 	output<<endl;
 	Report(1)<< "You are using "<<yellowText(cmds.productNameCopyright())<<endReport;
@@ -45,7 +45,7 @@ if(!cmds.parse(argc, argv)) return 0;
 	
 
 // this should be palced in each main 
-#include "finalize.H"
+#include "finalize.hpp"
 
 	return 0;
 } 
diff --git a/utilities/geometryPhasicFlow/CMakeLists.txt b/utilities/geometryPhasicFlow/CMakeLists.txt
index 47e91685..1c875a2c 100644
--- a/utilities/geometryPhasicFlow/CMakeLists.txt
+++ b/utilities/geometryPhasicFlow/CMakeLists.txt
@@ -1,11 +1,11 @@
 
 set(source_files 
-geometryPhasicFlow.C
-Wall/Wall.C 
-planeWall/planeWall.C 
-stlWall/stlWall.C
-cylinderWall/cylinderWall.C
-cuboidWall/cuboidWall.C
+geometryPhasicFlow.cpp
+Wall/Wall.cpp 
+planeWall/planeWall.cpp 
+stlWall/stlWall.cpp
+cylinderWall/cylinderWall.cpp
+cuboidWall/cuboidWall.cpp
 )
 set(link_lib phasicFlow Geometry Kokkos::kokkos Utilities)
 
diff --git a/utilities/geometryPhasicFlow/Wall/Wall.C b/utilities/geometryPhasicFlow/Wall/Wall.cpp
similarity index 99%
rename from utilities/geometryPhasicFlow/Wall/Wall.C
rename to utilities/geometryPhasicFlow/Wall/Wall.cpp
index 9c5f539e..1db33230 100755
--- a/utilities/geometryPhasicFlow/Wall/Wall.C
+++ b/utilities/geometryPhasicFlow/Wall/Wall.cpp
@@ -19,7 +19,7 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#include "Wall.H"
+#include "Wall.hpp"
 
 bool pFlow::Wall::readCommon(const dictionary& dict)
 {
diff --git a/utilities/geometryPhasicFlow/Wall/Wall.H b/utilities/geometryPhasicFlow/Wall/Wall.hpp
similarity index 93%
rename from utilities/geometryPhasicFlow/Wall/Wall.H
rename to utilities/geometryPhasicFlow/Wall/Wall.hpp
index d08a1c6e..b8296134 100755
--- a/utilities/geometryPhasicFlow/Wall/Wall.H
+++ b/utilities/geometryPhasicFlow/Wall/Wall.hpp
@@ -19,13 +19,13 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __Wall_H__
-#define __Wall_H__
+#ifndef __Wall_hpp__
+#define __Wall_hpp__
 
 
-#include "virtualConstructor.H"
-#include "Vectors.H"
-#include "dictionary.H"
+#include "virtualConstructor.hpp"
+#include "Vectors.hpp"
+#include "dictionary.hpp"
 
 namespace pFlow
 {
@@ -55,7 +55,7 @@ protected:
 public:
 
 	// - type info
-	TypeName("Wall");
+	TypeInfo("Wall");
 
 	//// - Constructors
 
diff --git a/utilities/geometryPhasicFlow/cuboidWall/cuboidWall.C b/utilities/geometryPhasicFlow/cuboidWall/cuboidWall.cpp
similarity index 98%
rename from utilities/geometryPhasicFlow/cuboidWall/cuboidWall.C
rename to utilities/geometryPhasicFlow/cuboidWall/cuboidWall.cpp
index c1a90172..79f7cd44 100755
--- a/utilities/geometryPhasicFlow/cuboidWall/cuboidWall.C
+++ b/utilities/geometryPhasicFlow/cuboidWall/cuboidWall.cpp
@@ -19,8 +19,8 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#include "cuboidWall.H"
-#include "planeWall.H"
+#include "cuboidWall.hpp"
+#include "planeWall.hpp"
 
 
 
diff --git a/utilities/geometryPhasicFlow/cuboidWall/cuboidWall.H b/utilities/geometryPhasicFlow/cuboidWall/cuboidWall.hpp
similarity index 91%
rename from utilities/geometryPhasicFlow/cuboidWall/cuboidWall.H
rename to utilities/geometryPhasicFlow/cuboidWall/cuboidWall.hpp
index bc0e8f32..9949f52b 100755
--- a/utilities/geometryPhasicFlow/cuboidWall/cuboidWall.H
+++ b/utilities/geometryPhasicFlow/cuboidWall/cuboidWall.hpp
@@ -19,12 +19,12 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __cuboidWall_H__
-#define __cuboidWall_H__
+#ifndef __cuboidWall_hpp__
+#define __cuboidWall_hpp__
 
 
-#include "Wall.H"
-#include "types.H"
+#include "Wall.hpp"
+#include "types.hpp"
 
 namespace pFlow
 {
@@ -39,7 +39,7 @@ protected:
 
 public:
 
-	TypeName("cuboidWall");
+	TypeInfo("cuboidWall");
 
 	cuboidWall();
 
diff --git a/utilities/geometryPhasicFlow/cylinderWall/cylinderWall.C b/utilities/geometryPhasicFlow/cylinderWall/cylinderWall.cpp
similarity index 92%
rename from utilities/geometryPhasicFlow/cylinderWall/cylinderWall.C
rename to utilities/geometryPhasicFlow/cylinderWall/cylinderWall.cpp
index c2573ee5..859c2811 100644
--- a/utilities/geometryPhasicFlow/cylinderWall/cylinderWall.C
+++ b/utilities/geometryPhasicFlow/cylinderWall/cylinderWall.cpp
@@ -1,5 +1,5 @@
-#include "cylinderWall.H"
-#include "line.H"
+#include "cylinderWall.hpp"
+#include "line.hpp"
 
 
 bool pFlow::cylinderWall::readCylinderWall(const dictionary& dict)
diff --git a/utilities/geometryPhasicFlow/cylinderWall/cylinderWall.H b/utilities/geometryPhasicFlow/cylinderWall/cylinderWall.hpp
similarity index 86%
rename from utilities/geometryPhasicFlow/cylinderWall/cylinderWall.H
rename to utilities/geometryPhasicFlow/cylinderWall/cylinderWall.hpp
index e8533aa4..6c8c881d 100644
--- a/utilities/geometryPhasicFlow/cylinderWall/cylinderWall.H
+++ b/utilities/geometryPhasicFlow/cylinderWall/cylinderWall.hpp
@@ -19,11 +19,11 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __cylinderWall_H__
-#define __cylinderWall_H__
+#ifndef __cylinderWall_hpp__
+#define __cylinderWall_hpp__
 
-#include "Wall.H"
-#include "zAxis.H"
+#include "Wall.hpp"
+#include "zAxis.hpp"
 
 namespace pFlow
 {
@@ -40,7 +40,7 @@ protected:
 
 public:
 
-	TypeName("cylinderWall");
+	TypeInfo("cylinderWall");
 
 	cylinderWall();
 
@@ -60,4 +60,4 @@ public:
 
 
 
-#endif //__cylinderWall_H__
\ No newline at end of file
+#endif //__cylinderWall_hpp__
\ No newline at end of file
diff --git a/utilities/geometryPhasicFlow/geometryPhasicFlow.C b/utilities/geometryPhasicFlow/geometryPhasicFlow.cpp
similarity index 92%
rename from utilities/geometryPhasicFlow/geometryPhasicFlow.C
rename to utilities/geometryPhasicFlow/geometryPhasicFlow.cpp
index 8265998c..ef06a505 100755
--- a/utilities/geometryPhasicFlow/geometryPhasicFlow.C
+++ b/utilities/geometryPhasicFlow/geometryPhasicFlow.cpp
@@ -19,12 +19,12 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#include "systemControl.H"
-#include "Wall.H"
-#include "multiTriSurface.H"
-#include "geometryMotion.H"
-#include "commandLine.H"
-#include "readControlDict.H"
+#include "systemControl.hpp"
+#include "Wall.hpp"
+#include "multiTriSurface.hpp"
+#include "geometryMotion.hpp"
+#include "commandLine.hpp"
+#include "readControlDict.hpp"
 
 using pFlow::output;
 using pFlow::endl;
@@ -55,9 +55,9 @@ int main( int argc, char* argv[] )
   if(!cmds.parse(argc, argv)) return 0;
 
 // this should be palced in each main 
-#include "initialize_Control.H"
+#include "initialize_Control.hpp"
 
-	#include "setProperty.H"
+	#include "setProperty.hpp"
 
 	Report(0)<<"\nReading "<<"createGeometryDict"<<" . . ."<<endReport;
 	auto objDict = IOobject::make<dictionary>
@@ -109,7 +109,7 @@ int main( int argc, char* argv[] )
 	Report(0)<< greenText("\nFinished successfully.\n");
 
 // this should be palced in each main 
-#include "finalize.H"
+#include "finalize.hpp"
 
 	return 0;
 } 
diff --git a/utilities/geometryPhasicFlow/planeWall/planeWall.C b/utilities/geometryPhasicFlow/planeWall/planeWall.cpp
similarity index 98%
rename from utilities/geometryPhasicFlow/planeWall/planeWall.C
rename to utilities/geometryPhasicFlow/planeWall/planeWall.cpp
index 7570d4fc..f76e3566 100755
--- a/utilities/geometryPhasicFlow/planeWall/planeWall.C
+++ b/utilities/geometryPhasicFlow/planeWall/planeWall.cpp
@@ -19,8 +19,8 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#include "planeWall.H"
-#include "line.H"
+#include "planeWall.hpp"
+#include "line.hpp"
 
 bool pFlow::planeWall::readPlaneWall
 (
diff --git a/utilities/geometryPhasicFlow/planeWall/planeWall.H b/utilities/geometryPhasicFlow/planeWall/planeWall.hpp
similarity index 93%
rename from utilities/geometryPhasicFlow/planeWall/planeWall.H
rename to utilities/geometryPhasicFlow/planeWall/planeWall.hpp
index 8710835b..9d599357 100755
--- a/utilities/geometryPhasicFlow/planeWall/planeWall.H
+++ b/utilities/geometryPhasicFlow/planeWall/planeWall.hpp
@@ -19,12 +19,12 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __planeWall_H__
-#define __planeWall_H__
+#ifndef __planeWall_hpp__
+#define __planeWall_hpp__
 
 
-#include "Wall.H"
-#include "types.H"
+#include "Wall.hpp"
+#include "types.hpp"
 
 namespace pFlow
 {
@@ -59,7 +59,7 @@ protected:
 
 public:
 
-	TypeName("planeWall");
+	TypeInfo("planeWall");
 
 	planeWall();
 
diff --git a/utilities/geometryPhasicFlow/stlWall/stlWall.C b/utilities/geometryPhasicFlow/stlWall/stlWall.cpp
similarity index 95%
rename from utilities/geometryPhasicFlow/stlWall/stlWall.C
rename to utilities/geometryPhasicFlow/stlWall/stlWall.cpp
index 7266648a..f54cfc67 100755
--- a/utilities/geometryPhasicFlow/stlWall/stlWall.C
+++ b/utilities/geometryPhasicFlow/stlWall/stlWall.cpp
@@ -19,10 +19,10 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#include "stlWall.H"
-#include "stlFile.H"
+#include "stlWall.hpp"
+#include "stlFile.hpp"
 
-#include "streams.H"
+#include "streams.hpp"
 
 bool pFlow::stlWall::readSTLWall
 (
diff --git a/utilities/geometryPhasicFlow/stlWall/stlWall.H b/utilities/geometryPhasicFlow/stlWall/stlWall.hpp
similarity index 91%
rename from utilities/geometryPhasicFlow/stlWall/stlWall.H
rename to utilities/geometryPhasicFlow/stlWall/stlWall.hpp
index e14870f7..dc14ae98 100755
--- a/utilities/geometryPhasicFlow/stlWall/stlWall.H
+++ b/utilities/geometryPhasicFlow/stlWall/stlWall.hpp
@@ -19,12 +19,12 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __stlWall_H__
-#define __stlWall_H__
+#ifndef __stlWall_hpp__
+#define __stlWall_hpp__
 
 
-#include "Wall.H"
-#include "types.H"
+#include "Wall.hpp"
+#include "types.hpp"
 
 namespace pFlow
 {
@@ -39,7 +39,7 @@ protected:
 
 public:
 
-	TypeName("stlWall");
+	TypeInfo("stlWall");
 
 	stlWall();
 
diff --git a/utilities/pFlowToVTK/CMakeLists.txt b/utilities/pFlowToVTK/CMakeLists.txt
index 8946cdfe..db943590 100644
--- a/utilities/pFlowToVTK/CMakeLists.txt
+++ b/utilities/pFlowToVTK/CMakeLists.txt
@@ -1,7 +1,7 @@
 
 set(source_files 
-pFlowToVTK.C 
-geometric.C 
+pFlowToVTK.cpp 
+geometric.cpp 
 )
 set(link_lib phasicFlow Kokkos::kokkos Utilities)
 
diff --git a/utilities/pFlowToVTK/geometric.C b/utilities/pFlowToVTK/geometric.cpp
similarity index 98%
rename from utilities/pFlowToVTK/geometric.C
rename to utilities/pFlowToVTK/geometric.cpp
index 404e6635..b7afbdda 100755
--- a/utilities/pFlowToVTK/geometric.C
+++ b/utilities/pFlowToVTK/geometric.cpp
@@ -19,7 +19,7 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#include "geometric.H"
+#include "geometric.hpp"
 
 
 template<>
diff --git a/utilities/pFlowToVTK/geometric.H b/utilities/pFlowToVTK/geometric.hpp
similarity index 91%
rename from utilities/pFlowToVTK/geometric.H
rename to utilities/pFlowToVTK/geometric.hpp
index 13330c38..2ace57c8 100755
--- a/utilities/pFlowToVTK/geometric.H
+++ b/utilities/pFlowToVTK/geometric.hpp
@@ -19,13 +19,13 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __geometric_H__
-#define __geometric_H__ 
+#ifndef __geometric_hpp__
+#define __geometric_hpp__ 
 
-#include "vtkFile.H"
-#include "triSurface.H"
-#include "multiTriSurface.H"
-#include "IOobject.H"
+#include "vtkFile.hpp"
+#include "triSurface.hpp"
+#include "multiTriSurface.hpp"
+#include "IOobject.hpp"
 
 namespace pFlow
 {
@@ -75,4 +75,4 @@ bool dataToVTK( vtkFile& vtk, const multiTriSurface& surface );
 
 }
 
-#endif //__geometric_H__
+#endif //__geometric_hpp__
diff --git a/utilities/pFlowToVTK/pFlowToVTK.C b/utilities/pFlowToVTK/pFlowToVTK.cpp
similarity index 93%
rename from utilities/pFlowToVTK/pFlowToVTK.C
rename to utilities/pFlowToVTK/pFlowToVTK.cpp
index 42998afd..f4a68e83 100755
--- a/utilities/pFlowToVTK/pFlowToVTK.C
+++ b/utilities/pFlowToVTK/pFlowToVTK.cpp
@@ -19,13 +19,13 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#include "systemControl.H"
-#include "pointFieldToVTK.H"
-#include "triSurfaceFieldToVTK.H"
-#include "timeFolder.H"
-#include "commandLine.H"
-#include "ranges.H"
-#include "readControlDict.H"
+#include "systemControl.hpp"
+#include "pointFieldToVTK.hpp"
+#include "triSurfaceFieldToVTK.hpp"
+#include "timeFolder.hpp"
+#include "commandLine.hpp"
+#include "ranges.hpp"
+#include "readControlDict.hpp"
 
 
 using pFlow::word;
@@ -88,7 +88,7 @@ int main(int argc, char** argv )
 	
 	
 // this should be palced in each main 
-#include "initialize_Control.H"
+#include "initialize_Control.hpp"
 
 
 	timeFolder folders(Control);
@@ -171,6 +171,6 @@ int main(int argc, char** argv )
 
 	
 // this should be palced in each main 
-#include "finalize.H"
+#include "finalize.hpp"
 	return 0;
 }
diff --git a/utilities/pFlowToVTK/pointFieldToVTK.H b/utilities/pFlowToVTK/pointFieldToVTK.hpp
similarity index 98%
rename from utilities/pFlowToVTK/pointFieldToVTK.H
rename to utilities/pFlowToVTK/pointFieldToVTK.hpp
index 2f04d03e..aebbf92f 100755
--- a/utilities/pFlowToVTK/pointFieldToVTK.H
+++ b/utilities/pFlowToVTK/pointFieldToVTK.hpp
@@ -19,14 +19,14 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __pointFieldToVTK_H__
-#define __pointFieldToVTK_H__
+#ifndef __pointFieldToVTK_hpp__
+#define __pointFieldToVTK_hpp__
 
 #include <regex>
 
-#include "vtkFile.H"
-#include "pointFields.H"
-#include "IOobject.H"
+#include "vtkFile.hpp"
+#include "pointFields.hpp"
+#include "IOobject.hpp"
 
 namespace pFlow::PFtoVTK
 {
diff --git a/utilities/pFlowToVTK/triSurfaceFieldToVTK.H b/utilities/pFlowToVTK/triSurfaceFieldToVTK.hpp
similarity index 96%
rename from utilities/pFlowToVTK/triSurfaceFieldToVTK.H
rename to utilities/pFlowToVTK/triSurfaceFieldToVTK.hpp
index 689435d1..231bc2a7 100644
--- a/utilities/pFlowToVTK/triSurfaceFieldToVTK.H
+++ b/utilities/pFlowToVTK/triSurfaceFieldToVTK.hpp
@@ -19,16 +19,16 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __triSurfaceFieldToVTK_H__
-#define __triSurfaceFieldToVTK_H__
+#ifndef __triSurfaceFieldToVTK_hpp__
+#define __triSurfaceFieldToVTK_hpp__
 
 #include <regex>
 
-#include "vtkFile.H"
-#include "triSurface.H"
-#include "multiTriSurface.H"
-#include "triSurfaceFields.H"
-#include "IOobject.H"
+#include "vtkFile.hpp"
+#include "triSurface.hpp"
+#include "multiTriSurface.hpp"
+#include "triSurfaceFields.hpp"
+#include "IOobject.hpp"
 
 namespace pFlow::TSFtoVTK
 {
diff --git a/utilities/particlesPhasicFlow/CMakeLists.txt b/utilities/particlesPhasicFlow/CMakeLists.txt
index 43e30daf..4a46570a 100644
--- a/utilities/particlesPhasicFlow/CMakeLists.txt
+++ b/utilities/particlesPhasicFlow/CMakeLists.txt
@@ -1,10 +1,10 @@
 
 set(source_files
-particlesPhasicFlow.C
-positionParticles/positionParticles.C 
-positionOrdered/positionOrdered.C 
-positionRandom/positionRandom.C
-empty/empty.C
+particlesPhasicFlow.cpp
+positionParticles/positionParticles.cpp 
+positionOrdered/positionOrdered.cpp 
+positionRandom/positionRandom.cpp
+empty/empty.cpp
 )
 set(link_lib phasicFlow Kokkos::kokkos Interaction Utilities)
 
diff --git a/utilities/particlesPhasicFlow/empty/empty.C b/utilities/particlesPhasicFlow/empty/empty.cpp
similarity index 98%
rename from utilities/particlesPhasicFlow/empty/empty.C
rename to utilities/particlesPhasicFlow/empty/empty.cpp
index ca2f8b1a..e75d0dac 100755
--- a/utilities/particlesPhasicFlow/empty/empty.C
+++ b/utilities/particlesPhasicFlow/empty/empty.cpp
@@ -18,7 +18,7 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#include "empty.H"
+#include "empty.hpp"
 
 
 
diff --git a/utilities/particlesPhasicFlow/empty/empty.H b/utilities/particlesPhasicFlow/empty/empty.hpp
similarity index 92%
rename from utilities/particlesPhasicFlow/empty/empty.H
rename to utilities/particlesPhasicFlow/empty/empty.hpp
index 3aaeef20..fc3bada1 100755
--- a/utilities/particlesPhasicFlow/empty/empty.H
+++ b/utilities/particlesPhasicFlow/empty/empty.hpp
@@ -18,11 +18,11 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __empty_H__
-#define __empty_H__
+#ifndef __empty_hpp__
+#define __empty_hpp__
 
-#include "positionParticles.H"
-#include "box.H"
+#include "positionParticles.hpp"
+#include "box.hpp"
 
 namespace pFlow
 {
@@ -42,7 +42,7 @@ protected:
 public:
 
 	// - type Info
-	TypeName("empty");
+	TypeInfo("empty");
 
 	empty(const dictionary& dict);
 
@@ -91,4 +91,4 @@ public:
 
 
 
-#endif // __empety_H__
+#endif // __empety_hpp__
diff --git a/utilities/particlesPhasicFlow/particlesPhasicFlow.C b/utilities/particlesPhasicFlow/particlesPhasicFlow.cpp
similarity index 95%
rename from utilities/particlesPhasicFlow/particlesPhasicFlow.C
rename to utilities/particlesPhasicFlow/particlesPhasicFlow.cpp
index a39e3892..fbf834f8 100755
--- a/utilities/particlesPhasicFlow/particlesPhasicFlow.C
+++ b/utilities/particlesPhasicFlow/particlesPhasicFlow.cpp
@@ -19,12 +19,12 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#include "positionParticles.H"
-#include "pointStructure.H"
-#include "setFields.H"
-#include "systemControl.H"
-#include "commandLine.H"
-#include "readControlDict.H"
+#include "positionParticles.hpp"
+#include "pointStructure.hpp"
+#include "setFields.hpp"
+#include "systemControl.hpp"
+#include "commandLine.hpp"
+#include "readControlDict.hpp"
 
 using pFlow::output;
 using pFlow::endl;
@@ -79,7 +79,7 @@ int main( int argc, char* argv[] )
 	}	
 
 // this should be palced in each main 
-#include "initialize_Control.H"
+#include "initialize_Control.hpp"
 
 	auto objCPDict = IOobject::make<dictionary>
 	(
@@ -195,7 +195,7 @@ int main( int argc, char* argv[] )
 
 
 // this should be palced in each main 
-#include "finalize.H"
+#include "finalize.hpp"
 
 	return 0;
 } 
diff --git a/utilities/particlesPhasicFlow/positionOrdered/positionOrdered.C b/utilities/particlesPhasicFlow/positionOrdered/positionOrdered.cpp
similarity index 97%
rename from utilities/particlesPhasicFlow/positionOrdered/positionOrdered.C
rename to utilities/particlesPhasicFlow/positionOrdered/positionOrdered.cpp
index c1d39d07..dc4d69e7 100755
--- a/utilities/particlesPhasicFlow/positionOrdered/positionOrdered.C
+++ b/utilities/particlesPhasicFlow/positionOrdered/positionOrdered.cpp
@@ -18,11 +18,11 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#include "positionOrdered.H"
-#include "error.H"
+#include "positionOrdered.hpp"
+#include "error.hpp"
 
 
-#include "streams.H"
+#include "streams.hpp"
 
 
 bool pFlow::positionOrdered::findAxisIndex()
diff --git a/utilities/particlesPhasicFlow/positionOrdered/positionOrdered.H b/utilities/particlesPhasicFlow/positionOrdered/positionOrdered.hpp
similarity index 92%
rename from utilities/particlesPhasicFlow/positionOrdered/positionOrdered.H
rename to utilities/particlesPhasicFlow/positionOrdered/positionOrdered.hpp
index c66d77fc..66452ab0 100755
--- a/utilities/particlesPhasicFlow/positionOrdered/positionOrdered.H
+++ b/utilities/particlesPhasicFlow/positionOrdered/positionOrdered.hpp
@@ -18,10 +18,10 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __positionOrdered_H__
-#define __positionOrdered_H__
+#ifndef __positionOrdered_hpp__
+#define __positionOrdered_hpp__
 
-#include "positionParticles.H"
+#include "positionParticles.hpp"
 
 namespace pFlow
 {
@@ -60,7 +60,7 @@ protected:
 public:
 
 	// - type Info
-	TypeName("positionOrdered");
+	TypeInfo("positionOrdered");
 
 	positionOrdered(const dictionary& dict);
 
@@ -109,4 +109,4 @@ public:
 
 
 
-#endif // __positionOrdered_H__
+#endif // __positionOrdered_hpp__
diff --git a/utilities/particlesPhasicFlow/positionParticles/positionParticles.C b/utilities/particlesPhasicFlow/positionParticles/positionParticles.cpp
similarity index 94%
rename from utilities/particlesPhasicFlow/positionParticles/positionParticles.C
rename to utilities/particlesPhasicFlow/positionParticles/positionParticles.cpp
index ff62ac7f..632851ec 100755
--- a/utilities/particlesPhasicFlow/positionParticles/positionParticles.C
+++ b/utilities/particlesPhasicFlow/positionParticles/positionParticles.cpp
@@ -18,14 +18,14 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#include "positionParticles.H"
-#include "box.H"
-#include "cylinder.H"
-#include "sphere.H"
-#include "cells.H"
-#include "contactSearchFunctions.H"
+#include "positionParticles.hpp"
+#include "box.hpp"
+#include "cylinder.hpp"
+#include "sphere.hpp"
+#include "cells.hpp"
+#include "contactSearchFunctions.hpp"
 
-#include "streams.H"
+#include "streams.hpp"
 
 
 pFlow::realx3Vector pFlow::positionParticles::sortByMortonCode(realx3Vector& position)const
diff --git a/utilities/particlesPhasicFlow/positionParticles/positionParticles.H b/utilities/particlesPhasicFlow/positionParticles/positionParticles.hpp
similarity index 93%
rename from utilities/particlesPhasicFlow/positionParticles/positionParticles.H
rename to utilities/particlesPhasicFlow/positionParticles/positionParticles.hpp
index 62ba5322..fe579e71 100755
--- a/utilities/particlesPhasicFlow/positionParticles/positionParticles.H
+++ b/utilities/particlesPhasicFlow/positionParticles/positionParticles.hpp
@@ -18,12 +18,12 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __positionParticles_H__
-#define __positionParticles_H__
+#ifndef __positionParticles_hpp__
+#define __positionParticles_hpp__
 
-#include "virtualConstructor.H"
-#include "Vectors.H"
-#include "dictionary.H"
+#include "virtualConstructor.hpp"
+#include "Vectors.hpp"
+#include "dictionary.hpp"
 
 namespace pFlow
 {
@@ -116,7 +116,7 @@ protected:
 public:
 
 	// - type Info
-	TypeName("positionParticles");
+	TypeInfo("positionParticles");
 
 	positionParticles(const dictionary& dict);
 
@@ -167,4 +167,4 @@ public:
 
 
 
-#endif // __positionParticles_H__
+#endif // __positionParticles_hpp__
diff --git a/utilities/particlesPhasicFlow/positionRandom/positionRandom.C b/utilities/particlesPhasicFlow/positionRandom/positionRandom.cpp
similarity index 97%
rename from utilities/particlesPhasicFlow/positionRandom/positionRandom.C
rename to utilities/particlesPhasicFlow/positionRandom/positionRandom.cpp
index 52cbccb4..63828fbc 100755
--- a/utilities/particlesPhasicFlow/positionRandom/positionRandom.C
+++ b/utilities/particlesPhasicFlow/positionRandom/positionRandom.cpp
@@ -19,11 +19,11 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#include "positionRandom.H"
-#include "uniformRandomReal.H"
-#include "NBSLevel0.H"
-#include "unsortedPairs.H"
-#include "box.H"
+#include "positionRandom.hpp"
+#include "uniformRandomReal.hpp"
+#include "NBSLevel0.hpp"
+#include "unsortedPairs.hpp"
+#include "box.hpp"
 
 
 
diff --git a/utilities/particlesPhasicFlow/positionRandom/positionRandom.H b/utilities/particlesPhasicFlow/positionRandom/positionRandom.hpp
similarity index 90%
rename from utilities/particlesPhasicFlow/positionRandom/positionRandom.H
rename to utilities/particlesPhasicFlow/positionRandom/positionRandom.hpp
index a0e2997c..33bc9899 100755
--- a/utilities/particlesPhasicFlow/positionRandom/positionRandom.H
+++ b/utilities/particlesPhasicFlow/positionRandom/positionRandom.hpp
@@ -19,12 +19,12 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __positionOrdered_H__
-#define __positionOrdered_H__
+#ifndef __positionOrdered_hpp__
+#define __positionOrdered_hpp__
 
-#include "positionParticles.H"
-#include "VectorSingles.H"
-#include "VectorDuals.H"
+#include "positionParticles.hpp"
+#include "VectorSingles.hpp"
+#include "VectorDuals.hpp"
 
 
 namespace pFlow
@@ -64,7 +64,7 @@ protected:
 public:
 
 	// - type Info
-	TypeName("positionRandom");
+	TypeInfo("positionRandom");
 
 	positionRandom(const dictionary& dict);
 
@@ -115,4 +115,4 @@ public:
 
 
 
-#endif // __positionOrdered_H__
+#endif // __positionOrdered_hpp__
diff --git a/utilities/particlesPhasicFlow/setFields.H b/utilities/particlesPhasicFlow/setFields.hpp
similarity index 88%
rename from utilities/particlesPhasicFlow/setFields.H
rename to utilities/particlesPhasicFlow/setFields.hpp
index b56b4263..0315c1b2 100755
--- a/utilities/particlesPhasicFlow/setFields.H
+++ b/utilities/particlesPhasicFlow/setFields.hpp
@@ -19,13 +19,13 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __setFields_H__
-#define __setFields_H__
+#ifndef __setFields_hpp__
+#define __setFields_hpp__
 
-#include "pStructSelector.H"
-#include "pointFields.H"
-#include "setFieldList.H"
-#include "systemControl.H"
+#include "pStructSelector.hpp"
+#include "pointFields.hpp"
+#include "setFieldList.hpp"
+#include "systemControl.hpp"
 
 namespace pFlow
 {
@@ -53,4 +53,4 @@ bool applySelector(systemControl& control, const pointStructure& pStruct, const
 
 } // pFlow
 
-#endif //__setFields_H__
+#endif //__setFields_hpp__
diff --git a/utilities/postprocessPhasicFlow/CMakeLists.txt b/utilities/postprocessPhasicFlow/CMakeLists.txt
index 84bfeee4..98f41726 100644
--- a/utilities/postprocessPhasicFlow/CMakeLists.txt
+++ b/utilities/postprocessPhasicFlow/CMakeLists.txt
@@ -1,11 +1,11 @@
 
 set(source_files 
-postprocessPhasicFlow.C 
-postprocess.C
-processField.C
-ProcessFields.C
-includeMask.C
-IncludeMasks.C
+postprocessPhasicFlow.cpp 
+postprocess.cpp
+processField.cpp
+ProcessFields.cpp
+includeMask.cpp
+IncludeMasks.cpp
 
 )
 set(link_lib phasicFlow Interaction Kokkos::kokkos Utilities)
diff --git a/utilities/postprocessPhasicFlow/IncludeMask.H b/utilities/postprocessPhasicFlow/IncludeMask.hpp
similarity index 88%
rename from utilities/postprocessPhasicFlow/IncludeMask.H
rename to utilities/postprocessPhasicFlow/IncludeMask.hpp
index fb537c13..8e042ce5 100644
--- a/utilities/postprocessPhasicFlow/IncludeMask.H
+++ b/utilities/postprocessPhasicFlow/IncludeMask.hpp
@@ -18,11 +18,11 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __IncludeMask_H__
-#define __IncludeMask_H__
+#ifndef __IncludeMask_hpp__
+#define __IncludeMask_hpp__
 
 
-#include "includeMask.H"
+#include "includeMask.hpp"
 
 namespace pFlow
 {
@@ -31,7 +31,7 @@ namespace pFlow
 template<typename T>
 struct greaterThanOp
 {
-	TypeNameNV("greaterThan");
+	TypeInfoNV("greaterThan");
 
  	inline
  	bool operator()(const T &compVal, const T &val) const {
@@ -41,7 +41,7 @@ struct greaterThanOp
 template<typename T>
 struct greaterThanEqOp
 {
-	TypeNameNV("greaterThanEq");
+	TypeInfoNV("greaterThanEq");
 
  	inline
  	bool operator()(const T &compVal, const T &val) const {
@@ -51,7 +51,7 @@ struct greaterThanEqOp
 template<typename T>
 struct lessThanOp
 {
-	TypeNameNV("lessThan");
+	TypeInfoNV("lessThan");
 
 	inline
 	bool operator()(const T &compVal, const T &val) const {
@@ -61,7 +61,7 @@ struct lessThanOp
 template<typename T>
 struct lessThanEqOp
 {
-	TypeNameNV("lessThanEq");
+	TypeInfoNV("lessThanEq");
 
 	inline
 	bool operator()(const T &compVal, const T &val) const {
@@ -71,7 +71,7 @@ struct lessThanEqOp
 template<typename T>
 struct equalOp
 {
-	TypeNameNV("equal");
+	TypeInfoNV("equal");
 
 	inline
 	bool operator()(const T &compVal, const T &val) const {
@@ -82,7 +82,7 @@ struct equalOp
 template<typename T>
 struct betweenOp
 {
-	TypeNameNV("between");
+	TypeInfoNV("between");
 
 	inline
 	bool operator()(const T &compVal1, const T &compVal2 ,const T &val) const {
@@ -93,7 +93,7 @@ struct betweenOp
 template<typename T>
 struct betweenEqOp
 {
-	TypeNameNV("betweenEq");
+	TypeInfoNV("betweenEq");
 
 	inline
 	bool operator()(const T &compVal1, const T &compVal2 ,const T &val) const {
@@ -103,7 +103,7 @@ struct betweenEqOp
 template<typename T>
 struct allOp
 {
-	TypeNameNV("all");
+	TypeInfoNV("all");
 
 	inline
 	bool operator()() const {return true; }
@@ -123,7 +123,7 @@ protected:
 	opertorType 	operator_{};
 public:
 
-	TypeNameNV(Operator<T>::TYPENAME());
+	TypeInfoNV(Operator<T>::TYPENAME());
 
 	compareOne(const dictionary& dict)
 	:
@@ -147,7 +147,7 @@ protected:
 	opertorType 	operator_{};
 public:
 	
-	TypeNameNV(opertorType::TYPENAME());
+	TypeInfoNV(opertorType::TYPENAME());
 
 	compareTwo(const dictionary& dict)
 	:
@@ -168,7 +168,7 @@ protected:
 	Operator 	operator_{};
 public:
 
-	TypeNameNV(Operator::TYPENAME());
+	TypeInfoNV(Operator::TYPENAME());
 	compareZero(const dictionary& dict);
 
 	bool operator()(const T& value) const
@@ -190,7 +190,7 @@ protected:
 
 public:
 
-	TypeNameTemplate2("IncludeMask", T, Operator);
+	TypeInfoTemplate2("IncludeMask", T, Operator);
 
 	IncludeMask(
 		const dictionary& dict,
@@ -221,7 +221,7 @@ class IncludeMask<T,allOp<T>>
 	public includeMask
 {
 public:
-	TypeNameTemplate2("IncludeMask", T, allOp<int8>);
+	TypeInfoTemplate2("IncludeMask", T, allOp<int8>);
 
 	IncludeMask(
 		const dictionary& dict,
@@ -245,6 +245,6 @@ public:
 
 } // pFlow
 
-#endif //__IncludeMask_H__
+#endif //__IncludeMask_hpp__
 
 
diff --git a/utilities/postprocessPhasicFlow/IncludeMasks.C b/utilities/postprocessPhasicFlow/IncludeMasks.cpp
similarity index 99%
rename from utilities/postprocessPhasicFlow/IncludeMasks.C
rename to utilities/postprocessPhasicFlow/IncludeMasks.cpp
index c6752152..4b644f99 100644
--- a/utilities/postprocessPhasicFlow/IncludeMasks.C
+++ b/utilities/postprocessPhasicFlow/IncludeMasks.cpp
@@ -18,7 +18,7 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#include "IncludeMask.H"
+#include "IncludeMask.hpp"
 
 // real
 template class pFlow::IncludeMask<pFlow::real, pFlow::compareOne<pFlow::real, pFlow::lessThanOp> >;
diff --git a/utilities/postprocessPhasicFlow/ProcessField.H b/utilities/postprocessPhasicFlow/ProcessField.hpp
similarity index 92%
rename from utilities/postprocessPhasicFlow/ProcessField.H
rename to utilities/postprocessPhasicFlow/ProcessField.hpp
index e7e40062..5ee87687 100644
--- a/utilities/postprocessPhasicFlow/ProcessField.H
+++ b/utilities/postprocessPhasicFlow/ProcessField.hpp
@@ -18,15 +18,15 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __ProcessField_H__ 
-#define __ProcessField_H__
+#ifndef __ProcessField_hpp__ 
+#define __ProcessField_hpp__
 
 
-#include "processField.H"
-#include "rectMeshFields.H"
-#include "twoPartEntry.H"
-#include "fieldOperations.H"
-#include "rectMeshFieldToVTK.H"
+#include "processField.hpp"
+#include "rectMeshFields.hpp"
+#include "twoPartEntry.hpp"
+#include "fieldOperations.hpp"
+#include "rectMeshFieldToVTK.hpp"
 
 namespace pFlow
 {
@@ -47,7 +47,7 @@ protected:
 
 public:
 
-	TypeNameTemplate("ProcessField", T);
+	TypeInfoTemplate("ProcessField", T);
 
 
 	ProcessField(
@@ -161,4 +161,4 @@ public:
 
 
 
-#endif //__ProcessField_H__
+#endif //__ProcessField_hpp__
diff --git a/utilities/postprocessPhasicFlow/ProcessFields.C b/utilities/postprocessPhasicFlow/ProcessFields.cpp
similarity index 97%
rename from utilities/postprocessPhasicFlow/ProcessFields.C
rename to utilities/postprocessPhasicFlow/ProcessFields.cpp
index e3f4b3a2..31969b57 100644
--- a/utilities/postprocessPhasicFlow/ProcessFields.C
+++ b/utilities/postprocessPhasicFlow/ProcessFields.cpp
@@ -18,7 +18,7 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#include "ProcessField.H"
+#include "ProcessField.hpp"
 
 
 template class pFlow::ProcessField<pFlow::int8>;
diff --git a/utilities/postprocessPhasicFlow/fieldOperations.H b/utilities/postprocessPhasicFlow/fieldOperations.hpp
similarity index 91%
rename from utilities/postprocessPhasicFlow/fieldOperations.H
rename to utilities/postprocessPhasicFlow/fieldOperations.hpp
index 8dbc1191..e3a3dbd8 100644
--- a/utilities/postprocessPhasicFlow/fieldOperations.H
+++ b/utilities/postprocessPhasicFlow/fieldOperations.hpp
@@ -18,13 +18,13 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __fieldOperations_H__ 
-#define __fieldOperations_H__
+#ifndef __fieldOperations_hpp__ 
+#define __fieldOperations_hpp__
 
-#include "rectMeshFields.H"
-#include "pointFields.H"
-#include "pointRectCell.H"
-#include "includeMask.H"
+#include "rectMeshFields.hpp"
+#include "pointFields.hpp"
+#include "pointRectCell.hpp"
+#include "includeMask.hpp"
 
 namespace pFlow
 {
@@ -105,5 +105,5 @@ rectMeshField_H<T> sumMaksOp( const pointField_H<T> field, const pointRectCell&
 }
 
 
-#endif //__fieldOperations_H__
+#endif //__fieldOperations_hpp__
 
diff --git a/utilities/postprocessPhasicFlow/includeMask.C b/utilities/postprocessPhasicFlow/includeMask.cpp
similarity index 98%
rename from utilities/postprocessPhasicFlow/includeMask.C
rename to utilities/postprocessPhasicFlow/includeMask.cpp
index 9fdd8c14..2da4211b 100644
--- a/utilities/postprocessPhasicFlow/includeMask.C
+++ b/utilities/postprocessPhasicFlow/includeMask.cpp
@@ -19,7 +19,7 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#include "includeMask.H"
+#include "includeMask.hpp"
 
 pFlow::includeMask::includeMask(
 	const dictionary& dict,
diff --git a/utilities/postprocessPhasicFlow/includeMask.H b/utilities/postprocessPhasicFlow/includeMask.hpp
similarity index 90%
rename from utilities/postprocessPhasicFlow/includeMask.H
rename to utilities/postprocessPhasicFlow/includeMask.hpp
index 5edf3b45..795a6d84 100644
--- a/utilities/postprocessPhasicFlow/includeMask.H
+++ b/utilities/postprocessPhasicFlow/includeMask.hpp
@@ -18,12 +18,12 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __includeMask_H__
-#define __includeMask_H__
+#ifndef __includeMask_hpp__
+#define __includeMask_hpp__
 
-#include "virtualConstructor.H"
-#include "readFromTimeFolder.H"
-#include "dictionary.H"
+#include "virtualConstructor.hpp"
+#include "readFromTimeFolder.hpp"
+#include "dictionary.hpp"
 
 
 namespace pFlow
@@ -46,7 +46,7 @@ protected:
 
 public:
 
-	TypeName("includeMask");
+	TypeInfo("includeMask");
 
 	includeMask(const dictionary& dict, const word& opType, readFromTimeFolder& timeFolder);
 
@@ -102,6 +102,6 @@ public:
 
 } // pFlow
 
-#endif //__IncludeMask_H__
+#endif //__IncludeMask_hpp__
 
 
diff --git a/utilities/postprocessPhasicFlow/pointRectCell.H b/utilities/postprocessPhasicFlow/pointRectCell.hpp
similarity index 93%
rename from utilities/postprocessPhasicFlow/pointRectCell.H
rename to utilities/postprocessPhasicFlow/pointRectCell.hpp
index dc709505..203db005 100644
--- a/utilities/postprocessPhasicFlow/pointRectCell.H
+++ b/utilities/postprocessPhasicFlow/pointRectCell.hpp
@@ -18,12 +18,12 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __pointRectCell_H__
-#define __pointRectCell_H__
+#ifndef __pointRectCell_hpp__
+#define __pointRectCell_hpp__
 
-#include "mapperNBS.H"
-#include "rectMeshFields.H"
-#include "pointStructure.H"
+#include "mapperNBS.hpp"
+#include "rectMeshFields.hpp"
+#include "pointStructure.hpp"
 
 namespace pFlow
 {
@@ -146,4 +146,4 @@ public:
 
 }
 
-#endif // __pointRectCell_H__ 
+#endif // __pointRectCell_hpp__ 
diff --git a/utilities/postprocessPhasicFlow/postprocess.C b/utilities/postprocessPhasicFlow/postprocess.cpp
similarity index 96%
rename from utilities/postprocessPhasicFlow/postprocess.C
rename to utilities/postprocessPhasicFlow/postprocess.cpp
index 76e6616e..6e0fc199 100644
--- a/utilities/postprocessPhasicFlow/postprocess.C
+++ b/utilities/postprocessPhasicFlow/postprocess.cpp
@@ -18,11 +18,11 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#include "postprocess.H" 
-#include "timeFolder.H"
-#include "pointStructure.H"
-#include "vocabs.H"
-#include "vtkFile.H"
+#include "postprocess.hpp" 
+#include "timeFolder.hpp"
+#include "pointStructure.hpp"
+#include "vocabs.hpp"
+#include "vtkFile.hpp"
 
 pFlow::postprocess::postprocess(systemControl& control)
 :
diff --git a/utilities/postprocessPhasicFlow/postprocess.H b/utilities/postprocessPhasicFlow/postprocess.hpp
similarity index 90%
rename from utilities/postprocessPhasicFlow/postprocess.H
rename to utilities/postprocessPhasicFlow/postprocess.hpp
index 13d979bc..e9e5398e 100644
--- a/utilities/postprocessPhasicFlow/postprocess.H
+++ b/utilities/postprocessPhasicFlow/postprocess.hpp
@@ -18,14 +18,14 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __postprocess_H__ 
-#define __postprocess_H__
+#ifndef __postprocess_hpp__ 
+#define __postprocess_hpp__
 
 
-#include "MapPtr.H"
-#include "systemControl.H"
-#include "pointRectCell.H"
-#include "processField.H"
+#include "MapPtr.hpp"
+#include "systemControl.hpp"
+#include "pointRectCell.hpp"
+#include "processField.hpp"
 	
 
 namespace pFlow
@@ -91,4 +91,4 @@ public:
 
 
 
-#endif //__postprocess_H__
+#endif //__postprocess_hpp__
diff --git a/utilities/postprocessPhasicFlow/postprocessPhasicFlow.C b/utilities/postprocessPhasicFlow/postprocessPhasicFlow.cpp
similarity index 91%
rename from utilities/postprocessPhasicFlow/postprocessPhasicFlow.C
rename to utilities/postprocessPhasicFlow/postprocessPhasicFlow.cpp
index 1f76a425..e0c6c189 100644
--- a/utilities/postprocessPhasicFlow/postprocessPhasicFlow.C
+++ b/utilities/postprocessPhasicFlow/postprocessPhasicFlow.cpp
@@ -18,13 +18,14 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#include "systemControl.H"
-#include "timeFolder.H"
-#include "commandLine.H"
-#include "ranges.H"
-#include "readControlDict.H"
+#include "KokkosUtilities.hpp"
+#include "systemControl.hpp"
+#include "timeFolder.hpp"
+#include "commandLine.hpp"
+#include "ranges.hpp"
+#include "readControlDict.hpp"
 
-#include "postprocess.H"
+#include "postprocess.hpp"
 
 using pFlow::word;
 using pFlow::wordVector;
@@ -70,7 +71,7 @@ int main(int argc, char** argv )
 
 	if(!cmds.parse(argc, argv)) return 0;
 
-	#include "initialize_Control.H"
+	#include "initialize_Control.hpp"
 
 	
 	pFlow::postprocess post(Control);
@@ -110,7 +111,7 @@ int main(int argc, char** argv )
 
 	}while (folders++);
 
-	#include "finalize.H"
+	#include "finalize.hpp"
 
 	return true;
 }
\ No newline at end of file
diff --git a/utilities/postprocessPhasicFlow/processField.C b/utilities/postprocessPhasicFlow/processField.cpp
similarity index 96%
rename from utilities/postprocessPhasicFlow/processField.C
rename to utilities/postprocessPhasicFlow/processField.cpp
index f63232c9..e53f2f2f 100644
--- a/utilities/postprocessPhasicFlow/processField.C
+++ b/utilities/postprocessPhasicFlow/processField.cpp
@@ -18,10 +18,10 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#include "processField.H"
-#include "pointRectCell.H"
-#include "repository.H"
-#include "twoPartEntry.H"
+#include "processField.hpp"
+#include "pointRectCell.hpp"
+#include "repository.hpp"
+#include "twoPartEntry.hpp"
 
 
 pFlow::processField::processField(
diff --git a/utilities/postprocessPhasicFlow/processField.H b/utilities/postprocessPhasicFlow/processField.hpp
similarity index 91%
rename from utilities/postprocessPhasicFlow/processField.H
rename to utilities/postprocessPhasicFlow/processField.hpp
index 50a67a3c..9b4f67f6 100644
--- a/utilities/postprocessPhasicFlow/processField.H
+++ b/utilities/postprocessPhasicFlow/processField.hpp
@@ -18,15 +18,15 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __processField_H__
-#define __processField_H__
+#ifndef __processField_hpp__
+#define __processField_hpp__
 
 
-#include "virtualConstructor.H"
-#include "dictionary.H"
-#include "readFromTimeFolder.H"
-#include "includeMask.H"
-#include "pointRectCell.H"
+#include "virtualConstructor.hpp"
+#include "dictionary.hpp"
+#include "readFromTimeFolder.hpp"
+#include "includeMask.hpp"
+#include "pointRectCell.hpp"
 
 namespace pFlow
 {
@@ -66,7 +66,7 @@ protected:
 
 public:
 
-	TypeName("processField");
+	TypeInfo("processField");
 
 	processField(const dictionary& dict, pointRectCell& pToCell, repository& rep);
 
@@ -166,4 +166,4 @@ public:
 }
 
 
-#endif //__processField_H__
\ No newline at end of file
+#endif //__processField_hpp__
\ No newline at end of file
diff --git a/utilities/postprocessPhasicFlow/rectMeshField.H b/utilities/postprocessPhasicFlow/rectMeshField.hpp
similarity index 93%
rename from utilities/postprocessPhasicFlow/rectMeshField.H
rename to utilities/postprocessPhasicFlow/rectMeshField.hpp
index 1d384921..fa1be8ac 100644
--- a/utilities/postprocessPhasicFlow/rectMeshField.H
+++ b/utilities/postprocessPhasicFlow/rectMeshField.hpp
@@ -18,11 +18,11 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __rectMeshField_H__
-#define __rectMeshField_H__
+#ifndef __rectMeshField_hpp__
+#define __rectMeshField_hpp__
 
-#include "rectangleMesh.H"
-#include "baseAlgorithms.H"
+#include "rectangleMesh.hpp"
+#include "baseAlgorithms.hpp"
 
 namespace pFlow
 {
@@ -54,7 +54,7 @@ protected:
 public:
 
 
-	TypeNameTemplateNV2("rectMeshField", T, memoerySpaceName());
+	TypeInfoTemplateNV2("rectMeshField", T, memoerySpaceName());
 	
 	rectMeshField(const rectangleMesh& mesh, const word& name ,const T& defVal)
 	:
@@ -170,4 +170,4 @@ public:
 }
 
 
-#endif // __rectMeshField_H__
+#endif // __rectMeshField_hpp__
diff --git a/utilities/postprocessPhasicFlow/rectMeshFieldToVTK.H b/utilities/postprocessPhasicFlow/rectMeshFieldToVTK.hpp
similarity index 96%
rename from utilities/postprocessPhasicFlow/rectMeshFieldToVTK.H
rename to utilities/postprocessPhasicFlow/rectMeshFieldToVTK.hpp
index c0c42f66..6219bdff 100644
--- a/utilities/postprocessPhasicFlow/rectMeshFieldToVTK.H
+++ b/utilities/postprocessPhasicFlow/rectMeshFieldToVTK.hpp
@@ -18,8 +18,8 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __rectMeshFieldToVTK_H__
-#define __rectMeshFieldToVTK_H__
+#ifndef __rectMeshFieldToVTK_hpp__
+#define __rectMeshFieldToVTK_hpp__
 
 
 namespace pFlow
diff --git a/utilities/postprocessPhasicFlow/rectMeshFields.H b/utilities/postprocessPhasicFlow/rectMeshFields.hpp
similarity index 91%
rename from utilities/postprocessPhasicFlow/rectMeshFields.H
rename to utilities/postprocessPhasicFlow/rectMeshFields.hpp
index 2e57cba4..64b0a625 100644
--- a/utilities/postprocessPhasicFlow/rectMeshFields.H
+++ b/utilities/postprocessPhasicFlow/rectMeshFields.hpp
@@ -18,10 +18,10 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __rectMeshFields_H__
-#define __rectMeshFields_H__
+#ifndef __rectMeshFields_hpp__
+#define __rectMeshFields_hpp__
 
-#include "rectMeshField.H"
+#include "rectMeshField.hpp"
 
 namespace pFlow
 {
@@ -42,4 +42,4 @@ using realx3RectMeshField_H	= rectMeshField<realx3, HostSpace>;
 }
 
 
-#endif // __rectMeshFields_H__
+#endif // __rectMeshFields_hpp__
diff --git a/utilities/postprocessPhasicFlow/rectangleMesh.H b/utilities/postprocessPhasicFlow/rectangleMesh.hpp
similarity index 95%
rename from utilities/postprocessPhasicFlow/rectangleMesh.H
rename to utilities/postprocessPhasicFlow/rectangleMesh.hpp
index cf766267..fded02a2 100644
--- a/utilities/postprocessPhasicFlow/rectangleMesh.H
+++ b/utilities/postprocessPhasicFlow/rectangleMesh.hpp
@@ -18,10 +18,10 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __rectangleMesh_H__
-#define __rectangleMesh_H__
+#ifndef __rectangleMesh_hpp__
+#define __rectangleMesh_hpp__
 
-#include "cells.H"
+#include "cells.hpp"
 
 namespace pFlow
 {
@@ -35,7 +35,7 @@ class rectangleMesh
 	
 public:
 
-	TypeNameNV("rectangleMesh");
+	TypeInfoNV("rectangleMesh");
 	
 
 	INLINE_FUNCTION_HD
@@ -159,4 +159,4 @@ public:
 }
 
 
-#endif // __rectangleMesh_H__
+#endif // __rectangleMesh_hpp__