--- a/LibDBlasLxF77.def.m2pp
+++ b/LibDBlasLxF77.def.m2pp
@@ -46,9 +46,9 @@
   (* Licence : GNU Lesser General Public License (LGPL)                     *)
   (*------------------------------------------------------------------------*)
 
-  (* $Id: LibDBlasLxF77.def.m2pp,v 1.4 2018/09/12 13:20:49 mriedl Exp mriedl $ *)
-
-FROM LibDBlasL1F77 IMPORT CHAR1,INTEGER4,REAL4,DOUBLEPRECISION,DOUBLECOMPLEX;
+  (* $Id: LibDBlasLxF77.def.m2pp,v 1.5 2019/02/01 22:24:03 mriedl Exp mriedl $ *)
+
+FROM LibDBlasL1F77 IMPORT CHAR1,INTEGER4,REAL4,REAL8,COMPLEX16;
 
 <* IF (__XDS__) THEN *>
 CONST Version = "LibDBlasLxF77 for XDS Modula-2";
@@ -62,13 +62,13 @@
 
 PROCEDURE dgemv_(VAR Trans : CHAR1; 
                  VAR M,N   : INTEGER4;
-                 VAR Alpha : DOUBLEPRECISION;
-                 VAR A     : (* ARRAY OF ARRAY OF *) DOUBLEPRECISION;
-                 VAR lda   : INTEGER4;
-                 VAR X     : (* ARRAY OF *) DOUBLEPRECISION;
+                 VAR Alpha : REAL8;
+                 VAR A     : (* ARRAY OF ARRAY OF *) REAL8;
+                 VAR lda   : INTEGER4;
+                 VAR X     : (* ARRAY OF *) REAL8;
                  VAR IncX  : INTEGER4;
-                 VAR Beta  : DOUBLEPRECISION;
-                 VAR Y     : (* ARRAY OF *) DOUBLEPRECISION;
+                 VAR Beta  : REAL8;
+                 VAR Y     : (* ARRAY OF *) REAL8;
                  VAR IncY  : INTEGER4);
 
           (*----------------------------------------------------------------*)
@@ -85,13 +85,13 @@
 
 PROCEDURE zgemv_(VAR Trans : CHAR1; 
                  VAR M,N   : INTEGER4;
-                 VAR Alpha : DOUBLECOMPLEX;
-                 VAR A     : (* ARRAY OF ARRAY OF *) DOUBLECOMPLEX;
-                 VAR lda   : INTEGER4;
-                 VAR X     : (* ARRAY OF *) DOUBLECOMPLEX;
+                 VAR Alpha : COMPLEX16;
+                 VAR A     : (* ARRAY OF ARRAY OF *) COMPLEX16;
+                 VAR lda   : INTEGER4;
+                 VAR X     : (* ARRAY OF *) COMPLEX16;
                  VAR IncX  : INTEGER4;
-                 VAR Beta  : DOUBLECOMPLEX;
-                 VAR Y     : (* ARRAY OF *) DOUBLECOMPLEX;
+                 VAR Beta  : COMPLEX16;
+                 VAR Y     : (* ARRAY OF *) COMPLEX16;
                  VAR IncY  : INTEGER4);
 
           (*----------------------------------------------------------------*)
@@ -127,13 +127,13 @@
 PROCEDURE dgemm_(VAR TA    : CHAR1;
                  VAR TB    : CHAR1;
                  VAR M,N,K : INTEGER4;
-                 VAR Alpha : DOUBLEPRECISION;
-                 VAR A     : (* ARRAY OF ARRAY OF *) DOUBLEPRECISION;
-                 VAR lda   : INTEGER4;
-                 VAR B     : (* ARRAY OF ARRAY OF *) DOUBLEPRECISION;
+                 VAR Alpha : REAL8;
+                 VAR A     : (* ARRAY OF ARRAY OF *) REAL8;
+                 VAR lda   : INTEGER4;
+                 VAR B     : (* ARRAY OF ARRAY OF *) REAL8;
                  VAR ldb   : INTEGER4;
-                 VAR Beta  : DOUBLEPRECISION;
-                 VAR C     : (* ARRAY OF ARRAY OF *) DOUBLEPRECISION;
+                 VAR Beta  : REAL8;
+                 VAR C     : (* ARRAY OF ARRAY OF *) REAL8;
                  VAR ldc   : INTEGER4);
 
           (*----------------------------------------------------------------*)
@@ -150,13 +150,13 @@
 PROCEDURE dgemmomp(VAR TA    : CHAR1;
                    VAR TB    : CHAR1;
                    VAR M,N,K : INTEGER4;
-                   VAR Alpha : DOUBLEPRECISION;
-                   VAR A     : (* ARRAY OF ARRAY OF *) DOUBLEPRECISION;
+                   VAR Alpha : REAL8;
+                   VAR A     : (* ARRAY OF ARRAY OF *) REAL8;
                    VAR lda   : INTEGER4;
-                   VAR B     : (* ARRAY OF ARRAY OF *) DOUBLEPRECISION;
+                   VAR B     : (* ARRAY OF ARRAY OF *) REAL8;
                    VAR ldb   : INTEGER4;
-                   VAR Beta  : DOUBLEPRECISION;
-                   VAR C     : (* ARRAY OF ARRAY OF *) DOUBLEPRECISION;
+                   VAR Beta  : REAL8;
+                   VAR C     : (* ARRAY OF ARRAY OF *) REAL8;
                    VAR ldc   : INTEGER4);
 
           (*----------------------------------------------------------------*)
@@ -182,13 +182,13 @@
 PROCEDURE dgemmomp2(VAR TA    : CHAR1;
                     VAR TB    : CHAR1;
                     VAR M,N,K : INTEGER4;
-                    VAR Alpha : DOUBLEPRECISION;
-                    VAR A     : (* ARRAY OF ARRAY OF *) DOUBLEPRECISION;
+                    VAR Alpha : REAL8;
+                    VAR A     : (* ARRAY OF ARRAY OF *) REAL8;
                     VAR lda   : INTEGER4;
-                    VAR B     : (* ARRAY OF ARRAY OF *) DOUBLEPRECISION;
+                    VAR B     : (* ARRAY OF ARRAY OF *) REAL8;
                     VAR ldb   : INTEGER4;
-                    VAR Beta  : DOUBLEPRECISION;
-                    VAR C     : (* ARRAY OF ARRAY OF *) DOUBLEPRECISION;
+                    VAR Beta  : REAL8;
+                    VAR C     : (* ARRAY OF ARRAY OF *) REAL8;
                     VAR ldc   : INTEGER4);
           (*----------------------------------------------------------------*)
           (* Another OMP parallel version of dgemm (experimental)           *)
@@ -197,13 +197,13 @@
 PROCEDURE zgemm_(VAR TA    : CHAR1;
                  VAR TB    : CHAR1;
                  VAR M,N,K : INTEGER4;
-                 VAR Alpha : DOUBLECOMPLEX;
-                 VAR A     : (* ARRAY OF ARRAY OF *) DOUBLECOMPLEX;
-                 VAR lda   : INTEGER4;
-                 VAR B     : (* ARRAY OF ARRAY OF *) DOUBLECOMPLEX;
+                 VAR Alpha : COMPLEX16;
+                 VAR A     : (* ARRAY OF ARRAY OF *) COMPLEX16;
+                 VAR lda   : INTEGER4;
+                 VAR B     : (* ARRAY OF ARRAY OF *) COMPLEX16;
                  VAR ldb   : INTEGER4;
-                 VAR Beta  : DOUBLECOMPLEX;
-                 VAR C     : (* ARRAY OF ARRAY OF *) DOUBLECOMPLEX;
+                 VAR Beta  : COMPLEX16;
+                 VAR C     : (* ARRAY OF ARRAY OF *) COMPLEX16;
                  VAR ldc   : INTEGER4);
 
           (*----------------------------------------------------------------*)