diff --git a/test/c/TestCMockC.c b/test/c/TestCMockC.c
index 782b3bc..2f6f3de 100644
--- a/test/c/TestCMockC.c
+++ b/test/c/TestCMockC.c
@@ -179,7 +179,7 @@ void test_ThatCMockStopsReturningMoreDataWhenItRunsOutOfMemory(void)
   }
 
   //there aren't any after that
-  TEST_ASSERT_EQUAL_HEX(CMOCK_GUTS_NONE, (_UU32)next);
+  TEST_ASSERT_EQUAL_HEX(CMOCK_GUTS_NONE, (UNITY_UINT32)next);
 }
 
 void test_ThatCMockStopsReturningMoreDataWhenAskForMoreThanItHasLeftEvenIfNotAtExactEnd(void)
diff --git a/test/system/test_interactions/unity_64bit_support.yml b/test/system/test_interactions/unity_64bit_support.yml
index 8b12f93..861b151 100644
--- a/test/system/test_interactions/unity_64bit_support.yml
+++ b/test/system/test_interactions/unity_64bit_support.yml
@@ -8,14 +8,14 @@
 :systest:
   :types: |
     #include "unity_internals.h"
-    typedef _UU64 TEST64;
-    
+    typedef UNITY_UINT64 TEST64;
+
   :mockable: |
     TEST64 foo(TEST64 a);
     TEST64* bar(TEST64* b);
 
-  :source: 
-    :header: |   
+  :source:
+    :header: |
       TEST64 function_a(void);
 
     :code: |
@@ -23,17 +23,17 @@
         TEST64 a = 0x1234567890123456;
         TEST64 b;
         TEST64* c;
-        
+
         b = foo(a);
         c = bar(&b);
         return *c;
       }
-      
+
   :tests:
     :common: |
       void setUp(void) {}
       void tearDown(void) {}
-      
+
     :units:
     - :pass: TRUE
       :should: 'handle a straightforward 64-bit series of calls'
@@ -44,10 +44,10 @@
           TEST64 b = 0x5a5a5a5a5a5a5a5a;
           foo_ExpectAndReturn(0x1234567890123456, 0x0987654321543210);
           bar_ExpectAndReturn(&a, &b);
-          
+
           TEST_ASSERT_EQUAL_HEX64(b, function_a());
         }
-        
+
     - :pass: FALSE
       :should: 'handle a straightforward 64-bit series of calls with a failure'
       :code: |
@@ -57,10 +57,10 @@
           TEST64 b = 0x5a5a5a5a5a5a5a5a;
           foo_ExpectAndReturn(0x1234567890123456, 0x0987654321543211);
           bar_ExpectAndReturn(&a, &b);
-          
+
           TEST_ASSERT_EQUAL_HEX64(b, function_a());
         }
-        
+
     - :pass: FALSE
       :should: 'handle a straightforward 64-bit series of calls returning a failure'
       :code: |
@@ -70,8 +70,8 @@
           TEST64 b = 0x5a5a5a5a5a5a5a5a;
           foo_ExpectAndReturn(0x1234567890123456, 0x0987654321543210);
           bar_ExpectAndReturn(&a, &b);
-          
+
           TEST_ASSERT_EQUAL_HEX64(b+1, function_a());
         }
-        
+
 ...
diff --git a/vendor/c_exception b/vendor/c_exception
index f23e15e..03e48c5 160000
--- a/vendor/c_exception
+++ b/vendor/c_exception
@@ -1 +1 @@
-Subproject commit f23e15efb39d01236f83af557a04baf235fc33eb
+Subproject commit 03e48c5033e8902a07e338b02a84b62c1577ce27
diff --git a/vendor/unity b/vendor/unity
index ac455f2..8e31f5d 160000
--- a/vendor/unity
+++ b/vendor/unity
@@ -1 +1 @@
-Subproject commit ac455f2798cc2f2eff7e27740af487d60fbafad1
+Subproject commit 8e31f5d8695e2aeac2e48b097f7ddde34971d733