Index: firmware/App/Services/FpgaTD.h
===================================================================
diff -u -r3518e8a088c32e75c0c8960d5e629a7401095feb -rf730082d809bc52c15b2d17b8fd0a8d535e5c21a
--- firmware/App/Services/FpgaTD.h	(.../FpgaTD.h)	(revision 3518e8a088c32e75c0c8960d5e629a7401095feb)
+++ firmware/App/Services/FpgaTD.h	(.../FpgaTD.h)	(revision f730082d809bc52c15b2d17b8fd0a8d535e5c21a)
@@ -53,63 +53,43 @@
 U16 getFPGABloodPumpHallSensorCount( void );
 U08 getFPGABloodPumpHallSensorStatus( void );
 
-U32 getFPGAArterialPressure( void );
-U08 getFPGAArterialPressureReadCounter( void );
-U08 getFPGAArterialPressureErrorCounter( void );
+U32 getPBAPressure( void );
+U32 getPBATemperature( void );
+U08 getPBAReadCounter( void );
+U08 getPBAErrorCounter( void );
 
-U16 getFPGADVTArterialPressure( void );
-U16 getFPGADVTArterialTemperature( void );
-U08 getFPGADVTArterialPressureReadCounter( void );
-U08 getFPGATDVTArterialPressureErrorCounter( void );
+U32 getPBOPressure( void );
+U32 getPBOTemperature( void );
+U08 getPBOReadCounter( void );
+U08 getPBOErrorCounter( void );
 
-U16 getFPGAVenousPressure( void );
-U16 getFPGAVenousPressureTemperature( void );
-U08 getFPGAVenousPressureReadCounter( void );
-U08 getFPGAVenousPressureErrorCounter( void );
-
-void setFPGASyringePumpControlFlags( U08 bitFlags );
-void setFPGASyringePumpADCandDACControlFlags( U08 bitFlags );
-void setFPGASyringePumpDACOutputLevel( U16 counts );
-void setFPGASyringePumpStepToggleTime( U32 microSeconds );
-U08  getFPGASyringePumpStatus( void );
-U08  getFPGASyringePumpADCReadCounter( void );
-U08  getFPGASyringePumpADCandDACStatus( void );
-U08  getFPGASyringePumpEncoderStatus( void );
-U32  getFPGASyringePumpEncoderPosition( void );
-U16  getFPGASyringePumpADCChannel0( void );
-U16  getFPGASyringePumpADCChannel1( void );
-U16  getFPGASyringePumpADCChannel2( void );
-U16  getFPGASyringePumpADCChannel3( void );
-U08  getFPGASyringePumpDACStatus( void );
-U16  getFPGASyringePumpDACSetting( void );
-U16  getFPGASyringePumpDACStoredSetting( void );
-
 F32  getFPGABackupAlarmAudioCurrent( void );
 
 void getFPGAAirTrapLevels( BOOL *airAtLower, BOOL *airAtUpper );
 
 void setFPGAValvesControlMode( U16 bits );
-U16  getFPGAValvesStatus( void );
 
 BOOL noFPGAFluidLeakDetected( void );
 
-BOOL noFPGAVenousBubbleDetected( void );
+BOOL ADVBubbleDetected( void );
 void setFPGAVenousBubbleSelfTest( void );
 void clearFPGAVenousBubbleSelfTest( void );
 
-void setFPGAValveBloodVenousPosition( S16 setPoint );
-S16 getFPGAValveBloodVenousPosition( void );
-U16 getFPGAValveBloodVenousCurrentCounts( void );
+void setVBVPosition( S16 setPoint );
+S16  getVBVPosition( void );
+U16  getVBVStatus( void );
+U16  getFPGAValveBloodVenousCurrentCounts( void );
 
-void setFPGAValveBloodArterialPosition( S16 setPoint );
-S16 getFPGAValveBloodArterialPosition( void );
-U16 getFPGAValveBloodArterialCurrentCounts( void );
+void setVBAPosition( S16 setPoint );
+S16  getVBAPosition( void );
+U16  getVBAStatus( void );
+U16  getFPGAValveBloodArterialCurrentCounts( void );
 
-U16 getFPGABoardTemperature( void );
-U32 getFPGAPBAADCTemperature( void );
-U16 getFPGAInletFan1TogglePeriod( void );
+U16  getFPGABoardTemperature( void );
+U32  getFPGAPBAADCTemperature( void );
+U16  getFPGAInletFan1TogglePeriod( void );
 
-U16 getFPGAFrontDoorStatus( void );
+U16  getFPGAFrontDoorStatus( void );
 
 /**@}*/