diff --git a/CMakeLists.txt b/CMakeLists.txt
index 927b34b194bf0105d6d493149bcd8a1e8d05313a..868b4ddd8aca002fa781f85d347ac99d2b360f2f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -205,7 +205,7 @@ endmacro(set_config_option)
 # machines)
 check_type_size("void*" SIZEOF_VOID_P)
 if(SIZEOF_VOID_P EQUAL 8)
-  set_config_option(HAVE_64BIT_SIZE_T "Have64BitSizeT")
+  set_config_option(HAVE_64BIT_SIZE_T "64Bit")
 endif(SIZEOF_VOID_P EQUAL 8)
 
 if(ENABLE_BLAS_LAPACK)
@@ -230,8 +230,8 @@ if(ENABLE_BLAS_LAPACK)
       set(REFLAPACK_LIBS_REQUIRED lapack blas g2c gcc)
       find_all_libraries(LAPACK_LIBRARIES REFLAPACK_LIBS_REQUIRED "" "")
       if(LAPACK_LIBRARIES)
-        set_config_option(HAVE_BLAS "Blas(Ref)")
-        set_config_option(HAVE_LAPACK "Lapack(Ref)")
+        set_config_option(HAVE_BLAS "Blas(Reference)")
+        set_config_option(HAVE_LAPACK "Lapack(Reference)")
       endif(LAPACK_LIBRARIES)
     endif(LAPACK_LIBRARIES)
   elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
@@ -265,15 +265,15 @@ if(ENABLE_BLAS_LAPACK)
         set(GENERIC_LIBS_REQUIRED lapack blas pthread)
         find_all_libraries(LAPACK_LIBRARIES GENERIC_LIBS_REQUIRED "" "")
         if(LAPACK_LIBRARIES)
-          set_config_option(HAVE_BLAS "Blas(Generic)")
-          set_config_option(HAVE_LAPACK "Lapack(Generic)")
+          set_config_option(HAVE_BLAS "Blas")
+          set_config_option(HAVE_LAPACK "Lapack")
         endif(LAPACK_LIBRARIES)
       endif(LAPACK_LIBRARIES)
     endif(LAPACK_LIBRARIES)
   elseif(${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
     # on SunOS we know blas and lapack are available in sunperf
     set(LAPACK_FLAGS -library=sunperf)
-    set_config_option(HAVE_BLAS "Blas(SubPerf)")
+    set_config_option(HAVE_BLAS "Blas(SunPerf)")
     set_config_option(HAVE_LAPACK "Lapack(SunPerf)")
   elseif(APPLE)
     # on Mac we also know that blas and lapack are available