Index: sources/update/UiProtocol.cpp
===================================================================
diff -u -r61c46e9379ca82d826fbe7fae018b8362a107d9d -r110fa8df5fc77830fa05d04af55b349dd8f9c6d9
--- sources/update/UiProtocol.cpp	(.../UiProtocol.cpp)	(revision 61c46e9379ca82d826fbe7fae018b8362a107d9d)
+++ sources/update/UiProtocol.cpp	(.../UiProtocol.cpp)	(revision 110fa8df5fc77830fa05d04af55b349dd8f9c6d9)
@@ -374,8 +374,10 @@
         // Create the security token and send it.
         SwUpdate_createSecurity((uint8 *) &msg, sizeof(SwUpdateDataBuffer));
         ok = _link.sendOk(
-            (_target == HD) || (_target == DG) ? 
-                SwUpdateCanMsgIds::DataBufferId_FW : SwUpdateCanMsgIds::DataBufferId_FPGA, 
+            (_target == HD) ? SwUpdateCanMsgIds::DataBufferId_HD_FW :
+            (_target == DG) ? SwUpdateCanMsgIds::DataBufferId_DG_FW :
+            (_target == HDFPGA) ? SwUpdateCanMsgIds::DataBufferId_HD_FPGA :
+                SwUpdateCanMsgIds::DataBufferId_DG_FPGA,
             (uint8*)&msg, _retryEffort);
         if ((_desired != Complete) || (!ok)) {
             return false;
@@ -414,8 +416,10 @@
     // Create the security token and send it.
     SwUpdate_createSecurity((uint8 *) &msg, sizeof(SwUpdateDataBuffer));
     bool ok = _link.sendOk(
-        (_target == HD) || (_target == DG) ? 
-            SwUpdateCanMsgIds::DataBufferId_FW : SwUpdateCanMsgIds::DataBufferId_FPGA, 
+        (_target == HD) ? SwUpdateCanMsgIds::DataBufferId_HD_FW :
+        (_target == DG) ? SwUpdateCanMsgIds::DataBufferId_DG_FW :
+        (_target == HDFPGA) ? SwUpdateCanMsgIds::DataBufferId_HD_FPGA :
+        SwUpdateCanMsgIds::DataBufferId_DG_FPGA,
         (uint8*)&msg, _retryEffort);
 
     return (ok && (_link.numberRetries() <= _maxCyberRetries));