Index: trunk/BNC/src/RTCM3/RTCM3Decoder.cpp
===================================================================
--- trunk/BNC/src/RTCM3/RTCM3Decoder.cpp	(revision 10617)
+++ trunk/BNC/src/RTCM3/RTCM3Decoder.cpp	(revision 10619)
@@ -425,5 +425,5 @@
     };
 
-/** MSM signal types for IRNSS */
+/** MSM signal types for NavIC */
 static struct CodeData irn[RTCM3_MSM_NUMSIG] = {
         {0.0, 0},
@@ -434,19 +434,19 @@
         {0.0, 0},
         {0.0, 0},
-        {IRNSS_WAVELENGTH_S, "9A"},
-        {0.0, 0},
-        {0.0, 0},
-        {0.0, 0},
-        {0.0, 0},
-        {0.0, 0},
-        {0.0, 0},
-        {0.0, 0},
-        {0.0, 0},
-        {0.0, 0},
-        {0.0, 0},
-        {0.0, 0},
-        {0.0, 0},
-        {0.0, 0},
-        {IRNSS_WAVELENGTH_L5, "5A"},
+        {NavIC_WAVELENGTH_S, "9A"},
+        {0.0, 0},
+        {0.0, 0},
+        {0.0, 0},
+        {0.0, 0},
+        {0.0, 0},
+        {0.0, 0},
+        {0.0, 0},
+        {0.0, 0},
+        {0.0, 0},
+        {0.0, 0},
+        {0.0, 0},
+        {0.0, 0},
+        {0.0, 0},
+        {NavIC_WAVELENGTH_L5, "5A"},
         {0.0, 0},
         {0.0, 0},
@@ -1467,5 +1467,5 @@
 //
 ////////////////////////////////////////////////////////////////////////////
-bool RTCM3Decoder::DecodeIRNSSEphemeris(unsigned char* data, int size) {
+bool RTCM3Decoder::DecodeNavICEphemeris(unsigned char* data, int size) {
   bool decoded = false;
 
@@ -2267,5 +2267,5 @@
             break;
           case 1041:
-            if (DecodeIRNSSEphemeris(_Message, _BlockSize))
+            if (DecodeNavICEphemeris(_Message, _BlockSize))
               decoded = true;
             break;
Index: trunk/BNC/src/RTCM3/RTCM3Decoder.h
===================================================================
--- trunk/BNC/src/RTCM3/RTCM3Decoder.h	(revision 10617)
+++ trunk/BNC/src/RTCM3/RTCM3Decoder.h	(revision 10619)
@@ -138,5 +138,5 @@
    * @return <code>true</code> when data block was decodable
    */
-  bool DecodeIRNSSEphemeris(unsigned char* buffer, int bufLen);
+  bool DecodeNavICEphemeris(unsigned char* buffer, int bufLen);
   /**
    * Extract ephemeris data from 1045 and 1046 RTCM3 messages.
Index: trunk/BNC/src/RTCM3/ephEncoder.cpp
===================================================================
--- trunk/BNC/src/RTCM3/ephEncoder.cpp	(revision 10617)
+++ trunk/BNC/src/RTCM3/ephEncoder.cpp	(revision 10619)
@@ -52,5 +52,5 @@
     GPSADDBITS(1, fitIntervalFlag)
     GPSADDBITS(3, 0) /* padding */
-  } else if (eph.system() == t_eph::IRNSS) {
+  } else if (eph.system() == t_eph::NavIC) {
     GPSADDBITS(12, 1041)
     GPSADDBITS(6, eph._prn.number())
Index: trunk/BNC/src/RTCM3/gnss.h
===================================================================
--- trunk/BNC/src/RTCM3/gnss.h	(revision 10617)
+++ trunk/BNC/src/RTCM3/gnss.h	(revision 10619)
@@ -82,10 +82,10 @@
 #define BDS_WAVELENGTH_B2b  (LIGHTSPEED / BDS_FREQU_B2b) /* m */
 
-#define IRNSS_FREQU_L1      1575420000.0 /* Hz */
-#define IRNSS_FREQU_L5      1176450000.0 /* Hz */
-#define IRNSS_FREQU_S       2492028000.0 /* Hz */
-#define IRNSS_WAVELENGTH_L1 (LIGHTSPEED / IRNSS_FREQU_L1) /* m */
-#define IRNSS_WAVELENGTH_L5 (LIGHTSPEED / IRNSS_FREQU_L5) /* m */
-#define IRNSS_WAVELENGTH_S  (LIGHTSPEED / IRNSS_FREQU_S)  /* m */
+#define NavIC_FREQU_L1      1575420000.0 /* Hz */
+#define NavIC_FREQU_L5      1176450000.0 /* Hz */
+#define NavIC_FREQU_S       2492028000.0 /* Hz */
+#define NavIC_WAVELENGTH_L1 (LIGHTSPEED / NavIC_FREQU_L1) /* m */
+#define NavIC_WAVELENGTH_L5 (LIGHTSPEED / NavIC_FREQU_L5) /* m */
+#define NavIC_WAVELENGTH_S  (LIGHTSPEED / NavIC_FREQU_S)  /* m */
 
 #define R2R_PI          3.1415926535898