diff --git a/HDF5Examples/C/H5T/116/h5ex_t_complex.c b/HDF5Examples/C/H5T/116/h5ex_t_complex.c
index a3b03145acc..4e59f0a6efc 100644
--- a/HDF5Examples/C/H5T/116/h5ex_t_complex.c
+++ b/HDF5Examples/C/H5T/116/h5ex_t_complex.c
@@ -60,7 +60,7 @@ main(void)
      * type.  The HDF5 library automatically converts between different
      * complex number types.
      */
-    dset   = H5Dcreate(file, DATASET, H5T_CPLX_IEEE_F64LE, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    dset   = H5Dcreate(file, DATASET, H5T_COMPLEX_IEEE_F64LE, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     status = H5Dwrite(dset, H5T_NATIVE_FLOAT_COMPLEX, H5S_ALL, H5S_ALL, H5P_DEFAULT, wdata[0]);
 
     /*
diff --git a/HDF5Examples/C/H5T/116/h5ex_t_complex_custom.c b/HDF5Examples/C/H5T/116/h5ex_t_complex_custom.c
index 27f72ec125e..6c36a2578d8 100644
--- a/HDF5Examples/C/H5T/116/h5ex_t_complex_custom.c
+++ b/HDF5Examples/C/H5T/116/h5ex_t_complex_custom.c
@@ -60,7 +60,7 @@ main(void)
      * type.  The HDF5 library automatically converts between different
      * complex number types.
      */
-    dset = H5Dcreate(file, DATASET, H5T_CPLX_IEEE_F64LE, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    dset = H5Dcreate(file, DATASET, H5T_COMPLEX_IEEE_F64LE, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
 
     /*
      * Create a datatype for writing to the dataset. This datatype is a
diff --git a/HDF5Examples/C/H5T/116/h5ex_t_complex_msvc.c b/HDF5Examples/C/H5T/116/h5ex_t_complex_msvc.c
index 2a7fe841302..2059380a76b 100644
--- a/HDF5Examples/C/H5T/116/h5ex_t_complex_msvc.c
+++ b/HDF5Examples/C/H5T/116/h5ex_t_complex_msvc.c
@@ -61,7 +61,7 @@ main(void)
      * type.  The HDF5 library automatically converts between different
      * complex number types.
      */
-    dset   = H5Dcreate(file, DATASET, H5T_CPLX_IEEE_F64LE, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    dset   = H5Dcreate(file, DATASET, H5T_COMPLEX_IEEE_F64LE, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     status = H5Dwrite(dset, H5T_NATIVE_FLOAT_COMPLEX, H5S_ALL, H5S_ALL, H5P_DEFAULT, wdata[0]);
 
     /*
diff --git a/doxygen/dox/DDLBNF116.dox b/doxygen/dox/DDLBNF116.dox
index 094d67245a0..e63dc759293 100644
--- a/doxygen/dox/DDLBNF116.dox
+++ b/doxygen/dox/DDLBNF116.dox
@@ -171,9 +171,9 @@ This section contains a brief explanation of the symbols used in the DDL.
 <enum_val> ::= <int_value>
 
 <complex_type> ::= H5T_COMPLEX { <complex_base_type> <complex_base_type> } |
-                   H5T_CPLX_IEEE_F16BE | H5T_CPLX_IEEE_F16LE |
-                   H5T_CPLX_IEEE_F32BE | H5T_CPLX_IEEE_F32LE |
-                   H5T_CPLX_IEEE_F64BE | H5T_CPLX_IEEE_F64LE |
+                   H5T_COMPLEX_IEEE_F16BE   | H5T_COMPLEX_IEEE_F16LE    |
+                   H5T_COMPLEX_IEEE_F32BE   | H5T_COMPLEX_IEEE_F32LE    |
+                   H5T_COMPLEX_IEEE_F64BE   | H5T_COMPLEX_IEEE_F64LE    |
                    H5T_NATIVE_FLOAT_COMPLEX | H5T_NATIVE_DOUBLE_COMPLEX |
                    H5T_NATIVE_LDOUBLE_COMPLEX
 
diff --git a/doxygen/dox/PredefinedDatatypeTables.dox b/doxygen/dox/PredefinedDatatypeTables.dox
index e97b2d9328a..7b3795016b3 100644
--- a/doxygen/dox/PredefinedDatatypeTables.dox
+++ b/doxygen/dox/PredefinedDatatypeTables.dox
@@ -8,7 +8,7 @@
  * </div>
  *
  * <div>
- * \snippet{doc} tables/predefinedDatatypes.dox predefined_cplx_datatypes_table
+ * \snippet{doc} tables/predefinedDatatypes.dox predefined_complex_datatypes_table
  * </div>
  * 
  * <div>
diff --git a/doxygen/examples/tables/predefinedDatatypes.dox b/doxygen/examples/tables/predefinedDatatypes.dox
index 9409872e107..f73382ab865 100644
--- a/doxygen/examples/tables/predefinedDatatypes.dox
+++ b/doxygen/examples/tables/predefinedDatatypes.dox
@@ -35,7 +35,7 @@
 //! [predefined_ieee_datatypes_table]
  *
  *
-//! [predefined_cplx_datatypes_table]
+//! [predefined_complex_datatypes_table]
 <table>
 <caption>Predefined Complex Number Datatypes</caption>
 <tr>
@@ -43,31 +43,31 @@
 <th>Description</th>
 </tr>
 <tr>
-<td>#H5T_CPLX_IEEE_F16BE</td>
+<td>#H5T_COMPLEX_IEEE_F16BE</td>
 <td>Complex number of 2 16-bit big-endian IEEE floating point numbers</td>
 </tr>
 <tr>
-<td>#H5T_CPLX_IEEE_F16LE</td>
+<td>#H5T_COMPLEX_IEEE_F16LE</td>
 <td>Complex number of 2 16-bit little-endian IEEE floating point numbers</td>
 </tr>
 <tr>
-<td>#H5T_CPLX_IEEE_F32BE</td>
+<td>#H5T_COMPLEX_IEEE_F32BE</td>
 <td>Complex number of 2 32-bit big-endian IEEE floating point numbers</td>
 </tr>
 <tr>
-<td>#H5T_CPLX_IEEE_F32LE</td>
+<td>#H5T_COMPLEX_IEEE_F32LE</td>
 <td>Complex number of 2 32-bit little-endian IEEE floating point numbers</td>
 </tr>
 <tr>
-<td>#H5T_CPLX_IEEE_F64BE</td>
+<td>#H5T_COMPLEX_IEEE_F64BE</td>
 <td>Complex number of 2 64-bit big-endian IEEE floating point numbers</td>
 </tr>
 <tr>
-<td>#H5T_CPLX_IEEE_F64LE</td>
+<td>#H5T_COMPLEX_IEEE_F64LE</td>
 <td>Complex number of 2 64-bit little-endian IEEE floating point numbers</td>
 </tr>
 </table>
-//! [predefined_cplx_datatypes_table]
+//! [predefined_complex_datatypes_table]
  *
  *
 //! [predefined_std_datatypes_table]
diff --git a/hl/src/H5LTanalyze.c b/hl/src/H5LTanalyze.c
index 0c540fbfba4..03bafd19cab 100644
--- a/hl/src/H5LTanalyze.c
+++ b/hl/src/H5LTanalyze.c
@@ -656,7 +656,7 @@ struct yy_trans_info
 	flex_int32_t yy_verify;
 	flex_int32_t yy_nxt;
 	};
-static const flex_int16_t yy_accept[338] =
+static const flex_int16_t yy_accept[335] =
     {   0,
        76,   76,   78,   77,   76,   77,   68,   74,   75,   77,
        77,   77,   77,   72,   73,   70,   71,   76,    0,   68,
@@ -664,37 +664,37 @@ static const flex_int16_t yy_accept[338] =
         0,   50,    0,    0,    0,    0,    0,   51,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,   49,    0,    0,    0,
+        0,    0,    0,    0,    0,   49,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,   67,   48,    0,    0,    0,    0,   57,
-       61,    0,    0,    0,    0,    0,    0,    0,    0,   63,
+        0,   67,   48,    0,    0,    0,   57,   61,    0,    0,
+        0,    0,    0,    0,    0,    0,   63,   66,   62,    0,
 
-       66,   62,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,   65,    0,    0,    0,    0,    0,
-        0,    0,    0,   47,    0,    0,    0,   64,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,   65,
+        0,    0,    0,    0,    0,    0,    0,    0,   47,    0,
+        0,    0,   64,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,   60,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-       60,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    1,    2,    0,    0,    0,    0,    0,    0,    9,
-       10,    0,    0,   59,    0,    0,   56,    0,    0,    0,
+        0,    0,    0,    0,    0,    1,    2,    0,    0,    0,
+        0,    0,    0,    9,   10,    0,    0,   59,    0,    0,
+       56,    0,    0,    0,    0,    0,    0,    0,    0,    0,
 
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    3,    4,    5,
-        6,    7,    8,   11,   12,   13,   14,   15,   16,    0,
-        0,    0,    0,   55,   58,   28,   29,   30,   31,   32,
-       33,    0,    0,    0,   22,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,   17,
-        0,    0,    0,    0,   24,    0,    0,    0,   23,    0,
-        0,    0,   53,    0,    0,    0,    0,    0,    0,   35,
-        0,   26,   18,   20,   19,    0,   25,    0,   52,   54,
-        0,    0,    0,   36,    0,    0,    0,   27,   21,    0,
-
-        0,    0,    0,    0,    0,    0,   34,    0,   37,   38,
-       39,   40,   41,   42,   43,    0,    0,    0,    0,    0,
+        0,    3,    4,    5,    6,    7,    8,   11,   12,   13,
+       14,   15,   16,    0,    0,    0,    0,   55,   58,   28,
+       29,   30,   31,   32,   33,    0,    0,    0,   22,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,   17,    0,    0,    0,    0,   24,    0,
+        0,    0,   23,    0,    0,    0,   53,    0,    0,    0,
+        0,   35,    0,   26,   18,   20,   19,    0,   25,    0,
+       52,   54,    0,   36,    0,    0,    0,   27,   21,    0,
+        0,   34,    0,   37,    0,    0,    0,    0,    0,    0,
+
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,   44,    0,   45,    0,   46,    0
+        0,    0,    0,    0,    0,   38,   39,   40,   41,   42,
+       43,    0,    0,    0,    0,    0,    0,    0,   44,    0,
+       45,    0,   46,    0
     } ;
 
 static const YY_CHAR yy_ec[256] =
@@ -738,184 +738,184 @@ static const YY_CHAR yy_meta[42] =
         1
     } ;
 
-static const flex_int16_t yy_base[340] =
+static const flex_int16_t yy_base[337] =
     {   0,
-        0,    0,  363,  364,  360,    0,    0,  364,  364,   12,
-      352,  333,  328,  364,  364,  364,  364,  356,  354,    0,
-      338,  320,  323,  325,  323,  364,  320,  323,  310,  309,
-       17,  364,  329,   34,   15,  332,  323,  364,  315,   31,
-      318,  316,  323,  326,  312,  307,   40,  315,  322,  318,
-      298,  304,  308,  308,  312,  299,  296,  298,  308,  294,
-      310,   45,  294,  304,  285,  300,  364,  301,  304,  290,
-      282,  284,  309,  289,  281,  293,  288,  281,  269,   27,
-      285,  281,  287,  364,  364,  269,   42,  264,  263,  364,
-      364,  272,  261,  266,  266,   47,  272,   46,  282,  364,
-
-      364,  364,  277,  262,  271,   41,  278,  272,  272,  271,
-       70,   77,  268,  255,  259,  270,  250,  258,  264,  251,
-      249,  254,   84,  239,  364,  267,  270,  267,   63,  264,
-      267,  264,   70,  364,  248,  256,  246,  364,  251,  249,
-      250,  246,  225,  253,  256,  253,   79,   77,   82,   84,
-      242,  241,   89,   91,   93,  240,  239,  233,  239,  236,
-      364,  235,  230,  240,  220,   95,   98,  100,  228,  222,
-      224,  221,  102,  101,  104,  227,  226,  225,  224,  223,
-      222,  364,  364,  221,  220,  219,  218,  217,  216,  364,
-      364,  102,  215,  364,  193,  209,  364,  225,  211,  210,
-
-      209,  208,  207,  206,  209,  190,  195,  189,  193,  192,
-      192,  195,  189,  193,  188,  109,  191,  364,  364,  364,
-      364,  364,  364,  364,  364,  364,  364,  364,  364,  197,
-      192,  182,  189,  364,  364,  364,  364,  364,  364,  364,
-      364,  178,  191,  191,  364,  172,  178,  182,  187,  171,
-      185,  167,  171,  171,  169,  177,  164,  178,  131,  364,
-      168,  159,  174,  168,  364,  158,  155,  156,  364,  159,
-      163,  153,  364,  157,  163,  169,  172,  169,  158,   85,
-      152,  364,  364,  364,  364,  154,  364,  142,  364,  364,
-      116,  122,  125,  133,  161,  154,  151,  364,  364,  150,
-
-      149,  148,  147,  146,  145,  146,  364,  135,  121,  364,
-      364,  364,  364,  364,  364,  133,  134,  141,  132,  128,
-      128,  126,  129,  126,  124,  128,  117,  125,  108,  107,
-       69,  364,   65,  364,   38,  364,  364,  148,   48
+        0,    0,  360,  361,  357,    0,    0,  361,  361,   12,
+      349,  330,  325,  361,  361,  361,  361,  353,  351,    0,
+      335,  317,  320,  322,  320,  361,  317,  320,  307,  306,
+       17,  361,  326,   34,   15,  329,  320,  361,  312,   31,
+      315,  313,  320,  323,  309,  304,   35,  312,  319,  315,
+      295,  301,  305,  310,  297,  294,  296,  306,  292,  308,
+       34,  292,  302,  283,  298,  361,  299,  302,  288,  283,
+      308,  288,  280,  292,  287,  280,  268,   32,  284,  280,
+      286,  361,  361,  268,   39,  263,  361,  361,  272,  261,
+      266,  266,   44,  272,   43,  282,  361,  361,  361,  277,
+
+      262,   55,  279,  273,  273,  272,   67,   74,  269,  256,
+      260,  271,  251,  259,  253,  251,  256,   81,  241,  361,
+      269,  272,  269,   60,  266,  269,  266,   67,  361,  250,
+      258,  248,  231,  252,  252,  248,  227,  255,  258,  255,
+       76,   74,   79,   81,  244,  243,   86,   88,   90,  242,
+      241,  235,  241,  238,  233,  361,  232,  242,  222,   92,
+       95,   97,  230,  224,  226,  223,   99,   98,  101,  229,
+      228,  227,  226,  225,  224,  361,  361,  223,  222,  221,
+      220,  219,  218,  361,  361,   99,  217,  361,  216,  211,
+      361,  227,  213,  212,  211,  210,  209,  208,  211,  192,
+
+      197,  191,  195,  194,  194,  197,  191,  195,  190,  106,
+      193,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  199,  194,  184,  192,  361,  361,  361,
+      361,  361,  361,  361,  361,  180,  193,  193,  361,  174,
+      180,  184,  189,  173,  187,  169,  173,  173,  171,  179,
+      166,  180,  175,  361,  169,  160,  175,  169,  361,  159,
+      156,  157,  361,  160,  164,  154,  361,  158,  164,  141,
+      161,   95,  155,  361,  361,  361,  361,  157,  361,  145,
+      361,  361,  156,  135,  163,  156,  153,  361,  361,  128,
+      154,  361,  143,  129,  157,  160,  157,  138,  139,  146,
+
+      113,  122,  124,  137,  133,  133,  140,  139,  138,  137,
+      136,  135,  125,  128,  125,  361,  361,  361,  361,  361,
+      361,  123,  126,  116,  124,  107,  117,   93,  361,  103,
+      361,   46,  361,  361,  147,   52
     } ;
 
-static const flex_int16_t yy_def[340] =
+static const flex_int16_t yy_def[337] =
     {   0,
-      337,    1,  337,  337,  337,  338,  339,  337,  337,  337,
-      337,  337,  337,  337,  337,  337,  337,  337,  338,  339,
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
-
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
-
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
-
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
-      337,  337,  337,  337,  337,  337,    0,  337,  337
+      334,    1,  334,  334,  334,  335,  336,  334,  334,  334,
+      334,  334,  334,  334,  334,  334,  334,  334,  335,  336,
+      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
+      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
+      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
+      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
+      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
+      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
+      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
+      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
+
+      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
+      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
+      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
+      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
+      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
+      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
+      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
+      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
+      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
+      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
+
+      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
+      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
+      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
+      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
+      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
+      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
+      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
+      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
+      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
+      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
+
+      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
+      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
+      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
+      334,  334,  334,    0,  334,  334
     } ;
 
-static const flex_int16_t yy_nxt[406] =
+static const flex_int16_t yy_nxt[403] =
     {   0,
         4,    5,    6,    7,    7,    7,    7,    7,    7,    7,
         7,    8,    9,    4,    4,   10,    4,    4,    4,    4,
        11,    4,    4,    4,    4,   12,    4,    4,    4,   13,
         4,    4,    4,    4,    4,    4,   14,   15,    4,   16,
-       17,   21,   22,   36,   48,   49,   37,   39,   97,   40,
-       20,   41,   42,   63,  120,   43,   53,   54,   44,   45,
-       55,   79,   64,   46,  103,   98,   47,  104,  111,   56,
-      114,  336,  121,   80,  126,  115,  127,  151,  112,  128,
-      129,  130,  335,  131,  156,  152,  132,  133,  144,  295,
-      145,  176,  157,  146,  169,  170,  178,  171,  180,  177,
-
-      172,  173,  334,  184,  179,  186,  181,  188,  174,  199,
-      175,  185,  201,  187,  203,  189,  212,  200,  209,  214,
-      202,  213,  204,  296,  210,  215,  216,  211,  230,  333,
-      300,  253,  231,  217,  254,  276,  302,  277,  301,  304,
-      278,  332,  331,  330,  303,  329,  328,  305,   19,  327,
-       19,  326,  325,  324,  323,  322,  321,  320,  319,  318,
-      317,  316,  315,  314,  313,  312,  311,  310,  309,  308,
-      307,  306,  299,  298,  297,  294,  293,  292,  291,  290,
-      289,  288,  287,  286,  285,  284,  283,  282,  281,  280,
-      279,  275,  274,  273,  272,  271,  270,  269,  268,  267,
-
-      266,  265,  264,  263,  262,  261,  260,  259,  258,  257,
-      256,  255,  252,  251,  250,  249,  248,  247,  246,  245,
-      244,  243,  242,  241,  240,  239,  238,  237,  236,  235,
-      234,  233,  232,  229,  228,  227,  226,  225,  224,  223,
-      222,  221,  220,  219,  218,  208,  207,  206,  205,  198,
-      197,  196,  195,  194,  193,  192,  191,  190,  183,  182,
-      168,  167,  166,  165,  164,  163,  162,  161,  160,  159,
-      158,  155,  154,  153,  150,  149,  148,  147,  143,  142,
-      141,  140,  139,  138,  137,  136,  135,  134,  125,  124,
-      123,  122,  119,  118,  117,  116,  113,  110,  109,  108,
-
-      107,  106,  105,  102,  101,  100,   99,   96,   95,   94,
-       93,   92,   91,   90,   89,   88,   87,   86,   85,   84,
-       83,   82,   81,   78,   77,   76,   75,   74,   73,   72,
-       71,   70,   69,   68,   67,   66,   65,   62,   61,   60,
-       59,   58,   57,   52,   51,   50,   38,   35,   34,   33,
-       32,   31,   30,   29,   28,   27,   26,   18,   25,   24,
-       23,   18,  337,    3,  337,  337,  337,  337,  337,  337,
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
-
-      337,  337,  337,  337,  337
+       17,   21,   22,   36,   48,   49,   37,   39,   62,   40,
+       77,   41,   42,   94,   20,   43,   53,   63,   44,   45,
+       54,  100,   78,   46,  101,  107,   47,  110,  115,   55,
+       95,  121,  111,  122,  145,  108,  123,  124,  125,  333,
+      126,  150,  146,  127,  128,  138,  116,  139,  170,  151,
+      140,  163,  164,  172,  165,  174,  171,  166,  167,  285,
+
+      178,  173,  180,  175,  182,  168,  193,  169,  179,  195,
+      181,  197,  183,  206,  194,  203,  208,  196,  207,  198,
+      332,  204,  209,  210,  205,  224,  331,  307,  247,  225,
+      211,  248,  295,  286,  296,  308,  309,  297,  311,  330,
+      329,  328,  327,  326,  310,  325,  312,   19,  324,   19,
+      323,  322,  321,  320,  319,  318,  317,  316,  315,  314,
+      313,  306,  305,  304,  303,  302,  301,  300,  299,  298,
+      294,  293,  292,  291,  290,  289,  288,  287,  284,  283,
+      282,  281,  280,  279,  278,  277,  276,  275,  274,  273,
+      272,  271,  270,  269,  268,  267,  266,  265,  264,  263,
+
+      262,  261,  260,  259,  258,  257,  256,  255,  254,  253,
+      252,  251,  250,  249,  246,  245,  244,  243,  242,  241,
+      240,  239,  238,  237,  236,  235,  234,  233,  232,  231,
+      230,  229,  228,  227,  226,  223,  222,  221,  220,  219,
+      218,  217,  216,  215,  214,  213,  212,  202,  201,  200,
+      199,  192,  191,  190,  189,  188,  187,  186,  185,  184,
+      177,  176,  162,  161,  160,  159,  158,  157,  156,  155,
+      154,  153,  152,  149,  148,  147,  144,  143,  142,  141,
+      137,  136,  135,  134,  133,  132,  131,  130,  129,  120,
+      119,  118,  117,  114,  113,  112,  109,  106,  105,  104,
+
+      103,  102,   99,   98,   97,   96,   93,   92,   91,   90,
+       89,   88,   87,   86,   85,   84,   83,   82,   81,   80,
+       79,   76,   75,   74,   73,   72,   71,   70,   69,   68,
+       67,   66,   65,   64,   61,   60,   59,   58,   57,   56,
+       52,   51,   50,   38,   35,   34,   33,   32,   31,   30,
+       29,   28,   27,   26,   18,   25,   24,   23,   18,  334,
+        3,  334,  334,  334,  334,  334,  334,  334,  334,  334,
+      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
+      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
+      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
+
+      334,  334
     } ;
 
-static const flex_int16_t yy_chk[406] =
+static const flex_int16_t yy_chk[403] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,   10,   10,   31,   35,   35,   31,   34,   80,   34,
-      339,   34,   34,   47,  106,   34,   40,   40,   34,   34,
-       40,   62,   47,   34,   87,   80,   34,   87,   96,   40,
-       98,  335,  106,   62,  111,   98,  111,  129,   96,  111,
-      111,  112,  333,  112,  133,  129,  112,  112,  123,  280,
-      123,  148,  133,  123,  147,  147,  149,  147,  150,  148,
-
-      147,  147,  331,  153,  149,  154,  150,  155,  147,  166,
-      147,  153,  167,  154,  168,  155,  174,  166,  173,  175,
-      167,  174,  168,  280,  173,  175,  175,  173,  192,  330,
-      291,  216,  192,  175,  216,  259,  292,  259,  291,  293,
-      259,  329,  328,  327,  292,  326,  325,  293,  338,  324,
-      338,  323,  322,  321,  320,  319,  318,  317,  316,  309,
-      308,  306,  305,  304,  303,  302,  301,  300,  297,  296,
-      295,  294,  288,  286,  281,  279,  278,  277,  276,  275,
-      274,  272,  271,  270,  268,  267,  266,  264,  263,  262,
-      261,  258,  257,  256,  255,  254,  253,  252,  251,  250,
-
-      249,  248,  247,  246,  244,  243,  242,  233,  232,  231,
-      230,  217,  215,  214,  213,  212,  211,  210,  209,  208,
-      207,  206,  205,  204,  203,  202,  201,  200,  199,  198,
-      196,  195,  193,  189,  188,  187,  186,  185,  184,  181,
-      180,  179,  178,  177,  176,  172,  171,  170,  169,  165,
-      164,  163,  162,  160,  159,  158,  157,  156,  152,  151,
-      146,  145,  144,  143,  142,  141,  140,  139,  137,  136,
-      135,  132,  131,  130,  128,  127,  126,  124,  122,  121,
-      120,  119,  118,  117,  116,  115,  114,  113,  110,  109,
-      108,  107,  105,  104,  103,   99,   97,   95,   94,   93,
-
-       92,   89,   88,   86,   83,   82,   81,   79,   78,   77,
-       76,   75,   74,   73,   72,   71,   70,   69,   68,   66,
-       65,   64,   63,   61,   60,   59,   58,   57,   56,   55,
-       54,   53,   52,   51,   50,   49,   48,   46,   45,   44,
-       43,   42,   41,   39,   37,   36,   33,   30,   29,   28,
-       27,   25,   24,   23,   22,   21,   19,   18,   13,   12,
-       11,    5,    3,  337,  337,  337,  337,  337,  337,  337,
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
-
-      337,  337,  337,  337,  337
+        1,   10,   10,   31,   35,   35,   31,   34,   47,   34,
+       61,   34,   34,   78,  336,   34,   40,   47,   34,   34,
+       40,   85,   61,   34,   85,   93,   34,   95,  102,   40,
+       78,  107,   95,  107,  124,   93,  107,  107,  108,  332,
+      108,  128,  124,  108,  108,  118,  102,  118,  142,  128,
+      118,  141,  141,  143,  141,  144,  142,  141,  141,  272,
+
+      147,  143,  148,  144,  149,  141,  160,  141,  147,  161,
+      148,  162,  149,  168,  160,  167,  169,  161,  168,  162,
+      330,  167,  169,  169,  167,  186,  328,  301,  210,  186,
+      169,  210,  290,  272,  290,  301,  302,  290,  303,  327,
+      326,  325,  324,  323,  302,  322,  303,  335,  315,  335,
+      314,  313,  312,  311,  310,  309,  308,  307,  306,  305,
+      304,  300,  299,  298,  297,  296,  295,  294,  293,  291,
+      287,  286,  285,  284,  283,  280,  278,  273,  271,  270,
+      269,  268,  266,  265,  264,  262,  261,  260,  258,  257,
+      256,  255,  253,  252,  251,  250,  249,  248,  247,  246,
+
+      245,  244,  243,  242,  241,  240,  238,  237,  236,  227,
+      226,  225,  224,  211,  209,  208,  207,  206,  205,  204,
+      203,  202,  201,  200,  199,  198,  197,  196,  195,  194,
+      193,  192,  190,  189,  187,  183,  182,  181,  180,  179,
+      178,  175,  174,  173,  172,  171,  170,  166,  165,  164,
+      163,  159,  158,  157,  155,  154,  153,  152,  151,  150,
+      146,  145,  140,  139,  138,  137,  136,  135,  134,  133,
+      132,  131,  130,  127,  126,  125,  123,  122,  121,  119,
+      117,  116,  115,  114,  113,  112,  111,  110,  109,  106,
+      105,  104,  103,  101,  100,   96,   94,   92,   91,   90,
+
+       89,   86,   84,   81,   80,   79,   77,   76,   75,   74,
+       73,   72,   71,   70,   69,   68,   67,   65,   64,   63,
+       62,   60,   59,   58,   57,   56,   55,   54,   53,   52,
+       51,   50,   49,   48,   46,   45,   44,   43,   42,   41,
+       39,   37,   36,   33,   30,   29,   28,   27,   25,   24,
+       23,   22,   21,   19,   18,   13,   12,   11,    5,    3,
+      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
+      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
+      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
+      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
+
+      334,  334
     } ;
 
 static yy_state_type yy_last_accepting_state;
@@ -1214,13 +1214,13 @@ YY_DECL
 			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 				{
 				yy_current_state = (int) yy_def[yy_current_state];
-				if ( yy_current_state >= 338 )
+				if ( yy_current_state >= 335 )
 					yy_c = yy_meta[yy_c];
 				}
 			yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
 			++yy_cp;
 			}
-		while ( yy_base[yy_current_state] != 364 );
+		while ( yy_base[yy_current_state] != 361 );
 
 yy_find_action:
 		yy_act = yy_accept[yy_current_state];
@@ -1432,32 +1432,32 @@ YY_RULE_SETUP
 case 38:
 YY_RULE_SETUP
 #line 96 "hl/src//H5LTanalyze.l"
-{return hid(H5T_CPLX_IEEE_F16BE_TOKEN);}
+{return hid(H5T_COMPLEX_IEEE_F16BE_TOKEN);}
 	YY_BREAK
 case 39:
 YY_RULE_SETUP
 #line 97 "hl/src//H5LTanalyze.l"
-{return hid(H5T_CPLX_IEEE_F16LE_TOKEN);}
+{return hid(H5T_COMPLEX_IEEE_F16LE_TOKEN);}
 	YY_BREAK
 case 40:
 YY_RULE_SETUP
 #line 98 "hl/src//H5LTanalyze.l"
-{return hid(H5T_CPLX_IEEE_F32BE_TOKEN);}
+{return hid(H5T_COMPLEX_IEEE_F32BE_TOKEN);}
 	YY_BREAK
 case 41:
 YY_RULE_SETUP
 #line 99 "hl/src//H5LTanalyze.l"
-{return hid(H5T_CPLX_IEEE_F32LE_TOKEN);}
+{return hid(H5T_COMPLEX_IEEE_F32LE_TOKEN);}
 	YY_BREAK
 case 42:
 YY_RULE_SETUP
 #line 100 "hl/src//H5LTanalyze.l"
-{return hid(H5T_CPLX_IEEE_F64BE_TOKEN);}
+{return hid(H5T_COMPLEX_IEEE_F64BE_TOKEN);}
 	YY_BREAK
 case 43:
 YY_RULE_SETUP
 #line 101 "hl/src//H5LTanalyze.l"
-{return hid(H5T_CPLX_IEEE_F64LE_TOKEN);}
+{return hid(H5T_COMPLEX_IEEE_F64LE_TOKEN);}
 	YY_BREAK
 case 44:
 YY_RULE_SETUP
@@ -1934,7 +1934,7 @@ static int yy_get_next_buffer (void)
 		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 			{
 			yy_current_state = (int) yy_def[yy_current_state];
-			if ( yy_current_state >= 338 )
+			if ( yy_current_state >= 335 )
 				yy_c = yy_meta[yy_c];
 			}
 		yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
@@ -1962,11 +1962,11 @@ static int yy_get_next_buffer (void)
 	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 		{
 		yy_current_state = (int) yy_def[yy_current_state];
-		if ( yy_current_state >= 338 )
+		if ( yy_current_state >= 335 )
 			yy_c = yy_meta[yy_c];
 		}
 	yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
-	yy_is_jam = (yy_current_state == 337);
+	yy_is_jam = (yy_current_state == 334);
 
 		return yy_is_jam ? 0 : yy_current_state;
 }
diff --git a/hl/src/H5LTanalyze.l b/hl/src/H5LTanalyze.l
index 8cbdd32b4b3..ac4851e029a 100644
--- a/hl/src/H5LTanalyze.l
+++ b/hl/src/H5LTanalyze.l
@@ -93,12 +93,12 @@ H5T_NATIVE_FLOAT   {return hid(H5T_NATIVE_FLOAT_TOKEN);}
 H5T_NATIVE_DOUBLE  {return hid(H5T_NATIVE_DOUBLE_TOKEN);}
 H5T_NATIVE_LDOUBLE {return hid(H5T_NATIVE_LDOUBLE_TOKEN);}
 
-H5T_CPLX_IEEE_F16BE        {return hid(H5T_CPLX_IEEE_F16BE_TOKEN);}
-H5T_CPLX_IEEE_F16LE        {return hid(H5T_CPLX_IEEE_F16LE_TOKEN);}
-H5T_CPLX_IEEE_F32BE        {return hid(H5T_CPLX_IEEE_F32BE_TOKEN);}
-H5T_CPLX_IEEE_F32LE        {return hid(H5T_CPLX_IEEE_F32LE_TOKEN);}
-H5T_CPLX_IEEE_F64BE        {return hid(H5T_CPLX_IEEE_F64BE_TOKEN);}
-H5T_CPLX_IEEE_F64LE        {return hid(H5T_CPLX_IEEE_F64LE_TOKEN);}
+H5T_COMPLEX_IEEE_F16BE        {return hid(H5T_COMPLEX_IEEE_F16BE_TOKEN);}
+H5T_COMPLEX_IEEE_F16LE        {return hid(H5T_COMPLEX_IEEE_F16LE_TOKEN);}
+H5T_COMPLEX_IEEE_F32BE        {return hid(H5T_COMPLEX_IEEE_F32BE_TOKEN);}
+H5T_COMPLEX_IEEE_F32LE        {return hid(H5T_COMPLEX_IEEE_F32LE_TOKEN);}
+H5T_COMPLEX_IEEE_F64BE        {return hid(H5T_COMPLEX_IEEE_F64BE_TOKEN);}
+H5T_COMPLEX_IEEE_F64LE        {return hid(H5T_COMPLEX_IEEE_F64LE_TOKEN);}
 H5T_NATIVE_FLOAT_COMPLEX   {return hid(H5T_NATIVE_FLOAT_COMPLEX_TOKEN);}
 H5T_NATIVE_DOUBLE_COMPLEX  {return hid(H5T_NATIVE_DOUBLE_COMPLEX_TOKEN);}
 H5T_NATIVE_LDOUBLE_COMPLEX {return hid(H5T_NATIVE_LDOUBLE_COMPLEX_TOKEN);}
diff --git a/hl/src/H5LTparse.c b/hl/src/H5LTparse.c
index a853f4b03f1..38d89e1958e 100644
--- a/hl/src/H5LTparse.c
+++ b/hl/src/H5LTparse.c
@@ -223,12 +223,12 @@ enum yysymbol_kind_t
   YYSYMBOL_H5T_NATIVE_FLOAT_TOKEN = 37,    /* H5T_NATIVE_FLOAT_TOKEN  */
   YYSYMBOL_H5T_NATIVE_DOUBLE_TOKEN = 38,   /* H5T_NATIVE_DOUBLE_TOKEN  */
   YYSYMBOL_H5T_NATIVE_LDOUBLE_TOKEN = 39,  /* H5T_NATIVE_LDOUBLE_TOKEN  */
-  YYSYMBOL_H5T_CPLX_IEEE_F16BE_TOKEN = 40, /* H5T_CPLX_IEEE_F16BE_TOKEN  */
-  YYSYMBOL_H5T_CPLX_IEEE_F16LE_TOKEN = 41, /* H5T_CPLX_IEEE_F16LE_TOKEN  */
-  YYSYMBOL_H5T_CPLX_IEEE_F32BE_TOKEN = 42, /* H5T_CPLX_IEEE_F32BE_TOKEN  */
-  YYSYMBOL_H5T_CPLX_IEEE_F32LE_TOKEN = 43, /* H5T_CPLX_IEEE_F32LE_TOKEN  */
-  YYSYMBOL_H5T_CPLX_IEEE_F64BE_TOKEN = 44, /* H5T_CPLX_IEEE_F64BE_TOKEN  */
-  YYSYMBOL_H5T_CPLX_IEEE_F64LE_TOKEN = 45, /* H5T_CPLX_IEEE_F64LE_TOKEN  */
+  YYSYMBOL_H5T_COMPLEX_IEEE_F16BE_TOKEN = 40, /* H5T_COMPLEX_IEEE_F16BE_TOKEN  */
+  YYSYMBOL_H5T_COMPLEX_IEEE_F16LE_TOKEN = 41, /* H5T_COMPLEX_IEEE_F16LE_TOKEN  */
+  YYSYMBOL_H5T_COMPLEX_IEEE_F32BE_TOKEN = 42, /* H5T_COMPLEX_IEEE_F32BE_TOKEN  */
+  YYSYMBOL_H5T_COMPLEX_IEEE_F32LE_TOKEN = 43, /* H5T_COMPLEX_IEEE_F32LE_TOKEN  */
+  YYSYMBOL_H5T_COMPLEX_IEEE_F64BE_TOKEN = 44, /* H5T_COMPLEX_IEEE_F64BE_TOKEN  */
+  YYSYMBOL_H5T_COMPLEX_IEEE_F64LE_TOKEN = 45, /* H5T_COMPLEX_IEEE_F64LE_TOKEN  */
   YYSYMBOL_H5T_NATIVE_FLOAT_COMPLEX_TOKEN = 46, /* H5T_NATIVE_FLOAT_COMPLEX_TOKEN  */
   YYSYMBOL_H5T_NATIVE_DOUBLE_COMPLEX_TOKEN = 47, /* H5T_NATIVE_DOUBLE_COMPLEX_TOKEN  */
   YYSYMBOL_H5T_NATIVE_LDOUBLE_COMPLEX_TOKEN = 48, /* H5T_NATIVE_LDOUBLE_COMPLEX_TOKEN  */
@@ -739,9 +739,9 @@ static const char *const yytname[] =
   "H5T_IEEE_F64BE_TOKEN", "H5T_IEEE_F64LE_TOKEN",
   "H5T_NATIVE_FLOAT16_TOKEN", "H5T_NATIVE_FLOAT_TOKEN",
   "H5T_NATIVE_DOUBLE_TOKEN", "H5T_NATIVE_LDOUBLE_TOKEN",
-  "H5T_CPLX_IEEE_F16BE_TOKEN", "H5T_CPLX_IEEE_F16LE_TOKEN",
-  "H5T_CPLX_IEEE_F32BE_TOKEN", "H5T_CPLX_IEEE_F32LE_TOKEN",
-  "H5T_CPLX_IEEE_F64BE_TOKEN", "H5T_CPLX_IEEE_F64LE_TOKEN",
+  "H5T_COMPLEX_IEEE_F16BE_TOKEN", "H5T_COMPLEX_IEEE_F16LE_TOKEN",
+  "H5T_COMPLEX_IEEE_F32BE_TOKEN", "H5T_COMPLEX_IEEE_F32LE_TOKEN",
+  "H5T_COMPLEX_IEEE_F64BE_TOKEN", "H5T_COMPLEX_IEEE_F64LE_TOKEN",
   "H5T_NATIVE_FLOAT_COMPLEX_TOKEN", "H5T_NATIVE_DOUBLE_COMPLEX_TOKEN",
   "H5T_NATIVE_LDOUBLE_COMPLEX_TOKEN", "H5T_STRING_TOKEN", "STRSIZE_TOKEN",
   "STRPAD_TOKEN", "CSET_TOKEN", "CTYPE_TOKEN", "H5T_VARIABLE_TOKEN",
@@ -1790,39 +1790,39 @@ yyparse (void)
 #line 1760 "hl/src//H5LTparse.c"
     break;
 
-  case 73: /* complex_type: H5T_CPLX_IEEE_F16LE_TOKEN  */
+  case 73: /* complex_type: H5T_COMPLEX_IEEE_F16LE_TOKEN  */
 #line 258 "hl/src//H5LTparse.y"
-                                                   { (yyval.hid) = H5Tcopy(H5T_CPLX_IEEE_F16LE); }
+                                                      { (yyval.hid) = H5Tcopy(H5T_COMPLEX_IEEE_F16LE); }
 #line 1766 "hl/src//H5LTparse.c"
     break;
 
-  case 74: /* complex_type: H5T_CPLX_IEEE_F16BE_TOKEN  */
+  case 74: /* complex_type: H5T_COMPLEX_IEEE_F16BE_TOKEN  */
 #line 259 "hl/src//H5LTparse.y"
-                                                   { (yyval.hid) = H5Tcopy(H5T_CPLX_IEEE_F16BE); }
+                                                      { (yyval.hid) = H5Tcopy(H5T_COMPLEX_IEEE_F16BE); }
 #line 1772 "hl/src//H5LTparse.c"
     break;
 
-  case 75: /* complex_type: H5T_CPLX_IEEE_F32LE_TOKEN  */
+  case 75: /* complex_type: H5T_COMPLEX_IEEE_F32LE_TOKEN  */
 #line 260 "hl/src//H5LTparse.y"
-                                                   { (yyval.hid) = H5Tcopy(H5T_CPLX_IEEE_F32LE); }
+                                                      { (yyval.hid) = H5Tcopy(H5T_COMPLEX_IEEE_F32LE); }
 #line 1778 "hl/src//H5LTparse.c"
     break;
 
-  case 76: /* complex_type: H5T_CPLX_IEEE_F32BE_TOKEN  */
+  case 76: /* complex_type: H5T_COMPLEX_IEEE_F32BE_TOKEN  */
 #line 261 "hl/src//H5LTparse.y"
-                                                   { (yyval.hid) = H5Tcopy(H5T_CPLX_IEEE_F32BE); }
+                                                      { (yyval.hid) = H5Tcopy(H5T_COMPLEX_IEEE_F32BE); }
 #line 1784 "hl/src//H5LTparse.c"
     break;
 
-  case 77: /* complex_type: H5T_CPLX_IEEE_F64LE_TOKEN  */
+  case 77: /* complex_type: H5T_COMPLEX_IEEE_F64LE_TOKEN  */
 #line 262 "hl/src//H5LTparse.y"
-                                                   { (yyval.hid) = H5Tcopy(H5T_CPLX_IEEE_F64LE); }
+                                                      { (yyval.hid) = H5Tcopy(H5T_COMPLEX_IEEE_F64LE); }
 #line 1790 "hl/src//H5LTparse.c"
     break;
 
-  case 78: /* complex_type: H5T_CPLX_IEEE_F64BE_TOKEN  */
+  case 78: /* complex_type: H5T_COMPLEX_IEEE_F64BE_TOKEN  */
 #line 263 "hl/src//H5LTparse.y"
-                                                   { (yyval.hid) = H5Tcopy(H5T_CPLX_IEEE_F64BE); }
+                                                      { (yyval.hid) = H5Tcopy(H5T_COMPLEX_IEEE_F64BE); }
 #line 1796 "hl/src//H5LTparse.c"
     break;
 
diff --git a/hl/src/H5LTparse.h b/hl/src/H5LTparse.h
index 3d2342297b1..0ac873895c3 100644
--- a/hl/src/H5LTparse.h
+++ b/hl/src/H5LTparse.h
@@ -91,12 +91,12 @@ extern int H5LTyydebug;
     H5T_NATIVE_FLOAT_TOKEN = 292,  /* H5T_NATIVE_FLOAT_TOKEN  */
     H5T_NATIVE_DOUBLE_TOKEN = 293, /* H5T_NATIVE_DOUBLE_TOKEN  */
     H5T_NATIVE_LDOUBLE_TOKEN = 294, /* H5T_NATIVE_LDOUBLE_TOKEN  */
-    H5T_CPLX_IEEE_F16BE_TOKEN = 295, /* H5T_CPLX_IEEE_F16BE_TOKEN  */
-    H5T_CPLX_IEEE_F16LE_TOKEN = 296, /* H5T_CPLX_IEEE_F16LE_TOKEN  */
-    H5T_CPLX_IEEE_F32BE_TOKEN = 297, /* H5T_CPLX_IEEE_F32BE_TOKEN  */
-    H5T_CPLX_IEEE_F32LE_TOKEN = 298, /* H5T_CPLX_IEEE_F32LE_TOKEN  */
-    H5T_CPLX_IEEE_F64BE_TOKEN = 299, /* H5T_CPLX_IEEE_F64BE_TOKEN  */
-    H5T_CPLX_IEEE_F64LE_TOKEN = 300, /* H5T_CPLX_IEEE_F64LE_TOKEN  */
+    H5T_COMPLEX_IEEE_F16BE_TOKEN = 295, /* H5T_COMPLEX_IEEE_F16BE_TOKEN  */
+    H5T_COMPLEX_IEEE_F16LE_TOKEN = 296, /* H5T_COMPLEX_IEEE_F16LE_TOKEN  */
+    H5T_COMPLEX_IEEE_F32BE_TOKEN = 297, /* H5T_COMPLEX_IEEE_F32BE_TOKEN  */
+    H5T_COMPLEX_IEEE_F32LE_TOKEN = 298, /* H5T_COMPLEX_IEEE_F32LE_TOKEN  */
+    H5T_COMPLEX_IEEE_F64BE_TOKEN = 299, /* H5T_COMPLEX_IEEE_F64BE_TOKEN  */
+    H5T_COMPLEX_IEEE_F64LE_TOKEN = 300, /* H5T_COMPLEX_IEEE_F64LE_TOKEN  */
     H5T_NATIVE_FLOAT_COMPLEX_TOKEN = 301, /* H5T_NATIVE_FLOAT_COMPLEX_TOKEN  */
     H5T_NATIVE_DOUBLE_COMPLEX_TOKEN = 302, /* H5T_NATIVE_DOUBLE_COMPLEX_TOKEN  */
     H5T_NATIVE_LDOUBLE_COMPLEX_TOKEN = 303, /* H5T_NATIVE_LDOUBLE_COMPLEX_TOKEN  */
diff --git a/hl/src/H5LTparse.y b/hl/src/H5LTparse.y
index 33e983c3eba..c58da83aa4d 100644
--- a/hl/src/H5LTparse.y
+++ b/hl/src/H5LTparse.y
@@ -83,9 +83,9 @@ static char*       enum_memb_symbol;       /*enum member symbol string*/
 %token <hid> H5T_IEEE_F32BE_TOKEN H5T_IEEE_F32LE_TOKEN H5T_IEEE_F64BE_TOKEN H5T_IEEE_F64LE_TOKEN
 %token <hid> H5T_NATIVE_FLOAT16_TOKEN H5T_NATIVE_FLOAT_TOKEN H5T_NATIVE_DOUBLE_TOKEN H5T_NATIVE_LDOUBLE_TOKEN
 
-%token <hid> H5T_CPLX_IEEE_F16BE_TOKEN H5T_CPLX_IEEE_F16LE_TOKEN
-%token <hid> H5T_CPLX_IEEE_F32BE_TOKEN H5T_CPLX_IEEE_F32LE_TOKEN
-%token <hid> H5T_CPLX_IEEE_F64BE_TOKEN H5T_CPLX_IEEE_F64LE_TOKEN
+%token <hid> H5T_COMPLEX_IEEE_F16BE_TOKEN H5T_COMPLEX_IEEE_F16LE_TOKEN
+%token <hid> H5T_COMPLEX_IEEE_F32BE_TOKEN H5T_COMPLEX_IEEE_F32LE_TOKEN
+%token <hid> H5T_COMPLEX_IEEE_F64BE_TOKEN H5T_COMPLEX_IEEE_F64LE_TOKEN
 %token <hid> H5T_NATIVE_FLOAT_COMPLEX_TOKEN H5T_NATIVE_DOUBLE_COMPLEX_TOKEN H5T_NATIVE_LDOUBLE_COMPLEX_TOKEN
 
 %token <ival> H5T_STRING_TOKEN STRSIZE_TOKEN STRPAD_TOKEN CSET_TOKEN CTYPE_TOKEN H5T_VARIABLE_TOKEN
@@ -255,12 +255,12 @@ vlen_type       :       H5T_VLEN_TOKEN '{' ddl_type '}'
 complex_type    :       H5T_NATIVE_FLOAT_COMPLEX_TOKEN  { $<hid>$ = H5Tcopy(H5T_NATIVE_FLOAT_COMPLEX); }
                 |       H5T_NATIVE_DOUBLE_COMPLEX_TOKEN  { $<hid>$ = H5Tcopy(H5T_NATIVE_DOUBLE_COMPLEX); }
                 |       H5T_NATIVE_LDOUBLE_COMPLEX_TOKEN  { $<hid>$ = H5Tcopy(H5T_NATIVE_LDOUBLE_COMPLEX); }
-                |       H5T_CPLX_IEEE_F16LE_TOKEN  { $<hid>$ = H5Tcopy(H5T_CPLX_IEEE_F16LE); }
-                |       H5T_CPLX_IEEE_F16BE_TOKEN  { $<hid>$ = H5Tcopy(H5T_CPLX_IEEE_F16BE); }
-                |       H5T_CPLX_IEEE_F32LE_TOKEN  { $<hid>$ = H5Tcopy(H5T_CPLX_IEEE_F32LE); }
-                |       H5T_CPLX_IEEE_F32BE_TOKEN  { $<hid>$ = H5Tcopy(H5T_CPLX_IEEE_F32BE); }
-                |       H5T_CPLX_IEEE_F64LE_TOKEN  { $<hid>$ = H5Tcopy(H5T_CPLX_IEEE_F64LE); }
-                |       H5T_CPLX_IEEE_F64BE_TOKEN  { $<hid>$ = H5Tcopy(H5T_CPLX_IEEE_F64BE); }
+                |       H5T_COMPLEX_IEEE_F16LE_TOKEN  { $<hid>$ = H5Tcopy(H5T_COMPLEX_IEEE_F16LE); }
+                |       H5T_COMPLEX_IEEE_F16BE_TOKEN  { $<hid>$ = H5Tcopy(H5T_COMPLEX_IEEE_F16BE); }
+                |       H5T_COMPLEX_IEEE_F32LE_TOKEN  { $<hid>$ = H5Tcopy(H5T_COMPLEX_IEEE_F32LE); }
+                |       H5T_COMPLEX_IEEE_F32BE_TOKEN  { $<hid>$ = H5Tcopy(H5T_COMPLEX_IEEE_F32BE); }
+                |       H5T_COMPLEX_IEEE_F64LE_TOKEN  { $<hid>$ = H5Tcopy(H5T_COMPLEX_IEEE_F64LE); }
+                |       H5T_COMPLEX_IEEE_F64BE_TOKEN  { $<hid>$ = H5Tcopy(H5T_COMPLEX_IEEE_F64BE); }
                 |       H5T_COMPLEX_TOKEN '{' ddl_type '}'
                             { $<hid>$ = H5Tcomplex_create($<hid>3); H5Tclose($<hid>3); }
                 ;
diff --git a/hl/test/test_lite.c b/hl/test/test_lite.c
index b403645b3f6..8a601649dfb 100644
--- a/hl/test/test_lite.c
+++ b/hl/test/test_lite.c
@@ -1952,68 +1952,68 @@ test_complex(void)
         goto out;
 #endif
 
-    if ((dtype = H5LTtext_to_dtype("H5T_CPLX_IEEE_F16LE\n", H5LT_DDL)) < 0)
+    if ((dtype = H5LTtext_to_dtype("H5T_COMPLEX_IEEE_F16LE\n", H5LT_DDL)) < 0)
         goto out;
     if ((type_class = H5Tget_class(dtype)) < 0)
         goto out;
     if (type_class != H5T_COMPLEX)
         goto out;
-    if (!H5Tequal(dtype, H5T_CPLX_IEEE_F16LE))
+    if (!H5Tequal(dtype, H5T_COMPLEX_IEEE_F16LE))
         goto out;
     if (H5Tclose(dtype) < 0)
         goto out;
 
-    if ((dtype = H5LTtext_to_dtype("H5T_CPLX_IEEE_F16BE\n", H5LT_DDL)) < 0)
+    if ((dtype = H5LTtext_to_dtype("H5T_COMPLEX_IEEE_F16BE\n", H5LT_DDL)) < 0)
         goto out;
     if ((type_class = H5Tget_class(dtype)) < 0)
         goto out;
     if (type_class != H5T_COMPLEX)
         goto out;
-    if (!H5Tequal(dtype, H5T_CPLX_IEEE_F16BE))
+    if (!H5Tequal(dtype, H5T_COMPLEX_IEEE_F16BE))
         goto out;
     if (H5Tclose(dtype) < 0)
         goto out;
 
-    if ((dtype = H5LTtext_to_dtype("H5T_CPLX_IEEE_F32LE\n", H5LT_DDL)) < 0)
+    if ((dtype = H5LTtext_to_dtype("H5T_COMPLEX_IEEE_F32LE\n", H5LT_DDL)) < 0)
         goto out;
     if ((type_class = H5Tget_class(dtype)) < 0)
         goto out;
     if (type_class != H5T_COMPLEX)
         goto out;
-    if (!H5Tequal(dtype, H5T_CPLX_IEEE_F32LE))
+    if (!H5Tequal(dtype, H5T_COMPLEX_IEEE_F32LE))
         goto out;
     if (H5Tclose(dtype) < 0)
         goto out;
 
-    if ((dtype = H5LTtext_to_dtype("H5T_CPLX_IEEE_F32BE\n", H5LT_DDL)) < 0)
+    if ((dtype = H5LTtext_to_dtype("H5T_COMPLEX_IEEE_F32BE\n", H5LT_DDL)) < 0)
         goto out;
     if ((type_class = H5Tget_class(dtype)) < 0)
         goto out;
     if (type_class != H5T_COMPLEX)
         goto out;
-    if (!H5Tequal(dtype, H5T_CPLX_IEEE_F32BE))
+    if (!H5Tequal(dtype, H5T_COMPLEX_IEEE_F32BE))
         goto out;
     if (H5Tclose(dtype) < 0)
         goto out;
 
-    if ((dtype = H5LTtext_to_dtype("H5T_CPLX_IEEE_F64LE\n", H5LT_DDL)) < 0)
+    if ((dtype = H5LTtext_to_dtype("H5T_COMPLEX_IEEE_F64LE\n", H5LT_DDL)) < 0)
         goto out;
     if ((type_class = H5Tget_class(dtype)) < 0)
         goto out;
     if (type_class != H5T_COMPLEX)
         goto out;
-    if (!H5Tequal(dtype, H5T_CPLX_IEEE_F64LE))
+    if (!H5Tequal(dtype, H5T_COMPLEX_IEEE_F64LE))
         goto out;
     if (H5Tclose(dtype) < 0)
         goto out;
 
-    if ((dtype = H5LTtext_to_dtype("H5T_CPLX_IEEE_F64BE\n", H5LT_DDL)) < 0)
+    if ((dtype = H5LTtext_to_dtype("H5T_COMPLEX_IEEE_F64BE\n", H5LT_DDL)) < 0)
         goto out;
     if ((type_class = H5Tget_class(dtype)) < 0)
         goto out;
     if (type_class != H5T_COMPLEX)
         goto out;
-    if (!H5Tequal(dtype, H5T_CPLX_IEEE_F64BE))
+    if (!H5Tequal(dtype, H5T_COMPLEX_IEEE_F64BE))
         goto out;
     if (H5Tclose(dtype) < 0)
         goto out;
@@ -2024,7 +2024,7 @@ test_complex(void)
         goto out;
     if (type_class != H5T_COMPLEX)
         goto out;
-    if (!H5Tequal(dtype, H5T_CPLX_IEEE_F16LE))
+    if (!H5Tequal(dtype, H5T_COMPLEX_IEEE_F16LE))
         goto out;
     if (H5Tclose(dtype) < 0)
         goto out;
@@ -2035,7 +2035,7 @@ test_complex(void)
         goto out;
     if (type_class != H5T_COMPLEX)
         goto out;
-    if (!H5Tequal(dtype, H5T_CPLX_IEEE_F16BE))
+    if (!H5Tequal(dtype, H5T_COMPLEX_IEEE_F16BE))
         goto out;
     if (H5Tclose(dtype) < 0)
         goto out;
@@ -2046,7 +2046,7 @@ test_complex(void)
         goto out;
     if (type_class != H5T_COMPLEX)
         goto out;
-    if (!H5Tequal(dtype, H5T_CPLX_IEEE_F32LE))
+    if (!H5Tequal(dtype, H5T_COMPLEX_IEEE_F32LE))
         goto out;
     if (H5Tclose(dtype) < 0)
         goto out;
@@ -2057,7 +2057,7 @@ test_complex(void)
         goto out;
     if (type_class != H5T_COMPLEX)
         goto out;
-    if (!H5Tequal(dtype, H5T_CPLX_IEEE_F32BE))
+    if (!H5Tequal(dtype, H5T_COMPLEX_IEEE_F32BE))
         goto out;
     if (H5Tclose(dtype) < 0)
         goto out;
@@ -2068,7 +2068,7 @@ test_complex(void)
         goto out;
     if (type_class != H5T_COMPLEX)
         goto out;
-    if (!H5Tequal(dtype, H5T_CPLX_IEEE_F64LE))
+    if (!H5Tequal(dtype, H5T_COMPLEX_IEEE_F64LE))
         goto out;
     if (H5Tclose(dtype) < 0)
         goto out;
@@ -2079,7 +2079,7 @@ test_complex(void)
         goto out;
     if (type_class != H5T_COMPLEX)
         goto out;
-    if (!H5Tequal(dtype, H5T_CPLX_IEEE_F64BE))
+    if (!H5Tequal(dtype, H5T_COMPLEX_IEEE_F64BE))
         goto out;
     if (H5Tclose(dtype) < 0)
         goto out;
diff --git a/java/src/hdf/hdf5lib/HDF5Constants.java b/java/src/hdf/hdf5lib/HDF5Constants.java
index 7f9829c0e7d..124d2b55cce 100644
--- a/java/src/hdf/hdf5lib/HDF5Constants.java
+++ b/java/src/hdf/hdf5lib/HDF5Constants.java
@@ -1051,17 +1051,17 @@ public class HDF5Constants {
     /** */
     public static final int H5T_CONV_INIT = H5T_CONV_INIT();
     /** */
-    public static final long H5T_CPLX_IEEE_F16BE = H5T_CPLX_IEEE_F16BE();
+    public static final long H5T_COMPLEX_IEEE_F16BE = H5T_COMPLEX_IEEE_F16BE();
     /** */
-    public static final long H5T_CPLX_IEEE_F16LE = H5T_CPLX_IEEE_F16LE();
+    public static final long H5T_COMPLEX_IEEE_F16LE = H5T_COMPLEX_IEEE_F16LE();
     /** */
-    public static final long H5T_CPLX_IEEE_F32BE = H5T_CPLX_IEEE_F32BE();
+    public static final long H5T_COMPLEX_IEEE_F32BE = H5T_COMPLEX_IEEE_F32BE();
     /** */
-    public static final long H5T_CPLX_IEEE_F32LE = H5T_CPLX_IEEE_F32LE();
+    public static final long H5T_COMPLEX_IEEE_F32LE = H5T_COMPLEX_IEEE_F32LE();
     /** */
-    public static final long H5T_CPLX_IEEE_F64BE = H5T_CPLX_IEEE_F64BE();
+    public static final long H5T_COMPLEX_IEEE_F64BE = H5T_COMPLEX_IEEE_F64BE();
     /** */
-    public static final long H5T_CPLX_IEEE_F64LE = H5T_CPLX_IEEE_F64LE();
+    public static final long H5T_COMPLEX_IEEE_F64LE = H5T_COMPLEX_IEEE_F64LE();
     /** */
     public static final int H5T_CSET_ERROR = H5T_CSET_ERROR();
     /** */
@@ -2562,17 +2562,17 @@ public class HDF5Constants {
 
     private static native final int H5T_CONV_INIT();
 
-    private static native final long H5T_CPLX_IEEE_F16BE();
+    private static native final long H5T_COMPLEX_IEEE_F16BE();
 
-    private static native final long H5T_CPLX_IEEE_F16LE();
+    private static native final long H5T_COMPLEX_IEEE_F16LE();
 
-    private static native final long H5T_CPLX_IEEE_F32BE();
+    private static native final long H5T_COMPLEX_IEEE_F32BE();
 
-    private static native final long H5T_CPLX_IEEE_F32LE();
+    private static native final long H5T_COMPLEX_IEEE_F32LE();
 
-    private static native final long H5T_CPLX_IEEE_F64BE();
+    private static native final long H5T_COMPLEX_IEEE_F64BE();
 
-    private static native final long H5T_CPLX_IEEE_F64LE();
+    private static native final long H5T_COMPLEX_IEEE_F64LE();
 
     private static native final int H5T_CSET_ERROR();
 
diff --git a/java/src/jni/h5Constants.c b/java/src/jni/h5Constants.c
index b27c35e3af8..2a31b7fed4a 100644
--- a/java/src/jni/h5Constants.c
+++ b/java/src/jni/h5Constants.c
@@ -2568,34 +2568,34 @@ Java_hdf_hdf5lib_HDF5Constants_H5T_1CONV_1INIT(JNIEnv *env, jclass cls)
     return H5T_CONV_INIT;
 }
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1CPLX_1IEEE_1F16BE(JNIEnv *env, jclass cls)
+Java_hdf_hdf5lib_HDF5Constants_H5T_1COMPLEX_1IEEE_1F16BE(JNIEnv *env, jclass cls)
 {
-    return H5T_CPLX_IEEE_F16BE;
+    return H5T_COMPLEX_IEEE_F16BE;
 }
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1CPLX_1IEEE_1F16LE(JNIEnv *env, jclass cls)
+Java_hdf_hdf5lib_HDF5Constants_H5T_1COMPLEX_1IEEE_1F16LE(JNIEnv *env, jclass cls)
 {
-    return H5T_CPLX_IEEE_F16LE;
+    return H5T_COMPLEX_IEEE_F16LE;
 }
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1CPLX_1IEEE_1F32BE(JNIEnv *env, jclass cls)
+Java_hdf_hdf5lib_HDF5Constants_H5T_1COMPLEX_1IEEE_1F32BE(JNIEnv *env, jclass cls)
 {
-    return H5T_CPLX_IEEE_F32BE;
+    return H5T_COMPLEX_IEEE_F32BE;
 }
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1CPLX_1IEEE_1F32LE(JNIEnv *env, jclass cls)
+Java_hdf_hdf5lib_HDF5Constants_H5T_1COMPLEX_1IEEE_1F32LE(JNIEnv *env, jclass cls)
 {
-    return H5T_CPLX_IEEE_F32LE;
+    return H5T_COMPLEX_IEEE_F32LE;
 }
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1CPLX_1IEEE_1F64BE(JNIEnv *env, jclass cls)
+Java_hdf_hdf5lib_HDF5Constants_H5T_1COMPLEX_1IEEE_1F64BE(JNIEnv *env, jclass cls)
 {
-    return H5T_CPLX_IEEE_F64BE;
+    return H5T_COMPLEX_IEEE_F64BE;
 }
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1CPLX_1IEEE_1F64LE(JNIEnv *env, jclass cls)
+Java_hdf_hdf5lib_HDF5Constants_H5T_1COMPLEX_1IEEE_1F64LE(JNIEnv *env, jclass cls)
 {
-    return H5T_CPLX_IEEE_F64LE;
+    return H5T_COMPLEX_IEEE_F64LE;
 }
 JNIEXPORT jint JNICALL
 Java_hdf_hdf5lib_HDF5Constants_H5T_1CSET_1ERROR(JNIEnv *env, jclass cls)
diff --git a/java/src/jni/h5util.c b/java/src/jni/h5util.c
index f203e8ed903..ff65e9d8eda 100644
--- a/java/src/jni/h5util.c
+++ b/java/src/jni/h5util.c
@@ -2197,11 +2197,11 @@ h5str_get_little_endian_type(hid_t tid)
 
         case H5T_COMPLEX: {
             if (size == 4)
-                p_type = H5Tcopy(H5T_CPLX_IEEE_F16LE);
+                p_type = H5Tcopy(H5T_COMPLEX_IEEE_F16LE);
             else if (size == 8)
-                p_type = H5Tcopy(H5T_CPLX_IEEE_F32LE);
+                p_type = H5Tcopy(H5T_COMPLEX_IEEE_F32LE);
             else if (size == 16)
-                p_type = H5Tcopy(H5T_CPLX_IEEE_F64LE);
+                p_type = H5Tcopy(H5T_COMPLEX_IEEE_F64LE);
 
             break;
         }
@@ -2304,11 +2304,11 @@ h5str_get_big_endian_type(hid_t tid)
 
         case H5T_COMPLEX: {
             if (size == 4)
-                p_type = H5Tcopy(H5T_CPLX_IEEE_F16BE);
+                p_type = H5Tcopy(H5T_COMPLEX_IEEE_F16BE);
             else if (size == 8)
-                p_type = H5Tcopy(H5T_CPLX_IEEE_F32BE);
+                p_type = H5Tcopy(H5T_COMPLEX_IEEE_F32BE);
             else if (size == 16)
-                p_type = H5Tcopy(H5T_CPLX_IEEE_F64BE);
+                p_type = H5Tcopy(H5T_COMPLEX_IEEE_F64BE);
 
             break;
         }
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index 2b095f7fa52..c795c268f03 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -509,21 +509,21 @@ New Features
         not available (H5_HAVE_COMPLEX_NUMBERS is not defined), the macro will map
         to H5I_INVALID_HID and should not be used.
 
-        - H5T_CPLX_IEEE_F16LE / H5T_CPLX_IEEE_F16BE
+        - H5T_COMPLEX_IEEE_F16LE / H5T_COMPLEX_IEEE_F16BE
 
         These macros map to IDs of HDF5 datatypes representing a complex number of
         two parts, each of which is an IEEE 754 16-bit floating-point datatype in
         little- or big-endian order. These datatypes are available regardless of
         whether complex number support is available or not.
 
-        - H5T_CPLX_IEEE_F32LE / H5T_CPLX_IEEE_F32BE
+        - H5T_COMPLEX_IEEE_F32LE / H5T_COMPLEX_IEEE_F32BE
 
         These macros map to IDs of HDF5 datatypes representing a complex number of
         two parts, each of which is an IEEE 754 32-bit floating-point datatype in
         little- or big-endian order. These datatypes are available regardless of
         whether complex number support is available or not.
 
-        - H5T_CPLX_IEEE_F64LE / H5T_CPLX_IEEE_F64BE
+        - H5T_COMPLEX_IEEE_F64LE / H5T_COMPLEX_IEEE_F64BE
 
         These macros map to IDs of HDF5 datatypes representing a complex number of
         two parts, each of which is an IEEE 754 64-bit floating-point datatype in
diff --git a/src/H5T.c b/src/H5T.c
index 177191f275e..5efd23ccc18 100644
--- a/src/H5T.c
+++ b/src/H5T.c
@@ -430,12 +430,12 @@ hid_t H5T_IEEE_F32LE_g = H5I_INVALID_HID;
 hid_t H5T_IEEE_F64BE_g = H5I_INVALID_HID;
 hid_t H5T_IEEE_F64LE_g = H5I_INVALID_HID;
 
-hid_t H5T_CPLX_IEEE_F16BE_g = H5I_INVALID_HID;
-hid_t H5T_CPLX_IEEE_F16LE_g = H5I_INVALID_HID;
-hid_t H5T_CPLX_IEEE_F32BE_g = H5I_INVALID_HID;
-hid_t H5T_CPLX_IEEE_F32LE_g = H5I_INVALID_HID;
-hid_t H5T_CPLX_IEEE_F64BE_g = H5I_INVALID_HID;
-hid_t H5T_CPLX_IEEE_F64LE_g = H5I_INVALID_HID;
+hid_t H5T_COMPLEX_IEEE_F16BE_g = H5I_INVALID_HID;
+hid_t H5T_COMPLEX_IEEE_F16LE_g = H5I_INVALID_HID;
+hid_t H5T_COMPLEX_IEEE_F32BE_g = H5I_INVALID_HID;
+hid_t H5T_COMPLEX_IEEE_F32LE_g = H5I_INVALID_HID;
+hid_t H5T_COMPLEX_IEEE_F64BE_g = H5I_INVALID_HID;
+hid_t H5T_COMPLEX_IEEE_F64LE_g = H5I_INVALID_HID;
 
 hid_t H5T_VAX_F32_g = H5I_INVALID_HID;
 hid_t H5T_VAX_F64_g = H5I_INVALID_HID;
@@ -1232,7 +1232,7 @@ H5T_init(void)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype object");
     if (NULL == (dt = H5T__complex_create(tmp_float)))
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "couldn't create complex number datatype");
-    if ((H5T_CPLX_IEEE_F16LE_g = H5I_register(H5I_DATATYPE, dt, false)) < 0)
+    if ((H5T_COMPLEX_IEEE_F16LE_g = H5I_register(H5I_DATATYPE, dt, false)) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, FAIL, "unable to register datatype atom");
 
     /* Complex number of 2 IEEE 2-byte big-endian floats */
@@ -1240,7 +1240,7 @@ H5T_init(void)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype object");
     if (NULL == (dt = H5T__complex_create(tmp_float)))
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "couldn't create complex number datatype");
-    if ((H5T_CPLX_IEEE_F16BE_g = H5I_register(H5I_DATATYPE, dt, false)) < 0)
+    if ((H5T_COMPLEX_IEEE_F16BE_g = H5I_register(H5I_DATATYPE, dt, false)) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, FAIL, "unable to register datatype atom");
 
     /* Complex number of 2 IEEE 4-byte little-endian floats */
@@ -1248,7 +1248,7 @@ H5T_init(void)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype object");
     if (NULL == (dt = H5T__complex_create(tmp_float)))
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "couldn't create complex number datatype");
-    if ((H5T_CPLX_IEEE_F32LE_g = H5I_register(H5I_DATATYPE, dt, false)) < 0)
+    if ((H5T_COMPLEX_IEEE_F32LE_g = H5I_register(H5I_DATATYPE, dt, false)) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, FAIL, "unable to register datatype atom");
 
     /* Complex number of 2 IEEE 4-byte big-endian floats */
@@ -1256,7 +1256,7 @@ H5T_init(void)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype object");
     if (NULL == (dt = H5T__complex_create(tmp_float)))
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "couldn't create complex number datatype");
-    if ((H5T_CPLX_IEEE_F32BE_g = H5I_register(H5I_DATATYPE, dt, false)) < 0)
+    if ((H5T_COMPLEX_IEEE_F32BE_g = H5I_register(H5I_DATATYPE, dt, false)) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, FAIL, "unable to register datatype atom");
 
     /* Complex number of 2 IEEE 8-byte little-endian floats */
@@ -1264,7 +1264,7 @@ H5T_init(void)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype object");
     if (NULL == (dt = H5T__complex_create(tmp_float)))
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "couldn't create complex number datatype");
-    if ((H5T_CPLX_IEEE_F64LE_g = H5I_register(H5I_DATATYPE, dt, false)) < 0)
+    if ((H5T_COMPLEX_IEEE_F64LE_g = H5I_register(H5I_DATATYPE, dt, false)) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, FAIL, "unable to register datatype atom");
 
     /* Complex number of 2 IEEE 8-byte big-endian floats */
@@ -1272,7 +1272,7 @@ H5T_init(void)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype object");
     if (NULL == (dt = H5T__complex_create(tmp_float)))
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "couldn't create complex number datatype");
-    if ((H5T_CPLX_IEEE_F64BE_g = H5I_register(H5I_DATATYPE, dt, false)) < 0)
+    if ((H5T_COMPLEX_IEEE_F64BE_g = H5I_register(H5I_DATATYPE, dt, false)) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, FAIL, "unable to register datatype atom");
 
     /*
@@ -2146,12 +2146,12 @@ H5T_top_term_package(void)
         H5T_IEEE_F64BE_g = H5I_INVALID_HID;
         H5T_IEEE_F64LE_g = H5I_INVALID_HID;
 
-        H5T_CPLX_IEEE_F16BE_g = H5I_INVALID_HID;
-        H5T_CPLX_IEEE_F16LE_g = H5I_INVALID_HID;
-        H5T_CPLX_IEEE_F32BE_g = H5I_INVALID_HID;
-        H5T_CPLX_IEEE_F32LE_g = H5I_INVALID_HID;
-        H5T_CPLX_IEEE_F64BE_g = H5I_INVALID_HID;
-        H5T_CPLX_IEEE_F64LE_g = H5I_INVALID_HID;
+        H5T_COMPLEX_IEEE_F16BE_g = H5I_INVALID_HID;
+        H5T_COMPLEX_IEEE_F16LE_g = H5I_INVALID_HID;
+        H5T_COMPLEX_IEEE_F32BE_g = H5I_INVALID_HID;
+        H5T_COMPLEX_IEEE_F32LE_g = H5I_INVALID_HID;
+        H5T_COMPLEX_IEEE_F64BE_g = H5I_INVALID_HID;
+        H5T_COMPLEX_IEEE_F64LE_g = H5I_INVALID_HID;
 
         H5T_STD_I8BE_g        = H5I_INVALID_HID;
         H5T_STD_I8LE_g        = H5I_INVALID_HID;
diff --git a/src/H5Tmodule.h b/src/H5Tmodule.h
index f98d43564ec..aee16fa85a3 100644
--- a/src/H5Tmodule.h
+++ b/src/H5Tmodule.h
@@ -3941,9 +3941,9 @@ filled according to the value of this property. The padding can be:
  *   <enum_symbol> ::= <identifier>
  *   <enum_val> ::= <int_value>
  *   <complex_type> ::= H5T_COMPLEX { <complex_base_type> <complex_base_type> } |
- *                      H5T_CPLX_IEEE_F16BE | H5T_CPLX_IEEE_F16LE |
- *                      H5T_CPLX_IEEE_F32BE | H5T_CPLX_IEEE_F32LE |
- *                      H5T_CPLX_IEEE_F64BE | H5T_CPLX_IEEE_F64LE |
+ *                      H5T_COMPLEX_IEEE_F16BE   | H5T_COMPLEX_IEEE_F16LE    |
+ *                      H5T_COMPLEX_IEEE_F32BE   | H5T_COMPLEX_IEEE_F32LE    |
+ *                      H5T_COMPLEX_IEEE_F64BE   | H5T_COMPLEX_IEEE_F64LE    |
  *                      H5T_NATIVE_FLOAT_COMPLEX | H5T_NATIVE_DOUBLE_COMPLEX |
  *                      H5T_NATIVE_LDOUBLE_COMPLEX
  *   <complex_base_type> ::= <float>
@@ -4060,12 +4060,12 @@ filled according to the value of this property. The padding can be:
  * \snippet{doc} tables/predefinedDatatypes.dox predefined_ieee_datatypes_table
  * </div>
  *
- * \defgroup PDTCPLX Complex Number Datatypes
+ * \defgroup PDTCOMPLEX Complex Number Datatypes
  * \ingroup PDT
  * \details Complex number types consisting of 2 floating point values in big-
  *          and little-endian byte orders.
  * <div>
- * \snippet{doc} tables/predefinedDatatypes.dox predefined_cplx_datatypes_table
+ * \snippet{doc} tables/predefinedDatatypes.dox predefined_complex_datatypes_table
  * </div>
  *
  * \defgroup PDTSTD Standard Datatypes
diff --git a/src/H5Tpublic.h b/src/H5Tpublic.h
index 241594b8760..e507e0d24da 100644
--- a/src/H5Tpublic.h
+++ b/src/H5Tpublic.h
@@ -292,41 +292,41 @@ H5_DLLVAR hid_t H5T_IEEE_F64LE_g;
  * Complex number types made up of IEEE floating point types
  */
 /**
- * \ingroup PDTCPLX
+ * \ingroup PDTCOMPLEX
  * Complex number of 2 16-bit little-endian IEEE floating-point numbers
  */
-#define H5T_CPLX_IEEE_F16BE (H5OPEN H5T_CPLX_IEEE_F16BE_g)
+#define H5T_COMPLEX_IEEE_F16BE (H5OPEN H5T_COMPLEX_IEEE_F16BE_g)
 /**
- * \ingroup PDTCPLX
+ * \ingroup PDTCOMPLEX
  * Complex number of 2 16-bit big-endian IEEE floating-point numbers
  */
-#define H5T_CPLX_IEEE_F16LE (H5OPEN H5T_CPLX_IEEE_F16LE_g)
+#define H5T_COMPLEX_IEEE_F16LE (H5OPEN H5T_COMPLEX_IEEE_F16LE_g)
 /**
- * \ingroup PDTCPLX
+ * \ingroup PDTCOMPLEX
  * Complex number of 2 32-bit big-endian IEEE floating-point numbers
  */
-#define H5T_CPLX_IEEE_F32BE (H5OPEN H5T_CPLX_IEEE_F32BE_g)
+#define H5T_COMPLEX_IEEE_F32BE (H5OPEN H5T_COMPLEX_IEEE_F32BE_g)
 /**
- * \ingroup PDTCPLX
+ * \ingroup PDTCOMPLEX
  * Complex number of 2 32-bit little-endian IEEE floating-point numbers
  */
-#define H5T_CPLX_IEEE_F32LE (H5OPEN H5T_CPLX_IEEE_F32LE_g)
+#define H5T_COMPLEX_IEEE_F32LE (H5OPEN H5T_COMPLEX_IEEE_F32LE_g)
 /**
- * \ingroup PDTCPLX
+ * \ingroup PDTCOMPLEX
  * Complex number of 2 64-bit big-endian IEEE floating-point numbers
  */
-#define H5T_CPLX_IEEE_F64BE (H5OPEN H5T_CPLX_IEEE_F64BE_g)
+#define H5T_COMPLEX_IEEE_F64BE (H5OPEN H5T_COMPLEX_IEEE_F64BE_g)
 /**
- * \ingroup PDTCPLX
+ * \ingroup PDTCOMPLEX
  * Complex number of 2 64-bit little-endian IEEE floating-point numbers
  */
-#define H5T_CPLX_IEEE_F64LE (H5OPEN H5T_CPLX_IEEE_F64LE_g)
-H5_DLLVAR hid_t H5T_CPLX_IEEE_F16BE_g;
-H5_DLLVAR hid_t H5T_CPLX_IEEE_F16LE_g;
-H5_DLLVAR hid_t H5T_CPLX_IEEE_F32BE_g;
-H5_DLLVAR hid_t H5T_CPLX_IEEE_F32LE_g;
-H5_DLLVAR hid_t H5T_CPLX_IEEE_F64BE_g;
-H5_DLLVAR hid_t H5T_CPLX_IEEE_F64LE_g;
+#define H5T_COMPLEX_IEEE_F64LE (H5OPEN H5T_COMPLEX_IEEE_F64LE_g)
+H5_DLLVAR hid_t H5T_COMPLEX_IEEE_F16BE_g;
+H5_DLLVAR hid_t H5T_COMPLEX_IEEE_F16LE_g;
+H5_DLLVAR hid_t H5T_COMPLEX_IEEE_F32BE_g;
+H5_DLLVAR hid_t H5T_COMPLEX_IEEE_F32LE_g;
+H5_DLLVAR hid_t H5T_COMPLEX_IEEE_F64BE_g;
+H5_DLLVAR hid_t H5T_COMPLEX_IEEE_F64LE_g;
 
 /*
  * These are "standard" types.  For instance, signed (2's complement) and
diff --git a/src/H5trace.c b/src/H5trace.c
index b5a540b4698..2f416c70baa 100644
--- a/src/H5trace.c
+++ b/src/H5trace.c
@@ -1687,18 +1687,18 @@ H5_trace_args(H5RS_str_t *rs, const char *type, va_list ap)
                                     H5RS_acat(rs, "H5T_IEEE_F64BE");
                                 else if (obj == H5T_IEEE_F64LE_g)
                                     H5RS_acat(rs, "H5T_IEEE_F64LE");
-                                else if (obj == H5T_CPLX_IEEE_F16BE_g)
-                                    H5RS_acat(rs, "H5T_CPLX_IEEE_F16BE");
-                                else if (obj == H5T_CPLX_IEEE_F16LE_g)
-                                    H5RS_acat(rs, "H5T_CPLX_IEEE_F16LE");
-                                else if (obj == H5T_CPLX_IEEE_F32BE_g)
-                                    H5RS_acat(rs, "H5T_CPLX_IEEE_F32BE");
-                                else if (obj == H5T_CPLX_IEEE_F32LE_g)
-                                    H5RS_acat(rs, "H5T_CPLX_IEEE_F32LE");
-                                else if (obj == H5T_CPLX_IEEE_F64BE_g)
-                                    H5RS_acat(rs, "H5T_CPLX_IEEE_F64BE");
-                                else if (obj == H5T_CPLX_IEEE_F64LE_g)
-                                    H5RS_acat(rs, "H5T_CPLX_IEEE_F64LE");
+                                else if (obj == H5T_COMPLEX_IEEE_F16BE_g)
+                                    H5RS_acat(rs, "H5T_COMPLEX_IEEE_F16BE");
+                                else if (obj == H5T_COMPLEX_IEEE_F16LE_g)
+                                    H5RS_acat(rs, "H5T_COMPLEX_IEEE_F16LE");
+                                else if (obj == H5T_COMPLEX_IEEE_F32BE_g)
+                                    H5RS_acat(rs, "H5T_COMPLEX_IEEE_F32BE");
+                                else if (obj == H5T_COMPLEX_IEEE_F32LE_g)
+                                    H5RS_acat(rs, "H5T_COMPLEX_IEEE_F32LE");
+                                else if (obj == H5T_COMPLEX_IEEE_F64BE_g)
+                                    H5RS_acat(rs, "H5T_COMPLEX_IEEE_F64BE");
+                                else if (obj == H5T_COMPLEX_IEEE_F64LE_g)
+                                    H5RS_acat(rs, "H5T_COMPLEX_IEEE_F64LE");
                                 else if (obj == H5T_STD_I8BE_g)
                                     H5RS_acat(rs, "H5T_STD_I8BE");
                                 else if (obj == H5T_STD_I8LE_g)
diff --git a/test/API/H5_api_dataset_test.c b/test/API/H5_api_dataset_test.c
index 6e12043c30a..346f3b71d24 100644
--- a/test/API/H5_api_dataset_test.c
+++ b/test/API/H5_api_dataset_test.c
@@ -1277,13 +1277,13 @@ test_create_dataset_predefined_types(void)
     hid_t  fspace_id                    = H5I_INVALID_HID;
     hid_t  dset_id                      = H5I_INVALID_HID;
     hid_t  predefined_type_test_table[] = {
-        H5T_STD_U8LE,        H5T_STD_U8BE,        H5T_STD_I8LE,        H5T_STD_I8BE,
-        H5T_STD_U16LE,       H5T_STD_U16BE,       H5T_STD_I16LE,       H5T_STD_I16BE,
-        H5T_STD_U32LE,       H5T_STD_U32BE,       H5T_STD_I32LE,       H5T_STD_I32BE,
-        H5T_STD_U64LE,       H5T_STD_U64BE,       H5T_STD_I64LE,       H5T_STD_I64BE,
-        H5T_IEEE_F16LE,      H5T_IEEE_F16BE,      H5T_IEEE_F32LE,      H5T_IEEE_F32BE,
-        H5T_IEEE_F64LE,      H5T_IEEE_F64BE,      H5T_CPLX_IEEE_F16BE, H5T_CPLX_IEEE_F16LE,
-        H5T_CPLX_IEEE_F32BE, H5T_CPLX_IEEE_F32LE, H5T_CPLX_IEEE_F64BE, H5T_CPLX_IEEE_F64LE};
+        H5T_STD_U8LE,           H5T_STD_U8BE,           H5T_STD_I8LE,           H5T_STD_I8BE,
+        H5T_STD_U16LE,          H5T_STD_U16BE,          H5T_STD_I16LE,          H5T_STD_I16BE,
+        H5T_STD_U32LE,          H5T_STD_U32BE,          H5T_STD_I32LE,          H5T_STD_I32BE,
+        H5T_STD_U64LE,          H5T_STD_U64BE,          H5T_STD_I64LE,          H5T_STD_I64BE,
+        H5T_IEEE_F16LE,         H5T_IEEE_F16BE,         H5T_IEEE_F32LE,         H5T_IEEE_F32BE,
+        H5T_IEEE_F64LE,         H5T_IEEE_F64BE,         H5T_COMPLEX_IEEE_F16BE, H5T_COMPLEX_IEEE_F16LE,
+        H5T_COMPLEX_IEEE_F32BE, H5T_COMPLEX_IEEE_F32LE, H5T_COMPLEX_IEEE_F64BE, H5T_COMPLEX_IEEE_F64LE};
 
     TESTING("dataset creation with predefined datatypes");
 
diff --git a/test/API/H5_api_test_util.c b/test/API/H5_api_test_util.c
index 2d815009382..15d4d09bec8 100644
--- a/test/API/H5_api_test_util.c
+++ b/test/API/H5_api_test_util.c
@@ -617,22 +617,22 @@ generate_random_datatype_complex(H5T_class_t H5_ATTR_UNUSED parent_class, bool H
 
     switch (rand() % NUM_PREDEFINED_COMPLEX_TYPES) {
         case 0:
-            type_to_copy = H5T_CPLX_IEEE_F16BE;
+            type_to_copy = H5T_COMPLEX_IEEE_F16BE;
             break;
         case 1:
-            type_to_copy = H5T_CPLX_IEEE_F16LE;
+            type_to_copy = H5T_COMPLEX_IEEE_F16LE;
             break;
         case 2:
-            type_to_copy = H5T_CPLX_IEEE_F32BE;
+            type_to_copy = H5T_COMPLEX_IEEE_F32BE;
             break;
         case 3:
-            type_to_copy = H5T_CPLX_IEEE_F32LE;
+            type_to_copy = H5T_COMPLEX_IEEE_F32LE;
             break;
         case 4:
-            type_to_copy = H5T_CPLX_IEEE_F64BE;
+            type_to_copy = H5T_COMPLEX_IEEE_F64BE;
             break;
         case 5:
-            type_to_copy = H5T_CPLX_IEEE_F64LE;
+            type_to_copy = H5T_COMPLEX_IEEE_F64LE;
             break;
         default:
             printf("    invalid value for complex number type; should not happen\n");
diff --git a/test/dtypes.c b/test/dtypes.c
index 4afcd32b904..efb19696737 100644
--- a/test/dtypes.c
+++ b/test/dtypes.c
@@ -417,41 +417,41 @@ test_detect(void)
     /*--------------------------------------------------------------------------------
      *  Test class of complex number types.
      *------------------------------------------------------------------------------*/
-    if (H5Tdetect_class(H5T_CPLX_IEEE_F16LE, H5T_COMPLEX) != true)
+    if (H5Tdetect_class(H5T_COMPLEX_IEEE_F16LE, H5T_COMPLEX) != true)
         TEST_ERROR;
-    if (H5Tdetect_class(H5T_CPLX_IEEE_F16BE, H5T_COMPLEX) != true)
+    if (H5Tdetect_class(H5T_COMPLEX_IEEE_F16BE, H5T_COMPLEX) != true)
         TEST_ERROR;
-    if (H5Tdetect_class(H5T_CPLX_IEEE_F32LE, H5T_COMPLEX) != true)
+    if (H5Tdetect_class(H5T_COMPLEX_IEEE_F32LE, H5T_COMPLEX) != true)
         TEST_ERROR;
-    if (H5Tdetect_class(H5T_CPLX_IEEE_F32BE, H5T_COMPLEX) != true)
+    if (H5Tdetect_class(H5T_COMPLEX_IEEE_F32BE, H5T_COMPLEX) != true)
         TEST_ERROR;
-    if (H5Tdetect_class(H5T_CPLX_IEEE_F64LE, H5T_COMPLEX) != true)
+    if (H5Tdetect_class(H5T_COMPLEX_IEEE_F64LE, H5T_COMPLEX) != true)
         TEST_ERROR;
-    if (H5Tdetect_class(H5T_CPLX_IEEE_F64BE, H5T_COMPLEX) != true)
+    if (H5Tdetect_class(H5T_COMPLEX_IEEE_F64BE, H5T_COMPLEX) != true)
         TEST_ERROR;
-    if (H5Tdetect_class(H5T_CPLX_IEEE_F16LE, H5T_FLOAT) != true)
+    if (H5Tdetect_class(H5T_COMPLEX_IEEE_F16LE, H5T_FLOAT) != true)
         TEST_ERROR;
-    if (H5Tdetect_class(H5T_CPLX_IEEE_F16BE, H5T_FLOAT) != true)
+    if (H5Tdetect_class(H5T_COMPLEX_IEEE_F16BE, H5T_FLOAT) != true)
         TEST_ERROR;
-    if (H5Tdetect_class(H5T_CPLX_IEEE_F32LE, H5T_FLOAT) != true)
+    if (H5Tdetect_class(H5T_COMPLEX_IEEE_F32LE, H5T_FLOAT) != true)
         TEST_ERROR;
-    if (H5Tdetect_class(H5T_CPLX_IEEE_F32BE, H5T_FLOAT) != true)
+    if (H5Tdetect_class(H5T_COMPLEX_IEEE_F32BE, H5T_FLOAT) != true)
         TEST_ERROR;
-    if (H5Tdetect_class(H5T_CPLX_IEEE_F64LE, H5T_FLOAT) != true)
+    if (H5Tdetect_class(H5T_COMPLEX_IEEE_F64LE, H5T_FLOAT) != true)
         TEST_ERROR;
-    if (H5Tdetect_class(H5T_CPLX_IEEE_F64BE, H5T_FLOAT) != true)
+    if (H5Tdetect_class(H5T_COMPLEX_IEEE_F64BE, H5T_FLOAT) != true)
         TEST_ERROR;
-    if (H5Tdetect_class(H5T_CPLX_IEEE_F16LE, H5T_INTEGER) == true)
+    if (H5Tdetect_class(H5T_COMPLEX_IEEE_F16LE, H5T_INTEGER) == true)
         TEST_ERROR;
-    if (H5Tdetect_class(H5T_CPLX_IEEE_F16BE, H5T_INTEGER) == true)
+    if (H5Tdetect_class(H5T_COMPLEX_IEEE_F16BE, H5T_INTEGER) == true)
         TEST_ERROR;
-    if (H5Tdetect_class(H5T_CPLX_IEEE_F32LE, H5T_INTEGER) == true)
+    if (H5Tdetect_class(H5T_COMPLEX_IEEE_F32LE, H5T_INTEGER) == true)
         TEST_ERROR;
-    if (H5Tdetect_class(H5T_CPLX_IEEE_F32BE, H5T_INTEGER) == true)
+    if (H5Tdetect_class(H5T_COMPLEX_IEEE_F32BE, H5T_INTEGER) == true)
         TEST_ERROR;
-    if (H5Tdetect_class(H5T_CPLX_IEEE_F64LE, H5T_INTEGER) == true)
+    if (H5Tdetect_class(H5T_COMPLEX_IEEE_F64LE, H5T_INTEGER) == true)
         TEST_ERROR;
-    if (H5Tdetect_class(H5T_CPLX_IEEE_F64BE, H5T_INTEGER) == true)
+    if (H5Tdetect_class(H5T_COMPLEX_IEEE_F64BE, H5T_INTEGER) == true)
         TEST_ERROR;
 #ifdef H5_HAVE_COMPLEX_NUMBERS
     if (H5Tdetect_class(H5T_NATIVE_FLOAT_COMPLEX, H5T_COMPLEX) != true)
@@ -6818,40 +6818,40 @@ test_complex_type(void)
     /*
      * Check that standard macros map to valid types
      */
-    type_size = H5Tget_size(H5T_CPLX_IEEE_F16BE);
+    type_size = H5Tget_size(H5T_COMPLEX_IEEE_F16BE);
     if (0 == type_size) {
         H5_FAILED();
-        printf("Invalid size for H5T_CPLX_IEEE_F16BE datatype\n");
+        printf("Invalid size for H5T_COMPLEX_IEEE_F16BE datatype\n");
         goto error;
     }
-    type_size = H5Tget_size(H5T_CPLX_IEEE_F16LE);
+    type_size = H5Tget_size(H5T_COMPLEX_IEEE_F16LE);
     if (0 == type_size) {
         H5_FAILED();
-        printf("Invalid size for H5T_CPLX_IEEE_F16LE datatype\n");
+        printf("Invalid size for H5T_COMPLEX_IEEE_F16LE datatype\n");
         goto error;
     }
-    type_size = H5Tget_size(H5T_CPLX_IEEE_F32BE);
+    type_size = H5Tget_size(H5T_COMPLEX_IEEE_F32BE);
     if (0 == type_size) {
         H5_FAILED();
-        printf("Invalid size for H5T_CPLX_IEEE_F32BE datatype\n");
+        printf("Invalid size for H5T_COMPLEX_IEEE_F32BE datatype\n");
         goto error;
     }
-    type_size = H5Tget_size(H5T_CPLX_IEEE_F32LE);
+    type_size = H5Tget_size(H5T_COMPLEX_IEEE_F32LE);
     if (0 == type_size) {
         H5_FAILED();
-        printf("Invalid size for H5T_CPLX_IEEE_F32LE datatype\n");
+        printf("Invalid size for H5T_COMPLEX_IEEE_F32LE datatype\n");
         goto error;
     }
-    type_size = H5Tget_size(H5T_CPLX_IEEE_F64BE);
+    type_size = H5Tget_size(H5T_COMPLEX_IEEE_F64BE);
     if (0 == type_size) {
         H5_FAILED();
-        printf("Invalid size for H5T_CPLX_IEEE_F64BE datatype\n");
+        printf("Invalid size for H5T_COMPLEX_IEEE_F64BE datatype\n");
         goto error;
     }
-    type_size = H5Tget_size(H5T_CPLX_IEEE_F64LE);
+    type_size = H5Tget_size(H5T_COMPLEX_IEEE_F64LE);
     if (0 == type_size) {
         H5_FAILED();
-        printf("Invalid size for H5T_CPLX_IEEE_F64LE datatype\n");
+        printf("Invalid size for H5T_COMPLEX_IEEE_F64LE datatype\n");
         goto error;
     }
 
@@ -7190,7 +7190,7 @@ test_complex_type(void)
         }
 
         /* Make sure this type matches predefined type */
-        if (0 == H5Tequal(complex_type, H5T_CPLX_IEEE_F32LE)) {
+        if (0 == H5Tequal(complex_type, H5T_COMPLEX_IEEE_F32LE)) {
             H5_FAILED();
             printf("Derived complex number type didn't match predefined type\n");
             goto error;
@@ -7204,7 +7204,7 @@ test_complex_type(void)
         }
 
         /* Make sure this type matches predefined type */
-        if (0 == H5Tequal(complex_type, H5T_CPLX_IEEE_F32BE)) {
+        if (0 == H5Tequal(complex_type, H5T_COMPLEX_IEEE_F32BE)) {
             H5_FAILED();
             printf("Derived complex number type didn't match predefined type\n");
             goto error;
@@ -7469,12 +7469,12 @@ test_complex_type_conv_funcs(void)
      * covered by H5T__conv_order. They shouldn't be covered by H5T__conv_order_opt
      * (at least not yet).
      */
-    if (NULL == (complex_le = H5I_object_verify(H5T_CPLX_IEEE_F32LE, H5I_DATATYPE))) {
+    if (NULL == (complex_le = H5I_object_verify(H5T_COMPLEX_IEEE_F32LE, H5I_DATATYPE))) {
         H5_FAILED();
         printf("Can't get H5T_t structure for datatype\n");
         goto error;
     }
-    if (NULL == (complex_be = H5I_object_verify(H5T_CPLX_IEEE_F32BE, H5I_DATATYPE))) {
+    if (NULL == (complex_be = H5I_object_verify(H5T_COMPLEX_IEEE_F32BE, H5I_DATATYPE))) {
         H5_FAILED();
         printf("Can't get H5T_t structure for datatype\n");
         goto error;
@@ -7487,7 +7487,7 @@ test_complex_type_conv_funcs(void)
     }
     if (conv_path->conv.u.lib_func != H5T__conv_order) {
         H5_FAILED();
-        printf("Conversion path for H5T_CPLX_IEEE_F32LE -> H5T_CPLX_IEEE_F32BE was not a byte-swap "
+        printf("Conversion path for H5T_COMPLEX_IEEE_F32LE -> H5T_COMPLEX_IEEE_F32BE was not a byte-swap "
                "conversion\n");
         goto error;
     }
@@ -7499,7 +7499,7 @@ test_complex_type_conv_funcs(void)
     }
     if (conv_path->conv.u.lib_func != H5T__conv_order) {
         H5_FAILED();
-        printf("Conversion path for H5T_CPLX_IEEE_F32BE -> H5T_CPLX_IEEE_F32LE was not a byte-swap "
+        printf("Conversion path for H5T_COMPLEX_IEEE_F32BE -> H5T_COMPLEX_IEEE_F32LE was not a byte-swap "
                "conversion\n");
         goto error;
     }
@@ -7661,9 +7661,9 @@ test_complex_type_conv_funcs(void)
      * types are library soft conversions
      */
     if (native_order == H5T_ORDER_LE)
-        conv_type = H5T_CPLX_IEEE_F16LE;
+        conv_type = H5T_COMPLEX_IEEE_F16LE;
     else
-        conv_type = H5T_CPLX_IEEE_F16BE;
+        conv_type = H5T_COMPLEX_IEEE_F16BE;
     if (!H5Tequal(conv_type, H5T_NATIVE_FLOAT_COMPLEX) && !H5Tequal(conv_type, H5T_NATIVE_DOUBLE_COMPLEX) &&
         !H5Tequal(conv_type, H5T_NATIVE_LDOUBLE_COMPLEX)) {
         CHECK_LIB_SOFT_CONV(conv_type, H5T_NATIVE_SCHAR);
@@ -7708,9 +7708,9 @@ test_complex_type_conv_funcs(void)
     }
 
     if (native_order == H5T_ORDER_LE)
-        conv_type = H5T_CPLX_IEEE_F32LE;
+        conv_type = H5T_COMPLEX_IEEE_F32LE;
     else
-        conv_type = H5T_CPLX_IEEE_F32BE;
+        conv_type = H5T_COMPLEX_IEEE_F32BE;
     if (!H5Tequal(conv_type, H5T_NATIVE_FLOAT_COMPLEX) && !H5Tequal(conv_type, H5T_NATIVE_DOUBLE_COMPLEX) &&
         !H5Tequal(conv_type, H5T_NATIVE_LDOUBLE_COMPLEX)) {
         CHECK_LIB_SOFT_CONV(conv_type, H5T_NATIVE_SCHAR);
@@ -7755,9 +7755,9 @@ test_complex_type_conv_funcs(void)
     }
 
     if (native_order == H5T_ORDER_LE)
-        conv_type = H5T_CPLX_IEEE_F64LE;
+        conv_type = H5T_COMPLEX_IEEE_F64LE;
     else
-        conv_type = H5T_CPLX_IEEE_F64BE;
+        conv_type = H5T_COMPLEX_IEEE_F64BE;
     if (!H5Tequal(conv_type, H5T_NATIVE_FLOAT_COMPLEX) && !H5Tequal(conv_type, H5T_NATIVE_DOUBLE_COMPLEX) &&
         !H5Tequal(conv_type, H5T_NATIVE_LDOUBLE_COMPLEX)) {
         CHECK_LIB_SOFT_CONV(conv_type, H5T_NATIVE_SCHAR);
diff --git a/test/ntypes.c b/test/ntypes.c
index d09b99a4d49..f07ff6fe9f3 100644
--- a/test/ntypes.c
+++ b/test/ntypes.c
@@ -3208,8 +3208,8 @@ test_complex(hid_t file)
     if ((space = H5Screate_simple(2, dims, NULL)) < 0)
         TEST_ERROR;
 
-    if ((dataset = H5Dcreate2(file, DSET_COMPLEX_NAME, H5T_CPLX_IEEE_F32BE, space, H5P_DEFAULT, H5P_DEFAULT,
-                              H5P_DEFAULT)) < 0)
+    if ((dataset = H5Dcreate2(file, DSET_COMPLEX_NAME, H5T_COMPLEX_IEEE_F32BE, space, H5P_DEFAULT,
+                              H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR;
 
     /* Write the data to the dataset */
@@ -3233,7 +3233,7 @@ test_complex(hid_t file)
     /* Verify the datatype retrieved and converted */
     if (H5Tget_order(native_type) != H5Tget_order(H5T_NATIVE_FLOAT_COMPLEX))
         TEST_ERROR;
-    if (H5Tget_size(native_type) != H5Tget_size(H5T_CPLX_IEEE_F32BE))
+    if (H5Tget_size(native_type) != H5Tget_size(H5T_COMPLEX_IEEE_F32BE))
         TEST_ERROR;
     if (H5T_COMPLEX != H5Tget_class(native_type))
         TEST_ERROR;
diff --git a/tools/lib/h5tools_dump.c b/tools/lib/h5tools_dump.c
index a805198fd37..ab23465732f 100644
--- a/tools/lib/h5tools_dump.c
+++ b/tools/lib/h5tools_dump.c
@@ -2634,18 +2634,18 @@ h5tools_print_datatype(FILE *stream, h5tools_str_t *buffer, const h5tool_format_
             break;
 
         case H5T_COMPLEX:
-            if (H5Tequal(type, H5T_CPLX_IEEE_F16BE) == true)
-                h5tools_str_append(buffer, "H5T_CPLX_IEEE_F16BE");
-            else if (H5Tequal(type, H5T_CPLX_IEEE_F16LE) == true)
-                h5tools_str_append(buffer, "H5T_CPLX_IEEE_F16LE");
-            else if (H5Tequal(type, H5T_CPLX_IEEE_F32BE) == true)
-                h5tools_str_append(buffer, "H5T_CPLX_IEEE_F32BE");
-            else if (H5Tequal(type, H5T_CPLX_IEEE_F32LE) == true)
-                h5tools_str_append(buffer, "H5T_CPLX_IEEE_F32LE");
-            else if (H5Tequal(type, H5T_CPLX_IEEE_F64BE) == true)
-                h5tools_str_append(buffer, "H5T_CPLX_IEEE_F64BE");
-            else if (H5Tequal(type, H5T_CPLX_IEEE_F64LE) == true)
-                h5tools_str_append(buffer, "H5T_CPLX_IEEE_F64LE");
+            if (H5Tequal(type, H5T_COMPLEX_IEEE_F16BE) == true)
+                h5tools_str_append(buffer, "H5T_COMPLEX_IEEE_F16BE");
+            else if (H5Tequal(type, H5T_COMPLEX_IEEE_F16LE) == true)
+                h5tools_str_append(buffer, "H5T_COMPLEX_IEEE_F16LE");
+            else if (H5Tequal(type, H5T_COMPLEX_IEEE_F32BE) == true)
+                h5tools_str_append(buffer, "H5T_COMPLEX_IEEE_F32BE");
+            else if (H5Tequal(type, H5T_COMPLEX_IEEE_F32LE) == true)
+                h5tools_str_append(buffer, "H5T_COMPLEX_IEEE_F32LE");
+            else if (H5Tequal(type, H5T_COMPLEX_IEEE_F64BE) == true)
+                h5tools_str_append(buffer, "H5T_COMPLEX_IEEE_F64BE");
+            else if (H5Tequal(type, H5T_COMPLEX_IEEE_F64LE) == true)
+                h5tools_str_append(buffer, "H5T_COMPLEX_IEEE_F64LE");
 #ifdef H5_HAVE_COMPLEX_NUMBERS
             else if (H5Tequal(type, H5T_NATIVE_FLOAT_COMPLEX) == true)
                 h5tools_str_append(buffer, "H5T_NATIVE_FLOAT_COMPLEX");
diff --git a/tools/lib/h5tools_type.c b/tools/lib/h5tools_type.c
index 0b478a28834..d85dc5ba122 100644
--- a/tools/lib/h5tools_type.c
+++ b/tools/lib/h5tools_type.c
@@ -76,11 +76,11 @@ h5tools_get_little_endian_type(hid_t tid)
 
         case H5T_COMPLEX:
             if (size == 4)
-                p_type = H5Tcopy(H5T_CPLX_IEEE_F16LE);
+                p_type = H5Tcopy(H5T_COMPLEX_IEEE_F16LE);
             else if (size == 8)
-                p_type = H5Tcopy(H5T_CPLX_IEEE_F32LE);
+                p_type = H5Tcopy(H5T_COMPLEX_IEEE_F32LE);
             else if (size == 16)
-                p_type = H5Tcopy(H5T_CPLX_IEEE_F64LE);
+                p_type = H5Tcopy(H5T_COMPLEX_IEEE_F64LE);
             break;
 
         case H5T_TIME:
@@ -166,11 +166,11 @@ h5tools_get_big_endian_type(hid_t tid)
 
         case H5T_COMPLEX:
             if (size == 4)
-                p_type = H5Tcopy(H5T_CPLX_IEEE_F16BE);
+                p_type = H5Tcopy(H5T_COMPLEX_IEEE_F16BE);
             else if (size == 8)
-                p_type = H5Tcopy(H5T_CPLX_IEEE_F32BE);
+                p_type = H5Tcopy(H5T_COMPLEX_IEEE_F32BE);
             else if (size == 16)
-                p_type = H5Tcopy(H5T_CPLX_IEEE_F64BE);
+                p_type = H5Tcopy(H5T_COMPLEX_IEEE_F64BE);
             break;
 
         case H5T_TIME:
diff --git a/tools/test/h5dump/expected/tcomplex.ddl b/tools/test/h5dump/expected/tcomplex.ddl
index e30b8063b66..4f59a9ad610 100644
--- a/tools/test/h5dump/expected/tcomplex.ddl
+++ b/tools/test/h5dump/expected/tcomplex.ddl
@@ -1,6 +1,6 @@
 HDF5 "tcomplex.h5" {
 DATASET "ArrayDatasetFloatComplex" {
-   DATATYPE  H5T_ARRAY { [10][10] H5T_CPLX_IEEE_F32LE }
+   DATATYPE  H5T_ARRAY { [10][10] H5T_COMPLEX_IEEE_F32LE }
    DATASPACE  SIMPLE { ( 1, 1 ) / ( 1, 1 ) }
    DATA {
    (0,0): [ 10.000000+0.000000i, 1.000000+1.000000i, 2.000000+2.000000i, 3.000000+3.000000i, 4.000000+4.000000i, 5.000000+5.000000i, 6.000000+6.000000i, 7.000000+7.000000i, 8.000000+8.000000i, 9.000000+9.000000i,
@@ -17,7 +17,7 @@ DATASET "ArrayDatasetFloatComplex" {
 }
 DATASET "CompoundDatasetFloatComplex" {
    DATATYPE  H5T_COMPOUND {
-      H5T_CPLX_IEEE_F32LE "float_complex_mem";
+      H5T_COMPLEX_IEEE_F32LE "float_complex_mem";
    }
    DATASPACE  SIMPLE { ( 10, 10 ) / ( 10, 10 ) }
    DATA {
@@ -324,7 +324,7 @@ DATASET "CompoundDatasetFloatComplex" {
    }
 }
 DATASET "DatasetDoubleComplex" {
-   DATATYPE  H5T_CPLX_IEEE_F64LE
+   DATATYPE  H5T_COMPLEX_IEEE_F64LE
    DATASPACE  SIMPLE { ( 10, 10 ) / ( 10, 10 ) }
    DATA {
    (0,0): 10.000000+0.000000i, 1.000000+1.000000i, 2.000000+2.000000i,
@@ -370,7 +370,7 @@ DATASET "DatasetDoubleComplex" {
    }
 }
 DATASET "DatasetFloatComplex" {
-   DATATYPE  H5T_CPLX_IEEE_F32LE
+   DATATYPE  H5T_COMPLEX_IEEE_F32LE
    DATASPACE  SIMPLE { ( 10, 10 ) / ( 10, 10 ) }
    DATA {
    (0,0): 10.000000+0.000000i, 1.000000+1.000000i, 2.000000+2.000000i,
@@ -415,7 +415,7 @@ DATASET "DatasetFloatComplex" {
    (9,9): 9.900000+9.900000i
    }
    ATTRIBUTE "AttributeFloatComplex" {
-      DATATYPE  H5T_CPLX_IEEE_F32LE
+      DATATYPE  H5T_COMPLEX_IEEE_F32LE
       DATASPACE  SIMPLE { ( 1, 1 ) / ( 1, 1 ) }
       DATA {
       (0,0): -1.000000+1.000000i
@@ -423,7 +423,7 @@ DATASET "DatasetFloatComplex" {
    }
 }
 DATASET "VariableLengthDatasetFloatComplex" {
-   DATATYPE  H5T_VLEN { H5T_CPLX_IEEE_F32LE }
+   DATATYPE  H5T_VLEN { H5T_COMPLEX_IEEE_F32LE }
    DATASPACE  SIMPLE { ( 10 ) / ( 10 ) }
    DATA {
    (0): (10.000000+0.000000i, 1.000000+1.000000i, 2.000000+2.000000i, 3.000000+3.000000i, 4.000000+4.000000i, 5.000000+5.000000i, 6.000000+6.000000i, 7.000000+7.000000i, 8.000000+8.000000i, 9.000000+9.000000i),
diff --git a/tools/test/h5dump/expected/tcomplex_be.ddl b/tools/test/h5dump/expected/tcomplex_be.ddl
index 36ae50995ab..d1881755310 100644
--- a/tools/test/h5dump/expected/tcomplex_be.ddl
+++ b/tools/test/h5dump/expected/tcomplex_be.ddl
@@ -1,6 +1,6 @@
 HDF5 "tcomplex_be.h5" {
 DATASET "ArrayDatasetFloatComplex" {
-   DATATYPE  H5T_ARRAY { [10][10] H5T_CPLX_IEEE_F32BE }
+   DATATYPE  H5T_ARRAY { [10][10] H5T_COMPLEX_IEEE_F32BE }
    DATASPACE  SIMPLE { ( 1, 1 ) / ( 1, 1 ) }
    DATA {
    (0,0): [ 10.000000+0.000000i, 1.000000+1.000000i, 2.000000+2.000000i, 3.000000+3.000000i, 4.000000+4.000000i, 5.000000+5.000000i, 6.000000+6.000000i, 7.000000+7.000000i, 8.000000+8.000000i, 9.000000+9.000000i,
@@ -17,7 +17,7 @@ DATASET "ArrayDatasetFloatComplex" {
 }
 DATASET "CompoundDatasetFloatComplex" {
    DATATYPE  H5T_COMPOUND {
-      H5T_CPLX_IEEE_F32BE "float_complex_mem";
+      H5T_COMPLEX_IEEE_F32BE "float_complex_mem";
    }
    DATASPACE  SIMPLE { ( 10, 10 ) / ( 10, 10 ) }
    DATA {
@@ -324,7 +324,7 @@ DATASET "CompoundDatasetFloatComplex" {
    }
 }
 DATASET "DatasetDoubleComplex" {
-   DATATYPE  H5T_CPLX_IEEE_F64BE
+   DATATYPE  H5T_COMPLEX_IEEE_F64BE
    DATASPACE  SIMPLE { ( 10, 10 ) / ( 10, 10 ) }
    DATA {
    (0,0): 10.000000+0.000000i, 1.000000+1.000000i, 2.000000+2.000000i,
@@ -370,7 +370,7 @@ DATASET "DatasetDoubleComplex" {
    }
 }
 DATASET "DatasetFloatComplex" {
-   DATATYPE  H5T_CPLX_IEEE_F32BE
+   DATATYPE  H5T_COMPLEX_IEEE_F32BE
    DATASPACE  SIMPLE { ( 10, 10 ) / ( 10, 10 ) }
    DATA {
    (0,0): 10.000000+0.000000i, 1.000000+1.000000i, 2.000000+2.000000i,
@@ -415,7 +415,7 @@ DATASET "DatasetFloatComplex" {
    (9,9): 9.900000+9.900000i
    }
    ATTRIBUTE "AttributeFloatComplex" {
-      DATATYPE  H5T_CPLX_IEEE_F32BE
+      DATATYPE  H5T_COMPLEX_IEEE_F32BE
       DATASPACE  SIMPLE { ( 1, 1 ) / ( 1, 1 ) }
       DATA {
       (0,0): -1.000000+1.000000i
@@ -423,7 +423,7 @@ DATASET "DatasetFloatComplex" {
    }
 }
 DATASET "VariableLengthDatasetFloatComplex" {
-   DATATYPE  H5T_VLEN { H5T_CPLX_IEEE_F32BE }
+   DATATYPE  H5T_VLEN { H5T_COMPLEX_IEEE_F32BE }
    DATASPACE  SIMPLE { ( 10 ) / ( 10 ) }
    DATA {
    (0): (10.000000+0.000000i, 1.000000+1.000000i, 2.000000+2.000000i, 3.000000+3.000000i, 4.000000+4.000000i, 5.000000+5.000000i, 6.000000+6.000000i, 7.000000+7.000000i, 8.000000+8.000000i, 9.000000+9.000000i),
diff --git a/tools/test/h5dump/expected/tcomplex_be_info.ddl b/tools/test/h5dump/expected/tcomplex_be_info.ddl
index 44dcf4f9573..93a9bf41656 100644
--- a/tools/test/h5dump/expected/tcomplex_be_info.ddl
+++ b/tools/test/h5dump/expected/tcomplex_be_info.ddl
@@ -1,6 +1,6 @@
 HDF5 "tcomplex_be.h5" {
 DATASET "ArrayDatasetFloatComplex" {
-   DATATYPE  H5T_ARRAY { [10][10] H5T_CPLX_IEEE_F32BE }
+   DATATYPE  H5T_ARRAY { [10][10] H5T_COMPLEX_IEEE_F32BE }
    DATASPACE  SIMPLE { ( 1, 1 ) / ( 1, 1 ) }
    STORAGE_LAYOUT {
       CONTIGUOUS
@@ -20,7 +20,7 @@ DATASET "ArrayDatasetFloatComplex" {
 }
 DATASET "CompoundDatasetFloatComplex" {
    DATATYPE  H5T_COMPOUND {
-      H5T_CPLX_IEEE_F32BE "float_complex_mem";
+      H5T_COMPLEX_IEEE_F32BE "float_complex_mem";
    }
    DATASPACE  SIMPLE { ( 10, 10 ) / ( 10, 10 ) }
    STORAGE_LAYOUT {
@@ -40,7 +40,7 @@ DATASET "CompoundDatasetFloatComplex" {
    }
 }
 DATASET "DatasetDoubleComplex" {
-   DATATYPE  H5T_CPLX_IEEE_F64BE
+   DATATYPE  H5T_COMPLEX_IEEE_F64BE
    DATASPACE  SIMPLE { ( 10, 10 ) / ( 10, 10 ) }
    STORAGE_LAYOUT {
       CONTIGUOUS
@@ -59,7 +59,7 @@ DATASET "DatasetDoubleComplex" {
    }
 }
 DATASET "DatasetFloatComplex" {
-   DATATYPE  H5T_CPLX_IEEE_F32BE
+   DATATYPE  H5T_COMPLEX_IEEE_F32BE
    DATASPACE  SIMPLE { ( 10, 10 ) / ( 10, 10 ) }
    STORAGE_LAYOUT {
       CONTIGUOUS
@@ -77,12 +77,12 @@ DATASET "DatasetFloatComplex" {
       H5D_ALLOC_TIME_LATE
    }
    ATTRIBUTE "AttributeFloatComplex" {
-      DATATYPE  H5T_CPLX_IEEE_F32BE
+      DATATYPE  H5T_COMPLEX_IEEE_F32BE
       DATASPACE  SIMPLE { ( 1, 1 ) / ( 1, 1 ) }
    }
 }
 DATASET "VariableLengthDatasetFloatComplex" {
-   DATATYPE  H5T_VLEN { H5T_CPLX_IEEE_F32BE }
+   DATATYPE  H5T_VLEN { H5T_COMPLEX_IEEE_F32BE }
    DATASPACE  SIMPLE { ( 10 ) / ( 10 ) }
    STORAGE_LAYOUT {
       CONTIGUOUS
diff --git a/tools/test/h5dump/expected/tcomplex_info.ddl b/tools/test/h5dump/expected/tcomplex_info.ddl
index 031510e9e56..ac313521cb4 100644
--- a/tools/test/h5dump/expected/tcomplex_info.ddl
+++ b/tools/test/h5dump/expected/tcomplex_info.ddl
@@ -1,6 +1,6 @@
 HDF5 "tcomplex.h5" {
 DATASET "ArrayDatasetFloatComplex" {
-   DATATYPE  H5T_ARRAY { [10][10] H5T_CPLX_IEEE_F32LE }
+   DATATYPE  H5T_ARRAY { [10][10] H5T_COMPLEX_IEEE_F32LE }
    DATASPACE  SIMPLE { ( 1, 1 ) / ( 1, 1 ) }
    STORAGE_LAYOUT {
       CONTIGUOUS
@@ -20,7 +20,7 @@ DATASET "ArrayDatasetFloatComplex" {
 }
 DATASET "CompoundDatasetFloatComplex" {
    DATATYPE  H5T_COMPOUND {
-      H5T_CPLX_IEEE_F32LE "float_complex_mem";
+      H5T_COMPLEX_IEEE_F32LE "float_complex_mem";
    }
    DATASPACE  SIMPLE { ( 10, 10 ) / ( 10, 10 ) }
    STORAGE_LAYOUT {
@@ -40,7 +40,7 @@ DATASET "CompoundDatasetFloatComplex" {
    }
 }
 DATASET "DatasetDoubleComplex" {
-   DATATYPE  H5T_CPLX_IEEE_F64LE
+   DATATYPE  H5T_COMPLEX_IEEE_F64LE
    DATASPACE  SIMPLE { ( 10, 10 ) / ( 10, 10 ) }
    STORAGE_LAYOUT {
       CONTIGUOUS
@@ -59,7 +59,7 @@ DATASET "DatasetDoubleComplex" {
    }
 }
 DATASET "DatasetFloatComplex" {
-   DATATYPE  H5T_CPLX_IEEE_F32LE
+   DATATYPE  H5T_COMPLEX_IEEE_F32LE
    DATASPACE  SIMPLE { ( 10, 10 ) / ( 10, 10 ) }
    STORAGE_LAYOUT {
       CONTIGUOUS
@@ -77,12 +77,12 @@ DATASET "DatasetFloatComplex" {
       H5D_ALLOC_TIME_LATE
    }
    ATTRIBUTE "AttributeFloatComplex" {
-      DATATYPE  H5T_CPLX_IEEE_F32LE
+      DATATYPE  H5T_COMPLEX_IEEE_F32LE
       DATASPACE  SIMPLE { ( 1, 1 ) / ( 1, 1 ) }
    }
 }
 DATASET "VariableLengthDatasetFloatComplex" {
-   DATATYPE  H5T_VLEN { H5T_CPLX_IEEE_F32LE }
+   DATATYPE  H5T_VLEN { H5T_COMPLEX_IEEE_F32LE }
    DATASPACE  SIMPLE { ( 10 ) / ( 10 ) }
    STORAGE_LAYOUT {
       CONTIGUOUS
diff --git a/tools/test/h5dump/expected/treference.ddl b/tools/test/h5dump/expected/treference.ddl
index 8e3bd0455d0..1c7685c61ce 100644
--- a/tools/test/h5dump/expected/treference.ddl
+++ b/tools/test/h5dump/expected/treference.ddl
@@ -69,14 +69,14 @@ GROUP "/" {
       }
    }
    ATTRIBUTE "complex" {
-      DATATYPE  H5T_CPLX_IEEE_F32LE
+      DATATYPE  H5T_COMPLEX_IEEE_F32LE
       DATASPACE  SIMPLE { ( 2 ) / ( 2 ) }
       DATA {
       (0): 1+2i, 3+4i
       }
    }
    ATTRIBUTE "complex2D" {
-      DATATYPE  H5T_CPLX_IEEE_F32LE
+      DATATYPE  H5T_COMPLEX_IEEE_F32LE
       DATASPACE  SIMPLE { ( 3, 2 ) / ( 3, 2 ) }
       DATA {
       (0,0): 1+2i, 3+4i,
@@ -85,7 +85,7 @@ GROUP "/" {
       }
    }
    ATTRIBUTE "complex3D" {
-      DATATYPE  H5T_CPLX_IEEE_F32LE
+      DATATYPE  H5T_COMPLEX_IEEE_F32LE
       DATASPACE  SIMPLE { ( 4, 3, 2 ) / ( 4, 3, 2 ) }
       DATA {
       (0,0,0): 1+2i, 3+4i,
@@ -569,14 +569,14 @@ GROUP "/" {
          }
       }
       ATTRIBUTE "complex" {
-         DATATYPE  H5T_CPLX_IEEE_F32LE
+         DATATYPE  H5T_COMPLEX_IEEE_F32LE
          DATASPACE  SIMPLE { ( 2 ) / ( 2 ) }
          DATA {
          (0): 1+2i, 3+4i
          }
       }
       ATTRIBUTE "complex2D" {
-         DATATYPE  H5T_CPLX_IEEE_F32LE
+         DATATYPE  H5T_COMPLEX_IEEE_F32LE
          DATASPACE  SIMPLE { ( 3, 2 ) / ( 3, 2 ) }
          DATA {
          (0,0): 1+2i, 3+4i,
@@ -585,7 +585,7 @@ GROUP "/" {
          }
       }
       ATTRIBUTE "complex3D" {
-         DATATYPE  H5T_CPLX_IEEE_F32LE
+         DATATYPE  H5T_COMPLEX_IEEE_F32LE
          DATASPACE  SIMPLE { ( 4, 3, 2 ) / ( 4, 3, 2 ) }
          DATA {
          (0,0,0): 1+2i, 3+4i,
@@ -1211,14 +1211,14 @@ GROUP "/" {
          }
       }
       ATTRIBUTE "complex" {
-         DATATYPE  H5T_CPLX_IEEE_F32LE
+         DATATYPE  H5T_COMPLEX_IEEE_F32LE
          DATASPACE  SIMPLE { ( 2 ) / ( 2 ) }
          DATA {
          (0): 1+2i, 3+4i
          }
       }
       ATTRIBUTE "complex2D" {
-         DATATYPE  H5T_CPLX_IEEE_F32LE
+         DATATYPE  H5T_COMPLEX_IEEE_F32LE
          DATASPACE  SIMPLE { ( 3, 2 ) / ( 3, 2 ) }
          DATA {
          (0,0): 1+2i, 3+4i,
@@ -1227,7 +1227,7 @@ GROUP "/" {
          }
       }
       ATTRIBUTE "complex3D" {
-         DATATYPE  H5T_CPLX_IEEE_F32LE
+         DATATYPE  H5T_COMPLEX_IEEE_F32LE
          DATASPACE  SIMPLE { ( 4, 3, 2 ) / ( 4, 3, 2 ) }
          DATA {
          (0,0,0): 1+2i, 3+4i,
@@ -1707,14 +1707,14 @@ GROUP "/" {
          }
       }
       DATASET "complex" {
-         DATATYPE  H5T_CPLX_IEEE_F32LE
+         DATATYPE  H5T_COMPLEX_IEEE_F32LE
          DATASPACE  SIMPLE { ( 2 ) / ( 2 ) }
          DATA {
          (0): 1+2i, 3+4i
          }
       }
       DATASET "complex2D" {
-         DATATYPE  H5T_CPLX_IEEE_F32LE
+         DATATYPE  H5T_COMPLEX_IEEE_F32LE
          DATASPACE  SIMPLE { ( 3, 2 ) / ( 3, 2 ) }
          DATA {
          (0,0): 1+2i, 3+4i,
@@ -1723,7 +1723,7 @@ GROUP "/" {
          }
       }
       DATASET "complex3D" {
-         DATATYPE  H5T_CPLX_IEEE_F32LE
+         DATATYPE  H5T_COMPLEX_IEEE_F32LE
          DATASPACE  SIMPLE { ( 4, 3, 2 ) / ( 4, 3, 2 ) }
          DATA {
          (0,0,0): 1+2i, 3+4i,
diff --git a/tools/test/h5dump/h5dumpgentest.c b/tools/test/h5dump/h5dumpgentest.c
index 14cdfcebc73..25201877348 100644
--- a/tools/test/h5dump/h5dumpgentest.c
+++ b/tools/test/h5dump/h5dumpgentest.c
@@ -12296,7 +12296,7 @@ gent_complex(void)
     /* float complex dataset */
     H5Pset_fill_value(dcpl_id, H5T_NATIVE_FLOAT_COMPLEX, &fc_fillval);
 
-    dataset = H5Dcreate2(fid, F95_DSET_FC, H5T_CPLX_IEEE_F32LE, space, H5P_DEFAULT, dcpl_id, H5P_DEFAULT);
+    dataset = H5Dcreate2(fid, F95_DSET_FC, H5T_COMPLEX_IEEE_F32LE, space, H5P_DEFAULT, dcpl_id, H5P_DEFAULT);
 
     dset_fc = malloc(sizeof(*dset_fc));
 
@@ -12320,7 +12320,7 @@ gent_complex(void)
     /* Create a float complex attribute on the dataset with a single value */
     single_space = H5Screate_simple(2, single_dims, NULL);
 
-    attr = H5Acreate2(dataset, F95_ATTR_FC, H5T_CPLX_IEEE_F32LE, single_space, H5P_DEFAULT, H5P_DEFAULT);
+    attr = H5Acreate2(dataset, F95_ATTR_FC, H5T_COMPLEX_IEEE_F32LE, single_space, H5P_DEFAULT, H5P_DEFAULT);
 
     H5Awrite(attr, H5T_NATIVE_FLOAT_COMPLEX, &fc_fillval);
 
@@ -12331,7 +12331,7 @@ gent_complex(void)
     /* double complex dataset */
     H5Pset_fill_value(dcpl_id, H5T_NATIVE_DOUBLE_COMPLEX, &dc_fillval);
 
-    dataset = H5Dcreate2(fid, F95_DSET_DC, H5T_CPLX_IEEE_F64LE, space, H5P_DEFAULT, dcpl_id, H5P_DEFAULT);
+    dataset = H5Dcreate2(fid, F95_DSET_DC, H5T_COMPLEX_IEEE_F64LE, space, H5P_DEFAULT, dcpl_id, H5P_DEFAULT);
 
     dset_dc = malloc(sizeof(*dset_dc));
 
@@ -12395,8 +12395,8 @@ gent_complex(void)
     mem_tid = H5Tcreate(H5T_COMPOUND, sizeof(H5_float_complex));
     H5Tinsert(mem_tid, "float_complex_mem", 0, H5T_NATIVE_FLOAT_COMPLEX);
 
-    tid = H5Tcreate(H5T_COMPOUND, H5Tget_size(H5T_CPLX_IEEE_F32LE));
-    H5Tinsert(tid, "float_complex_mem", 0, H5T_CPLX_IEEE_F32LE);
+    tid = H5Tcreate(H5T_COMPOUND, H5Tget_size(H5T_COMPLEX_IEEE_F32LE));
+    H5Tinsert(tid, "float_complex_mem", 0, H5T_COMPLEX_IEEE_F32LE);
 
     dataset = H5Dcreate2(fid, F95_DSET_COMP_FC, tid, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
 
@@ -12426,7 +12426,7 @@ gent_complex(void)
     /* Variable-length of float complex dataset */
     mem_tid = H5Tvlen_create(H5T_NATIVE_FLOAT_COMPLEX);
 
-    tid = H5Tvlen_create(H5T_CPLX_IEEE_F32LE);
+    tid = H5Tvlen_create(H5T_COMPLEX_IEEE_F32LE);
 
     varlen_space = H5Screate_simple(1, varlen_dims, NULL);
 
@@ -12463,7 +12463,7 @@ gent_complex(void)
     /* Array of float complex dataset */
     mem_tid = H5Tarray_create2(H5T_NATIVE_FLOAT_COMPLEX, 2, dims);
 
-    tid = H5Tarray_create2(H5T_CPLX_IEEE_F32LE, 2, dims);
+    tid = H5Tarray_create2(H5T_COMPLEX_IEEE_F32LE, 2, dims);
 
     single_space = H5Screate_simple(2, single_dims, NULL);
 
@@ -12547,7 +12547,7 @@ gent_complex_be(void)
     /* float complex dataset */
     H5Pset_fill_value(dcpl_id, H5T_NATIVE_FLOAT_COMPLEX, &fc_fillval);
 
-    dataset = H5Dcreate2(fid, F96_DSET_FC, H5T_CPLX_IEEE_F32BE, space, H5P_DEFAULT, dcpl_id, H5P_DEFAULT);
+    dataset = H5Dcreate2(fid, F96_DSET_FC, H5T_COMPLEX_IEEE_F32BE, space, H5P_DEFAULT, dcpl_id, H5P_DEFAULT);
 
     dset_fc = malloc(sizeof(*dset_fc));
 
@@ -12571,7 +12571,7 @@ gent_complex_be(void)
     /* Create a float complex attribute on the dataset with a single value */
     single_space = H5Screate_simple(2, single_dims, NULL);
 
-    attr = H5Acreate2(dataset, F96_ATTR_FC, H5T_CPLX_IEEE_F32BE, single_space, H5P_DEFAULT, H5P_DEFAULT);
+    attr = H5Acreate2(dataset, F96_ATTR_FC, H5T_COMPLEX_IEEE_F32BE, single_space, H5P_DEFAULT, H5P_DEFAULT);
 
     H5Awrite(attr, H5T_NATIVE_FLOAT_COMPLEX, &fc_fillval);
 
@@ -12582,7 +12582,7 @@ gent_complex_be(void)
     /* double complex dataset */
     H5Pset_fill_value(dcpl_id, H5T_NATIVE_DOUBLE_COMPLEX, &dc_fillval);
 
-    dataset = H5Dcreate2(fid, F96_DSET_DC, H5T_CPLX_IEEE_F64BE, space, H5P_DEFAULT, dcpl_id, H5P_DEFAULT);
+    dataset = H5Dcreate2(fid, F96_DSET_DC, H5T_COMPLEX_IEEE_F64BE, space, H5P_DEFAULT, dcpl_id, H5P_DEFAULT);
 
     dset_dc = malloc(sizeof(*dset_dc));
 
@@ -12646,8 +12646,8 @@ gent_complex_be(void)
     mem_tid = H5Tcreate(H5T_COMPOUND, sizeof(H5_float_complex));
     H5Tinsert(mem_tid, "float_complex_mem", 0, H5T_NATIVE_FLOAT_COMPLEX);
 
-    tid = H5Tcreate(H5T_COMPOUND, H5Tget_size(H5T_CPLX_IEEE_F32BE));
-    H5Tinsert(tid, "float_complex_mem", 0, H5T_CPLX_IEEE_F32BE);
+    tid = H5Tcreate(H5T_COMPOUND, H5Tget_size(H5T_COMPLEX_IEEE_F32BE));
+    H5Tinsert(tid, "float_complex_mem", 0, H5T_COMPLEX_IEEE_F32BE);
 
     dataset = H5Dcreate2(fid, F96_DSET_COMP_FC, tid, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
 
@@ -12677,7 +12677,7 @@ gent_complex_be(void)
     /* Variable-length of float complex dataset */
     mem_tid = H5Tvlen_create(H5T_NATIVE_FLOAT_COMPLEX);
 
-    tid = H5Tvlen_create(H5T_CPLX_IEEE_F32BE);
+    tid = H5Tvlen_create(H5T_COMPLEX_IEEE_F32BE);
 
     varlen_space = H5Screate_simple(1, varlen_dims, NULL);
 
@@ -12714,7 +12714,7 @@ gent_complex_be(void)
     /* Array of float complex dataset */
     mem_tid = H5Tarray_create2(H5T_NATIVE_FLOAT_COMPLEX, 2, dims);
 
-    tid = H5Tarray_create2(H5T_CPLX_IEEE_F32BE, 2, dims);
+    tid = H5Tarray_create2(H5T_COMPLEX_IEEE_F32BE, 2, dims);
 
     single_space = H5Screate_simple(2, single_dims, NULL);