diff --git a/src/dbcsr_lib/dbcsr_message_passing__nametype1_.template b/src/dbcsr_lib/dbcsr_message_passing__nametype1_.template
index 977ef16184..653ae0d92c 100644
--- a/src/dbcsr_lib/dbcsr_message_passing__nametype1_.template
+++ b/src/dbcsr_lib/dbcsr_message_passing__nametype1_.template
@@ -2015,7 +2015,7 @@
     IF (ierr .ne. 0) CALL mp_abort("mpi_file_write_at_[nametype1]v @ "//routineN)
     DEALLOCATE(status)
 #else
-    WRITE(UNIT=fh, POS=offset+1) msg(1:msglen)
+    WRITE(UNIT=fh, POS=offset+1) msg(1:msg_len)
 #endif
   END SUBROUTINE mp_file_write_at_[nametype1]v
 
@@ -2157,7 +2157,7 @@
     IF (ierr .ne. 0) CALL mp_abort("mpi_file_read_at_all_[nametype1]v @ "//routineN)
     DEALLOCATE(status)
 #else
-    READ(UNIT=fh, POS=offset+1) msg(1:msglen)
+    READ(UNIT=fh, POS=offset+1) msg(1:msg_len)
 #endif
   END SUBROUTINE mp_file_read_at_all_[nametype1]v
 
diff --git a/src/dbcsr_lib/dbcsr_message_passing_c.F b/src/dbcsr_lib/dbcsr_message_passing_c.F
index 37b8dbd2b9..5086eee3a9 100644
--- a/src/dbcsr_lib/dbcsr_message_passing_c.F
+++ b/src/dbcsr_lib/dbcsr_message_passing_c.F
@@ -2015,7 +2015,7 @@
     IF (ierr .NE. 0) CALL mp_abort("mpi_file_write_at_cv @ "//routineN)
     DEALLOCATE(status)
 #else
-    WRITE(UNIT=fh, POS=offset+1) msg(1:msglen)
+    WRITE(UNIT=fh, POS=offset+1) msg(1:msg_len)
 #endif
   END SUBROUTINE mp_file_write_at_cv
 
@@ -2157,7 +2157,7 @@
     IF (ierr .NE. 0) CALL mp_abort("mpi_file_read_at_all_cv @ "//routineN)
     DEALLOCATE(status)
 #else
-    READ(UNIT=fh, POS=offset+1) msg(1:msglen)
+    READ(UNIT=fh, POS=offset+1) msg(1:msg_len)
 #endif
   END SUBROUTINE mp_file_read_at_all_cv
 
diff --git a/src/dbcsr_lib/dbcsr_message_passing_d.F b/src/dbcsr_lib/dbcsr_message_passing_d.F
index 063eb61491..a5118bb0ca 100644
--- a/src/dbcsr_lib/dbcsr_message_passing_d.F
+++ b/src/dbcsr_lib/dbcsr_message_passing_d.F
@@ -2015,7 +2015,7 @@
     IF (ierr .NE. 0) CALL mp_abort("mpi_file_write_at_dv @ "//routineN)
     DEALLOCATE(status)
 #else
-    WRITE(UNIT=fh, POS=offset+1) msg(1:msglen)
+    WRITE(UNIT=fh, POS=offset+1) msg(1:msg_len)
 #endif
   END SUBROUTINE mp_file_write_at_dv
 
@@ -2157,7 +2157,7 @@
     IF (ierr .NE. 0) CALL mp_abort("mpi_file_read_at_all_dv @ "//routineN)
     DEALLOCATE(status)
 #else
-    READ(UNIT=fh, POS=offset+1) msg(1:msglen)
+    READ(UNIT=fh, POS=offset+1) msg(1:msg_len)
 #endif
   END SUBROUTINE mp_file_read_at_all_dv
 
diff --git a/src/dbcsr_lib/dbcsr_message_passing_i.F b/src/dbcsr_lib/dbcsr_message_passing_i.F
index 43b54a7cf9..5c1aa55aec 100644
--- a/src/dbcsr_lib/dbcsr_message_passing_i.F
+++ b/src/dbcsr_lib/dbcsr_message_passing_i.F
@@ -2015,7 +2015,7 @@
     IF (ierr .NE. 0) CALL mp_abort("mpi_file_write_at_iv @ "//routineN)
     DEALLOCATE(status)
 #else
-    WRITE(UNIT=fh, POS=offset+1) msg(1:msglen)
+    WRITE(UNIT=fh, POS=offset+1) msg(1:msg_len)
 #endif
   END SUBROUTINE mp_file_write_at_iv
 
@@ -2157,7 +2157,7 @@
     IF (ierr .NE. 0) CALL mp_abort("mpi_file_read_at_all_iv @ "//routineN)
     DEALLOCATE(status)
 #else
-    READ(UNIT=fh, POS=offset+1) msg(1:msglen)
+    READ(UNIT=fh, POS=offset+1) msg(1:msg_len)
 #endif
   END SUBROUTINE mp_file_read_at_all_iv
 
diff --git a/src/dbcsr_lib/dbcsr_message_passing_l.F b/src/dbcsr_lib/dbcsr_message_passing_l.F
index d6aeaa9699..9a16a8c413 100644
--- a/src/dbcsr_lib/dbcsr_message_passing_l.F
+++ b/src/dbcsr_lib/dbcsr_message_passing_l.F
@@ -2015,7 +2015,7 @@
     IF (ierr .NE. 0) CALL mp_abort("mpi_file_write_at_lv @ "//routineN)
     DEALLOCATE(status)
 #else
-    WRITE(UNIT=fh, POS=offset+1) msg(1:msglen)
+    WRITE(UNIT=fh, POS=offset+1) msg(1:msg_len)
 #endif
   END SUBROUTINE mp_file_write_at_lv
 
@@ -2157,7 +2157,7 @@
     IF (ierr .NE. 0) CALL mp_abort("mpi_file_read_at_all_lv @ "//routineN)
     DEALLOCATE(status)
 #else
-    READ(UNIT=fh, POS=offset+1) msg(1:msglen)
+    READ(UNIT=fh, POS=offset+1) msg(1:msg_len)
 #endif
   END SUBROUTINE mp_file_read_at_all_lv
 
diff --git a/src/dbcsr_lib/dbcsr_message_passing_r.F b/src/dbcsr_lib/dbcsr_message_passing_r.F
index 85589a8e4e..2c7b222eb8 100644
--- a/src/dbcsr_lib/dbcsr_message_passing_r.F
+++ b/src/dbcsr_lib/dbcsr_message_passing_r.F
@@ -2015,7 +2015,7 @@
     IF (ierr .NE. 0) CALL mp_abort("mpi_file_write_at_rv @ "//routineN)
     DEALLOCATE(status)
 #else
-    WRITE(UNIT=fh, POS=offset+1) msg(1:msglen)
+    WRITE(UNIT=fh, POS=offset+1) msg(1:msg_len)
 #endif
   END SUBROUTINE mp_file_write_at_rv
 
@@ -2157,7 +2157,7 @@
     IF (ierr .NE. 0) CALL mp_abort("mpi_file_read_at_all_rv @ "//routineN)
     DEALLOCATE(status)
 #else
-    READ(UNIT=fh, POS=offset+1) msg(1:msglen)
+    READ(UNIT=fh, POS=offset+1) msg(1:msg_len)
 #endif
   END SUBROUTINE mp_file_read_at_all_rv
 
diff --git a/src/dbcsr_lib/dbcsr_message_passing_z.F b/src/dbcsr_lib/dbcsr_message_passing_z.F
index 7ebfd5e0b3..f111a3353e 100644
--- a/src/dbcsr_lib/dbcsr_message_passing_z.F
+++ b/src/dbcsr_lib/dbcsr_message_passing_z.F
@@ -2015,7 +2015,7 @@
     IF (ierr .NE. 0) CALL mp_abort("mpi_file_write_at_zv @ "//routineN)
     DEALLOCATE(status)
 #else
-    WRITE(UNIT=fh, POS=offset+1) msg(1:msglen)
+    WRITE(UNIT=fh, POS=offset+1) msg(1:msg_len)
 #endif
   END SUBROUTINE mp_file_write_at_zv
 
@@ -2157,7 +2157,7 @@
     IF (ierr .NE. 0) CALL mp_abort("mpi_file_read_at_all_zv @ "//routineN)
     DEALLOCATE(status)
 #else
-    READ(UNIT=fh, POS=offset+1) msg(1:msglen)
+    READ(UNIT=fh, POS=offset+1) msg(1:msg_len)
 #endif
   END SUBROUTINE mp_file_read_at_all_zv