2 files changed, 12 insertions, 14 deletions

diff --git a/dev/ZBA/BootKit/BootKit.hxx b/dev/ZBA/BootKit/BootKit.hxx
index c0539133..c4d415f4 100644
--- a/dev/ZBA/BootKit/BootKit.hxx
+++ b/dev/ZBA/BootKit/BootKit.hxx
@@ -36,7 +36,7 @@
 
 class BTextWriter;
 class BFileReader;
-class BFileRunner;
+class BThread;
 class BVersionString;
 
 typedef Char* PEFImagePtr;
@@ -145,7 +145,7 @@ typedef UInt8* BlobType;
 class BVersionString final
 {
 public:
-	static const CharacterTypeUTF16* The()
+	static const CharacterTypeUTF8* The()
 	{
 		return BOOTLOADER_VERSION;
 	}
@@ -284,7 +284,8 @@ private:
 		--partBlock.FreeCatalog;
 		--partBlock.FreeSectors;
 
-		writer.Write(L"newosldr: root directory: ").Write(blob->fFileName).Write(L"\r");
+		writer.Write(L"newosldr: Wrote directory: ").Write(blob->fFileName).Write(L"\r");
+		writer.Write(L"newosldr: disk formatted.\r");
 
 		CopyMem(catalogKind->Name, blob->fFileName, StrLen(blob->fFileName));
 
@@ -373,9 +374,6 @@ inline Boolean BDiskFormatFactory<BootDev>::Format(const char*							partName,
 		CopyMem(epmBoot->Name, reinterpret_cast<VoidPtr>(const_cast<Char*>(cBlockName)), StrLen(cBlockName));
 		CopyMem(epmBoot->Magic, reinterpret_cast<VoidPtr>(const_cast<Char*>(kEPMMagic)), StrLen(kEPMMagic));
 
-		BTextWriter writer;
-		writer.Write(L"newosldr: wrote partition with success.\r");
-
 		fDiskDev.Leak().mBase = kEpmBase;
 		fDiskDev.Leak().mSize = sectorSz;
 
diff --git a/dev/ZBA/BootKit/Thread.hxx b/dev/ZBA/BootKit/Thread.hxx
index 58b9683d..3946f6eb 100644
--- a/dev/ZBA/BootKit/Thread.hxx
+++ b/dev/ZBA/BootKit/Thread.hxx
@@ -14,20 +14,20 @@ namespace Boot
 {
 	using namespace Kernel;
 
-	class Thread;
+	class BThread;
 
 	/// @brief Program loader class
 	/// @package nl.zeta.boot.api
-	class Thread final
+	class BThread final
 	{
 	public:
-		explicit Thread() = delete;
-		~Thread()		 = default;
+		explicit BThread() = delete;
+		~BThread()		 = default;
 
-		explicit Thread(Kernel::VoidPtr blob);
+		explicit BThread(Kernel::VoidPtr blob);
 
-		Thread& operator=(const Thread&) = default;
-		Thread(const Thread&)			   = default;
+		BThread& operator=(const BThread&) = default;
+		BThread(const BThread&)			   = default;
 
 		void		Start(HEL::HandoverInformationHeader* handover);
 		const char* GetName();
@@ -35,7 +35,7 @@ namespace Boot
 		bool 		IsValid();
 
 	private:
-		Char	fBlobName[255] = { "Boot Thread" };
+		Char	fBlobName[255] = { "BootThread" };
 		VoidPtr fStartAddress{nullptr};
 		VoidPtr fBlob{nullptr};
 	};