diff --git a/src/as/asHost.rc b/src/as/asHost.rc
index 5bb0e9eb7..4cfabd3f6 100755
--- a/src/as/asHost.rc
+++ b/src/as/asHost.rc
@@ -2,8 +2,8 @@
 #include "epicsVersion.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION BASE_VERSION,BASE_REVISION,BASE_MODIFICATION,BASE_UPDATE_LEVEL
- PRODUCTVERSION BASE_VERSION,BASE_REVISION,BASE_MODIFICATION,BASE_UPDATE_LEVEL
+ FILEVERSION EPICS_VERSION,EPICS_REVISION,EPICS_MODIFICATION,EPICS_UPDATE_LEVEL
+ PRODUCTVERSION EPICS_VERSION,EPICS_REVISION,EPICS_MODIFICATION,EPICS_UPDATE_LEVEL
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -21,12 +21,12 @@ BEGIN
             VALUE "Comments","Host Access Security Library for EPICS\0"
             VALUE "CompanyName", "The EPICS collaboration\0"
             VALUE "FileDescription", "Host Access Security Library\0"
-            VALUE "FileVersion", BASE_VERSION_STRING "\0"
+            VALUE "FileVersion", EPICS_VERSION_STRING "\0"
             VALUE "InternalName", "asHost\0"
             VALUE "LegalCopyright", "Copyright (C) Univ. of California, Univ. of Chicago\0"
             VALUE "OriginalFilename", "asHost.dll\0"
             VALUE "ProductName", "Experimental Physics and Industrial Control System (EPICS)\0"
-            VALUE "ProductVersion", BASE_VERSION_STRING "\0"
+            VALUE "ProductVersion", EPICS_VERSION_STRING "\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/src/as/asIoc.rc b/src/as/asIoc.rc
index fe180c852..f3ba16436 100755
--- a/src/as/asIoc.rc
+++ b/src/as/asIoc.rc
@@ -2,8 +2,8 @@
 #include "epicsVersion.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION BASE_VERSION,BASE_REVISION,BASE_MODIFICATION,BASE_UPDATE_LEVEL
- PRODUCTVERSION BASE_VERSION,BASE_REVISION,BASE_MODIFICATION,BASE_UPDATE_LEVEL
+ FILEVERSION EPICS_VERSION,EPICS_REVISION,EPICS_MODIFICATION,EPICS_UPDATE_LEVEL
+ PRODUCTVERSION EPICS_VERSION,EPICS_REVISION,EPICS_MODIFICATION,EPICS_UPDATE_LEVEL
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -21,12 +21,12 @@ BEGIN
             VALUE "Comments","IOC Access Security Library for EPICS\0"
             VALUE "CompanyName", "The EPICS collaboration\0"
             VALUE "FileDescription", "IOC Access Security Library\0"
-            VALUE "FileVersion", BASE_VERSION_STRING "\0"
+            VALUE "FileVersion", EPICS_VERSION_STRING "\0"
             VALUE "InternalName", "asIoc\0"
             VALUE "LegalCopyright", "Copyright (C) Univ. of California, Univ. of Chicago\0"
             VALUE "OriginalFilename", "asIoc.dll\0"
             VALUE "ProductName", "Experimental Physics and Industrial Control System (EPICS)\0"
-            VALUE "ProductVersion", BASE_VERSION_STRING "\0"
+            VALUE "ProductVersion", EPICS_VERSION_STRING "\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/src/ca/ca.rc b/src/ca/ca.rc
index 39fbc853d..7b24e9b57 100755
--- a/src/ca/ca.rc
+++ b/src/ca/ca.rc
@@ -2,8 +2,8 @@
 #include "epicsVersion.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION BASE_VERSION,BASE_REVISION,BASE_MODIFICATION,BASE_UPDATE_LEVEL
- PRODUCTVERSION BASE_VERSION,BASE_REVISION,BASE_MODIFICATION,BASE_UPDATE_LEVEL
+ FILEVERSION EPICS_VERSION,EPICS_REVISION,EPICS_MODIFICATION,EPICS_UPDATE_LEVEL
+ PRODUCTVERSION EPICS_VERSION,EPICS_REVISION,EPICS_MODIFICATION,EPICS_UPDATE_LEVEL
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -21,12 +21,12 @@ BEGIN
             VALUE "Comments","Channel Access Library for EPICS\0"
             VALUE "CompanyName", "The EPICS collaboration\0"
             VALUE "FileDescription", "Channel Access Library\0"
-            VALUE "FileVersion", BASE_VERSION_STRING "\0"
+            VALUE "FileVersion", EPICS_VERSION_STRING "\0"
             VALUE "InternalName", "ca\0"
             VALUE "LegalCopyright", "Copyright (C) Univ. of California, Univ. of Chicago\0"
             VALUE "OriginalFilename", "ca.dll\0"
             VALUE "ProductName", "Experimental Physics and Industrial Control System (EPICS)\0"
-            VALUE "ProductVersion", BASE_VERSION_STRING "\0"
+            VALUE "ProductVersion", EPICS_VERSION_STRING "\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/src/cas/build/cas.rc b/src/cas/build/cas.rc
index cdbb09cc5..5623b2960 100755
--- a/src/cas/build/cas.rc
+++ b/src/cas/build/cas.rc
@@ -2,8 +2,8 @@
 #include "epicsVersion.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION BASE_VERSION,BASE_REVISION,BASE_MODIFICATION,BASE_UPDATE_LEVEL
- PRODUCTVERSION BASE_VERSION,BASE_REVISION,BASE_MODIFICATION,BASE_UPDATE_LEVEL
+ FILEVERSION EPICS_VERSION,EPICS_REVISION,EPICS_MODIFICATION,EPICS_UPDATE_LEVEL
+ PRODUCTVERSION EPICS_VERSION,EPICS_REVISION,EPICS_MODIFICATION,EPICS_UPDATE_LEVEL
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -21,12 +21,12 @@ BEGIN
             VALUE "Comments","Channel Access Server Library for EPICS\0"
             VALUE "CompanyName", "The EPICS collaboration\0"
             VALUE "FileDescription", "Channel Access Server Library\0"
-            VALUE "FileVersion", BASE_VERSION_STRING "\0"
+            VALUE "FileVersion", EPICS_VERSION_STRING "\0"
             VALUE "InternalName", "cas\0"
             VALUE "LegalCopyright", "Copyright (C) Univ. of California, Univ. of Chicago\0"
             VALUE "OriginalFilename", "cas.dll\0"
             VALUE "ProductName", "Experimental Physics and Industrial Control System (EPICS)\0"
-            VALUE "ProductVersion", BASE_VERSION_STRING "\0"
+            VALUE "ProductVersion", EPICS_VERSION_STRING "\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/src/db/dbIoc.rc b/src/db/dbIoc.rc
index 22fd8080f..77fbf38e3 100755
--- a/src/db/dbIoc.rc
+++ b/src/db/dbIoc.rc
@@ -2,8 +2,8 @@
 #include "epicsVersion.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION BASE_VERSION,BASE_REVISION,BASE_MODIFICATION,BASE_UPDATE_LEVEL
- PRODUCTVERSION BASE_VERSION,BASE_REVISION,BASE_MODIFICATION,BASE_UPDATE_LEVEL
+ FILEVERSION EPICS_VERSION,EPICS_REVISION,EPICS_MODIFICATION,EPICS_UPDATE_LEVEL
+ PRODUCTVERSION EPICS_VERSION,EPICS_REVISION,EPICS_MODIFICATION,EPICS_UPDATE_LEVEL
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -21,12 +21,12 @@ BEGIN
             VALUE "Comments","Database Library for EPICS\0"
             VALUE "CompanyName", "The EPICS collaboration\0"
             VALUE "FileDescription", "Database Library\0"
-            VALUE "FileVersion", BASE_VERSION_STRING "\0"
+            VALUE "FileVersion", EPICS_VERSION_STRING "\0"
             VALUE "InternalName", "dbIoc\0"
             VALUE "LegalCopyright", "Copyright (C) Univ. of California, Univ. of Chicago\0"
             VALUE "OriginalFilename", "dbIoc.dll\0"
             VALUE "ProductName", "Experimental Physics and Industrial Control System (EPICS)\0"
-            VALUE "ProductVersion", BASE_VERSION_STRING "\0"
+            VALUE "ProductVersion", EPICS_VERSION_STRING "\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/src/dbStatic/dbStaticHost.rc b/src/dbStatic/dbStaticHost.rc
index b4653714c..1564a6884 100755
--- a/src/dbStatic/dbStaticHost.rc
+++ b/src/dbStatic/dbStaticHost.rc
@@ -2,8 +2,8 @@
 #include "epicsVersion.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION BASE_VERSION,BASE_REVISION,BASE_MODIFICATION,BASE_UPDATE_LEVEL
- PRODUCTVERSION BASE_VERSION,BASE_REVISION,BASE_MODIFICATION,BASE_UPDATE_LEVEL
+ FILEVERSION EPICS_VERSION,EPICS_REVISION,EPICS_MODIFICATION,EPICS_UPDATE_LEVEL
+ PRODUCTVERSION EPICS_VERSION,EPICS_REVISION,EPICS_MODIFICATION,EPICS_UPDATE_LEVEL
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -21,12 +21,12 @@ BEGIN
             VALUE "Comments","Static Host Database Library for EPICS\0"
             VALUE "CompanyName", "The EPICS collaboration\0"
             VALUE "FileDescription", "Static Host Database Library\0"
-            VALUE "FileVersion", BASE_VERSION_STRING "\0"
+            VALUE "FileVersion", EPICS_VERSION_STRING "\0"
             VALUE "InternalName", "dbStaticHost\0"
             VALUE "LegalCopyright", "Copyright (C) Univ. of California, Univ. of Chicago\0"
             VALUE "OriginalFilename", "dbStaticHost.dll\0"
             VALUE "ProductName", "Experimental Physics and Industrial Control System (EPICS)\0"
-            VALUE "ProductVersion", BASE_VERSION_STRING "\0"
+            VALUE "ProductVersion", EPICS_VERSION_STRING "\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/src/dbStatic/dbStaticIoc.rc b/src/dbStatic/dbStaticIoc.rc
index 7ff035a82..48ebb7f05 100755
--- a/src/dbStatic/dbStaticIoc.rc
+++ b/src/dbStatic/dbStaticIoc.rc
@@ -2,8 +2,8 @@
 #include "epicsVersion.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION BASE_VERSION,BASE_REVISION,BASE_MODIFICATION,BASE_UPDATE_LEVEL
- PRODUCTVERSION BASE_VERSION,BASE_REVISION,BASE_MODIFICATION,BASE_UPDATE_LEVEL
+ FILEVERSION EPICS_VERSION,EPICS_REVISION,EPICS_MODIFICATION,EPICS_UPDATE_LEVEL
+ PRODUCTVERSION EPICS_VERSION,EPICS_REVISION,EPICS_MODIFICATION,EPICS_UPDATE_LEVEL
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -21,12 +21,12 @@ BEGIN
             VALUE "Comments","Static Ioc Database Library for EPICS\0"
             VALUE "CompanyName", "The EPICS collaboration\0"
             VALUE "FileDescription", "Static Ioc Database Library\0"
-            VALUE "FileVersion", BASE_VERSION_STRING "\0"
+            VALUE "FileVersion", EPICS_VERSION_STRING "\0"
             VALUE "InternalName", "dbStaticIoc\0"
             VALUE "LegalCopyright", "Copyright (C) Univ. of California, Univ. of Chicago\0"
             VALUE "OriginalFilename", "dbStaticIoc.dll\0"
             VALUE "ProductName", "Experimental Physics and Industrial Control System (EPICS)\0"
-            VALUE "ProductVersion", BASE_VERSION_STRING "\0"
+            VALUE "ProductVersion", EPICS_VERSION_STRING "\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/src/dbtools/dbtoolsIoc.rc b/src/dbtools/dbtoolsIoc.rc
index 2b5ec030a..731c807d7 100755
--- a/src/dbtools/dbtoolsIoc.rc
+++ b/src/dbtools/dbtoolsIoc.rc
@@ -2,8 +2,8 @@
 #include "epicsVersion.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION BASE_VERSION,BASE_REVISION,BASE_MODIFICATION,BASE_UPDATE_LEVEL
- PRODUCTVERSION BASE_VERSION,BASE_REVISION,BASE_MODIFICATION,BASE_UPDATE_LEVEL
+ FILEVERSION EPICS_VERSION,EPICS_REVISION,EPICS_MODIFICATION,EPICS_UPDATE_LEVEL
+ PRODUCTVERSION EPICS_VERSION,EPICS_REVISION,EPICS_MODIFICATION,EPICS_UPDATE_LEVEL
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -21,12 +21,12 @@ BEGIN
             VALUE "Comments","Ioc Database Tools Library for EPICS\0"
             VALUE "CompanyName", "The EPICS collaboration\0"
             VALUE "FileDescription", "Ioc Database Tools Library\0"
-            VALUE "FileVersion", BASE_VERSION_STRING "\0"
+            VALUE "FileVersion", EPICS_VERSION_STRING "\0"
             VALUE "InternalName", "dbtoolsIoc\0"
             VALUE "LegalCopyright", "Copyright (C) Univ. of California, Univ. of Chicago\0"
             VALUE "OriginalFilename", "dbtoolsIoc.dll\0"
             VALUE "ProductName", "Experimental Physics and Industrial Control System (EPICS)\0"
-            VALUE "ProductVersion", BASE_VERSION_STRING "\0"
+            VALUE "ProductVersion", EPICS_VERSION_STRING "\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/src/gdd/gdd.rc b/src/gdd/gdd.rc
index f40ce20a4..abdd38d95 100755
--- a/src/gdd/gdd.rc
+++ b/src/gdd/gdd.rc
@@ -2,8 +2,8 @@
 #include "epicsVersion.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION BASE_VERSION,BASE_REVISION,BASE_MODIFICATION,BASE_UPDATE_LEVEL
- PRODUCTVERSION BASE_VERSION,BASE_REVISION,BASE_MODIFICATION,BASE_UPDATE_LEVEL
+ FILEVERSION EPICS_VERSION,EPICS_REVISION,EPICS_MODIFICATION,EPICS_UPDATE_LEVEL
+ PRODUCTVERSION EPICS_VERSION,EPICS_REVISION,EPICS_MODIFICATION,EPICS_UPDATE_LEVEL
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -21,12 +21,12 @@ BEGIN
             VALUE "Comments","General Data Descriptor Library for EPICS\0"
             VALUE "CompanyName", "The EPICS collaboration\0"
             VALUE "FileDescription", "General Data Descriptor Library\0"
-            VALUE "FileVersion", BASE_VERSION_STRING "\0"
+            VALUE "FileVersion", EPICS_VERSION_STRING "\0"
             VALUE "InternalName", "gdd\0"
             VALUE "LegalCopyright", "Copyright (C) Univ. of California, Univ. of Chicago\0"
             VALUE "OriginalFilename", "gdd.dll\0"
             VALUE "ProductName", "Experimental Physics and Industrial Control System (EPICS)\0"
-            VALUE "ProductVersion", BASE_VERSION_STRING "\0"
+            VALUE "ProductVersion", EPICS_VERSION_STRING "\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/src/iocsh/iocsh.rc b/src/iocsh/iocsh.rc
index 34507ea76..045156af5 100755
--- a/src/iocsh/iocsh.rc
+++ b/src/iocsh/iocsh.rc
@@ -2,8 +2,8 @@
 #include "epicsVersion.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION BASE_VERSION,BASE_REVISION,BASE_MODIFICATION,BASE_UPDATE_LEVEL
- PRODUCTVERSION BASE_VERSION,BASE_REVISION,BASE_MODIFICATION,BASE_UPDATE_LEVEL
+ FILEVERSION EPICS_VERSION,EPICS_REVISION,EPICS_MODIFICATION,EPICS_UPDATE_LEVEL
+ PRODUCTVERSION EPICS_VERSION,EPICS_REVISION,EPICS_MODIFICATION,EPICS_UPDATE_LEVEL
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -21,12 +21,12 @@ BEGIN
             VALUE "Comments","Ioc Shell Library for EPICS\0"
             VALUE "CompanyName", "The EPICS collaboration\0"
             VALUE "FileDescription", "Ioc Shell Library\0"
-            VALUE "FileVersion", BASE_VERSION_STRING "\0"
+            VALUE "FileVersion", EPICS_VERSION_STRING "\0"
             VALUE "InternalName", "iocsh\0"
             VALUE "LegalCopyright", "Copyright (C) Univ. of California, Univ. of Chicago\0"
             VALUE "OriginalFilename", "iocsh.dll\0"
             VALUE "ProductName", "Experimental Physics and Industrial Control System (EPICS)\0"
-            VALUE "ProductVersion", BASE_VERSION_STRING "\0"
+            VALUE "ProductVersion", EPICS_VERSION_STRING "\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/src/libCom/Com.rc b/src/libCom/Com.rc
index 56c2a23a7..ca9c62403 100755
--- a/src/libCom/Com.rc
+++ b/src/libCom/Com.rc
@@ -2,8 +2,8 @@
 #include "epicsVersion.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION BASE_VERSION,BASE_REVISION,BASE_MODIFICATION,BASE_UPDATE_LEVEL
- PRODUCTVERSION BASE_VERSION,BASE_REVISION,BASE_MODIFICATION,BASE_UPDATE_LEVEL
+ FILEVERSION EPICS_VERSION,EPICS_REVISION,EPICS_MODIFICATION,EPICS_UPDATE_LEVEL
+ PRODUCTVERSION EPICS_VERSION,EPICS_REVISION,EPICS_MODIFICATION,EPICS_UPDATE_LEVEL
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -21,12 +21,12 @@ BEGIN
             VALUE "Comments","Common Library for EPICS\0"
             VALUE "CompanyName", "The EPICS collaboration\0"
             VALUE "FileDescription", "Common Library\0"
-            VALUE "FileVersion", BASE_VERSION_STRING "\0"
+            VALUE "FileVersion", EPICS_VERSION_STRING "\0"
             VALUE "InternalName", "Com\0"
             VALUE "LegalCopyright", "Copyright (C) Univ. of California, Univ. of Chicago\0"
             VALUE "OriginalFilename", "Com.dll\0"
             VALUE "ProductName", "Experimental Physics and Industrial Control System (EPICS)\0"
-            VALUE "ProductVersion", BASE_VERSION_STRING "\0"
+            VALUE "ProductVersion", EPICS_VERSION_STRING "\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/src/misc/misc.rc b/src/misc/misc.rc
index 7168f1ac4..3f92fe643 100755
--- a/src/misc/misc.rc
+++ b/src/misc/misc.rc
@@ -2,8 +2,8 @@
 #include "epicsVersion.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION BASE_VERSION,BASE_REVISION,BASE_MODIFICATION,BASE_UPDATE_LEVEL
- PRODUCTVERSION BASE_VERSION,BASE_REVISION,BASE_MODIFICATION,BASE_UPDATE_LEVEL
+ FILEVERSION EPICS_VERSION,EPICS_REVISION,EPICS_MODIFICATION,EPICS_UPDATE_LEVEL
+ PRODUCTVERSION EPICS_VERSION,EPICS_REVISION,EPICS_MODIFICATION,EPICS_UPDATE_LEVEL
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -21,12 +21,12 @@ BEGIN
             VALUE "Comments","Miscellaneous Tools Library for EPICS\0"
             VALUE "CompanyName", "The EPICS collaboration\0"
             VALUE "FileDescription", "Miscellaneous Tools Library\0"
-            VALUE "FileVersion", BASE_VERSION_STRING "\0"
+            VALUE "FileVersion", EPICS_VERSION_STRING "\0"
             VALUE "InternalName", "misc\0"
             VALUE "LegalCopyright", "Copyright (C) Univ. of California, Univ. of Chicago\0"
             VALUE "OriginalFilename", "misc.dll\0"
             VALUE "ProductName", "Experimental Physics and Industrial Control System (EPICS)\0"
-            VALUE "ProductVersion", BASE_VERSION_STRING "\0"
+            VALUE "ProductVersion", EPICS_VERSION_STRING "\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/src/misc/miscIoc.rc b/src/misc/miscIoc.rc
index 36f6eb64f..96348cd78 100755
--- a/src/misc/miscIoc.rc
+++ b/src/misc/miscIoc.rc
@@ -2,8 +2,8 @@
 #include "epicsVersion.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION BASE_VERSION,BASE_REVISION,BASE_MODIFICATION,BASE_UPDATE_LEVEL
- PRODUCTVERSION BASE_VERSION,BASE_REVISION,BASE_MODIFICATION,BASE_UPDATE_LEVEL
+ FILEVERSION EPICS_VERSION,EPICS_REVISION,EPICS_MODIFICATION,EPICS_UPDATE_LEVEL
+ PRODUCTVERSION EPICS_VERSION,EPICS_REVISION,EPICS_MODIFICATION,EPICS_UPDATE_LEVEL
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -21,12 +21,12 @@ BEGIN
             VALUE "Comments","Miscellaneous Ioc Tools Library for EPICS\0"
             VALUE "CompanyName", "The EPICS collaboration\0"
             VALUE "FileDescription", "Miscellaneous Ioc Tools Library\0"
-            VALUE "FileVersion", BASE_VERSION_STRING "\0"
+            VALUE "FileVersion", EPICS_VERSION_STRING "\0"
             VALUE "InternalName", "miscIoc\0"
             VALUE "LegalCopyright", "Copyright (C) Univ. of California, Univ. of Chicago\0"
             VALUE "OriginalFilename", "miscIoc.dll\0"
             VALUE "ProductName", "Experimental Physics and Industrial Control System (EPICS)\0"
-            VALUE "ProductVersion", BASE_VERSION_STRING "\0"
+            VALUE "ProductVersion", EPICS_VERSION_STRING "\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/src/registry/registryIoc.rc b/src/registry/registryIoc.rc
index 40cac00cf..6d7d2ce95 100755
--- a/src/registry/registryIoc.rc
+++ b/src/registry/registryIoc.rc
@@ -2,8 +2,8 @@
 #include "epicsVersion.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION BASE_VERSION,BASE_REVISION,BASE_MODIFICATION,BASE_UPDATE_LEVEL
- PRODUCTVERSION BASE_VERSION,BASE_REVISION,BASE_MODIFICATION,BASE_UPDATE_LEVEL
+ FILEVERSION EPICS_VERSION,EPICS_REVISION,EPICS_MODIFICATION,EPICS_UPDATE_LEVEL
+ PRODUCTVERSION EPICS_VERSION,EPICS_REVISION,EPICS_MODIFICATION,EPICS_UPDATE_LEVEL
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -21,12 +21,12 @@ BEGIN
             VALUE "Comments","Registry Ioc Library for EPICS\0"
             VALUE "CompanyName", "The EPICS collaboration\0"
             VALUE "FileDescription", "Registry Ioc Library\0"
-            VALUE "FileVersion", BASE_VERSION_STRING "\0"
+            VALUE "FileVersion", EPICS_VERSION_STRING "\0"
             VALUE "InternalName", "registryIoc\0"
             VALUE "LegalCopyright", "Copyright (C) Univ. of California, Univ. of Chicago\0"
             VALUE "OriginalFilename", "registryIoc.dll\0"
             VALUE "ProductName", "Experimental Physics and Industrial Control System (EPICS)\0"
-            VALUE "ProductVersion", BASE_VERSION_STRING "\0"
+            VALUE "ProductVersion", EPICS_VERSION_STRING "\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/src/rsrv/rsrvIoc.rc b/src/rsrv/rsrvIoc.rc
index 8d48d94bf..608c82770 100755
--- a/src/rsrv/rsrvIoc.rc
+++ b/src/rsrv/rsrvIoc.rc
@@ -2,8 +2,8 @@
 #include "epicsVersion.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION BASE_VERSION,BASE_REVISION,BASE_MODIFICATION,BASE_UPDATE_LEVEL
- PRODUCTVERSION BASE_VERSION,BASE_REVISION,BASE_MODIFICATION,BASE_UPDATE_LEVEL
+ FILEVERSION EPICS_VERSION,EPICS_REVISION,EPICS_MODIFICATION,EPICS_UPDATE_LEVEL
+ PRODUCTVERSION EPICS_VERSION,EPICS_REVISION,EPICS_MODIFICATION,EPICS_UPDATE_LEVEL
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -21,12 +21,12 @@ BEGIN
             VALUE "Comments","Channel Access Ioc Resource Server Library for EPICS\0"
             VALUE "CompanyName", "The EPICS collaboration\0"
             VALUE "FileDescription", "Channel Access Ioc Resource Server Library\0"
-            VALUE "FileVersion", BASE_VERSION_STRING "\0"
+            VALUE "FileVersion", EPICS_VERSION_STRING "\0"
             VALUE "InternalName", "rsrv\0"
             VALUE "LegalCopyright", "Copyright (C) Univ. of California, Univ. of Chicago\0"
             VALUE "OriginalFilename", "rsrv.dll\0"
             VALUE "ProductName", "Experimental Physics and Industrial Control System (EPICS)\0"
-            VALUE "ProductVersion", BASE_VERSION_STRING "\0"
+            VALUE "ProductVersion", EPICS_VERSION_STRING "\0"
         END
     END
     BLOCK "VarFileInfo"