Index: branches/FEPSimulator/NetworkReader.h
===================================================================
--- branches/FEPSimulator/NetworkReader.h	(revision 86)
+++ branches/FEPSimulator/NetworkReader.h	(revision 182)
@@ -58,5 +58,5 @@
 #include "DataPacker.h"
 
-class NetworkReader {
+class HighwaysParser {
 public:
     /**
@@ -64,10 +64,10 @@
      * @param xml Highway Status XML data
      */
-    NetworkReader(const char * xml);
+    HighwaysParser(const char * xml);
     
     /**
      * Destructor: no cleaning necessary
      */
-    ~NetworkReader();
+    ~HighwaysParser();
     
     /**