Index: branches/FEPSimulator/DataPacker.h
===================================================================
--- branches/fep_rpc_client/DataPacker.h	(revision 79)
+++ branches/FEPSimulator/DataPacker.h	(revision 80)
@@ -27,12 +27,12 @@
      * @return The packed data message
      */
-    static unsigned char * packData(LDS_LOOP *station);
+    static unsigned char * packData(STATION *station);
 
 private:
     static unsigned char *msg;
     // Packs the static data in message sent to ATMS
-    unsigned char * staticDataPack(LDS_LOOP *station);
+    unsigned char * staticDataPack(STATION *station);
     // Packs dynamic data in message sent to ATMS
-    int dynamicDataPack(LDS_LOOP *station, int packNo, int pos);
+    int dynamicDataPack(STATION *station, int packNo, int pos);
     // Sets last byte of message
     char chksum(unsigned char *dataptr, int len);