rename EMode to Mode

11 files changed, 69 insertions, 69 deletions

diff --git a/zenserver/cache/structuredcachestore.cpp b/zenserver/cache/structuredcachestore.cpp
index 6b448b8d2..e22b06572 100644
--- a/zenserver/cache/structuredcachestore.cpp
+++ b/zenserver/cache/structuredcachestore.cpp
@@ -484,8 +484,8 @@ ZenCacheDiskLayer::CacheBucket::OpenLog(const fs::path& BucketDir, const bool Is
 	std::filesystem::path SobsPath{BucketDir / "zen.sobs"};
 	std::filesystem::path SlogPath{BucketDir / "zen.slog"};
 
-	m_SobsFile.Open(SobsPath, IsNew ? BasicFile::EMode::kTruncate : BasicFile::EMode::kWrite);
-	m_SlogFile.Open(SlogPath, IsNew ? CasLogFile::EMode::kTruncate : CasLogFile::EMode::kWrite);
+	m_SobsFile.Open(SobsPath, IsNew ? BasicFile::Mode::kTruncate : BasicFile::Mode::kWrite);
+	m_SlogFile.Open(SlogPath, IsNew ? CasLogFile::Mode::kTruncate : CasLogFile::Mode::kWrite);
 
 	m_SlogFile.Replay([&](const DiskIndexEntry& Entry) {
 		if (Entry.Key == IoHash::Zero)
@@ -917,8 +917,8 @@ ZenCacheDiskLayer::CacheBucket::CollectGarbage(GcContext& GcCtx)
 			m_SlogFile.Close();
 
 			const bool IsNew = true;
-			m_SobsFile.Open(m_BucketDir / "zen.sobs", IsNew ? BasicFile::EMode::kTruncate : BasicFile::EMode::kWrite);
-			m_SlogFile.Open(m_BucketDir / "zen.slog", IsNew ? CasLogFile::EMode::kTruncate : CasLogFile::EMode::kWrite);
+			m_SobsFile.Open(m_BucketDir / "zen.sobs", IsNew ? BasicFile::Mode::kTruncate : BasicFile::Mode::kWrite);
+			m_SlogFile.Open(m_BucketDir / "zen.slog", IsNew ? CasLogFile::Mode::kTruncate : CasLogFile::Mode::kWrite);
 
 			m_SobsCursor = 0;
 			m_TotalSize	 = 0;
@@ -979,8 +979,8 @@ ZenCacheDiskLayer::CacheBucket::CollectGarbage(GcContext& GcCtx)
 			uint64_t					TmpCursor{};
 			std::vector<uint8_t>		Chunk;
 
-			TmpSobs.Open(TmpSobsPath, BasicFile::EMode::kTruncate);
-			TmpLog.Open(TmpSlogPath, CasLogFile::EMode::kTruncate);
+			TmpSobs.Open(TmpSobsPath, BasicFile::Mode::kTruncate);
+			TmpLog.Open(TmpSlogPath, CasLogFile::Mode::kTruncate);
 
 			for (const auto& Entry : ValidEntries)
 			{
diff --git a/zenserver/projectstore.cpp b/zenserver/projectstore.cpp
index bee143bd8..bb8adb19f 100644
--- a/zenserver/projectstore.cpp
+++ b/zenserver/projectstore.cpp
@@ -115,10 +115,10 @@ struct ProjectStore::OplogStorage : public RefCounted
 			CreateDirectories(m_OplogStoragePath);
 		}
 
-		m_Oplog.Open(m_OplogStoragePath / "ops.zlog", IsCreate ? CasLogFile::EMode::kTruncate : CasLogFile::EMode::kWrite);
+		m_Oplog.Open(m_OplogStoragePath / "ops.zlog", IsCreate ? CasLogFile::Mode::kTruncate : CasLogFile::Mode::kWrite);
 		m_Oplog.Initialize();
 
-		m_OpBlobs.Open(m_OplogStoragePath / "ops.zops", IsCreate ? BasicFile::EMode::kTruncate : BasicFile::EMode::kWrite);
+		m_OpBlobs.Open(m_OplogStoragePath / "ops.zops", IsCreate ? BasicFile::Mode::kTruncate : BasicFile::Mode::kWrite);
 
 		ZEN_ASSERT(IsPow2(m_OpsAlign));
 		ZEN_ASSERT(!(m_NextOpsOffset & (m_OpsAlign - 1)));
@@ -654,7 +654,7 @@ ProjectStore::Project::Read()
 	ZEN_INFO("reading config for project '{}' from {}", Identifier, ProjectStateFilePath);
 
 	BasicFile Blob;
-	Blob.Open(ProjectStateFilePath, BasicFile::EMode::kRead);
+	Blob.Open(ProjectStateFilePath, BasicFile::Mode::kRead);
 
 	IoBuffer		Obj				= Blob.ReadAll();
 	CbValidateError ValidationError = ValidateCompactBinary(MemoryView(Obj.Data(), Obj.Size()), CbValidateMode::All);
@@ -694,7 +694,7 @@ ProjectStore::Project::Write()
 	ZEN_INFO("persisting config for project '{}' to {}", Identifier, ProjectStateFilePath);
 
 	BasicFile Blob;
-	Blob.Open(ProjectStateFilePath, BasicFile::EMode::kTruncate);
+	Blob.Open(ProjectStateFilePath, BasicFile::Mode::kTruncate);
 	Blob.Write(Mem.Data(), Mem.Size(), 0);
 	Blob.Flush();
 }
diff --git a/zenstore/basicfile.cpp b/zenstore/basicfile.cpp
index eb93638f2..f518e0491 100644
--- a/zenstore/basicfile.cpp
+++ b/zenstore/basicfile.cpp
@@ -29,7 +29,7 @@ BasicFile::~BasicFile()
 }
 
 void
-BasicFile::Open(const std::filesystem::path& FileName, EMode Mode)
+BasicFile::Open(const std::filesystem::path& FileName, Mode Mode)
 {
 	std::error_code Ec;
 	Open(FileName, Mode, Ec);
@@ -41,7 +41,7 @@ BasicFile::Open(const std::filesystem::path& FileName, EMode Mode)
 }
 
 void
-BasicFile::Open(const std::filesystem::path& FileName, EMode Mode, std::error_code& Ec)
+BasicFile::Open(const std::filesystem::path& FileName, Mode Mode, std::error_code& Ec)
 {
 	Ec.clear();
 
@@ -50,23 +50,23 @@ BasicFile::Open(const std::filesystem::path& FileName, EMode Mode, std::error_co
 	DWORD dwDesiredAccess		= 0;
 	switch (Mode)
 	{
-		case EMode::kRead:
+		case Mode::kRead:
 			dwCreationDisposition |= OPEN_EXISTING;
 			dwDesiredAccess |= GENERIC_READ;
 			break;
-		case EMode::kWrite:
+		case Mode::kWrite:
 			dwCreationDisposition |= OPEN_ALWAYS;
 			dwDesiredAccess |= (GENERIC_READ | GENERIC_WRITE);
 			break;
-		case EMode::kDelete:
+		case Mode::kDelete:
 			dwCreationDisposition |= OPEN_ALWAYS;
 			dwDesiredAccess |= (GENERIC_READ | GENERIC_WRITE | DELETE);
 			break;
-		case EMode::kTruncate:
+		case Mode::kTruncate:
 			dwCreationDisposition |= CREATE_ALWAYS;
 			dwDesiredAccess |= (GENERIC_READ | GENERIC_WRITE);
 			break;
-		case EMode::kTruncateDelete:
+		case Mode::kTruncateDelete:
 			dwCreationDisposition |= CREATE_ALWAYS;
 			dwDesiredAccess |= (GENERIC_READ | GENERIC_WRITE | DELETE);
 			break;
@@ -94,15 +94,15 @@ BasicFile::Open(const std::filesystem::path& FileName, EMode Mode, std::error_co
 	int OpenFlags = O_CLOEXEC;
 	switch (Mode)
 	{
-		case EMode::kRead:
+		case Mode::kRead:
 			OpenFlags |= O_RDONLY;
 			break;
-		case EMode::kWrite:
-		case EMode::kDelete:
+		case Mode::kWrite:
+		case Mode::kDelete:
 			OpenFlags |= (O_RDWR | O_CREAT);
 			break;
-		case EMode::kTruncate:
-		case EMode::kTruncateDelete:
+		case Mode::kTruncate:
+		case Mode::kTruncateDelete:
 			OpenFlags |= (O_RDWR | O_CREAT | O_TRUNC);
 			break;
 	}
@@ -113,7 +113,7 @@ BasicFile::Open(const std::filesystem::path& FileName, EMode Mode, std::error_co
 		Ec = zen::MakeErrorCodeFromLastError();
 		return;
 	}
-	if (Mode != EMode::kRead)
+	if (Mode != Mode::kRead)
 	{
 		fchmod(Fd, 0666);
 	}
@@ -427,7 +427,7 @@ TemporaryFile::CreateTemporary(std::filesystem::path TempDirName, std::error_cod
 
 	m_TempPath = TempDirName / TempName.c_str();
 
-	Open(m_TempPath, BasicFile::EMode::kTruncateDelete, Ec);
+	Open(m_TempPath, BasicFile::Mode::kTruncateDelete, Ec);
 }
 
 void
@@ -527,8 +527,8 @@ TEST_CASE("BasicFile")
 	ScopedCurrentDirectoryChange _;
 
 	BasicFile File1;
-	CHECK_THROWS(File1.Open("zonk", BasicFile::EMode::kRead));
-	CHECK_NOTHROW(File1.Open("zonk", BasicFile::EMode::kTruncate));
+	CHECK_THROWS(File1.Open("zonk", BasicFile::Mode::kRead));
+	CHECK_NOTHROW(File1.Open("zonk", BasicFile::Mode::kTruncate));
 	CHECK_NOTHROW(File1.Write("abcd", 4, 0));
 	CHECK(File1.FileSize() == 4);
 	{
diff --git a/zenstore/blockstore.cpp b/zenstore/blockstore.cpp
index 7eb73101a..1eb859d5a 100644
--- a/zenstore/blockstore.cpp
+++ b/zenstore/blockstore.cpp
@@ -37,7 +37,7 @@ BlockStoreFile::GetPath() const
 void
 BlockStoreFile::Open()
 {
-	m_File.Open(m_Path, BasicFile::EMode::kDelete);
+	m_File.Open(m_Path, BasicFile::Mode::kDelete);
 	void* FileHandle = m_File.Handle();
 	m_IoBuffer		 = IoBuffer(IoBuffer::File, FileHandle, 0, m_File.FileSize());
 }
@@ -51,7 +51,7 @@ BlockStoreFile::Create(uint64_t InitialSize)
 		CreateDirectories(ParentPath);
 	}
 
-	m_File.Open(m_Path, BasicFile::EMode::kTruncateDelete);
+	m_File.Open(m_Path, BasicFile::Mode::kTruncateDelete);
 	if (InitialSize > 0)
 	{
 		m_File.SetFileSize(InitialSize);
diff --git a/zenstore/cas.cpp b/zenstore/cas.cpp
index f0a1c9776..0e1d5b242 100644
--- a/zenstore/cas.cpp
+++ b/zenstore/cas.cpp
@@ -164,7 +164,7 @@ CasImpl::OpenOrCreateManifest()
 
 	std::error_code Ec;
 	BasicFile		ManifestFile;
-	ManifestFile.Open(ManifestPath.c_str(), BasicFile::EMode::kRead, Ec);
+	ManifestFile.Open(ManifestPath.c_str(), BasicFile::Mode::kRead, Ec);
 
 	bool ManifestIsOk = false;
 
@@ -236,7 +236,7 @@ CasImpl::UpdateManifest()
 	ZEN_TRACE("Writing new manifest to '{}'", ManifestPath);
 
 	BasicFile Marker;
-	Marker.Open(ManifestPath.c_str(), BasicFile::EMode::kTruncate);
+	Marker.Open(ManifestPath.c_str(), BasicFile::Mode::kTruncate);
 	Marker.Write(m_ManifestObject.GetBuffer(), 0);
 }
 
diff --git a/zenstore/caslog.cpp b/zenstore/caslog.cpp
index 3737e9f45..e080d6771 100644
--- a/zenstore/caslog.cpp
+++ b/zenstore/caslog.cpp
@@ -39,19 +39,19 @@ CasLogFile::~CasLogFile()
 }
 
 void
-CasLogFile::Open(std::filesystem::path FileName, size_t RecordSize, EMode Mode)
+CasLogFile::Open(std::filesystem::path FileName, size_t RecordSize, Mode Mode)
 {
 	m_RecordSize = RecordSize;
 
-	std::error_code	 Ec;
-	BasicFile::EMode FileMode = BasicFile::EMode::kRead;
+	std::error_code Ec;
+	BasicFile::Mode FileMode = BasicFile::Mode::kRead;
 	switch (Mode)
 	{
-		case EMode::kWrite:
-			FileMode = BasicFile::EMode::kWrite;
+		case Mode::kWrite:
+			FileMode = BasicFile::Mode::kWrite;
 			break;
-		case EMode::kTruncate:
-			FileMode = BasicFile::EMode::kTruncate;
+		case Mode::kTruncate:
+			FileMode = BasicFile::Mode::kTruncate;
 			break;
 	}
 
@@ -63,9 +63,9 @@ CasLogFile::Open(std::filesystem::path FileName, size_t RecordSize, EMode Mode)
 
 	uint64_t AppendOffset = 0;
 
-	if ((Mode == EMode::kTruncate) || (m_File.FileSize() < sizeof(FileHeader)))
+	if ((Mode == Mode::kTruncate) || (m_File.FileSize() < sizeof(FileHeader)))
 	{
-		if (Mode == EMode::kRead)
+		if (Mode == Mode::kRead)
 		{
 			throw std::runtime_error(fmt::format("Mangled log header (file to small) in '{}'", FileName));
 		}
diff --git a/zenstore/cidstore.cpp b/zenstore/cidstore.cpp
index 5ddf32e73..482a89b9d 100644
--- a/zenstore/cidstore.cpp
+++ b/zenstore/cidstore.cpp
@@ -127,7 +127,7 @@ struct CidStore::Impl
 
 		bool IsNew = !std::filesystem::exists(SlogPath);
 
-		m_LogFile.Open(SlogPath, IsNew ? CasLogFile::EMode::kTruncate : CasLogFile::EMode::kWrite);
+		m_LogFile.Open(SlogPath, IsNew ? CasLogFile::Mode::kTruncate : CasLogFile::Mode::kWrite);
 
 		ZEN_DEBUG("Initializing index from '{}' ({})", SlogPath, NiceBytes(m_LogFile.GetLogSize()));
 
diff --git a/zenstore/compactcas.cpp b/zenstore/compactcas.cpp
index 64f240613..36c9df26f 100644
--- a/zenstore/compactcas.cpp
+++ b/zenstore/compactcas.cpp
@@ -186,7 +186,7 @@ namespace {
 			});
 
 			BasicFile ObjectIndexFile;
-			ObjectIndexFile.Open(SidxPath, BasicFile::EMode::kRead);
+			ObjectIndexFile.Open(SidxPath, BasicFile::Mode::kRead);
 			uint64_t Size = ObjectIndexFile.FileSize();
 			if (Size >= sizeof(CasDiskIndexHeader))
 			{
@@ -282,7 +282,7 @@ namespace {
 			});
 
 			TCasLogFile<CasDiskIndexEntry> CasLog;
-			CasLog.Open(SlogPath, CasLogFile::EMode::kRead);
+			CasLog.Open(SlogPath, CasLogFile::Mode::kRead);
 			if (CasLog.Initialize())
 			{
 				Entries.reserve(CasLog.GetLogCount());
@@ -346,12 +346,12 @@ namespace {
 		}
 
 		BasicFile BlockFile;
-		BlockFile.Open(LegacySobsPath, BasicFile::EMode::kRead);
+		BlockFile.Open(LegacySobsPath, BasicFile::Mode::kRead);
 
 		std::unordered_map<IoHash, LegacyCasDiskIndexEntry, IoHash::Hasher> LegacyDiskIndex;
 
 		TCasLogFile<LegacyCasDiskIndexEntry> LegacyCasLog;
-		LegacyCasLog.Open(LegacyLogPath, CleanSource ? CasLogFile::EMode::kWrite : CasLogFile::EMode::kRead);
+		LegacyCasLog.Open(LegacyLogPath, CleanSource ? CasLogFile::Mode::kWrite : CasLogFile::Mode::kRead);
 		{
 			Stopwatch  Timer;
 			const auto __ = MakeGuard([RootPath, ContainerBaseName, &LegacyDiskIndex, &Timer] {
@@ -396,11 +396,11 @@ namespace {
 				// the legacy data files to zero length.
 
 				BasicFile LegacyLog;
-				LegacyLog.Open(LegacyLogPath, BasicFile::EMode::kTruncate);
+				LegacyLog.Open(LegacyLogPath, BasicFile::Mode::kTruncate);
 				BasicFile LegacySobs;
-				LegacySobs.Open(LegacySobsPath, BasicFile::EMode::kTruncate);
+				LegacySobs.Open(LegacySobsPath, BasicFile::Mode::kTruncate);
 				BasicFile LegacySidx;
-				LegacySidx.Open(LegacySidxPath, BasicFile::EMode::kTruncate);
+				LegacySidx.Open(LegacySidxPath, BasicFile::Mode::kTruncate);
 			}
 			return Result;
 		}
@@ -452,7 +452,7 @@ namespace {
 		std::filesystem::path SlogPath = GetLogPath(RootPath, ContainerBaseName);
 		CreateDirectories(SlogPath.parent_path());
 		TCasLogFile<CasDiskIndexEntry> CasLog;
-		CasLog.Open(SlogPath, CasLogFile::EMode::kWrite);
+		CasLog.Open(SlogPath, CasLogFile::Mode::kWrite);
 
 		if (CleanSource && (MaxRequiredBlockCount < 2))
 		{
@@ -622,11 +622,11 @@ namespace {
 			// the legacy data files to zero length.
 
 			BasicFile LegacyLog;
-			LegacyLog.Open(LegacyLogPath, BasicFile::EMode::kTruncate);
+			LegacyLog.Open(LegacyLogPath, BasicFile::Mode::kTruncate);
 			BasicFile LegacySobs;
-			LegacySobs.Open(LegacySobsPath, BasicFile::EMode::kTruncate);
+			LegacySobs.Open(LegacySobsPath, BasicFile::Mode::kTruncate);
 			BasicFile LegacySidx;
-			LegacySidx.Open(LegacySidxPath, BasicFile::EMode::kTruncate);
+			LegacySidx.Open(LegacySidxPath, BasicFile::Mode::kTruncate);
 		}
 		return Result;
 	}
@@ -1341,7 +1341,7 @@ CasContainerStrategy::MakeIndexSnapshot()
 		fs::rename(SlogPath, STmplogPath);
 
 		// Open an new log
-		m_CasLog.Open(SlogPath, CasLogFile::EMode::kTruncate);
+		m_CasLog.Open(SlogPath, CasLogFile::Mode::kTruncate);
 	}
 
 	try
@@ -1363,7 +1363,7 @@ CasContainerStrategy::MakeIndexSnapshot()
 		}
 
 		BasicFile ObjectIndexFile;
-		ObjectIndexFile.Open(SidxPath, BasicFile::EMode::kTruncate);
+		ObjectIndexFile.Open(SidxPath, BasicFile::Mode::kTruncate);
 		CasDiskIndexHeader Header = {.PayloadAlignment = gsl::narrow<uint32_t>(m_PayloadAlignment), .EntryCount = Entries.size()};
 		ObjectIndexFile.Write(&Header, sizeof(CasDiskIndexEntry), 0);
 		ObjectIndexFile.Write(Entries.data(), Entries.size() * sizeof(CasDiskIndexEntry), sizeof(CasDiskIndexEntry));
@@ -1383,7 +1383,7 @@ CasContainerStrategy::MakeIndexSnapshot()
 			Records.reserve(m_LocationMap.size());
 			{
 				TCasLogFile<CasDiskIndexEntry> OldCasLog;
-				OldCasLog.Open(STmplogPath, CasLogFile::EMode::kRead);
+				OldCasLog.Open(STmplogPath, CasLogFile::Mode::kRead);
 				Records.reserve(OldCasLog.GetLogCount());
 				OldCasLog.Replay([&](const CasDiskIndexEntry& Record) { Records.push_back(Record); });
 			}
@@ -1393,7 +1393,7 @@ CasContainerStrategy::MakeIndexSnapshot()
 			}
 
 			TCasLogFile<CasDiskIndexEntry> RecoveredCasLog;
-			RecoveredCasLog.Open(SRecoveredlogPath, CasLogFile::EMode::kWrite);
+			RecoveredCasLog.Open(SRecoveredlogPath, CasLogFile::Mode::kWrite);
 			RecoveredCasLog.Append(Records);
 			RecoveredCasLog.Flush();
 			RecoveredCasLog.Close();
@@ -1504,7 +1504,7 @@ CasContainerStrategy::OpenContainer(bool IsNewStore)
 	CreateDirectories(BasePath);
 
 	std::filesystem::path SlogPath = GetLogPath(m_Config.RootDirectory, m_ContainerBaseName);
-	m_CasLog.Open(SlogPath, CasLogFile::EMode::kWrite);
+	m_CasLog.Open(SlogPath, CasLogFile::Mode::kWrite);
 
 	std::unordered_set<uint32_t> KnownBlocks;
 	for (const auto& Entry : m_LocationMap)
@@ -2220,7 +2220,7 @@ TEST_CASE("compactcas.legacyconversion")
 	if (std::filesystem::is_regular_file(SidxPath))
 	{
 		BasicFile ObjectIndexFile;
-		ObjectIndexFile.Open(SidxPath, BasicFile::EMode::kRead);
+		ObjectIndexFile.Open(SidxPath, BasicFile::Mode::kRead);
 		uint64_t Size = ObjectIndexFile.FileSize();
 		if (Size >= sizeof(CasDiskIndexHeader))
 		{
@@ -2241,13 +2241,13 @@ TEST_CASE("compactcas.legacyconversion")
 	std::filesystem::path SlogPath = GetLogPath(CasConfig.RootDirectory, "test");
 	{
 		TCasLogFile<CasDiskIndexEntry> CasLog;
-		CasLog.Open(SlogPath, CasLogFile::EMode::kRead);
+		CasLog.Open(SlogPath, CasLogFile::Mode::kRead);
 		LogEntries.reserve(CasLog.GetLogCount());
 		CasLog.Replay([&](const CasDiskIndexEntry& Record) { LogEntries.push_back(Record); });
 	}
 	TCasLogFile<LegacyCasDiskIndexEntry> LegacyCasLog;
 	std::filesystem::path				 SLegacylogPath = GetLegacyLogPath(CasConfig.RootDirectory, "test");
-	LegacyCasLog.Open(SLegacylogPath, CasLogFile::EMode::kTruncate);
+	LegacyCasLog.Open(SLegacylogPath, CasLogFile::Mode::kTruncate);
 
 	for (const CasDiskIndexEntry& Entry : LogEntries)
 	{
diff --git a/zenstore/filecas.cpp b/zenstore/filecas.cpp
index 929a199af..6b0082ab0 100644
--- a/zenstore/filecas.cpp
+++ b/zenstore/filecas.cpp
@@ -89,7 +89,7 @@ FileCasStrategy::Initialize(bool IsNewStore)
 
 	CreateDirectories(m_Config.RootDirectory);
 
-	m_CasLog.Open(m_Config.RootDirectory / "cas.ulog", IsNewStore ? CasLogFile::EMode::kTruncate : CasLogFile::EMode::kWrite);
+	m_CasLog.Open(m_Config.RootDirectory / "cas.ulog", IsNewStore ? CasLogFile::Mode::kTruncate : CasLogFile::Mode::kWrite);
 
 	Stopwatch  Timer;
 	const auto _ = MakeGuard([this, &Timer] {
@@ -583,7 +583,7 @@ FileCasStrategy::IterateChunks(std::function<void(const IoHash& Hash, BasicFile&
 
 				BasicFile		PayloadFile;
 				std::error_code Ec;
-				PayloadFile.Open(Parent / File, BasicFile::EMode::kWrite, Ec);
+				PayloadFile.Open(Parent / File, BasicFile::Mode::kWrite, Ec);
 
 				if (!Ec)
 				{
@@ -782,7 +782,7 @@ TEST_CASE("cas.file.move")
 		IoHash	 ZeroHash = IoHash::HashBuffer(ZeroBytes);
 
 		BasicFile PayloadFile;
-		PayloadFile.Open(Payload1Path, BasicFile::EMode::kTruncate);
+		PayloadFile.Open(Payload1Path, BasicFile::Mode::kTruncate);
 		PayloadFile.Write(ZeroBytes, 0);
 		PayloadFile.Close();
 
diff --git a/zenstore/include/zenstore/basicfile.h b/zenstore/include/zenstore/basicfile.h
index ae875bf8a..5a500c65f 100644
--- a/zenstore/include/zenstore/basicfile.h
+++ b/zenstore/include/zenstore/basicfile.h
@@ -31,7 +31,7 @@ public:
 	BasicFile(const BasicFile&) = delete;
 	BasicFile& operator=(const BasicFile&) = delete;
 
-	enum class EMode : uint32_t
+	enum class Mode : uint32_t
 	{
 		kRead			= 0,  // Opens a existing file for read only
 		kWrite			= 1,  // Opens (or creates) a file for read and write
@@ -40,8 +40,8 @@ public:
 		kTruncateDelete = 4	  // Opens (or creates) a file for read and write and sets the size to zero enabling MarkAsDeleteOnClose()
 	};
 
-	void	 Open(const std::filesystem::path& FileName, EMode Mode);
-	void	 Open(const std::filesystem::path& FileName, EMode Mode, std::error_code& Ec);
+	void	 Open(const std::filesystem::path& FileName, Mode Mode);
+	void	 Open(const std::filesystem::path& FileName, Mode Mode, std::error_code& Ec);
 	void	 Close();
 	void	 Read(void* Data, uint64_t Size, uint64_t FileOffset);
 	void	 StreamFile(std::function<void(const void* Data, uint64_t Size)>&& ChunkFun);
diff --git a/zenstore/include/zenstore/caslog.h b/zenstore/include/zenstore/caslog.h
index 464cb373a..d09f4befb 100644
--- a/zenstore/include/zenstore/caslog.h
+++ b/zenstore/include/zenstore/caslog.h
@@ -15,14 +15,14 @@ public:
 	CasLogFile();
 	~CasLogFile();
 
-	enum class EMode
+	enum class Mode
 	{
 		kRead,
 		kWrite,
 		kTruncate
 	};
 
-	void	 Open(std::filesystem::path FileName, size_t RecordSize, EMode Mode);
+	void	 Open(std::filesystem::path FileName, size_t RecordSize, Mode Mode);
 	void	 Append(const void* DataPointer, uint64_t DataSize);
 	void	 Replay(std::function<void(const void*)>&& Handler);
 	void	 Flush();
@@ -49,7 +49,7 @@ private:
 	static_assert(sizeof(FileHeader) == 64);
 
 private:
-	void Open(std::filesystem::path FileName, size_t RecordSize, BasicFile::EMode Mode);
+	void Open(std::filesystem::path FileName, size_t RecordSize, BasicFile::Mode Mode);
 
 	BasicFile			  m_File;
 	FileHeader			  m_Header;
@@ -61,7 +61,7 @@ template<typename T>
 class TCasLogFile : public CasLogFile
 {
 public:
-	void Open(std::filesystem::path FileName, EMode Mode) { CasLogFile::Open(FileName, sizeof(T), Mode); }
+	void Open(std::filesystem::path FileName, Mode Mode) { CasLogFile::Open(FileName, sizeof(T), Mode); }
 
 	// This should be called before the Replay() is called to do some basic sanity checking
 	bool Initialize() { return true; }