diff --git a/Makefile.am b/Makefile.am
index 0826e28d09f4b4de76aced26716922aecdeb6e71..8f566c448e7e18782a6965eecccb595c309ca5e6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,8 +27,8 @@ if ENABLE_LEGACY
 libelpa@SUFFIX@_public_la_SOURCES += \
   src/elpa_driver/legacy_interface/elpa.F90 \
   src/elpa1/legacy_interface/elpa1.F90 \
-  src/elpa2/legacy_interface/elpa2_legacy.F90 \
-  src/elpa2/legacy_interface/elpa2_utilities_legacy.F90 \
+  src/elpa2/legacy_interface/elpa2.F90 \
+  src/elpa2/legacy_interface/elpa2_utilities.F90 \
   src/elpa1/legacy_interface/elpa1_auxiliary.F90
 endif
 
@@ -67,7 +67,7 @@ if ENABLE_LEGACY
 libelpa@SUFFIX@_private_la_SOURCES += \
   src/elpa_driver/legacy_interface/elpa_driver_c_interface.F90 \
   src/elpa1/legacy_interface/elpa_1stage_c_interface.F90 \
-  src/elpa2/legacy_interface/elpa_2stage_c_interface_legacy.F90
+  src/elpa2/legacy_interface/elpa_2stage_c_interface.F90
 endif
 
 EXTRA_libelpa@SUFFIX@_private_la_DEPENDENCIES = \
@@ -101,9 +101,9 @@ EXTRA_libelpa@SUFFIX@_private_la_DEPENDENCIES = \
 if ENABLE_LEGACY
 EXTRA_libelpa@SUFFIX@_private_la_DEPENDENCIES += \
   src/elpa1/legacy_interface/elpa1_template.X90 \
-  src/elpa2/legacy_interface/elpa2_template_legacy.X90 \
+  src/elpa2/legacy_interface/elpa2_template.X90 \
   src/elpa1/legacy_interface/elpa1_c_interface_template.X90 \
-  src/elpa2/legacy_interface/elpa2_c_interface_template_legacy.X90 \
+  src/elpa2/legacy_interface/elpa2_c_interface_template.X90 \
   src/elpa_driver/legacy_interface/elpa_driver_c_interface_template.X90 \
   src/elpa1/legacy_interface/elpa_solve_tridi_c_interface_template.X90 \
   src/elpa1/legacy_interface/elpa_mult_at_b_c_interface_template.X90 \
@@ -1231,11 +1231,11 @@ EXTRA_DIST = \
 
 if ENABLE_LEGACY
 EXTRA_DIST += \
-  src/elpa1/elpa1_solve_tridi_real_template_legacy.X90 \
+  src/elpa1/elpa1_solve_tridi_real_template.X90 \
   src/elpa1/legacy_interface/elpa1_template.X90 \
-  src/elpa2/legacy_interface/elpa2_template_legacy.X90 \
+  src/elpa2/legacy_interface/elpa2_template.X90 \
   src/elpa1/legacy_interface/elpa1_c_interface_template.X90 \
-  src/elpa2/legacy_interface/elpa2_c_interface_template_legacy.X90 \
+  src/elpa2/legacy_interface/elpa2_c_interface_template.X90 \
   src/elpa_driver/legacy_interface/elpa_driver_c_interface_template.X90 \
   src/elpa1/legacy_interface/elpa_solve_tridi_c_interface_template.X90 \
   src/elpa1/legacy_interface/elpa_mult_at_b_c_interface_template.X90 \
diff --git a/generated_headers.am b/generated_headers.am
index 311ea255c19a55b7e31f726ab724a141a0255b0f..0ef3eca7b05219342270f875919fc2bf7b9ee2ee 100644
--- a/generated_headers.am
+++ b/generated_headers.am
@@ -15,7 +15,7 @@ config-f90.h: config.h
 
 elpa/elpa_generated.h: $(top_srcdir)/src/elpa_driver/legacy_interface/elpa_driver_c_interface.F90 \
                        $(top_srcdir)/src/elpa1/legacy_interface/elpa_1stage_c_interface.F90 \
-                       $(top_srcdir)/src/elpa2/legacy_interface/elpa_2stage_c_interface_legacy.F90 | elpa
+                       $(top_srcdir)/src/elpa2/legacy_interface/elpa_2stage_c_interface.F90 | elpa
 	@rm -f $@
 	$(call extract_interface,!c>)
 
diff --git a/src/elpa2/legacy_interface/elpa2_legacy.F90 b/src/elpa2/legacy_interface/elpa2.F90
similarity index 99%
rename from src/elpa2/legacy_interface/elpa2_legacy.F90
rename to src/elpa2/legacy_interface/elpa2.F90
index fe4eb4c9be2d60b1a802c650f23ae0fb64dc84c5..8b4cba848651526877cc5ba3235d33c61b36c33a 100644
--- a/src/elpa2/legacy_interface/elpa2_legacy.F90
+++ b/src/elpa2/legacy_interface/elpa2.F90
@@ -395,7 +395,7 @@ module elpa2
 !>
 !>  \result success                             logical, false if error occured
 !-------------------------------------------------------------------------------
-#include "./elpa2_template_legacy.X90"
+#include "./elpa2_template.X90"
 #undef REALCASE
 #undef DOUBLE_PRECISION
 
@@ -443,7 +443,7 @@ module elpa2
 !>
 !>  \result success                             logical, false if error occured
 !-------------------------------------------------------------------------------
-#include "./elpa2_template_legacy.X90"
+#include "./elpa2_template.X90"
 #undef REALCASE
 #undef SINGLE_PRECISION
 
@@ -489,7 +489,7 @@ module elpa2
 !>
 !>  \result success                             logical, false if error occured
 !-------------------------------------------------------------------------------
-#include "./elpa2_template_legacy.X90"
+#include "./elpa2_template.X90"
 #undef COMPLEXCASE
 #undef DOUBLE_PRECISION
 
@@ -536,7 +536,7 @@ module elpa2
 !>
 !>  \result success                             logical, false if error occured
 !-------------------------------------------------------------------------------
-#include "./elpa2_template_legacy.X90"
+#include "./elpa2_template.X90"
 #undef COMPLEXCASE
 #undef SINGLE_PRECISION
 
diff --git a/src/elpa2/legacy_interface/elpa2_c_interface_template_legacy.X90 b/src/elpa2/legacy_interface/elpa2_c_interface_template.X90
similarity index 100%
rename from src/elpa2/legacy_interface/elpa2_c_interface_template_legacy.X90
rename to src/elpa2/legacy_interface/elpa2_c_interface_template.X90
diff --git a/src/elpa2/legacy_interface/elpa2_template_legacy.X90 b/src/elpa2/legacy_interface/elpa2_template.X90
similarity index 100%
rename from src/elpa2/legacy_interface/elpa2_template_legacy.X90
rename to src/elpa2/legacy_interface/elpa2_template.X90
diff --git a/src/elpa2/legacy_interface/elpa2_utilities_legacy.F90 b/src/elpa2/legacy_interface/elpa2_utilities.F90
similarity index 100%
rename from src/elpa2/legacy_interface/elpa2_utilities_legacy.F90
rename to src/elpa2/legacy_interface/elpa2_utilities.F90
diff --git a/src/elpa2/legacy_interface/elpa_2stage_c_interface_legacy.F90 b/src/elpa2/legacy_interface/elpa_2stage_c_interface.F90
similarity index 98%
rename from src/elpa2/legacy_interface/elpa_2stage_c_interface_legacy.F90
rename to src/elpa2/legacy_interface/elpa_2stage_c_interface.F90
index f1c09433dd332cd7d934a78227a935111a2a52fc..7487030d4707ac0eee4d839d67b7bc5fc8aa2966 100644
--- a/src/elpa2/legacy_interface/elpa_2stage_c_interface_legacy.F90
+++ b/src/elpa2/legacy_interface/elpa_2stage_c_interface.F90
@@ -80,7 +80,7 @@
 #endif
 
 #include "../../general/precision_macros.h"
-#include "./elpa2_c_interface_template_legacy.X90"
+#include "./elpa2_c_interface_template.X90"
 #undef DOUBLE_PRECISION
 #undef REALCASE
 
@@ -125,7 +125,7 @@
 #endif
 
 #include "../../general/precision_macros.h"
-#include "./elpa2_c_interface_template_legacy.X90"
+#include "./elpa2_c_interface_template.X90"
 #undef DOUBLE_PRECISION
 #undef SINGLE_PRECISION
 #undef REALCASE
@@ -171,7 +171,7 @@
 #endif
 
 #include "../../general/precision_macros.h"
-#include "./elpa2_c_interface_template_legacy.X90"
+#include "./elpa2_c_interface_template.X90"
 #undef DOUBLE_PRECISION
 #undef COMPLEXCASE
 
@@ -216,7 +216,7 @@
 #endif
 
 #include "../../general/precision_macros.h"
-#include "./elpa2_c_interface_template_legacy.X90"
+#include "./elpa2_c_interface_template.X90"
 #undef DOUBLE_PRECISION
 #undef SINGLE_PRECISION
 #undef COMPLEXCASE