Index: firmware/App/TestSupport.h
===================================================================
diff -u -reff7b1575f008f81b29ef906f6346fac6012d3ab -r663c6ccbe24d0adf734ca0684510eef70884cdee
--- firmware/App/TestSupport.h	(.../TestSupport.h)	(revision eff7b1575f008f81b29ef906f6346fac6012d3ab)
+++ firmware/App/TestSupport.h	(.../TestSupport.h)	(revision 663c6ccbe24d0adf734ca0684510eef70884cdee)
@@ -28,14 +28,14 @@
 {
     BOOL reset;
     U32 state;
-} TEST_OVERRIDE_CARGO_T;
+} TEST_OVERRIDE_PAYLOAD_T;
 
 typedef struct
 {
     BOOL reset;
     U32 state;
     U32 index;
-} TEST_OVERRIDE_ARRAY_CARGO_T;
+} TEST_OVERRIDE_ARRAY_PAYLOAD_T;
 
 #pragma pack(pop)