diff --git a/unittests/fix16_exp_unittests.c b/unittests/fix16_exp_unittests.c
index a033a05..afb6706 100644
--- a/unittests/fix16_exp_unittests.c
+++ b/unittests/fix16_exp_unittests.c
@@ -12,8 +12,8 @@ int main()
     {
         COMMENT("Testing fix16_exp() corner cases");
         TEST(fix16_exp(0) == fix16_one);
-        TEST(fix16_exp(fix16_min) == 0);
-        TEST(fix16_exp(fix16_max) == fix16_max);
+        TEST(fix16_exp(fix16_minimum) == 0);
+        TEST(fix16_exp(fix16_maximum) == fix16_maximum);
     }
     
     {
@@ -95,7 +95,7 @@ int main()
         int count = 0;
         fix16_t a;
         
-        for (a = 100; a > 0 && a < fix16_max - 7561; a += 7561)
+        for (a = 100; a > 0 && a < fix16_maximum - 7561; a += 7561)
         {
             fix16_t result = fix16_log(a);
             fix16_t resultf = fix16_from_dbl(log(fix16_to_dbl(a)));
@@ -121,4 +121,4 @@ int main()
     fprintf(stdout, "\n\nSome tests FAILED!\n");
 
     return status;
-}
\ No newline at end of file
+}
diff --git a/unittests/fix16_unittests.c b/unittests/fix16_unittests.c
index a47cfb6..72ea260 100644
--- a/unittests/fix16_unittests.c
+++ b/unittests/fix16_unittests.c
@@ -91,8 +91,8 @@ int main()
         double fb = fix16_to_dbl(b);
         fix16_t fresult = fix16_from_dbl(fa * fb);
         
-        double max = fix16_to_dbl(fix16_max);
-        double min = fix16_to_dbl(fix16_min);
+        double max = fix16_to_dbl(fix16_maximum);
+        double min = fix16_to_dbl(fix16_minimum);
         
         if (delta(fresult, result) > max_delta)
         {
@@ -167,8 +167,8 @@ int main()
         double fb = fix16_to_dbl(b);
         fix16_t fresult = fix16_from_dbl(fa / fb);
         
-        double max = fix16_to_dbl(fix16_max);
-        double min = fix16_to_dbl(fix16_min);        
+        double max = fix16_to_dbl(fix16_maximum);
+        double min = fix16_to_dbl(fix16_minimum);        
         if (delta(fresult, result) > max_delta)
         {
           if (fa / fb > max || fa / fb < min)
@@ -212,8 +212,8 @@ int main()
         double fb = fix16_to_dbl(b);
         fix16_t fresult = fix16_from_dbl(fa + fb);
         
-        double max = fix16_to_dbl(fix16_max);
-        double min = fix16_to_dbl(fix16_min);
+        double max = fix16_to_dbl(fix16_maximum);
+        double min = fix16_to_dbl(fix16_minimum);
         
         if (delta(fresult, result) > max_delta)
         {
@@ -258,8 +258,8 @@ int main()
         double fb = fix16_to_dbl(b);
         fix16_t fresult = fix16_from_dbl(fa - fb);
         
-        double max = fix16_to_dbl(fix16_max);
-        double min = fix16_to_dbl(fix16_min);
+        double max = fix16_to_dbl(fix16_maximum);
+        double min = fix16_to_dbl(fix16_minimum);
         
         if (delta(fresult, result) > max_delta)
         {