diff --git a/flaim/util/rflread.cpp b/flaim/util/rflread.cpp
index cc516ce..8f7fe17 100644
--- a/flaim/util/rflread.cpp
+++ b/flaim/util/rflread.cpp
@@ -510,7 +510,7 @@ FSTATIC void rflFormatDBKeyLen(
 {
 	char *	pszTmp = *ppszTmp;
 
-	if (pRflPacket->uiEndDrn < FLM_VER_4_60)
+	if (pRflPacket->uiEndDrn < FLM_FILE_FORMAT_VER_4_60)
 	{
 		return;
 	}
@@ -1584,7 +1584,7 @@ FSTATIC RCODE rflRetrievePacket(
 			rflGetNumValue( pucPacketBody, uiBytesRead, 8,
 					4, &pRflPacket->uiEndDrn,
 					&pRflPacket->uiEndDrnBytes);
-			if (pRflPacket->uiEndDrn >= FLM_VER_4_60)
+			if (pRflPacket->uiEndDrn >= FLM_FILE_FORMAT_VER_4_60)
 			{
 				// Get the size of the DB key.
 				rflGetNumValue( pucPacketBody, uiBytesRead, 12,
diff --git a/flaim/util/viewrfl.cpp b/flaim/util/viewrfl.cpp
index 53b5eaa..c992aa2 100644
--- a/flaim/util/viewrfl.cpp
+++ b/flaim/util/viewrfl.cpp
@@ -1356,7 +1356,7 @@ FSTATIC RCODE rflOpenNewFile(
 	char			szPath [F_PATH_MAX_SIZE];
 	char			szBaseName [F_FILENAME_SIZE];
 	char			szPrefix [F_FILENAME_SIZE];
-	FLMUINT		uiDbVersion = FLM_VER_4_3;
+	FLMUINT		uiDbVersion = FLM_FILE_FORMAT_VER_4_3;
 	FLMUINT		uiFileNum;
 
 	// If no file name was specified, go to the next or previous file from
@@ -1371,11 +1371,11 @@ FSTATIC RCODE rflOpenNewFile(
 
 		// See if it is version 4.3 or greater first.
 
-		uiDbVersion = FLM_VER_4_3;
+		uiDbVersion = FLM_FILE_FORMAT_VER_4_3;
 		if (!rflGetFileNum( uiDbVersion, szPrefix, gv_szRflPath, &uiFileNum))
 		{
 			szPrefix [3] = 0;
-			uiDbVersion = FLM_VER_4_0;
+			uiDbVersion = FLM_FILE_FORMAT_VER_4_0;
 			if (!rflGetFileNum( uiDbVersion, szPrefix, gv_szRflPath, &uiFileNum))
 			{
 				rc = RC_SET( FERR_IO_PATH_NOT_FOUND);