diff --git a/c_check b/c_check
index 6ce5e4cc0..b4105d19a 100644
--- a/c_check
+++ b/c_check
@@ -43,10 +43,10 @@ $compiler = DEC       if ($data =~ /COMPILER_DEC/);
 $compiler = GCC       if ($compiler eq "");
 
 $os = Linux           if ($data =~ /OS_LINUX/);
-$os = FreeBSD         if ($data =~ /OS_FreeBSD/);
-$os = NetBSD          if ($data =~ /OS_NetBSD/);
-$os = Darwin          if ($data =~ /OS_Darwin/);
-$os = SunOS           if ($data =~ /OS_SunOS/);
+$os = FreeBSD         if ($data =~ /OS_FREEBSD/);
+$os = NetBSD          if ($data =~ /OS_NETBSD/);
+$os = Darwin          if ($data =~ /OS_DARWIN/);
+$os = SunOS           if ($data =~ /OS_SUNOS/);
 $os = AIX             if ($data =~ /OS_AIX/);
 $os = osf             if ($data =~ /OS_OSF/);
 $os = WINNT           if ($data =~ /OS_WINNT/);
diff --git a/common.h b/common.h
index 0868b594a..3718cdee4 100644
--- a/common.h
+++ b/common.h
@@ -68,7 +68,7 @@ extern "C" {
 #define SMP
 #endif
 
-#if defined(OS_WINNT) || defined(OS_CYGWIN_NT) || defined(OS_Interix)
+#if defined(OS_WINNT) || defined(OS_CYGWIN_NT) || defined(OS_INTERIX)
 #define WINDOWS_ABI
 #define OS_WINDOWS
 
diff --git a/common_x86.h b/common_x86.h
index eaf395806..468fc55eb 100644
--- a/common_x86.h
+++ b/common_x86.h
@@ -282,7 +282,7 @@ REALNAME:
 #define EPILOGUE .end	 REALNAME
 #endif
 
-#if defined(OS_LINUX) || defined(OS_FREEBSD) || defined(OS_NetBSD) || defined(__ELF__)
+#if defined(OS_LINUX) || defined(OS_FREEBSD) || defined(OS_NETBSD) || defined(__ELF__)
 #define PROLOGUE \
 	.text; \
 	.align 16; \
diff --git a/common_x86_64.h b/common_x86_64.h
index 735c9b294..2dc788c93 100644
--- a/common_x86_64.h
+++ b/common_x86_64.h
@@ -353,7 +353,7 @@ REALNAME:
 #define EPILOGUE .end	 REALNAME
 #endif
 
-#if defined(OS_LINUX) || defined(OS_FREEBSD) || defined(OS_NetBSD) || defined(__ELF__) || defined(C_PGI)
+#if defined(OS_LINUX) || defined(OS_FREEBSD) || defined(OS_NETBSD) || defined(__ELF__) || defined(C_PGI)
 #define PROLOGUE \
 	.text; \
 	.align 512; \
diff --git a/ctest.c b/ctest.c
index 0c373bf2b..ac8283898 100644
--- a/ctest.c
+++ b/ctest.c
@@ -35,19 +35,19 @@ OS_LINUX
 #endif
 
 #if defined(__FreeBSD__)
-OS_FreeBSD
+OS_FREEBSD
 #endif
 
 #if defined(__NetBSD__)
-OS_NetBSD
+OS_NETBSD
 #endif
 
 #if defined(__sun)
-OS_SunOS
+OS_SUNOS
 #endif
 
 #if defined(__APPLE__)
-OS_Darwin
+OS_DARWIN
 #endif
 
 #if defined(_AIX)
diff --git a/driver/others/memory.c b/driver/others/memory.c
index 9a925d290..9b8863f39 100644
--- a/driver/others/memory.c
+++ b/driver/others/memory.c
@@ -103,7 +103,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <sys/syscall.h>
 #endif
 
-#if defined(OS_FREEBSD) || defined(OS_Darwin)
+#if defined(OS_FREEBSD) || defined(OS_DARWIN)
 #include <sys/sysctl.h>
 #endif
 
@@ -185,7 +185,7 @@ int get_num_procs(void) {
 
 #endif
 
-#if defined(OS_FREEBSD) || defined(OS_Darwin)
+#if defined(OS_FREEBSD) || defined(OS_DARWIN)
 
 int get_num_procs(void) {
   
@@ -215,7 +215,7 @@ int  goto_get_num_procs  (void) {
 
 int blas_get_cpu_number(void){
   char *p;
-#if defined(OS_LINUX) || defined(OS_WINDOWS) || defined(OS_FREEBSD) || defined(OS_Darwin)
+#if defined(OS_LINUX) || defined(OS_WINDOWS) || defined(OS_FREEBSD) || defined(OS_DARWIN)
   int max_num;
 #endif
   int blas_goto_num   = 0;
@@ -223,7 +223,7 @@ int blas_get_cpu_number(void){
 
   if (blas_num_threads) return blas_num_threads;
 
-#if defined(OS_LINUX) || defined(OS_WINDOWS) || defined(OS_FREEBSD) || defined(OS_Darwin)
+#if defined(OS_LINUX) || defined(OS_WINDOWS) || defined(OS_FREEBSD) || defined(OS_DARWIN)
   max_num = get_num_procs();
 #endif
 
@@ -250,7 +250,7 @@ int blas_get_cpu_number(void){
   else if (blas_omp_num > 0) blas_num_threads = blas_omp_num;
   else blas_num_threads = MAX_CPU_NUMBER;
 
-#if defined(OS_LINUX) || defined(OS_WINDOWS) || defined(OS_FREEBSD) || defined(OS_Darwin)
+#if defined(OS_LINUX) || defined(OS_WINDOWS) || defined(OS_FREEBSD) || defined(OS_DARWIN)
   if (blas_num_threads > max_num) blas_num_threads = max_num;
 #endif