diff --git a/src/Marc/DAMASK_Marc.f90 b/src/Marc/DAMASK_Marc.f90
index 6f34f5354..84af46996 100644
--- a/src/Marc/DAMASK_Marc.f90
+++ b/src/Marc/DAMASK_Marc.f90
@@ -20,7 +20,7 @@
 #include "../parallelization.f90"
 #include "../misc.f90"
 #include "../IO.f90"
-#include "../YAML_types.f90"
+#include "../types.f90"
 #include "../YAML_parse.f90"
 #include "../HDF5_utilities.f90"
 
@@ -187,7 +187,7 @@ subroutine hypela2(d,g,e,de,s,t,dt,ngens,m,nn,kcus,matus,ndi,nshear,disp, &
   use prec
   use DAMASK_interface
   use config
-  use YAML_types
+  use types
   use discretization_Marc
   use homogenization
   use materialpoint_Marc
diff --git a/src/Marc/materialpoint_Marc.f90 b/src/Marc/materialpoint_Marc.f90
index f0040cba2..37c5ff02e 100644
--- a/src/Marc/materialpoint_Marc.f90
+++ b/src/Marc/materialpoint_Marc.f90
@@ -7,7 +7,7 @@ module materialpoint_Marc
   use DAMASK_interface
   use prec
   use IO
-  use YAML_types
+  use types
   use YAML_parse
   use HDF5_utilities
   use result
@@ -70,7 +70,7 @@ subroutine materialpoint_initAll()
   call DAMASK_interface_init()
   call prec_init()
   call IO_init()
-  call YAML_types_init()
+  call types_init()
   call YAML_parse_init()
   call HDF5_utilities_init()
   call result_init(.false.)
diff --git a/src/YAML_parse.f90 b/src/YAML_parse.f90
index 74d9ab083..af6e89669 100644
--- a/src/YAML_parse.f90
+++ b/src/YAML_parse.f90
@@ -8,7 +8,7 @@ module YAML_parse
   use prec
   use misc
   use IO
-  use YAML_types
+  use types
 #ifdef FYAML
   use system_routines
 #endif
diff --git a/src/config.f90 b/src/config.f90
index 0d7b9e385..04cb2d635 100644
--- a/src/config.f90
+++ b/src/config.f90
@@ -6,7 +6,7 @@ module config
   use IO
   use misc
   use YAML_parse
-  use YAML_types
+  use types
   use result
   use parallelization
 #if   defined(MESH) || defined(GRID)
diff --git a/src/grid/grid_damage_spectral.f90 b/src/grid/grid_damage_spectral.f90
index 6b53c0a75..fd87d6593 100644
--- a/src/grid/grid_damage_spectral.f90
+++ b/src/grid/grid_damage_spectral.f90
@@ -23,7 +23,7 @@ module grid_damage_spectral
   use spectral_utilities
   use discretization_grid
   use homogenization
-  use YAML_types
+  use types
   use config
 
 #if (PETSC_VERSION_MAJOR==3 && PETSC_VERSION_MINOR>14) && !defined(PETSC_HAVE_MPI_F90MODULE_VISIBILITY)
diff --git a/src/grid/grid_thermal_spectral.f90 b/src/grid/grid_thermal_spectral.f90
index cc4b89afb..e987d7779 100644
--- a/src/grid/grid_thermal_spectral.f90
+++ b/src/grid/grid_thermal_spectral.f90
@@ -23,7 +23,7 @@ module grid_thermal_spectral
   use spectral_utilities
   use discretization_grid
   use homogenization
-  use YAML_types
+  use types
   use config
   use constants
 
diff --git a/src/material.f90 b/src/material.f90
index 82345fb1e..9310fb0d8 100644
--- a/src/material.f90
+++ b/src/material.f90
@@ -12,7 +12,7 @@ module material
   use IO
   use rotations
   use discretization
-  use YAML_types
+  use types
 
   implicit none(type,external)
   private
diff --git a/src/materialpoint.f90 b/src/materialpoint.f90
index 808cec146..d933d6f76 100644
--- a/src/materialpoint.f90
+++ b/src/materialpoint.f90
@@ -11,7 +11,7 @@ module materialpoint
   use prec
   use misc
   use IO
-  use YAML_types
+  use types
   use YAML_parse
   use HDF5
   use HDF5_utilities
@@ -57,7 +57,7 @@ subroutine materialpoint_initAll()
 #elif defined(GRID)
    call base64_init()
 #endif
-  call YAML_types_init()
+  call types_init()
   call YAML_parse_init()
   call HDF5_utilities_init()
   call result_init(restart=CLI_restartInc>0)
diff --git a/src/math.f90 b/src/math.f90
index 863661c2c..ec97846c0 100644
--- a/src/math.f90
+++ b/src/math.f90
@@ -10,7 +10,7 @@ module math
   use misc
   use IO
   use config
-  use YAML_types
+  use types
   use parallelization
   use LAPACK_interface
 
diff --git a/src/mesh/discretization_mesh.f90 b/src/mesh/discretization_mesh.f90
index 22eb6147f..f10c87789 100644
--- a/src/mesh/discretization_mesh.f90
+++ b/src/mesh/discretization_mesh.f90
@@ -22,7 +22,7 @@ module discretization_mesh
   use discretization
   use result
   use FEM_quadrature
-  use YAML_types
+  use types
   use prec
 
 #if (PETSC_VERSION_MAJOR==3 && PETSC_VERSION_MINOR>14) && !defined(PETSC_HAVE_MPI_F90MODULE_VISIBILITY)
diff --git a/src/polynomials.f90 b/src/polynomials.f90
index 3bbe5f28f..6f7855309 100644
--- a/src/polynomials.f90
+++ b/src/polynomials.f90
@@ -6,7 +6,7 @@ module polynomials
   use prec
   use IO
   use YAML_parse
-  use YAML_types
+  use types
 
   implicit none(type,external)
   private
diff --git a/src/tables.f90 b/src/tables.f90
index c067492d3..d8ba4f349 100644
--- a/src/tables.f90
+++ b/src/tables.f90
@@ -7,7 +7,7 @@ module tables
   use prec
   use IO
   use YAML_parse
-  use YAML_types
+  use types
 
   implicit none(type,external)
   private
diff --git a/src/test/DAMASK_test.f90 b/src/test/DAMASK_test.f90
index 7b35174e1..d66826c1a 100644
--- a/src/test/DAMASK_test.f90
+++ b/src/test/DAMASK_test.f90
@@ -13,7 +13,7 @@ program DAMASK_test
   use test_crystal
   use test_rotations
   use test_IO
-  use test_YAML_types
+  use test_types
   use test_HDF5_utilities
 
   external :: quit
@@ -63,8 +63,8 @@ program DAMASK_test
   call test_IO_run()
   write(IO_STDOUT,fmt='(a)') ok
 
-  write(IO_STDOUT,fmt=fmt, advance='no') 'YAML_types','...'
-  call test_YAML_types_run()
+  write(IO_STDOUT,fmt=fmt, advance='no') 'types','...'
+  call test_types_run()
   write(IO_STDOUT,fmt='(a)') ok
 
   write(IO_STDOUT,fmt=fmt, advance='no') 'HDF5_utilities','...'
diff --git a/src/test/test_YAML_types.f90 b/src/test/test_YAML_types.f90
deleted file mode 100644
index 4c337afb1..000000000
--- a/src/test/test_YAML_types.f90
+++ /dev/null
@@ -1,17 +0,0 @@
-module test_YAML_types
-  use YAML_types
-
-  implicit none(type,external)
-
-  private
-  public :: test_YAML_types_run
-
-  contains
-
-subroutine test_YAML_types_run()
-
-  call YAML_types_selfTest()
-
-end subroutine test_YAML_types_run
-
-end module test_YAML_types
diff --git a/src/test/test_types.f90 b/src/test/test_types.f90
new file mode 100644
index 000000000..7eb61a738
--- /dev/null
+++ b/src/test/test_types.f90
@@ -0,0 +1,17 @@
+module test_types
+  use types
+
+  implicit none(type,external)
+
+  private
+  public :: test_types_run
+
+  contains
+
+subroutine test_types_run()
+
+  call types_selfTest()
+
+end subroutine test_types_run
+
+end module test_types
diff --git a/src/YAML_types.f90 b/src/types.f90
similarity index 99%
rename from src/YAML_types.f90
rename to src/types.f90
index 1db64eeeb..bfb788612 100644
--- a/src/YAML_types.f90
+++ b/src/types.f90
@@ -7,7 +7,7 @@
 !! to a node.
 !--------------------------------------------------------------------------------------------------
 
-module YAML_types
+module types
   use IO
   use prec
   use misc
@@ -152,8 +152,8 @@ module YAML_types
   end interface assignment (=)
 
   public :: &
-    YAML_types_init, &
-    YAML_types_selfTest, &
+    types_init, &
+    types_selfTest, &
 #ifdef __GFORTRAN__
     output_as1dStr, &                                       !ToDo: Hack for GNU. Remove later
 #endif
@@ -164,19 +164,19 @@ contains
 !--------------------------------------------------------------------------------------------------
 !> @brief Do sanity checks.
 !--------------------------------------------------------------------------------------------------
-subroutine YAML_types_init
+subroutine types_init
 
-  print'(/,1x,a)', '<<<+-  YAML_types init  -+>>>'
+  print'(/,1x,a)', '<<<+-  types init  -+>>>'
 
-  call YAML_types_selfTest()
+  call types_selfTest()
 
-end subroutine YAML_types_init
+end subroutine types_init
 
 
 !--------------------------------------------------------------------------------------------------
 !> @brief Check correctness of some type bound procedures.
 !--------------------------------------------------------------------------------------------------
-subroutine YAML_types_selfTest()
+subroutine types_selfTest()
 
   scalar: block
     type(tScalar), target :: s
@@ -315,7 +315,7 @@ subroutine YAML_types_selfTest()
   end block dict_get_as1dReal_shape
 #endif
 
-end subroutine YAML_types_selfTest
+end subroutine types_selfTest
 
 
 !---------------------------------------------------------------------------------------------------
@@ -1504,4 +1504,4 @@ recursive subroutine tItem_finalize(self)
 
 end subroutine tItem_finalize
 
-end module YAML_types
+end module types