Index: trunk/BNC/src/rinex/reqcanalyze.cpp
===================================================================
--- trunk/BNC/src/rinex/reqcanalyze.cpp	(revision 10574)
+++ trunk/BNC/src/rinex/reqcanalyze.cpp	(revision 10577)
@@ -1019,5 +1019,5 @@
             *_log  << "                     "
                 << navFi.fileName() << ' ' << QString(": WRONG %2:%3\n")
-                           .arg(eph->navTypeString(eph->navType(), eph->prn(), 99.0))
+                           .arg(eph->ephTypeStr(eph->ephType(), eph->prn(), 99.0))
                            .arg(eph->rinexDateStr(eph->TOC(), eph->prn(), 99.0)).toLatin1();
           }
Index: trunk/BNC/src/rinex/reqcedit.cpp
===================================================================
--- trunk/BNC/src/rinex/reqcedit.cpp	(revision 10574)
+++ trunk/BNC/src/rinex/reqcedit.cpp	(revision 10577)
@@ -704,8 +704,8 @@
 
     if (outNavFile.version() < 4.0) {
-      if (eph->navType() == t_eph::CNAV ||
-          eph->navType() == t_eph::CNV1 ||
-          eph->navType() == t_eph::CNV2 ||
-          eph->navType() == t_eph::CNV3) {
+      if (eph->ephType() == t_eph::CNAV ||
+          eph->ephType() == t_eph::CNV1 ||
+          eph->ephType() == t_eph::CNV2 ||
+          eph->ephType() == t_eph::CNV3) {
         continue;
       }
@@ -713,5 +713,5 @@
 
     if (outNavFile.version() >= 4.0 &&
-        eph->navType() == t_eph::undefined) { // input files < version 4.0
+        eph->ephType() == t_eph::undefined) { // input files < version 4.0
       continue;
     }
Index: trunk/BNC/src/rinex/rnxnavfile.cpp
===================================================================
--- trunk/BNC/src/rinex/rnxnavfile.cpp	(revision 10574)
+++ trunk/BNC/src/rinex/rnxnavfile.cpp	(revision 10577)
@@ -149,5 +149,5 @@
 ////////////////////////////////////////////////////////////////////////////
 void t_rnxNavFile::read(QTextStream* stream) {
-  QString navType;
+  QString ephType;
 
   while (stream->status() == QTextStream::Ok && !stream->atEnd()) {
@@ -171,5 +171,5 @@
       prn = hlp.at(2);
       sys = prn[0].toLatin1();
-      navType = hlp.at(3);
+      ephType = hlp.at(3);
 
       // ALL Non-EPH messages are currently ignored
@@ -194,6 +194,6 @@
                  sys == 'J' || sys == 'I') {
           lines2skip = 3;
-          if (sys == 'I' && navType == "L1NV" || // I: KLOB, NEQN
-              sys == 'J' && navType == "CNVX") { // J: WIDE, JAPN
+          if ((sys == 'I' && ephType == "L1NV") || // I: KLOB, NEQN
+              (sys == 'J' && ephType == "CNVX")) { // J: WIDE, JAPN
             navSubType = hlp.at(4);
             if      (navSubType == "KLOB") {
@@ -273,5 +273,5 @@
 
     if (version() >= 4.0 && key == "EPH") {
-      if (eph->setNavType(navType) != success) {
+      if (eph->setEphType(ephType) != success) {
         delete eph;
         continue;