diff --git a/DateStamp.h.in b/DateStamp.h.in
index a9da1585ccfc8f93b1abc94c408f7710212d8561..4cae20c37c941e0a8d1fd4f6cc606a879a414afa 100644
--- a/DateStamp.h.in
+++ b/DateStamp.h.in
@@ -14,31 +14,31 @@
 #ifndef @KWSYS_NAMESPACE@_DateStamp_h
 #define @KWSYS_NAMESPACE@_DateStamp_h
 
-/**
- * Version date year component.  The format is CCYY.
- */
-#define @KWSYS_NAMESPACE@_VERSION_DATE_YEAR   @KWSYS_VERSION_DATE_YEAR@
-
-/**
- * Version date month component.  The format is MM.
- */
-#define @KWSYS_NAMESPACE@_VERSION_DATE_MONTH  @KWSYS_VERSION_DATE_MONTH@
-
-/**
- * Version date day component.  The format is DD.
- */
-#define @KWSYS_NAMESPACE@_VERSION_DATE_DAY    @KWSYS_VERSION_DATE_DAY@
-
-/**
- * Version date accessible from preprocessor.
- * This is an integer in the format CCYYMMDD.
- */
-#define @KWSYS_NAMESPACE@_VERSION_DATE_FULL   @KWSYS_VERSION_DATE_YEAR@@KWSYS_VERSION_DATE_MONTH@@KWSYS_VERSION_DATE_DAY@
-
-/**
- * Version date as a string literal.
- * The format is "CCYY-MM-DD".
- */
-#define @KWSYS_NAMESPACE@_VERSION_DATE_STRING "@KWSYS_VERSION_DATE_YEAR@-@KWSYS_VERSION_DATE_MONTH@-@KWSYS_VERSION_DATE_DAY@"
+/** Version date integer year.  The format is CCYY.  */
+#define @KWSYS_NAMESPACE@_DATE_STAMP_YEAR          @KWSYS_DATE_STAMP_YEAR@
+
+/** Version date integer month.  The format is MM.  */
+#define @KWSYS_NAMESPACE@_DATE_STAMP_MONTH         @KWSYS_DATE_STAMP_MONTH@
+
+/** Version date integer day.  The format is DD.  */
+#define @KWSYS_NAMESPACE@_DATE_STAMP_DAY           @KWSYS_DATE_STAMP_DAY@
+
+/** Version date full integer.  The format is CCYYMMDD.  */
+#define @KWSYS_NAMESPACE@_DATE_STAMP_FULL          @KWSYS_DATE_STAMP_YEAR@@KWSYS_DATE_STAMP_MONTH@@KWSYS_DATE_STAMP_DAY@
+
+/** Version date string year.  The format is "CCYY".  */
+#define @KWSYS_NAMESPACE@_DATE_STAMP_STRING_YEAR  "@KWSYS_DATE_STAMP_YEAR@"
+
+/** Version date string month.  The format is "MM".  */
+#define @KWSYS_NAMESPACE@_DATE_STAMP_STRING_MONTH "@KWSYS_DATE_STAMP_MONTH@"
+
+/** Version date string day.  The format is "DD".  */
+#define @KWSYS_NAMESPACE@_DATE_STAMP_STRING_DAY   "@KWSYS_DATE_STAMP_DAY@"
+
+/** Version date full string.  The format is "CCYYMMDD".  */
+#define @KWSYS_NAMESPACE@_DATE_STAMP_STRING_FULL  "@KWSYS_DATE_STAMP_YEAR@@KWSYS_DATE_STAMP_MONTH@@KWSYS_DATE_STAMP_DAY@"
+
+/** Version date formatted string.  The format is "CCYY-MM-DD".  */
+#define @KWSYS_NAMESPACE@_DATE_STAMP_STRING       "@KWSYS_DATE_STAMP_YEAR@-@KWSYS_DATE_STAMP_MONTH@-@KWSYS_DATE_STAMP_DAY@"
 
 #endif
diff --git a/kwsysDateStamp.py b/kwsysDateStamp.py
index 4370c8ad2b0afad325730c78dc3058afeb7f995c..e719a42169b051d0c5e30b86500bd04974c8d250 100755
--- a/kwsysDateStamp.py
+++ b/kwsysDateStamp.py
@@ -20,13 +20,13 @@ ct = time.localtime()
 fout.write("""# Do not edit!  Generated by kwsysDateStamp.py
 
 # KWSys version date year component.  Format is CCYY.
-SET(KWSYS_VERSION_DATE_YEAR  %04u)
+SET(KWSYS_DATE_STAMP_YEAR  %04u)
 
 # KWSys version date month component.  Format is MM.
-SET(KWSYS_VERSION_DATE_MONTH %02u)
+SET(KWSYS_DATE_STAMP_MONTH %02u)
 
 # KWSys version date day component.  Format is DD.
-SET(KWSYS_VERSION_DATE_DAY   %02u)
+SET(KWSYS_DATE_STAMP_DAY   %02u)
 """ % (ct.tm_year, ct.tm_mon, ct.tm_mday))
 
 fout.close()