diff --git a/src/stream.c b/src/stream.c
index 3422f5fafc62638c97fca4a4452b516b1c2a2c56..4d5499c03f0ff5a6ce993a176b466ec44b99c42d 100644
--- a/src/stream.c
+++ b/src/stream.c
@@ -1748,7 +1748,7 @@ cdiStreamSetupVlist_(stream_t *streamptr, int vlistID)
             if (cdiBaseFiletype(streamptr->filetype) == CDI_FILETYPE_NETCDF)
               {
                 const taxis_t *taxisptr = taxisPtr(taxisID);
-                if (cdiDateTime_isNull(taxisptr->rdatetime))
+                if (cdiDateTime_isNull(taxisptr->rDateTime))
                   {
                     int vdate = taxisInqVdate(taxisID);
                     if (vdate == 0) vdate = 10101;
diff --git a/src/stream_cdf_i.c b/src/stream_cdf_i.c
index c4dbddbc9952fd40b9a2bf33eb7d75227c9de13e..57a00efd3e788cfec6c0ad856aa1660cf2c62c81 100644
--- a/src/stream_cdf_i.c
+++ b/src/stream_cdf_i.c
@@ -262,9 +262,9 @@ set_base_time(const char *timeUnitsStr, taxis_t *taxis)
             }
           else if (taxisType == TAXIS_RELATIVE)
             {
-              taxis->rdatetime = scan_time_string(tu + pos);
+              taxis->rDateTime = scan_time_string(tu + pos);
               if (CDI_Debug)
-                Message("rdate = %d  rtime = %d", (int) cdiDate_get(taxis->rdatetime.date), cdiTime_get(taxis->rdatetime.time));
+                Message("rdate = %d  rtime = %d", (int) cdiDate_get(taxis->rDateTime.date), cdiTime_get(taxis->rDateTime.time));
             }
         }
     }
diff --git a/src/stream_cdf_time.c b/src/stream_cdf_time.c
index c7828d8f70b77d164febbec7bc06e8dc2ff7abdf..f070f3dbd75972616e2126a93c0e13b925e1ed64 100644
--- a/src/stream_cdf_time.c
+++ b/src/stream_cdf_time.c
@@ -71,12 +71,12 @@ cdfDefTimeUnits(char *unitstr, taxis_t *taxis)
         }
       else
         {
-          const int year = taxis->rdatetime.date.year;
-          const int month = taxis->rdatetime.date.month;
-          const int day = taxis->rdatetime.date.day;
-          const int hour = taxis->rdatetime.time.hour;
-          const int minute = taxis->rdatetime.time.minute;
-          const int second = taxis->rdatetime.time.second;
+          const int year = taxis->rDateTime.date.year;
+          const int month = taxis->rDateTime.date.month;
+          const int day = taxis->rDateTime.date.day;
+          const int hour = taxis->rDateTime.time.hour;
+          const int minute = taxis->rDateTime.time.minute;
+          const int second = taxis->rDateTime.time.second;
 
           int timeunit = (taxis->unit != -1) ? taxis->unit : TUNIT_HOUR;
           if (timeunit == TUNIT_QUARTER)
diff --git a/src/stream_cgribex.c b/src/stream_cgribex.c
index fc26346d27ac956e1f91a34d1bfc1d67a0ede3e9..39eda69f3081cda57cd065adf6c75e0fb0b5941e 100644
--- a/src/stream_cgribex.c
+++ b/src/stream_cgribex.c
@@ -846,7 +846,7 @@ cgribexScanTimestep1(stream_t *streamptr)
           vDateTime0 = vDateTime;
           fcast = cgribexTimeIsFC(isec1);
           taxis->unit = cgribexGetTimeUnit(isec1);
-          taxis->rdatetime = cdiDateTime_set(gribRefDate(isec1), gribRefTime(isec1));
+          taxis->rDateTime = cdiDateTime_set(gribRefDate(isec1), gribRefTime(isec1));
           taxis->sDateTime = sDateTime;
           taxis->vDateTime = vDateTime;
         }
@@ -1002,7 +1002,7 @@ cgribexScanTimestep2(stream_t *streamptr)
           if (taxisInqType(taxisID) == TAXIS_RELATIVE)
             {
               taxis->type = TAXIS_RELATIVE;
-              taxis->rdatetime = cdiDateTime_set(gribRefDate(isec1), gribRefTime(isec1));
+              taxis->rDateTime = cdiDateTime_set(gribRefDate(isec1), gribRefTime(isec1));
             }
           else
             {
@@ -1195,7 +1195,7 @@ cgribexScanTimestep(stream_t *streamptr)
               if (taxisInqType(taxisID) == TAXIS_RELATIVE)
                 {
                   taxis->type = TAXIS_RELATIVE;
-                  taxis->rdatetime = cdiDateTime_set(gribRefDate(isec1), gribRefTime(isec1));
+                  taxis->rDateTime = cdiDateTime_set(gribRefDate(isec1), gribRefTime(isec1));
                 }
               else
                 {
diff --git a/src/stream_ext.c b/src/stream_ext.c
index cf2d7a93463f51528155760e6ca1fecf8fcce84c..43cb561d0532179f8c5b373949863c0debeb978b 100644
--- a/src/stream_ext.c
+++ b/src/stream_ext.c
@@ -305,7 +305,7 @@ tstepScanLoopFinished:
 
   const int taxisID = taxisCreate(TAXIS_ABSOLUTE);
   taxis->type = TAXIS_ABSOLUTE;
-  taxis->rdatetime = taxis->vDateTime;
+  taxis->rDateTime = taxis->vDateTime;
 
   const int vlistID = streamptr->vlistID;
   vlistDefTaxis(vlistID, taxisID);
diff --git a/src/stream_gribapi.c b/src/stream_gribapi.c
index 29a427ba3eb4343d5c2819bd8aa7782a6420825d..b9b5b802c6d759f05e766cdc9c233c027ade3b70 100644
--- a/src/stream_gribapi.c
+++ b/src/stream_gribapi.c
@@ -1072,10 +1072,10 @@ fdbScanTimesteps(stream_t *streamptr)
       if (recID == 0)
         {
           vDateTime0 = vDateTime;
-          taxis->rdatetime = gribapiGetDataDateTime(gh);
+          taxis->rDateTime = gribapiGetDataDateTime(gh);
           fcast = gribapiTimeIsFC(gh);
           if (fcast) taxis->unit = gribapiGetTimeUnits(gh);
-          taxis->fDateTime = taxis->rdatetime;
+          taxis->fDateTime = taxis->rDateTime;
           taxis->sDateTime = sDateTime;
           taxis->vDateTime = vDateTime;
         }
@@ -1235,10 +1235,10 @@ gribapiScanTimestep1(stream_t *streamptr)
       if (nrecs == 0)
         {
           vDateTime0 = vDateTime;
-          taxis->rdatetime = gribapiGetDataDateTime(gh);
+          taxis->rDateTime = gribapiGetDataDateTime(gh);
           fcast = gribapiTimeIsFC(gh);
           if (fcast) taxis->unit = gribapiGetTimeUnits(gh);
-          taxis->fDateTime = taxis->rdatetime;
+          taxis->fDateTime = taxis->rDateTime;
           taxis->sDateTime = sDateTime;
           taxis->vDateTime = vDateTime;
         }
@@ -1398,13 +1398,13 @@ gribapiScanTimestep2(stream_t *streamptr)
             {
               taxis->type = TAXIS_RELATIVE;
               taxis->unit = gribapiGetTimeUnits(gh);
-              taxis->rdatetime = gribapiGetDataDateTime(gh);
+              taxis->rDateTime = gribapiGetDataDateTime(gh);
             }
           else
             {
               taxis->type = TAXIS_ABSOLUTE;
             }
-          taxis->fDateTime = taxis->rdatetime;
+          taxis->fDateTime = taxis->rDateTime;
           taxis->vDateTime = vDateTime;
           taxis->sDateTime = sDateTime;
         }
@@ -1583,13 +1583,13 @@ gribapiScanTimestep(stream_t *streamptr)
                 {
                   taxis->type = TAXIS_RELATIVE;
                   taxis->unit = gribapiGetTimeUnits(gh);
-                  taxis->rdatetime = gribapiGetDataDateTime(gh);
+                  taxis->rDateTime = gribapiGetDataDateTime(gh);
                 }
               else
                 {
                   taxis->type = TAXIS_ABSOLUTE;
                 }
-              taxis->fDateTime = taxis->rdatetime;
+              taxis->fDateTime = taxis->rDateTime;
               taxis->vDateTime = vDateTime;
               taxis->sDateTime = sDateTime;
             }
diff --git a/src/stream_ieg.c b/src/stream_ieg.c
index ef70cc09fabc9022c192e97845c4ab925aa2137e..9ea4579a8fd72a1f903ed26b44784d59084a2d2b 100644
--- a/src/stream_ieg.c
+++ b/src/stream_ieg.c
@@ -759,7 +759,7 @@ tstepScanLoopFinished:
 
   const int taxisID = taxisCreate(TAXIS_ABSOLUTE);
   taxis->type = TAXIS_ABSOLUTE;
-  taxis->rdatetime = taxis->vDateTime;
+  taxis->rDateTime = taxis->vDateTime;
 
   const int vlistID = streamptr->vlistID;
   vlistDefTaxis(vlistID, taxisID);
diff --git a/src/stream_srv.c b/src/stream_srv.c
index 5ddcafe8821ab775cb1b4f3519d84fffa31ab473..d23059b0238748f01a031a7739331c0830b5cc01 100644
--- a/src/stream_srv.c
+++ b/src/stream_srv.c
@@ -314,7 +314,7 @@ tstepScanLoopFinished:
 
   const int taxisID = taxisCreate(TAXIS_ABSOLUTE);
   taxis->type = TAXIS_ABSOLUTE;
-  taxis->rdatetime = taxis->vDateTime;
+  taxis->rDateTime = taxis->vDateTime;
 
   const int vlistID = streamptr->vlistID;
   vlistDefTaxis(vlistID, taxisID);
diff --git a/src/taxis.c b/src/taxis.c
index 14ad94556b4f9b0451d639bd5d1b5725109543b7..205b2b0bded10392caa0a7cdd6f5d5afff2f8c40 100644
--- a/src/taxis.c
+++ b/src/taxis.c
@@ -96,7 +96,7 @@ taxisDefaultValue(taxis_t *taxisptr)
   taxisptr->has_bounds = false;
   cdiDateTime_init(&taxisptr->sDateTime);
   cdiDateTime_init(&taxisptr->vDateTime);
-  cdiDateTime_init(&taxisptr->rdatetime);
+  cdiDateTime_init(&taxisptr->rDateTime);
   cdiDateTime_init(&taxisptr->fDateTime);
   cdiDateTime_init(&taxisptr->vDateTime_lb);
   cdiDateTime_init(&taxisptr->vDateTime_ub);
@@ -317,13 +317,13 @@ taxisDefVdatetime(int taxisID, CdiDateTime vDateTime)
 }
 
 void
-taxisDefRdatetime(int taxisID, CdiDateTime rdatetime)
+taxisDefRdatetime(int taxisID, CdiDateTime rDateTime)
 {
   taxis_t *taxisptr = (taxis_t *) reshGetVal(taxisID, &taxisOps);
 
-  if (cdiDateTime_isNE(taxisptr->rdatetime, rdatetime))
+  if (cdiDateTime_isNE(taxisptr->rDateTime, rDateTime))
     {
-      taxisptr->rdatetime = rdatetime;
+      taxisptr->rDateTime = rDateTime;
 
       if (taxisptr->units)
         {
@@ -353,9 +353,9 @@ taxisDefRdate(int taxisID, int rdate)
 {
   taxis_t *taxisptr = (taxis_t *) reshGetVal(taxisID, &taxisOps);
 
-  if ((int) cdiDate_get(taxisptr->rdatetime.date) != rdate)
+  if ((int) cdiDate_get(taxisptr->rDateTime.date) != rdate)
     {
-      taxisptr->rdatetime.date = cdiDate_set(rdate);
+      taxisptr->rDateTime.date = cdiDate_set(rdate);
 
       if (taxisptr->units)
         {
@@ -385,9 +385,9 @@ taxisDefRtime(int taxisID, int rtime)
 {
   taxis_t *taxisptr = (taxis_t *) reshGetVal(taxisID, &taxisOps);
 
-  if (cdiTime_get(taxisptr->rdatetime.time) != rtime)
+  if (cdiTime_get(taxisptr->rDateTime.time) != rtime)
     {
-      taxisptr->rdatetime.time = cdiTime_set(rtime);
+      taxisptr->rDateTime.time = cdiTime_set(rtime);
       if (taxisptr->units)
         {
           delete_refcount_string(taxisptr->units);
@@ -610,13 +610,13 @@ taxisInqRdatetime(int taxisID)
 {
   taxis_t *taxisptr = (taxis_t *) reshGetVal(taxisID, &taxisOps);
 
-  if (cdiDateTime_isNull(taxisptr->rdatetime))
+  if (cdiDateTime_isNull(taxisptr->rDateTime))
     {
-      taxisptr->rdatetime = taxisptr->vDateTime;
+      taxisptr->rDateTime = taxisptr->vDateTime;
       reshSetStatus(taxisID, &taxisOps, RESH_DESYNC_IN_USE);
     }
 
-  return taxisptr->rdatetime;
+  return taxisptr->rDateTime;
 }
 
 CdiDateTime
@@ -630,7 +630,7 @@ taxisInqFdatetime(int taxisID)
       reshSetStatus(taxisID, &taxisOps, RESH_DESYNC_IN_USE);
     }
 
-  return taxisptr->rdatetime;
+  return taxisptr->rDateTime;
 }
 
 /*
@@ -776,13 +776,13 @@ taxisInqRdate(int taxisID)
 {
   taxis_t *taxisptr = (taxis_t *) reshGetVal(taxisID, &taxisOps);
 
-  if (cdiDateTime_isNull(taxisptr->rdatetime))
+  if (cdiDateTime_isNull(taxisptr->rDateTime))
     {
-      taxisptr->rdatetime = taxisptr->vDateTime;
+      taxisptr->rDateTime = taxisptr->vDateTime;
       reshSetStatus(taxisID, &taxisOps, RESH_DESYNC_IN_USE);
     }
 
-  return (int) cdiDate_get(taxisptr->rdatetime.date);
+  return (int) cdiDate_get(taxisptr->rDateTime.date);
 }
 
 /*
@@ -806,13 +806,13 @@ taxisInqRtime(int taxisID)
 {
   taxis_t *taxisptr = (taxis_t *) reshGetVal(taxisID, &taxisOps);
 
-  if (cdiDateTime_isNull(taxisptr->rdatetime))
+  if (cdiDateTime_isNull(taxisptr->rDateTime))
     {
-      taxisptr->rdatetime = taxisptr->vDateTime;
+      taxisptr->rDateTime = taxisptr->vDateTime;
       reshSetStatus(taxisID, &taxisOps, RESH_DESYNC_IN_USE);
     }
 
-  return cdiTime_get(taxisptr->rdatetime.time);
+  return cdiTime_get(taxisptr->rDateTime.time);
 }
 
 /*
@@ -838,7 +838,7 @@ taxisInqFdate(int taxisID)
 
   if (cdiDateTime_isNull(taxisptr->fDateTime))
     {
-      // rdatetime is initialized from vDateTime if empty!
+      // rDateTime is initialized from vDateTime if empty!
       taxisptr->fDateTime = taxisInqRdatetime(taxisID);
     }
 
@@ -868,7 +868,7 @@ taxisInqFtime(int taxisID)
 
   if (cdiDateTime_isNull(taxisptr->fDateTime))
     {
-      // rdatetime is initialized from vDateTime if empty!
+      // rDateTime is initialized from vDateTime if empty!
       taxisptr->fDateTime = taxisInqRdatetime(taxisID);
     }
 
@@ -1083,7 +1083,7 @@ cdi_encode_timevalue(int days, double secs, int timeunit)
 static CdiDateTime
 rtimeval2datetime(double timevalue, taxis_t *taxis)
 {
-  if (IS_EQUAL(timevalue, 0.0)) return taxis->rdatetime;
+  if (IS_EQUAL(timevalue, 0.0)) return taxis->rDateTime;
 
   int timeunits = taxis->unit;
   const int calendar = taxis->calendar;
@@ -1094,12 +1094,12 @@ rtimeval2datetime(double timevalue, taxis_t *taxis)
       timevalue *= 30;
     }
 
-  CdiDateTime rdatetime = taxis->rdatetime;
+  CdiDateTime rDateTime = taxis->rDateTime;
 
   if (timeunits == TUNIT_MONTH || timeunits == TUNIT_YEAR)
     {
-      int year = rdatetime.date.year;
-      int month = rdatetime.date.month;
+      int year = rDateTime.date.year;
+      int month = rDateTime.date.month;
 
       if (timeunits == TUNIT_YEAR) timevalue *= 12;
 
@@ -1116,11 +1116,11 @@ rtimeval2datetime(double timevalue, taxis_t *taxis)
       timeunits = TUNIT_DAY;
       timevalue = fmon * days_per_month(calendar, year, month);
 
-      rdatetime.date.year = year;
-      rdatetime.date.month = month;
+      rDateTime.date.year = year;
+      rDateTime.date.month = month;
     }
 
-  const JulianDate julianDate = julianDate_encode(calendar, rdatetime);
+  const JulianDate julianDate = julianDate_encode(calendar, rDateTime);
   const JulianDate julianDate2 = timevalue_decode(timeunits, timevalue);
 
   return julianDate_decode(calendar, julianDate_add(julianDate2, julianDate));
@@ -1136,20 +1136,20 @@ datetime2rtimeval(CdiDateTime vDateTime, taxis_t *taxis)
   int timeunits = (*taxis).unit;
   const int timeunits0 = timeunits;
 
-  CdiDateTime rdatetime = (*taxis).rdatetime;
+  CdiDateTime rDateTime = (*taxis).rDateTime;
 
-  if (cdiDateTime_isNull(rdatetime)) rdatetime = (*taxis).vDateTime;
+  if (cdiDateTime_isNull(rDateTime)) rDateTime = (*taxis).vDateTime;
 
-  if (cdiDateTime_isNull(rdatetime) && cdiDateTime_isNull(vDateTime)) return value;
+  if (cdiDateTime_isNull(rDateTime) && cdiDateTime_isNull(vDateTime)) return value;
 
-  const JulianDate julianDate1 = julianDate_encode(calendar, rdatetime);
+  const JulianDate julianDate1 = julianDate_encode(calendar, rDateTime);
 
   if (timeunits == TUNIT_MONTH && calendar == CALENDAR_360DAYS) timeunits = TUNIT_DAY;
 
   if (timeunits == TUNIT_MONTH || timeunits == TUNIT_YEAR)
     {
-      const int ryear = rdatetime.date.year;
-      const int rmonth = rdatetime.date.month;
+      const int ryear = rDateTime.date.year;
+      const int rmonth = rDateTime.date.month;
       int year = vDateTime.date.year;
       int month = vDateTime.date.month;
       value = (year - ryear) * 12 - rmonth + month;
@@ -1422,7 +1422,7 @@ ptaxisCopy(taxis_t *dest, taxis_t *source)
   dest->has_bounds = source->has_bounds;
   dest->sDateTime = source->sDateTime;
   dest->vDateTime = source->vDateTime;
-  dest->rdatetime = source->rdatetime;
+  dest->rDateTime = source->rDateTime;
   dest->fDateTime = source->fDateTime;
   dest->vDateTime_lb = source->vDateTime_lb;
   dest->vDateTime_ub = source->vDateTime_ub;
@@ -1476,7 +1476,7 @@ taxisPrintKernel(taxis_t *taxisptr, FILE *fp)
           "fc_period   = %g\n"
           "\n",
           taxisptr->self, taxisptr->self, (int) taxisptr->used, taxisptr->type, (int) cdiDate_get(taxisptr->vDateTime.date),
-          cdiTime_get(taxisptr->vDateTime.time), (int) cdiDate_get(taxisptr->rdatetime.date), cdiTime_get(taxisptr->rdatetime.time),
+          cdiTime_get(taxisptr->vDateTime.time), (int) cdiDate_get(taxisptr->rDateTime.date), cdiTime_get(taxisptr->rDateTime.time),
           (int) cdiDate_get(taxisptr->fDateTime.date), cdiTime_get(taxisptr->fDateTime.time), taxisptr->calendar,
           taxisptr->unit, taxisptr->numavg, (int) taxisptr->climatology,
           (int) taxisptr->has_bounds, vdate_lb, vtime_lb, vdate_ub, vtime_ub, taxisptr->fc_unit, taxisptr->fc_period);
@@ -1490,7 +1490,7 @@ taxisCompareP(void *taxisptr1, void *taxisptr2)
   xassert(t1 && t2);
 
   return !(t1->used == t2->used && t1->type == t2->type && cdiDateTime_isEQ(t1->vDateTime, t2->vDateTime)
-           && cdiDateTime_isEQ(t1->rdatetime, t2->rdatetime) && cdiDateTime_isEQ(t1->fDateTime, t2->fDateTime)
+           && cdiDateTime_isEQ(t1->rDateTime, t2->rDateTime) && cdiDateTime_isEQ(t1->fDateTime, t2->fDateTime)
            && t1->calendar == t2->calendar && t1->unit == t2->unit && t1->fc_unit == t2->fc_unit && t1->numavg == t2->numavg
            && t1->climatology == t2->climatology && t1->has_bounds == t2->has_bounds
            && cdiDateTime_isEQ(t1->vDateTime_lb, t2->vDateTime_lb) && cdiDateTime_isEQ(t1->vDateTime_ub, t2->vDateTime_ub));
@@ -1542,8 +1542,8 @@ taxisUnpack(char *unpackBuffer, int unpackBufferSize, int *unpackBufferPos, int
   taxisP->type = intBuffer[idx++];
   taxisP->vDateTime.date = cdiDate_set(intBuffer[idx++]);
   taxisP->vDateTime.time = cdiTime_set(intBuffer[idx++]);
-  taxisP->rdatetime.date = cdiDate_set(intBuffer[idx++]);
-  taxisP->rdatetime.time = cdiTime_set(intBuffer[idx++]);
+  taxisP->rDateTime.date = cdiDate_set(intBuffer[idx++]);
+  taxisP->rDateTime.time = cdiTime_set(intBuffer[idx++]);
   taxisP->fDateTime.date = cdiDate_set(intBuffer[idx++]);
   taxisP->fDateTime.time = cdiTime_set(intBuffer[idx++]);
   taxisP->calendar = intBuffer[idx++];
@@ -1600,8 +1600,8 @@ taxisPack(void *voidP, void *packBuffer, int packBufferSize, int *packBufferPos,
   intBuffer[idx++] = taxisP->type;
   intBuffer[idx++] = (int) cdiDate_get(taxisP->vDateTime.date);
   intBuffer[idx++] = cdiTime_get(taxisP->vDateTime.time);
-  intBuffer[idx++] = (int) cdiDate_get(taxisP->rdatetime.date);
-  intBuffer[idx++] = cdiTime_get(taxisP->rdatetime.time);
+  intBuffer[idx++] = (int) cdiDate_get(taxisP->rDateTime.date);
+  intBuffer[idx++] = cdiTime_get(taxisP->rDateTime.time);
   intBuffer[idx++] = (int) cdiDate_get(taxisP->fDateTime.date);
   intBuffer[idx++] = cdiTime_get(taxisP->fDateTime.time);
   intBuffer[idx++] = taxisP->calendar;
diff --git a/src/taxis.h b/src/taxis.h
index 4614ad841b591e369596898515f52f9ed5eec225..7bdff4e33e65cbe885f3267bd4cc3503eb9be396 100644
--- a/src/taxis.h
+++ b/src/taxis.h
@@ -21,7 +21,7 @@ typedef struct
   bool climatology;
   CdiDateTime sDateTime;     // start date/time
   CdiDateTime vDateTime;     // verification date/time
-  CdiDateTime rdatetime;     // reference date/time
+  CdiDateTime rDateTime;     // reference date/time
   CdiDateTime fDateTime;     // forecast reference date/time
   CdiDateTime vDateTime_lb;  // lower bounds of verification date/time
   CdiDateTime vDateTime_ub;  // upper bounds of verification date/time