Index: trunk/BNC/src/RTCM3/RTCM3Decoder.cpp
===================================================================
--- trunk/BNC/src/RTCM3/RTCM3Decoder.cpp	(revision 10578)
+++ trunk/BNC/src/RTCM3/RTCM3Decoder.cpp	(revision 10579)
@@ -1743,11 +1743,11 @@
       /* set unused F/NAV values */
       eph._E5aHS = 0.0;
-      eph._e5aDataInValid = false;
+      eph._e5aDataInvalid = false;
 
       GETFLOATSIGN(eph._BGD_1_5B, 10, 1.0 / (double )(1 << 30) / (double )(1 << 2))
       GETBITS(eph._E5bHS, 2)
-      GETBITS(eph._e5bDataInValid, 1)
+      GETBITS(eph._e5bDataInvalid, 1)
       GETBITS(eph._E1_bHS, 2)
-      GETBITS(eph._e1DataInValid, 1)
+      GETBITS(eph._e1DataInvalid, 1)
       if (eph._E5bHS != eph._E1_bHS) {
 #ifdef BNC_DEBUG_BCE
@@ -1774,9 +1774,9 @@
       eph._E5bHS = 0.0;
       eph._E1_bHS = 0.0;
-      eph._e1DataInValid = false;
-      eph._e5bDataInValid = false;
+      eph._e1DataInvalid = false;
+      eph._e5bDataInvalid = false;
 
       GETBITS(eph._E5aHS, 2)
-      GETBITS(eph._e5aDataInValid, 1)
+      GETBITS(eph._e5aDataInvalid, 1)
       eph._ephType = t_eph::FNAV;
     }
Index: trunk/BNC/src/RTCM3/ephEncoder.cpp
===================================================================
--- trunk/BNC/src/RTCM3/ephEncoder.cpp	(revision 10578)
+++ trunk/BNC/src/RTCM3/ephEncoder.cpp	(revision 10579)
@@ -248,10 +248,10 @@
     GALILEOADDBITSFLOAT(10, eph._BGD_1_5B, 1.0/static_cast<double>(1<<30)/static_cast<double>(1<<2))
     GALILEOADDBITS(2, static_cast<int>(eph._E5bHS))
-    GALILEOADDBITS(1, eph._e5bDataInValid ? 1 : 0)
+    GALILEOADDBITS(1, eph._e5bDataInvalid ? 1 : 0)
     GALILEOADDBITS(2, static_cast<int>(eph._E1_bHS))
-    GALILEOADDBITS(1, eph._e1DataInValid ? 1 : 0)
+    GALILEOADDBITS(1, eph._e1DataInvalid ? 1 : 0)
   } else {
     GALILEOADDBITS(2, static_cast<int>(eph._E5aHS))
-    GALILEOADDBITS(1,  eph._e5aDataInValid ? 1 : 0)
+    GALILEOADDBITS(1,  eph._e5aDataInvalid ? 1 : 0)
   }
 
Index: trunk/BNC/src/ephemeris.cpp
===================================================================
--- trunk/BNC/src/ephemeris.cpp	(revision 10578)
+++ trunk/BNC/src/ephemeris.cpp	(revision 10579)
@@ -1542,13 +1542,13 @@
       } else {
         // Bit 0
-        _e1DataInValid = (int(SVhealth) & (1 << 0));
+        _e1DataInvalid = (int(SVhealth) & (1 << 0));
         // Bit 1-2
         _E1_bHS = double((int(SVhealth) >> 1) & 0x3);
         // Bit 3
-        _e5aDataInValid = (int(SVhealth) & (1 << 3));
+        _e5aDataInvalid = (int(SVhealth) & (1 << 3));
         // Bit 4-5
         _E5aHS = double((int(SVhealth) >> 4) & 0x3);
         // Bit 6
-        _e5bDataInValid = (int(SVhealth) & (1 << 6));
+        _e5bDataInvalid = (int(SVhealth) & (1 << 6));
         // Bit 7-8
         _E5bHS = double((int(SVhealth) >> 7) & 0x3);
@@ -1667,5 +1667,5 @@
     return 1;
   }
-  if (_e5aDataInValid || _e5bDataInValid || _e1DataInValid) {
+  if (_e5aDataInvalid || _e5bDataInvalid || _e1DataInvalid) {
     return 1;
   }
@@ -1736,5 +1736,5 @@
     // SVhealth
     //   Bit 3  : E5a DVS
-    if (_e5aDataInValid) {
+    if (_e5aDataInvalid) {
       SVhealth |= (1 << 3);
     }
@@ -1756,5 +1756,5 @@
     // SVhealth
     //   Bit 0  : E1-B DVS
-    if (_e1DataInValid) {
+    if (_e1DataInvalid) {
       SVhealth |= (1 << 0);
     }
@@ -1769,5 +1769,5 @@
     }
     //   Bit 3  : E5a DVS
-    if (_e5aDataInValid) {
+    if (_e5aDataInvalid) {
       SVhealth |= (1 << 3);
     }
@@ -1782,5 +1782,5 @@
     }
     //   Bit 6  : E5b DVS
-    if (_e5bDataInValid) {
+    if (_e5bDataInvalid) {
       SVhealth |= (1 << 6);
     }
Index: trunk/BNC/src/ephemeris.h
===================================================================
--- trunk/BNC/src/ephemeris.h	(revision 10578)
+++ trunk/BNC/src/ephemeris.h	(revision 10579)
@@ -351,10 +351,9 @@
     _BGD_1_5B        = 0.0;
     _TOT             = 0.0;
-    _inav            = 0;
-    /** Data comes from F/NAV when <code>true</code> */
-    _fnav            = 0;
-    _e1DataInValid   = 0;
-    _e5aDataInValid  = 0;
-    _e5bDataInValid  = 0;
+    _inav            = false;
+    _fnav            = false;
+    _e1DataInvalid   = false;
+    _e5aDataInvalid  = false;
+    _e5bDataInvalid  = false;
     _receptStaID     = "";
   };
@@ -406,14 +405,9 @@
 
   double  _TOT;              // [s]
-  /** Data comes from I/NAV when <code>true</code> */
-  int    _inav;
-  /** Data comes from F/NAV when <code>true</code> */
-  int    _fnav;
-  /** E1 Data is not valid */
-  int    _e1DataInValid;
-  /** E5A Data is not valid */
-  int    _e5aDataInValid;
-  /** E5B Data is not valid */
-  int    _e5bDataInValid;
+  bool    _inav;             // Data comes from I/NAV when <code>true</code>
+  bool    _fnav;             // Data comes from F/NAV when <code>true</code>
+  bool    _e1DataInvalid;    // E1 Data is not valid
+  bool    _e5aDataInvalid;   // E5A Data is not valid
+  bool    _e5bDataInvalid;   // E5B Data is not valid
 };