diff --git a/config/cmake/libhdf5.settings.cmake.in b/config/cmake/libhdf5.settings.cmake.in
index 28fb8767bf..7bb426f694 100644
--- a/config/cmake/libhdf5.settings.cmake.in
+++ b/config/cmake/libhdf5.settings.cmake.in
@@ -13,7 +13,7 @@ General Information:
 
 Compiling Options:
 ------------------
-                     Build Mode: @HDF5_BUILD_TYPE@
+                     Build Mode: @HDF_BUILD_TYPE@
               Debugging Symbols: @SYMBOLS@
                         Asserts: @ASSERTS@
                       Profiling: @PROFILING@
diff --git a/config/cmake_ext_mod/HDFMacros.cmake b/config/cmake_ext_mod/HDFMacros.cmake
index 870ff5ae90..1326420943 100644
--- a/config/cmake_ext_mod/HDFMacros.cmake
+++ b/config/cmake_ext_mod/HDFMacros.cmake
@@ -124,8 +124,8 @@ macro (HDF_SET_LIB_OPTIONS libtarget libname libtype)
 
   set_target_properties (${libtarget}
       PROPERTIES
-#         OUTPUT_NAME
-#               ${LIB_RELEASE_NAME}$<$<CONFIG:Debug>:${LIB_DEBUG_SUFFIX}>
+         OUTPUT_NAME
+               ${LIB_RELEASE_NAME}
          OUTPUT_NAME_DEBUG
                ${LIB_DEBUG_NAME}
          OUTPUT_NAME_RELEASE