Index: trunk/BNC/src/bnccore.cpp
===================================================================
--- trunk/BNC/src/bnccore.cpp	(revision 9155)
+++ trunk/BNC/src/bnccore.cpp	(revision 9158)
@@ -280,9 +280,9 @@
   if (_rinexVers == 0) {
 
-    if ( Qt::CheckState(settings.value("ephV3").toInt()) == Qt::Checked) {
+    if ( Qt::CheckState(settings.value("ephV2").toInt()) == Qt::Checked) {
+      _rinexVers = 2;
+    }
+    else {
       _rinexVers = 3;
-    }
-    else {
-      _rinexVers = 2;
     }
 
@@ -305,8 +305,8 @@
     QString ephFileNameGPS = _ephPath + "BRDC";
 
-    bool ephV3 = (_rinexVers == 3)? true : false;
+    bool ephV2 = (_rinexVers == 2)? true : false;
 
     QString hlpStr = bncRinex::nextEpochStr(datTim,
-                         settings.value("ephIntr").toString(), ephV3);
+                         settings.value("ephIntr").toString(), ephV2);
 
     if (_rinexVers == 3) {
Index: trunk/BNC/src/bnchelp.html
===================================================================
--- trunk/BNC/src/bnchelp.html	(revision 9155)
+++ trunk/BNC/src/bnchelp.html	(revision 9158)
@@ -30,5 +30,5 @@
 <p>
 <h4>Authors</h4>
-Georg Weber<sup>(1)</sup>, Leo&scaron; Mervart<sup>(2)</sup>, Andrea St&uuml;rze<sup>(1)</sup>, Axel R&uuml;lke<sup>(1)</sup>, Dirk St&ouml;cker<sup>(3)</sup><br><br>
+Georg Weber<sup>(1)</sup>, Leo&scaron; Mervart<sup>(2)</sup>, Andrea St&uuml;rze<sup>(1)</sup>, Dirk St&ouml;cker<sup>(3)</sup><br><br>
 
 <sup>(1) Federal Agency for Cartography and Geodesy (BKG), Frankfurt, Germany</sup><br>
@@ -108,7 +108,6 @@
 &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; 2.4.6 <a href="#sklMandat">Skeleton Mandatory</a><br>
 &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; 2.4.7 <a href="#rnxscript">Script</a><br>
+&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; 2.4.9 <a href="#rnxvers3">Version 3</a><br>
 &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; 2.4.8 <a href="#rnxvers2">Version 2</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; 2.4.9 <a href="#rnxvers3">Version 3</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; 2.4.10 <a href="#rnxvers3File">Version 3 Filenames</a><br>
 &nbsp; &nbsp; &nbsp; 2.5 <a href="#ephemeris"><b>RINEX Ephemeris</b></a><br>
 &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; 2.5.1 <a href="#ephdir">Directory</a><br>
@@ -116,5 +115,4 @@
 &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; 2.5.3 <a href="#ephport">Port</a><br>
 &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; 2.5.4 <a href="#ephvers">Version</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; 2.5.5 <a href="#ephversFile">Version 3 Filenames</a><br>
 &nbsp; &nbsp; &nbsp; 2.6 <a href="#reqc"><b>RINEX Editing & QC</b></a><br>
 &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; 2.6.1 <a href="#reqcact">Action</a><br>
@@ -1600,12 +1598,21 @@
 </p>
 
-<p><h4 id="rnxvers2">2.4.8 Version 2 - optional</h4></p>
-<p>
-GNSS observation data are generally hold available within BNC according to attributes as defined in RINEX Version 3. These attributes describe the tracking mode or channel when generating the observation signals. Capital letters specifying signal generation attributes are A, B, C, D, I, L, M, N, P, Q, S, W, X, Y, and Z, see RINEX Version 3 documentation. Although RINEX Version 3 with its signal generation attributes is the internal default processing format for BNC, there are two applications where the program is explicitly required to produce data files in RINEX Version 2 format:
+<p><h4 id="rnxvers3">2.4.8 Version 3 - optional</h4></p>
+<p>
+The default format for RINEX Observation files is RINEX Version 3. There is nothing to activate in addition to save RTCM Version 3 observation streams in RINEX Version 3 format.
+</p>
+
+<p>
+Note, that it is possible to force an RTCM Version 2 stream to be saved in RINEX Version 3 file format. However, this is not recommended, because such stream cannot be precisely mapped to RINEX Version 3 as the required information on tracking modes (observation attributes) is not part of RTCM Version 2.
+</p>
+
+<p><h4 id="rnxvers2">2.4.9 Version 2 - optional</h4></p>
+<p>
+GNSS observation data are generally hold available within BNC according to attributes as defined in RINEX Version 3. These attributes describe the tracking mode or channel when generating the observation signals. Capital letters specifying signal generation attributes are A, B, C, D, I, L, M, N, P, Q, S, W, X, Y, and Z, see RINEX Version 3 documentation. Although RINEX Version 3 with its signal generation attributes is the internal default processing format for BNC, there are two applications where the program can be setup to produce data files in RINEX Version 2.11 format:
 <ol type="1">
 <li>When saving the content of incoming observation streams in RINEX Version 2 files as described in this section.</li>
 <li>When editing or concatenating RINEX 3 files to save them in Version 2 format, see section on 'RINEX Editing & QC'.</li>
 </ol>
-As the Version 2 format ignores signal generation attributes, BNC is forced to somehow map RINEX Version 3 to RINEX Version 2 although this cannot be done in one-to-one correspondence. Hence we introduce a 'Signal priority' list of attributes (characters, forming a string) for mapping Version 3 to Version 2.
+Select RINEX 'Version 2' if you would like to save RTCM Version 3 observation streams in RINEX Version 2 format. As the Version 2 format ignores signal generation attributes, BNC is forced to somehow map RINEX Version 3 to RINEX Version 2 although this cannot be done in one-to-one correspondence. Hence we introduce a 'Signal priority' list of attributes (characters, forming a string) for mapping Version 3 to Version 2.
 </p>
 <p>
@@ -1636,23 +1643,19 @@
 </p>
 
-<p><h4 id="rnxvers3">2.4.9 Version 3 - optional</h4></p>
-<p>
-The default format for RINEX Observation files is RINEX Version 2.11. Select RINEX 'Version 3' if you would like to save RTCM Version 3 observation streams in RINEX Version 3.03 format.
-</p>
-
-<p>
-Note that it is possible to force an RTCM Version 2 stream to be saved in RINEX Version 3 file format. However, this is not recommended because such stream cannot be precisely mapped to RINEX Version 3 as the required information on tracking modes (observation attributes) is not part of RTCM Version 2.
-</p>
-
-<p><h4 id="rnxvers3File">2.4.10 Version 3 Filenames - optional</h4></p>
-<p>
-Tick check box 'Version 3 filenames' to let BNC create so-called extended filenames following the RINEX Version 3 standard.
-</p>
-<p>Default is an empty check box, meaning to still use filenames following the RINEX Version 2 standard although the file content is saved in RINEX Version 3 format.
-</p>
-
 <p><h4 id="ephemeris">2.5 RINEX Ephemeris</h4></p>
 <p>
-Broadcast Ephemeris can be saved in RINEX Navigation files when received e.g. via RTCM Version 3 message types 1019 (GPS) or 1020 (GLONASS) or 1044 (QZSS) or 1043 (SBAS) or 1045 and 1046 (Galileo) or 63 (BDS/BeiDou, tentative message number). The filename convention follows the details given in section 'RINEX Filenames' except that the first four characters are 'BRDC'.
+Broadcast Ephemeris can be saved in RINEX Navigation files when received e.g. via RTCM Version 3 message types:
+<ul>
+<li> 1019 (GPS) or </li>
+<li> 1020 (GLONASS) or </li>
+<li> 1044 (QZSS) or </li>
+<li> 1043 (SBAS) or </li>
+<li> 1045 (Galileo F/NAV) or </li>
+<li> 1046 (Galileo I/NAV) or </li>
+<li> 1042 (BDS/BeiDou) or </li>
+<li> 1041 (IRNSS). </li>
+</ul>
+</p>
+ <p> The filename convention follows the details given in section 'RINEX Filenames' except that the first four characters are 'BRDC'.
 </p>
 <p>
@@ -1660,5 +1663,5 @@
 </p>
 <p>
-Regarding RINEX Version 3 you will find all ephemeris data for GPS, GLONASS, Galileo, SBAS, QZSS, and BDS gathered in one Navigation file.
+Regarding RINEX Version 3 you will find all ephemeris data for GPS, GLONASS, Galileo, SBAS, QZSS, BDS, and IRNSS gathered in one Navigation file.
 </p>
 <p>
@@ -1697,19 +1700,9 @@
 <p><h4 id="ephvers">2.5.4 Version - optional</h4></p>
 <p>
-Default format for RINEX Navigation files containing Broadcast Ephemeris is RINEX Version 2.11. Select 'Version 3' if you want to save the ephemeris data in RINEX Version 3.03 format.
-</p>
-<p>
-Note that this does not concern the Broadcast Ephemeris output through IP port, which is always in RINEX Version 3.03 format.
-</p>
-
-<p><h4 id="ephversFile">2.5.5 Version 3 Filenames - optional</h4></p>
-<p>
-Tick check box 'Version 3 filenames' to let BNC create so-called extended filenames following the RINEX Version 3 standard.
-</p>
-<p>Default is an empty check box, meaning to still use filenames following the RINEX Version 2 standard although the file content is saved in RINEX Version 3 format.
-</p>
-
-<p><img src="IMG/screenshot42.png"/></p>
-<p>Figure 9: BNC converting Broadcast Ephemeris stream to RINEX Version 3 Navigation files</p>
+Default format for RINEX Navigation files containing Broadcast Ephemeris is RINEX Version 3. Select 'Version 2' if you want to save the ephemeris data in RINEX Version 2.11 format.
+</p>
+<p>
+Note that this does not concern the Broadcast Ephemeris output through IP port, which is always in RINEX Version 3 format.
+</p>
 
 <p><h4 id="reqc">2.6 RINEX Editing & QC</h4></p>
@@ -1745,7 +1738,4 @@
 <p>
 When specifying several input files, BNC will concatenate their contents. In case of RINEX Observation input files with different observation type header records, BNC will output only one set of adjusted observation type records in the RINEX header which fits to the whole file content.
-</p>
-<p>
-Note that you may specify several RINEX Version 2 Navigation files for GPS and GLONASS.
 </p>
 
@@ -5120,6 +5110,5 @@
    rnxScript      {File upload script, full path [character string]}
    rnxV2Priority  {Priority of signal attributes [character string, list separated by blank character, example: G:CWPX_? R:CP]}
-   rnxV3          {Produce version 3 file content [integer number: 0=no,2=yes]}
-   rnxV3filenames {Produce version 3 filenames [integer number: 0=no,2=yes]}
+   rnxV2          {Produce version 2 file content [integer number: 0=no,2=yes]}
 
 <b>RINEX Ephemeris Panel keys:</b>
@@ -5127,6 +5116,5 @@
    ephIntr        {File interval [character string: 1 min|2 min|5 min|10 min|15 min|30 min|1 hour|1 day]}
    ephOutPort     {Output port [integer number]}
-   ephV3          {Produce version 3 file content [integer number: 0=no,2=yes]}
-   ephV3filenames {Produce version 3 filenames [integer number: 0=no,2=yes]}
+   ephV2          {Produce version 2 file content [integer number: 0=no,2=yes]}
 
 <b>RINEX Editing and QC Panel keys:</b>
@@ -5215,5 +5203,5 @@
    PPP/antexFile   {ANTEX file, full path [character string]}
    PPP/crdFile     {Coordinates file, full path [character string]}
-   PPP/v3filenames {Produce version 3 filenames, [integer number: 0=no,2=yes]}
+   PPP/v2filenames {Produce version 2 filenames, [integer number: 0=no,2=yes]}
    PPP/logPath     {Directory for PPP log files [character string]}
    PPP/nmeaPath    {Directory for NMEA output files [character string]}
Index: trunk/BNC/src/bncmain.cpp
===================================================================
--- trunk/BNC/src/bncmain.cpp	(revision 9155)
+++ trunk/BNC/src/bncmain.cpp	(revision 9158)
@@ -115,5 +115,5 @@
       "   rnxScript      {File upload script, full path [character string]}\n"
       "   rnxV2Priority  {Priority of signal attributes [character string, list separated by blank character, example: G:12&PWCSLXYN G:5&IQX C:IQX]}\n"
-      "   rnxV3          {Produce version 3 file contents [integer number: 0=no,2=yes]}\n"
+      "   rnxV2          {Produce version 2 file contents [integer number: 0=no,2=yes]}\n"
       "\n"
       "RINEX Ephemeris Panel keys:\n"
@@ -121,5 +121,5 @@
       "   ephIntr        {File interval [character string: 1 min|2 min|5 min|10 min|15 min|30 min|1 hour|1 day]}\n"
       "   ephOutPort     {Output port [integer number]}\n"
-      "   ephV3          {Produce version 3 file contents [integer number: 0=no,2=yes]}\n"
+      "   ephV2          {Produce version 2 file contents [integer number: 0=no,2=yes]}\n"
       "\n"
       "RINEX Editing and QC Panel keys:\n"
@@ -206,5 +206,5 @@
       "   PPP/corrMount   {Corrections mountpoint [character string]}\n"
       "   PPP/corrFile    {Corrections file, full path [character string]}\n"
-      "   PPP/v3filenames {Produce version 3 filenames, 0=no,2=yes}\n"
+      "   PPP/v2filenames {Produce version 2 filenames, 0=no,2=yes}\n"
       "   PPP/crdFile     {Coordinates file, full path [character string]}\n"
       "   PPP/logPath     {Directory for PPP log files [character string]}\n"
Index: trunk/BNC/src/bncoutf.cpp
===================================================================
--- trunk/BNC/src/bncoutf.cpp	(revision 9155)
+++ trunk/BNC/src/bncoutf.cpp	(revision 9158)
@@ -48,5 +48,5 @@
 
   _append = Qt::CheckState(settings.value("rnxAppend").toInt()) == Qt::Checked;
-  _v3filenames = settings.value("PPP/v3filenames").toBool();
+  _v2filenames = settings.value("PPP/v2filenames").toBool();
 }
 
@@ -77,5 +77,5 @@
   if ( indHlp != -1) {
     int step = intStr.left(indHlp-1).toInt();
-    if (_v3filenames) {
+    if (!_v2filenames) {
       epoStr +=  QString("%1").arg(datTim.time().hour(), 2, 10, QChar('0')); // H
     } else {
@@ -95,5 +95,5 @@
     }
 
-    if (_v3filenames) {
+    if (!_v2filenames) {
       epoStr += QString("_%1M").arg(step, 2, 10, QChar('0'));                // period
     }
@@ -103,5 +103,5 @@
   else if (intStr == "1 hour") {
     int step = intStr.left(indHlp-1).toInt();
-    if (_v3filenames) {
+    if (!_v2filenames) {
       epoStr += QString("%1").arg(datTim.time().hour(), 2, 10, QChar('0'));  // H
       epoStr += QString("%1").arg(0, 2, 10, QChar('0'));                     // M
@@ -114,5 +114,5 @@
   else {
     int step = intStr.left(indHlp-1).toInt();
-    if (_v3filenames) {
+    if (!_v2filenames) {
       epoStr += QString("%1").arg(0, 2, 10, QChar('0'));                    // H
       epoStr += QString("%1").arg(0, 2, 10, QChar('0'));                    // M
@@ -122,5 +122,5 @@
   }
 
-  if (_v3filenames) {
+  if (!_v2filenames) {
     if (sampl < 60) {
       epoStr += QString("_%1S").arg(sampl, 2, 10, QChar('0'));
@@ -153,5 +153,5 @@
   baseName.replace("${V3}" , QString("_U_%1%2").arg(yyyy).arg(doy));
   if (_extension.count(".") == 2) {_extension.replace(0,1,"_"); }
-  
+
   return _path + baseName + epoStr + _extension;
 }
Index: trunk/BNC/src/bncoutf.h
===================================================================
--- trunk/BNC/src/bncoutf.h	(revision 9155)
+++ trunk/BNC/src/bncoutf.h	(revision 9158)
@@ -34,5 +34,5 @@
   QString _fName;
   bool    _append;
-  bool    _v3filenames;
+  bool    _v2filenames;
 };
 
Index: trunk/BNC/src/bncrinex.cpp
===================================================================
--- trunk/BNC/src/bncrinex.cpp	(revision 9155)
+++ trunk/BNC/src/bncrinex.cpp	(revision 9158)
@@ -116,5 +116,5 @@
   _writeRinexFileOnlyWithSkl = settings.value("rnxOnlyWithSKL").toBool();
 
-  _rnxV3 = (Qt::CheckState(settings.value("rnxV3").toInt()) == Qt::Checked) ? true : false;
+  _rnxV2 = (Qt::CheckState(settings.value("rnxV2").toInt()) == Qt::Checked) ? true : false;
 }
 
@@ -249,5 +249,5 @@
 ////////////////////////////////////////////////////////////////////////////
 QString bncRinex::nextEpochStr(const QDateTime& datTim,
-                               const QString& intStr, bool rnxV3,
+                               const QString& intStr, bool rnxV2,
                                QDateTime* nextEpoch) {
 
@@ -261,5 +261,5 @@
   if ( indHlp != -1) {
     int step = intStr.left(indHlp-1).toInt();
-    if (rnxV3) {
+    if (!rnxV2) {
       epoStr +=  QString("%1").arg(datTim.time().hour(), 2, 10, QChar('0')); // H
     } else {
@@ -288,5 +288,5 @@
       }
     }
-    if (rnxV3) {
+    if (!rnxV2) {
       epoStr += QString("_%1M").arg(step, 2, 10, QChar('0'));                // period
     }
@@ -294,5 +294,5 @@
   else if (intStr == "1 hour") {
     int step = intStr.left(indHlp-1).toInt();
-    if (rnxV3) {
+    if (!rnxV2) {
       epoStr += QString("%1").arg(datTim.time().hour(), 2, 10, QChar('0'));  // H
       epoStr += QString("%1").arg(0, 2, 10, QChar('0'));                     // M
@@ -312,5 +312,5 @@
   else {
     int step = intStr.left(indHlp-1).toInt();
-    if (rnxV3) {
+    if (!rnxV2) {
       epoStr += QString("%1").arg(0, 2, 10, QChar('0'));                    // H
       epoStr += QString("%1").arg(0, 2, 10, QChar('0'));                    // M
@@ -343,5 +343,5 @@
 
   QString hlpStr = nextEpochStr(datTim, settings.value("rnxIntr").toString(),
-                                _rnxV3, &_nextCloseEpoch);
+                                _rnxV2, &_nextCloseEpoch);
 
   int n = _statID.size();
@@ -380,5 +380,5 @@
   }
 
-  if (_rnxV3) {
+  if (!_rnxV2) {
     QString country;
     QString monNum = "0";
@@ -428,5 +428,5 @@
   // Set RINEX Version
   // -----------------
-  int intHeaderVers = (Qt::CheckState(settings.value("rnxV3").toInt()) == Qt::Checked ? 3 : 2);
+  int intHeaderVers = (Qt::CheckState(settings.value("rnxV2").toInt()) == Qt::Checked ? 2 : 3);
 
   // Open the Output File
Index: trunk/BNC/src/bncrinex.h
===================================================================
--- trunk/BNC/src/bncrinex.h	(revision 9155)
+++ trunk/BNC/src/bncrinex.h	(revision 9158)
@@ -47,5 +47,5 @@
    static QString nextEpochStr(const QDateTime& datTim,
                                const QString& intStr,
-                               bool rnxV3,
+                               bool rnxV2,
                                QDateTime* nextEpoch = 0);
    static std::string asciiSatLine(const t_satObs& obs, bool outLockTime);
@@ -71,5 +71,5 @@
    QString         _localSklNameAlternative;
    bool            _writeRinexFileOnlyWithSkl;
-   bool            _rnxV3;
+   bool            _rnxV2;
    QByteArray      _latitude;
    QByteArray      _longitude;
Index: trunk/BNC/src/bncsettings.cpp
===================================================================
--- trunk/BNC/src/bncsettings.cpp	(revision 9155)
+++ trunk/BNC/src/bncsettings.cpp	(revision 9158)
@@ -91,10 +91,10 @@
     setValue_p("rnxV2Priority",       "");
     setValue_p("rnxScript",           "");
-    setValue_p("rnxV3",               "0");
+    setValue_p("rnxV2",               "0");
     // RINEX Ephemeris
     setValue_p("ephPath",             "");
     setValue_p("ephIntr",             "1 day");
     setValue_p("ephOutPort",          "");
-    setValue_p("ephV3",               "0");
+    setValue_p("ephV2",               "0");
     // Reqc
     setValue_p("reqcAction",          "");
Index: trunk/BNC/src/bncwindow.cpp
===================================================================
--- trunk/BNC/src/bncwindow.cpp	(revision 9155)
+++ trunk/BNC/src/bncwindow.cpp	(revision 9158)
@@ -239,6 +239,6 @@
   _rnxSkelLineEdit->setMaximumWidth(5*ww);
   _rnxScrpLineEdit    = new QLineEdit(settings.value("rnxScript").toString());
-  _rnxV3CheckBox      = new QCheckBox();
-  _rnxV3CheckBox->setCheckState(Qt::CheckState(settings.value("rnxV3").toInt()));
+  _rnxV2CheckBox      = new QCheckBox();
+  _rnxV2CheckBox->setCheckState(Qt::CheckState(settings.value("rnxV2").toInt()));
   QString hlp = settings.value("rnxV2Priority").toString();
   if (hlp.isEmpty()) {
@@ -247,8 +247,6 @@
   _rnxV2Priority = new QLineEdit(hlp);
 
-  connect(_rnxPathLineEdit, SIGNAL(textChanged(const QString &)),
-          this, SLOT(slotBncTextChanged()));
-  connect(_rnxV3CheckBox, SIGNAL(stateChanged(int)),
-          this, SLOT(slotBncTextChanged()));
+  connect(_rnxPathLineEdit, SIGNAL(textChanged(const QString &)), this, SLOT(slotBncTextChanged()));
+  connect(_rnxV2CheckBox, SIGNAL(stateChanged(int)), this, SLOT(slotBncTextChanged()));
 
   // RINEX Ephemeris Options
@@ -263,6 +261,6 @@
   }
   _ephOutPortLineEdit    = new QLineEdit(settings.value("ephOutPort").toString());
-  _ephV3CheckBox = new QCheckBox();
-  _ephV3CheckBox->setCheckState(Qt::CheckState(settings.value("ephV3").toInt()));
+  _ephV2CheckBox = new QCheckBox();
+  _ephV2CheckBox->setCheckState(Qt::CheckState(settings.value("ephV2").toInt()));
 
   connect(_ephOutPortLineEdit, SIGNAL(textChanged(const QString &)),
@@ -764,6 +762,6 @@
   oLayout->addWidget(new QLabel("Version 2 signal priority"),      5, 0);
   oLayout->addWidget(_rnxV2Priority,                               5, 1, 1, 15);
-  oLayout->addWidget(new QLabel("Version 3"),                      6, 0);
-  oLayout->addWidget(_rnxV3CheckBox,                               6, 1);
+  oLayout->addWidget(new QLabel("Version 2"),                      6, 0);
+  oLayout->addWidget(_rnxV2CheckBox,                               6, 1);
   oLayout->addWidget(new QLabel(""),                               7, 1);
   oLayout->setRowStretch(8, 999);
@@ -785,6 +783,6 @@
   eLayout->addWidget(new QLabel("Port"),                          3, 0);
   eLayout->addWidget(_ephOutPortLineEdit,                         3, 1);
-  eLayout->addWidget(new QLabel("Version 3"),                     4, 0);
-  eLayout->addWidget(_ephV3CheckBox,                              4, 1);
+  eLayout->addWidget(new QLabel("Version 2"),                     4, 0);
+  eLayout->addWidget(_ephV2CheckBox,                              4, 1);
   eLayout->setRowStretch(5, 999);
 
@@ -938,6 +936,6 @@
   pppLayout1->addWidget(new QLabel("Data source"),           ir, 0);
   pppLayout1->addWidget(_pppWidgets._dataSource,             ir, 1);
-  pppLayout1->addWidget(new QLabel("   Version 3 filenames"),ir, 4);
-  pppLayout1->addWidget(_pppWidgets._v3filenames,            ir, 5, 1, 3);
+  pppLayout1->addWidget(new QLabel("   Version 2 filenames"),ir, 4);
+  pppLayout1->addWidget(_pppWidgets._v2filenames,            ir, 5, 1, 3);
   ++ir;
   pppLayout1->addWidget(new QLabel("Corrections stream"),    ir, 0);
@@ -1292,5 +1290,5 @@
   // WhatsThis, Network
   // ------------------
-  _proxyHostLineEdit->setWhatsThis(tr("<p>If you are running BNC within a protected Local Area Network (LAN), you may need to use a proxy server to access the Internet. Enter your proxy server IP and port number in case one is operated in front of BNC. If you do not know the IP and port of your proxy server, check the proxy server settings in your Internet browser or ask your network administrator.</p><p>Note that IP streaming is sometimes not allowed in a LAN. In this case you need to ask your network administrator for an appropriate modification of the local security policy or for the installation of a TCP relay to the Ntrip Broadcasters. If this is not possible, you may need to run BNC outside your LAN on a network that has unobstructed connection to the Internet. <i>[key: proxyHost]</i></p>"));
+  _proxyHostLineEdit->setWhatsThis(tr("<p>If you are running BNC within a protected Local Area Network (LAN), you may need to use a proxy server to access the Internet. Enter your proxy server IP and port number in case one is operated in front of BNC. If you do not know the IP and port of your proxy server, check the proxy server settings in your Internet browser or ask your network administrator. Without any entry, BNC will try to use the system proxies. </p><p>Note that IP streaming is sometimes not allowed in a LAN. In this case you need to ask your network administrator for an appropriate modification of the local security policy or for the installation of a TCP relay to the Ntrip Broadcasters. If this is not possible, you may need to run BNC outside your LAN on a network that has unobstructed connection to the Internet. <i>[key: proxyHost]</i></p>"));
   _proxyPortLineEdit->setWhatsThis(tr("<p>Enter your proxy server port number in case a proxy is operated in front of BNC. <i>[key: proxyPort]</i></p>"));
   _sslCaCertPathLineEdit->setWhatsThis(tr("<p>Communication with an Ntrip Broadcaster over SSL requires the exchange of client and/or server certificates. Specify the path to a directory where you save certificates on your system. Don't try communication via SSL if you are not sure whether this is supported by the involved Ntrip Broadcaster.</p><p>Note that SSL communication is usually done over port 443. <i>[key: sslCaCertPath]</i></p>"));
@@ -1314,5 +1312,5 @@
   _rnxScrpLineEdit->setWhatsThis(tr("<p>Whenever a RINEX Observation file is finally saved, you may want to compress, copy or upload it immediately, for example via FTP. BNC allows you to execute a script/batch file to carry out such operation.</p><p>Specify the full path of a script or batch file. BNC will pass the full RINEX Observation file path to the script as command line parameter (%1 on Windows systems, $1 on Unix/Linux/Mac systems). <i>[key: rnxScript]</i></p>"));
   _rnxV2Priority->setWhatsThis(tr("<p>Specify a priority list of characters defining signal attributes as defined in RINEX Version 3. Priorities will be used to map observations with RINEX Version 3 attributes from incoming streams to Version 2. The underscore character '_' stands for undefined attributes. A question mark '?' can be used as wildcard which represents any one character.</p><p>Signal priorities can be specified as equal for all systems, as system specific or as system and freq. specific. For example: </li><ul><li>'CWPX_?' (General signal priorities valid for all GNSS) </li><li>'I:ABCX' (System specific signal priorities for IRNSS) </li><li>'G:12&PWCSLX G:5&IQX R:12&PC R:3&IQX' (System and frequency specific signal priorities) </li></ul>Default is the following priority list 'G:12&PWCSLX G:5&IQX R:12&PC R:3&IQX R:46&ABX E:16&BCXZ E:578&IQX J:1&SLXCZ J:26&SLX J:5&IQX C:267&IQX C:128&DPX C:7&DPZ I:ABCX S:1&C S:5&IQX'. <i>[key: rnxV2Priority]</i></p>"));
-  _rnxV3CheckBox->setWhatsThis(tr("<p>The default format for RINEX Observation files is RINEX Version 2.</p><p>Select 'Version 3' if you want to save observations in RINEX Version 3 format. <i>[key: rnxV3]</i></p>"));
+  _rnxV2CheckBox->setWhatsThis(tr("<p>The default format for RINEX Observation files is RINEX Version 3.</p><p>Select 'Version 2' if you want to save observations in RINEX Version 2 format. <i>[key: rnxV2]</i></p>"));
 
   // WhatsThis, RINEX Ephemeris
@@ -1321,5 +1319,5 @@
   _ephIntrComboBox->setWhatsThis(tr("<p>Select the length of the RINEX Navigation file. <i>[key: ephIntr]</i></p>"));
   _ephOutPortLineEdit->setWhatsThis(tr("<p>BNC can produce ephemeris data in RINEX Navigation ASCII format on your local host through an IP port.</p><p>Specify a port number here to activate this function. <i>[key: ephOutPort]</i></p>"));
-  _ephV3CheckBox->setWhatsThis(tr("<p>The default format for output of RINEX Navigation data containing Broadcast Ephemeris is RINEX Version 2.</p><p>Select 'Version 3' if you want to output ephemeris in RINEX Version 3 format. <i>[key: ephV3]</i></p>"));
+  _ephV2CheckBox->setWhatsThis(tr("<p>The default format for output of RINEX Navigation data containing Broadcast Ephemeris is RINEX Version 3.</p><p>Select 'Version 2' if you want to output ephemeris in RINEX Version 2 format. <i>[key: ephV2]</i></p>"));
 
   // WhatsThis, RINEX Editing & QC
@@ -1394,5 +1392,5 @@
   _pppWidgets._antexFile->setWhatsThis(tr("<p>Observations in RTCM streams or RINEX files should be referred to the receiver's and to the satellite's Antenna Phase Center (APC) and therefore be corrected for<ul><li>Receiver APC offsets</li><li>Receiver APC variations</li><li>Satellite APC offsets.</li></ul> Specify the full path to an IGS 'ANTEX file' which contains APC offsets and variations.</p><p>If you don't specify an 'ANTEX file' then observations will not be corrected for APC offsets and variations.</p>"));
   _pppWidgets._crdFile->setWhatsThis(tr("<p>Enter the full path to an ASCII file which specifies the streams or files of those stations you want to process. Specifying a 'Coordinates file' is optional. If it exists, it should contain one record per station with the following parameters separated by blank character:<p><ul><li>Specify the station either by<ul><li>the 'Mountpoint' of the station's RTCM stream (when in real-time PPP mode), or</li><li>the 4-charater station ID of the RINEX Observations file (when in post processing PPP mode).</li></ul></li><li>Approximate X,Y,Z coordinate of station's Antenna Reference Point [m] (ARP, specify '0.0 0.0 0.0' if unknown).</li><li>North, East and Up component of antenna eccentricity [m] (specify '0.0 0.0 0.0' if unknown).</li><li>20 Characters describing the antenna type and radome following the IGS 'ANTEX file' standard (leave blank if unknown).</li><li>Receiver type following the naming conventions for IGS equipment.</li></ul></p><p>Records with exclamation mark '!' in the first column or blank records will be interpreted as comment lines and ignored.</p>"));
-  _pppWidgets._v3filenames->setWhatsThis(tr("<p>Tick 'Version 3 filenames' to let BNC create so-called extended filenames for PPP logfiles, NMEA files and SINEX Troposphere files following the RINEX Version 3 standard.</p><p>Default is an empty check box, meaning to create filenames following the RINEX Version 2 standard. The file content is not affected by this option. It only concerns the filenames.</p>"));
+  _pppWidgets._v2filenames->setWhatsThis(tr("<p>Tick 'Version 2 filenames' to let BNC create filenames for PPP logfiles , NMEA files and SINEX Troposphere files following the RINEX Version 2 standard.</p><p>Default is an empty check box, meaning to create filenames following the RINEX Version 3 standard. The file content is not affected by this option. It only concerns the filenames.</p>"));
   _pppWidgets._logPath->setWhatsThis(tr("<p>Specify a directory for saving daily PPP logfiles. If the specified directory does not exist, BNC will not create such files.</p><p>Default is an empty option field, meaning that no PPP logfiles shall be produced.</p>"));
   _pppWidgets._nmeaPath->setWhatsThis(tr("<p>Specify a directory for saving coordinates in daily NMEA files. If the specified directory does not exist, BNC will not create such files.</p><p>Default is an empty option field, meaning that no NMEA file shall be produced.</p>"));
@@ -1515,10 +1513,10 @@
   delete _rnxSkelLineEdit;
   delete _rnxScrpLineEdit;
-  delete _rnxV3CheckBox;
+  delete _rnxV2CheckBox;
   delete _rnxV2Priority;
   delete _ephPathLineEdit;
   delete _ephIntrComboBox;
   delete _ephOutPortLineEdit;
-  delete _ephV3CheckBox;
+  delete _ephV2CheckBox;
   delete _corrPathLineEdit;
   delete _corrIntrComboBox;
@@ -1971,10 +1969,10 @@
   settings.setValue("rnxScript",    _rnxScrpLineEdit->text());
   settings.setValue("rnxV2Priority",_rnxV2Priority->text());
-  settings.setValue("rnxV3",        _rnxV3CheckBox->checkState());
+  settings.setValue("rnxV2",        _rnxV2CheckBox->checkState());
 // RINEX Ephemeris
   settings.setValue("ephPath",       _ephPathLineEdit->text());
   settings.setValue("ephIntr",       _ephIntrComboBox->currentText());
   settings.setValue("ephOutPort",    _ephOutPortLineEdit->text());
-  settings.setValue("ephV3",         _ephV3CheckBox->checkState());
+  settings.setValue("ephV2",         _ephV2CheckBox->checkState());
 // Broadcast Corrections
   settings.setValue("corrPath",    _corrPathLineEdit->text());
@@ -2459,13 +2457,13 @@
     enableWidget(enable, _rnxScrpLineEdit);
     enableWidget(enable, _rnxV2Priority);
-    enableWidget(enable, _rnxV3CheckBox);
+    enableWidget(enable, _rnxV2CheckBox);
 
     bool enable1 = true;
-    enable1 = _rnxV3CheckBox->isChecked();
+    enable1 = _rnxV2CheckBox->isChecked();
     if (enable && enable1) {
+      enableWidget(true, _rnxV2Priority);
+    }
+    if (enable && !enable1) {
       enableWidget(false, _rnxV2Priority);
-    }
-    if (enable && !enable1) {
-      enableWidget(true, _rnxV2Priority);
     }
   }
@@ -2473,8 +2471,8 @@
   // RINEX Observations, Signal Priority
   // -----------------------------------
-  if (sender() == 0 || sender() == _rnxV3CheckBox) {
+  if (sender() == 0 || sender() == _rnxV2CheckBox) {
     if (!_rnxPathLineEdit->text().isEmpty()) {
       enableWidget(enable, _rnxIntrComboBox);
-      enable = !_rnxV3CheckBox->isChecked();
+      enable = _rnxV2CheckBox->isChecked();
       enableWidget(enable, _rnxV2Priority);
     }
@@ -2486,5 +2484,5 @@
     enable = !_ephPathLineEdit->text().isEmpty() || !_ephOutPortLineEdit->text().isEmpty();
     enableWidget(enable, _ephIntrComboBox);
-    enableWidget(enable, _ephV3CheckBox);
+    enableWidget(enable, _ephV2CheckBox);
   }
 
Index: trunk/BNC/src/bncwindow.h
===================================================================
--- trunk/BNC/src/bncwindow.h	(revision 9155)
+++ trunk/BNC/src/bncwindow.h	(revision 9158)
@@ -162,7 +162,7 @@
     QLineEdit*     _sp3CompLogLineEdit;
 
-    QCheckBox* _rnxV3CheckBox;
+    QCheckBox* _rnxV2CheckBox;
     QLineEdit* _rnxV2Priority;
-    QCheckBox* _ephV3CheckBox;
+    QCheckBox* _ephV2CheckBox;
     QLineEdit* _rnxSkelLineEdit;
     QCheckBox* _rnxFileCheckBox;
Index: trunk/BNC/src/pppMain.cpp
===================================================================
--- trunk/BNC/src/pppMain.cpp	(revision 9155)
+++ trunk/BNC/src/pppMain.cpp	(revision 9158)
@@ -462,9 +462,9 @@
     opt->_aprSigPhaseBias = 1000.0;
     // TODO: Find realistic values!!!!!!
-    opt->_noiseIon        = 1.00;
-    opt->_noiseCodeBias   = 1.00;
-    opt->_noisePhaseBias  = 5.00;
+    opt->_noiseIon        =  5.00; // Todo: add all to table
+    opt->_noiseCodeBias   =  5.00;
+    opt->_noisePhaseBias  =  5.00;
     // pseudo observations
-    opt->_sigmaGIMdiff    = 2.00; // Todo: add to bncWindow
+    opt->_sigmaGIMdiff    = 5.00; // Todo: add to bncWindow
     opt->_sigmaTz0        = 0.10;
 
Index: trunk/BNC/src/pppRun.cpp
===================================================================
--- trunk/BNC/src/pppRun.cpp	(revision 9155)
+++ trunk/BNC/src/pppRun.cpp	(revision 9158)
@@ -179,5 +179,5 @@
         country;
 
-  bool v3filenames = settings.value("PPP/v3filenames").toBool();
+  bool v2filenames = settings.value("PPP/v2filenames").toBool();
   QString logFileSkl = settings.value("PPP/logPath").toString();
   int l = logFileSkl.length();
@@ -189,5 +189,5 @@
       logFileSkl += QDir::separator();
     }
-    if (v3filenames) {
+    if (!v2filenames) {
       logFileSkl = logFileSkl + ID9 + "${V3}" + distStr + ".ppp";
     }
@@ -207,5 +207,5 @@
       nmeaFileSkl += QDir::separator();
     }
-    if (v3filenames) {
+    if (!v2filenames) {
       nmeaFileSkl = nmeaFileSkl + ID9 + "${V3}" + distStr + ".nmea";
     }
@@ -224,5 +224,5 @@
       snxtroFileSkl += QDir::separator();
     }
-    if (v3filenames) {
+    if (!v2filenames) {
       snxtroFileSkl = snxtroFileSkl + ID9 + "${V3}" + distStr + ".tra";
     }
Index: trunk/BNC/src/pppWidgets.cpp
===================================================================
--- trunk/BNC/src/pppWidgets.cpp	(revision 9155)
+++ trunk/BNC/src/pppWidgets.cpp	(revision 9158)
@@ -76,5 +76,5 @@
   _snxtroAc     = new QLineEdit();     _snxtroAc    ->setObjectName("PPP/snxtroAc");     _widgets << _snxtroAc;
   _snxtroSol    = new QLineEdit();     _snxtroSol   ->setObjectName("PPP/snxtroSol");    _widgets << _snxtroSol;
-  _v3filenames  = new QCheckBox();     _v3filenames ->setObjectName("PPP/v3filenames");  _widgets << _v3filenames;
+  _v2filenames  = new QCheckBox();     _v2filenames ->setObjectName("PPP/v2filenames");  _widgets << _v2filenames;
   _staTable     = new QTableWidget();  _staTable    ->setObjectName("PPP/staTable");     _widgets << _staTable;
   _lcGPS        = new QComboBox();     _lcGPS       ->setObjectName("PPP/lcGPS");        _widgets << _lcGPS;
@@ -245,5 +245,5 @@
   delete _snxtroAc;
   delete _snxtroSol;
-  delete _v3filenames;
+  delete _v2filenames;
   for (int iRow = _staTable->rowCount()-1; iRow >=0; iRow--) {
     _staTable->removeRow(iRow);
@@ -376,5 +376,5 @@
   _eleWgtCode ->setCheckState(Qt::CheckState(settings.value(_eleWgtCode ->objectName()).toInt()));
   _eleWgtPhase->setCheckState(Qt::CheckState(settings.value(_eleWgtPhase->objectName()).toInt()));
-  _v3filenames->setCheckState(Qt::CheckState(settings.value(_v3filenames->objectName()).toInt()));
+  _v2filenames->setCheckState(Qt::CheckState(settings.value(_v2filenames->objectName()).toInt()));
 
   // SpinBoxex
@@ -445,5 +445,5 @@
   settings.setValue(_snxtroAc    ->objectName(), _snxtroAc    ->text());
   settings.setValue(_snxtroSol   ->objectName(), _snxtroSol   ->text());
-  settings.setValue(_v3filenames ->objectName(), _v3filenames ->checkState());
+  settings.setValue(_v2filenames ->objectName(), _v2filenames ->checkState());
   settings.setValue(_lcGPS       ->objectName(), _lcGPS       ->currentText());
   settings.setValue(_lcGLONASS   ->objectName(), _lcGLONASS   ->currentText());
Index: trunk/BNC/src/pppWidgets.h
===================================================================
--- trunk/BNC/src/pppWidgets.h	(revision 9155)
+++ trunk/BNC/src/pppWidgets.h	(revision 9158)
@@ -60,5 +60,5 @@
   QLineEdit*     _snxtroAc;
   QLineEdit*     _snxtroSol;
-  QCheckBox*     _v3filenames;
+  QCheckBox*     _v2filenames;
   QTableWidget*  _staTable;
   QComboBox*     _lcGPS;
Index: trunk/BNC/src/reqcdlg.cpp
===================================================================
--- trunk/BNC/src/reqcdlg.cpp	(revision 9155)
+++ trunk/BNC/src/reqcdlg.cpp	(revision 9158)
@@ -95,5 +95,5 @@
 
   _reqcRnxVersion->setEditable(false);
-  _reqcRnxVersion->addItems(QString("2,3").split(","));
+  _reqcRnxVersion->addItems(QString("3,2").split(","));
   _reqcRnxVersion->setMaximumWidth(7*ww);
 
