[REFACTOR] use Char instead of builtin char.

Signed-off-by: Amlal El Mahrouss <amlal.elmahrouss@icloud.com>

33 files changed, 83 insertions, 84 deletions

diff --git a/dev/ZBA/BootKit/BootKit.hxx b/dev/ZBA/BootKit/BootKit.hxx
index c4d415f4..b81f2846 100644
--- a/dev/ZBA/BootKit/BootKit.hxx
+++ b/dev/ZBA/BootKit/BootKit.hxx
@@ -214,7 +214,7 @@ public:
 	/// @param Number of blobs.
 	/// @retval True disk has been formatted.
 	/// @retval False failed to format.
-	Boolean Format(const char* partName, BFileDescriptor* fileBlobs, SizeT blobCount);
+	Boolean Format(const Char* partName, BFileDescriptor* fileBlobs, SizeT blobCount);
 
 	/// @brief check if partition is good.
 	Bool IsPartitionValid() noexcept
@@ -236,7 +236,7 @@ public:
 				return false;
 		}
 
-		writer.Write(L"newosldr: disk size: ").Write(this->fDiskDev.GetDiskSize()).Write(L"\r");
+		writer.Write(L"newosldr: Disk size: ").Write(this->fDiskDev.GetDiskSize()).Write(L"\r");
 
 		if (blockPart->DiskSize != this->fDiskDev.GetDiskSize() ||
 			blockPart->DiskSize < 1 ||
@@ -250,7 +250,7 @@ public:
 			return false;
 		}
 
-		writer.Write(L"newosldr: partition name: ").Write(blockPart->PartitionName).Write(L" is healthy.\r");
+		writer.Write(L"newosldr: Partition name: ").Write(blockPart->PartitionName).Write(L" is healthy.\r");
 
 		return true;
 	}
@@ -285,7 +285,7 @@ private:
 		--partBlock.FreeSectors;
 
 		writer.Write(L"newosldr: Wrote directory: ").Write(blob->fFileName).Write(L"\r");
-		writer.Write(L"newosldr: disk formatted.\r");
+		writer.Write(L"newosldr: Disk formatted.\r");
 
 		CopyMem(catalogKind->Name, blob->fFileName, StrLen(blob->fFileName));
 
@@ -308,7 +308,7 @@ private:
 /// @retval True disk has been formatted.
 /// @retval False failed to format.
 template <typename BootDev>
-inline Boolean BDiskFormatFactory<BootDev>::Format(const char*							partName,
+inline Boolean BDiskFormatFactory<BootDev>::Format(const Char*							partName,
 												   BDiskFormatFactory::BFileDescriptor* fileBlobs,
 												   SizeT								blobCount)
 {
diff --git a/dev/ZKA/ArchKit/ArchKit.hxx b/dev/ZKA/ArchKit/ArchKit.hxx
index a3fd81a6..ba05e243 100644
--- a/dev/ZKA/ArchKit/ArchKit.hxx
+++ b/dev/ZKA/ArchKit/ArchKit.hxx
@@ -26,7 +26,7 @@
 
 namespace Kernel
 {
-	inline SSizeT rt_hash_seed(const char* seed, int mul)
+	inline SSizeT rt_hash_seed(const Char* seed, int mul)
 	{
 		SSizeT hash = 0;
 
diff --git a/dev/ZKA/HALKit/AMD64/HalACPIFactoryInterface.cxx b/dev/ZKA/HALKit/AMD64/HalACPIFactoryInterface.cxx
index 1fe14b4b..28b26223 100644
--- a/dev/ZKA/HALKit/AMD64/HalACPIFactoryInterface.cxx
+++ b/dev/ZKA/HALKit/AMD64/HalACPIFactoryInterface.cxx
@@ -62,7 +62,7 @@ namespace Kernel
 	}
 
 	/// @brief Finds a descriptor table inside ACPI XSDT.
-	ErrorOr<voidPtr> ACPIFactoryInterface::Find(const char* signature)
+	ErrorOr<voidPtr> ACPIFactoryInterface::Find(const Char* signature)
 	{
 		MUST_PASS(fRsdp);
 
@@ -128,7 +128,7 @@ namespace Kernel
 	@param checksum the header to checksum
 	@param len the length of it.
 */
-	bool ACPIFactoryInterface::Checksum(const char* checksum, SSizeT len)
+	bool ACPIFactoryInterface::Checksum(const Char* checksum, SSizeT len)
 	{
 		if (len == 0)
 			return -1;
diff --git a/dev/ZKA/HALKit/AMD64/HalDebugOutput.cxx b/dev/ZKA/HALKit/AMD64/HalDebugOutput.cxx
index d4e2b435..ee5bb2ea 100644
--- a/dev/ZKA/HALKit/AMD64/HalDebugOutput.cxx
+++ b/dev/ZKA/HALKit/AMD64/HalDebugOutput.cxx
@@ -62,7 +62,7 @@ namespace Kernel
 		}
 	} // namespace Detail
 
-	EXTERN_C void ke_io_write(const char* bytes)
+	EXTERN_C void ke_io_write(const Char* bytes)
 	{
 #ifdef __DEBUG__
 		Detail::hal_serial_init();
@@ -93,7 +93,7 @@ namespace Kernel
 #endif // __DEBUG__
 	}
 
-	EXTERN_C void ke_io_read(const char* bytes)
+	EXTERN_C void ke_io_read(const Char* bytes)
 	{
 #ifdef __DEBUG__
 		Detail::hal_serial_init();
diff --git a/dev/ZKA/HALKit/ARM64/HalKernelMain.cxx b/dev/ZKA/HALKit/ARM64/HalKernelMain.cxx
index ef955ba7..eb1f6385 100644
--- a/dev/ZKA/HALKit/ARM64/HalKernelMain.cxx
+++ b/dev/ZKA/HALKit/ARM64/HalKernelMain.cxx
@@ -90,7 +90,7 @@ EXTERN_C void hal_init_platform(
 	constexpr auto cLPCSanitizeMsg		 = 0x28;
 
 	kSyscalls[cSerialAlertInterrupt].Leak().Leak()->fProc = [](Kernel::VoidPtr rdx) -> void {
-		const char* msg = (const char*)rdx;
+		const Kernel::Char* msg = (const Kernel::Char*)rdx;
 		Kernel::kcout << "Kernel: " << msg << "\r";
 	};
 
diff --git a/dev/ZKA/KernelKit/CodeManager.hxx b/dev/ZKA/KernelKit/CodeManager.hxx
index 08e97e60..a1fea211 100644
--- a/dev/ZKA/KernelKit/CodeManager.hxx
+++ b/dev/ZKA/KernelKit/CodeManager.hxx
@@ -27,5 +27,5 @@ namespace Kernel
 	/// @note This sets up a new stack, anything on the main function that calls the kernel will not be accessible.
 	/// @param main the start of the process.
 	/// @return if the process was started or not.
-	bool execute_from_image(MainKind main, const char* processName) noexcept;
-} // namespace Kernel
\ No newline at end of file
+	bool execute_from_image(MainKind main, const Char* processName) noexcept;
+} // namespace Kernel
diff --git a/dev/ZKA/KernelKit/DebugOutput.hxx b/dev/ZKA/KernelKit/DebugOutput.hxx
index 2205acfe..b8fd97dd 100644
--- a/dev/ZKA/KernelKit/DebugOutput.hxx
+++ b/dev/ZKA/KernelKit/DebugOutput.hxx
@@ -45,8 +45,8 @@ namespace Kernel
 		virtual ~TerminalDevice() = default;
 
 		/// @brief returns device name (terminal name)
-		/// @return string type (const char*)
-		virtual const char* Name() const override
+		/// @return string type (const Char*)
+		virtual const Char* Name() const override
 		{
 			return ("TerminalDevice");
 		}
@@ -105,7 +105,7 @@ namespace Kernel
 			if (y < 0)
 				y = -y;
 
-			const char cNumbers[11] = "0123456789";
+			const Char cNumbers[11] = "0123456789";
 
 			Char buf[2];
 			buf[0] = cNumbers[h];
@@ -133,7 +133,7 @@ namespace Kernel
 			if (y < 0)
 				y = -y;
 
-			const char cNumbers[17] = "0123456789ABCDEF";
+			const Char cNumbers[17] = "0123456789ABCDEF";
 
 			Char buf[2];
 			buf[0] = cNumbers[h];
diff --git a/dev/ZKA/KernelKit/FileManager.hxx b/dev/ZKA/KernelKit/FileManager.hxx
index e27bcc35..0efb55a4 100644
--- a/dev/ZKA/KernelKit/FileManager.hxx
+++ b/dev/ZKA/KernelKit/FileManager.hxx
@@ -100,15 +100,15 @@ namespace Kernel
 		static FilesystemManagerInterface* GetMounted();
 
 	public:
-		virtual NodePtr Create(_Input const char* path)			 = 0;
-		virtual NodePtr CreateAlias(_Input const char* path)	 = 0;
-		virtual NodePtr CreateDirectory(_Input const char* path) = 0;
+		virtual NodePtr Create(_Input const Char* path)			 = 0;
+		virtual NodePtr CreateAlias(_Input const Char* path)	 = 0;
+		virtual NodePtr CreateDirectory(_Input const Char* path) = 0;
 
 	public:
-		virtual bool Remove(_Input const char* path) = 0;
+		virtual bool Remove(_Input const Char* path) = 0;
 
 	public:
-		virtual NodePtr Open(_Input const char* path, _Input const char* r) = 0;
+		virtual NodePtr Open(_Input const Char* path, _Input const Char* r) = 0;
 
 	public:
 		virtual Void Write(_Input NodePtr node, _Input VoidPtr data, _Input Int32 flags, _Input SizeT size) = 0;
@@ -245,7 +245,7 @@ namespace Kernel
 			return nullptr;
 		}
 
-		ErrorOr<Int64> WriteAll(const char* fName, const VoidPtr data) noexcept
+		ErrorOr<Int64> WriteAll(const Char* fName, const VoidPtr data) noexcept
 		{
 			if (this->fFileRestrict != eRestrictReadWrite &&
 				this->fFileRestrict != eRestrictReadWriteBinary &&
@@ -267,7 +267,7 @@ namespace Kernel
 			return ErrorOr<Int64>(kErrorInvalidData);
 		}
 
-		VoidPtr Read(const char* fName) noexcept
+		VoidPtr Read(const Char* fName) noexcept
 		{
 			if (this->fFileRestrict != eRestrictReadWrite &&
 				this->fFileRestrict != eRestrictReadWriteBinary &&
diff --git a/dev/ZKA/KernelKit/LoaderInterface.hxx b/dev/ZKA/KernelKit/LoaderInterface.hxx
index 7dcf41d4..ceb7d528 100644
--- a/dev/ZKA/KernelKit/LoaderInterface.hxx
+++ b/dev/ZKA/KernelKit/LoaderInterface.hxx
@@ -24,10 +24,10 @@ namespace Kernel
 		NEWOS_COPY_DEFAULT(LoaderInterface);
 
 	public:
-		virtual _Output const char* AsString()											= 0;
-		virtual _Output const char* MIME()														= 0;
-		virtual _Output const char* Path()														= 0;
+		virtual _Output const Char* AsString()											= 0;
+		virtual _Output const Char* MIME()														= 0;
+		virtual _Output const Char* Path()														= 0;
 		virtual _Output ErrorOr<VoidPtr> FindStart()											= 0;
-		virtual _Output VoidPtr			 FindSymbol(_Input const char* name, _Input Int32 kind) = 0;
+		virtual _Output VoidPtr			 FindSymbol(_Input const Char* name, _Input Int32 kind) = 0;
 	};
 } // namespace Kernel
diff --git a/dev/ZKA/KernelKit/PEFCodeManager.hxx b/dev/ZKA/KernelKit/PEFCodeManager.hxx
index 325ca9a3..db01d23c 100644
--- a/dev/ZKA/KernelKit/PEFCodeManager.hxx
+++ b/dev/ZKA/KernelKit/PEFCodeManager.hxx
@@ -34,13 +34,13 @@ namespace Kernel
 		NEWOS_COPY_DEFAULT(PEFLoader);
 
 	public:
-		const char* Path() override;
-		const char* AsString() override;
-		const char* MIME() override;
+		const Char* Path() override;
+		const Char* AsString() override;
+		const Char* MIME() override;
 
 	public:
 		ErrorOr<VoidPtr> FindStart() override;
-		VoidPtr			 FindSymbol(const char* name, Int32 kind) override;
+		VoidPtr			 FindSymbol(const Char* name, Int32 kind) override;
 
 	public:
 		bool IsLoaded() noexcept;
diff --git a/dev/ZKA/KernelKit/PEFSharedObject.hxx b/dev/ZKA/KernelKit/PEFSharedObject.hxx
index 2ce87c1d..690f0b5d 100644
--- a/dev/ZKA/KernelKit/PEFSharedObject.hxx
+++ b/dev/ZKA/KernelKit/PEFSharedObject.hxx
@@ -83,7 +83,7 @@ namespace Kernel
 		};
 
 		template <typename SymbolType>
-		SymbolType Load(const char* symbol_name, SizeT len, Int32 kind)
+		SymbolType Load(const Char* symbol_name, SizeT len, Int32 kind)
 		{
 			if (symbol_name == nullptr || *symbol_name == 0)
 				return nullptr;
@@ -115,4 +115,3 @@ namespace Kernel
 } // namespace Kernel
 
 #endif /* ifndef __KERNELKIT_SHARED_OBJECT_HXX__ */
-
diff --git a/dev/ZKA/KernelKit/ProcessHeap.hxx b/dev/ZKA/KernelKit/ProcessHeap.hxx
index b6b6352c..820daa76 100644
--- a/dev/ZKA/KernelKit/ProcessHeap.hxx
+++ b/dev/ZKA/KernelKit/ProcessHeap.hxx
@@ -33,9 +33,9 @@ namespace Kernel
 
 	/// @brief Allocate a process heap, no zero out is done here.
 	/// @param flags the heap's flags.
-	/// @param len_in_gib the heap in GB.
+	/// @param initial_len_in_gib the initial heap's length in GB.
 	/// @return The process's heap.
-	VoidPtr sched_new_heap(Int32 flags, SizeT len_in_gib);
+	VoidPtr sched_new_heap(Int32 flags, SizeT initial_len_in_gib);
 
 	/// @brief Frees the process heap.
 	/// @param pointer The process heap pointer.
diff --git a/dev/ZKA/Modules/ACPI/ACPIFactoryInterface.hxx b/dev/ZKA/Modules/ACPI/ACPIFactoryInterface.hxx
index 6405dc1b..a8f22c10 100644
--- a/dev/ZKA/Modules/ACPI/ACPIFactoryInterface.hxx
+++ b/dev/ZKA/Modules/ACPI/ACPIFactoryInterface.hxx
@@ -36,16 +36,16 @@ namespace Kernel
 		/// @brief Descriptor find factory.
 		/// @param signature The signature of the descriptor table (MADT, ACPI...)
 		/// @return the blob inside an ErrorOr object.
-		ErrorOr<voidPtr> Find(const char* signature);
+		ErrorOr<voidPtr> Find(const Char* signature);
 
 		/// @brief Checksum factory.
 		/// @param checksum the data to checksum
 		/// @param len it's size
 		/// @return if it succeed
-		bool Checksum(const char* checksum, SSizeT len); // watch for collides!
+		bool Checksum(const Char* checksum, SSizeT len); // watch for collides!
 
 	public:
-		ErrorOr<voidPtr> operator[](const char* signature)
+		ErrorOr<voidPtr> operator[](const Char* signature)
 		{
 			return this->Find(signature);
 		}
diff --git a/dev/ZKA/NetworkKit/IP.hxx b/dev/ZKA/NetworkKit/IP.hxx
index 6003021e..70d9fd76 100644
--- a/dev/ZKA/NetworkKit/IP.hxx
+++ b/dev/ZKA/NetworkKit/IP.hxx
@@ -78,6 +78,6 @@ namespace Kernel
 	public:
 		static ErrorOr<StringView> ToStringView(Ref<RawIPAddress6>& ipv6);
 		static ErrorOr<StringView> ToStringView(Ref<RawIPAddress>& ipv4);
-		static bool				   IpCheckVersion4(const char* ip);
+		static bool				   IpCheckVersion4(const Char* ip);
 	};
 } // namespace Kernel
diff --git a/dev/ZKA/NetworkKit/NetworkDevice.hxx b/dev/ZKA/NetworkKit/NetworkDevice.hxx
index 79c74459..c307a433 100644
--- a/dev/ZKA/NetworkKit/NetworkDevice.hxx
+++ b/dev/ZKA/NetworkKit/NetworkDevice.hxx
@@ -34,8 +34,8 @@ namespace Kernel
 		NetworkDevice(const NetworkDevice&)			   = default;
 
 	public:
-		const char* Name() const override;
-		Boolean		Name(const char* strView);
+		const Char* Name() const override;
+		Boolean		Name(const Char* strView);
 
 	private:
 		static constexpr auto cNetworkNameLen = 512;
diff --git a/dev/ZKA/NewKit/KernelCheck.hxx b/dev/ZKA/NewKit/KernelCheck.hxx
index 78d7506f..d1946e9a 100644
--- a/dev/ZKA/NewKit/KernelCheck.hxx
+++ b/dev/ZKA/NewKit/KernelCheck.hxx
@@ -11,7 +11,7 @@
 
 namespace Kernel
 {
-	void ke_runtime_check(bool bExpression, const char* file, const char* line);
+	void ke_runtime_check(bool bExpression, const Char* file, const Char* line);
 }
 
 #define MUST_PASS_COMPILER(EXPR, MSG) static_assert(EXPR, MSG)
diff --git a/dev/ZKA/NewKit/String.hxx b/dev/ZKA/NewKit/String.hxx
index 5d9ebd21..8c4986ec 100644
--- a/dev/ZKA/NewKit/String.hxx
+++ b/dev/ZKA/NewKit/String.hxx
@@ -79,9 +79,9 @@ namespace Kernel
 	struct StringBuilder final
 	{
 		static ErrorOr<StringView> Construct(const Char* data);
-		static const char*		   FromInt(const Char* fmt, int n);
-		static const char*		   FromBool(const Char* fmt, bool n);
-		static const char*		   Format(const Char* fmt, const Char* from);
+		static const Char*		   FromInt(const Char* fmt, int n);
+		static const Char*		   FromBool(const Char* fmt, bool n);
+		static const Char*		   Format(const Char* fmt, const Char* from);
 		static bool				   Equals(const Char* lhs, const Char* rhs);
 		static bool				   Equals(const WideChar* lhs, const WideChar* rhs);
 	};
diff --git a/dev/ZKA/NewKit/Utils.hxx b/dev/ZKA/NewKit/Utils.hxx
index a7213b5a..38f44f70 100644
--- a/dev/ZKA/NewKit/Utils.hxx
+++ b/dev/ZKA/NewKit/Utils.hxx
@@ -24,6 +24,6 @@ namespace Kernel
 	Boolean		is_space(Char chr);
 	Int			rt_to_uppercase(Int c);
 	Int			rt_to_lower(Int c);
-	voidPtr		rt_string_in_string(const char* in, const char* needle);
-	char*		rt_string_has_char(char* str, const char chr);
+	voidPtr		rt_string_in_string(const Char* in, const Char* needle);
+	char*		rt_string_has_char(Char* str, const Char chr);
 } // namespace Kernel
diff --git a/dev/ZKA/Sources/CodeManager.cxx b/dev/ZKA/Sources/CodeManager.cxx
index c0d1d308..ae4354c8 100644
--- a/dev/ZKA/Sources/CodeManager.cxx
+++ b/dev/ZKA/Sources/CodeManager.cxx
@@ -14,7 +14,7 @@ namespace Kernel
 	/// @note This sets up a new stack, anything on the main function that calls the kernel will not be accessible.
 	/// @param main the start of the process.
 	/// @return if the process was started or not.
-	bool execute_from_image(MainKind main, const char* processName) noexcept
+	bool execute_from_image(MainKind main, const Char* processName) noexcept
 	{
 		if (!main)
 			return false;
diff --git a/dev/ZKA/Sources/KernelCheck.cxx b/dev/ZKA/Sources/KernelCheck.cxx
index 27519369..6a900039 100644
--- a/dev/ZKA/Sources/KernelCheck.cxx
+++ b/dev/ZKA/Sources/KernelCheck.cxx
@@ -126,7 +126,7 @@ namespace Kernel
 		}
 	}
 
-	void ke_runtime_check(bool expr, const char* file, const char* line)
+	void ke_runtime_check(bool expr, const Char* file, const Char* line)
 	{
 		if (!expr)
 		{
diff --git a/dev/ZKA/Sources/Network/IP.cxx b/dev/ZKA/Sources/Network/IP.cxx
index 3e5462a1..77571bc7 100644
--- a/dev/ZKA/Sources/Network/IP.cxx
+++ b/dev/ZKA/Sources/Network/IP.cxx
@@ -102,7 +102,7 @@ namespace Kernel
 		return str;
 	}
 
-	bool IPFactory::IpCheckVersion4(const char* ip)
+	bool IPFactory::IpCheckVersion4(const Char* ip)
 	{
 		int cnter = 0;
 
diff --git a/dev/ZKA/Sources/Network/NetworkDevice.cxx b/dev/ZKA/Sources/Network/NetworkDevice.cxx
index 1bcd9e24..afb3e468 100644
--- a/dev/ZKA/Sources/Network/NetworkDevice.cxx
+++ b/dev/ZKA/Sources/Network/NetworkDevice.cxx
@@ -10,13 +10,13 @@
 namespace Kernel
 {
 	/// \brief Getter for fNetworkName.
-	const char* NetworkDevice::Name() const
+	const Char* NetworkDevice::Name() const
 	{
 		return this->fNetworkName;
 	}
 
 	/// \brief Setter for fNetworkName.
-	Boolean NetworkDevice::Name(const char* strView)
+	Boolean NetworkDevice::Name(const Char* strView)
 	{
 		if (strView == nullptr)
 			return false;
diff --git a/dev/ZKA/Sources/NewFS+FileManager.cxx b/dev/ZKA/Sources/NewFS+FileManager.cxx
index 36a0e984..e40e98aa 100644
--- a/dev/ZKA/Sources/NewFS+FileManager.cxx
+++ b/dev/ZKA/Sources/NewFS+FileManager.cxx
@@ -36,7 +36,7 @@ namespace Kernel
 	/// @brief Removes a node from the filesystem.
 	/// @param fileName The filename
 	/// @return If it was deleted or not.
-	bool NewFilesystemManager::Remove(const char* fileName)
+	bool NewFilesystemManager::Remove(const Char* fileName)
 	{
 		if (fileName == nullptr || *fileName == 0)
 			return false;
@@ -47,7 +47,7 @@ namespace Kernel
 	/// @brief Creates a node with the specified.
 	/// @param path The filename path.
 	/// @return The Node pointer.
-	NodePtr NewFilesystemManager::Create(const char* path)
+	NodePtr NewFilesystemManager::Create(const Char* path)
 	{
 		return node_cast(fImpl->CreateCatalog(path));
 	}
@@ -55,7 +55,7 @@ namespace Kernel
 	/// @brief Creates a node with is a directory.
 	/// @param path The filename path.
 	/// @return The Node pointer.
-	NodePtr NewFilesystemManager::CreateDirectory(const char* path)
+	NodePtr NewFilesystemManager::CreateDirectory(const Char* path)
 	{
 		return node_cast(fImpl->CreateCatalog(path, 0, kNewFSCatalogKindDir));
 	}
@@ -63,35 +63,35 @@ namespace Kernel
 	/// @brief Creates a node with is a alias.
 	/// @param path The filename path.
 	/// @return The Node pointer.
-	NodePtr NewFilesystemManager::CreateAlias(const char* path)
+	NodePtr NewFilesystemManager::CreateAlias(const Char* path)
 	{
 		return node_cast(fImpl->CreateCatalog(path, 0, kNewFSCatalogKindAlias));
 	}
 
 	/// @brief Gets the root directory.
 	/// @return
-	const char* NewFilesystemHelper::Root()
+	const Char* NewFilesystemHelper::Root()
 	{
 		return kNewFSRoot;
 	}
 
 	/// @brief Gets the up-dir directory.
 	/// @return
-	const char* NewFilesystemHelper::UpDir()
+	const Char* NewFilesystemHelper::UpDir()
 	{
 		return kNewFSUpDir;
 	}
 
 	/// @brief Gets the separator character.
 	/// @return
-	const char NewFilesystemHelper::Separator()
+	const Char NewFilesystemHelper::Separator()
 	{
 		return kNewFSSeparator;
 	}
 
 	/// @brief Gets the metafile character.
 	/// @return
-	const char NewFilesystemHelper::MetaFile()
+	const Char NewFilesystemHelper::MetaFile()
 	{
 		return kNewFSMetaFilePrefix;
 	}
diff --git a/dev/ZKA/Sources/PEFCodeManager.cxx b/dev/ZKA/Sources/PEFCodeManager.cxx
index d557cc2f..746b75eb 100644
--- a/dev/ZKA/Sources/PEFCodeManager.cxx
+++ b/dev/ZKA/Sources/PEFCodeManager.cxx
@@ -100,7 +100,7 @@ namespace Kernel
 		fFile.Delete();
 	}
 
-	VoidPtr PEFLoader::FindSymbol(const char* name, Int32 kind)
+	VoidPtr PEFLoader::FindSymbol(const Char* name, Int32 kind)
 	{
 		if (!fCachedBlob || fBad)
 			return nullptr;
@@ -115,7 +115,7 @@ namespace Kernel
 		PEFCommandHeader* container_header = reinterpret_cast<PEFCommandHeader*>(blob);
 
 		constexpr auto cMangleCharacter	 = '$';
-		const char*	   cContainerKinds[] = {".code64", ".data64", ".zero64", nullptr};
+		const Char*	   cContainerKinds[] = {".code64", ".data64", ".zero64", nullptr};
 
 		ErrorOr<StringView> errOrSym;
 
@@ -214,12 +214,12 @@ namespace Kernel
 		}
 	} // namespace Utils
 
-	const char* PEFLoader::Path()
+	const Char* PEFLoader::Path()
 	{
 		return fPath.Leak().CData();
 	}
 
-	const char* PEFLoader::AsString()
+	const Char* PEFLoader::AsString()
 	{
 #ifdef __32x0__
 		return "32x0 PEF format.";
@@ -234,7 +234,7 @@ namespace Kernel
 #endif // __32x0__ || __64x0__ || __x86_64__ || __powerpc64__
 	}
 
-	const char* PEFLoader::MIME()
+	const Char* PEFLoader::MIME()
 	{
 		return kPefApplicationMime;
 	}
diff --git a/dev/ZKA/Sources/ProcessScheduler.cxx b/dev/ZKA/Sources/ProcessScheduler.cxx
index c5933ed8..3fb82067 100644
--- a/dev/ZKA/Sources/ProcessScheduler.cxx
+++ b/dev/ZKA/Sources/ProcessScheduler.cxx
@@ -93,12 +93,12 @@ namespace Kernel
 			}
 
 			this->HeapCursor = reinterpret_cast<VoidPtr>((UIntPtr)this->HeapCursor + (sizeof(sz)));
-			VoidPtr ptr		 = this->HeapCursor;
+			VoidPtr cursor	 = this->HeapCursor;
 
 			++this->UsedMemory;
 			--this->FreeMemory;
 
-			return ptr;
+			return cursor;
 		}
 
 		return nullptr;
diff --git a/dev/ZKA/Sources/Storage/AHCIDeviceInterface.cxx b/dev/ZKA/Sources/Storage/AHCIDeviceInterface.cxx
index dde33193..cfb80c0f 100644
--- a/dev/ZKA/Sources/Storage/AHCIDeviceInterface.cxx
+++ b/dev/ZKA/Sources/Storage/AHCIDeviceInterface.cxx
@@ -29,7 +29,7 @@ AHCIDeviceInterface::~AHCIDeviceInterface()
 
 /// @brief Returns the name of the device interface.
 /// @return it's name as a string.
-const char* AHCIDeviceInterface::Name() const
+const Char* AHCIDeviceInterface::Name() const
 {
 	return "AHCIDeviceInterface";
 }
diff --git a/dev/ZKA/Sources/Storage/ATADeviceInterface.cxx b/dev/ZKA/Sources/Storage/ATADeviceInterface.cxx
index 1611e790..183481e1 100644
--- a/dev/ZKA/Sources/Storage/ATADeviceInterface.cxx
+++ b/dev/ZKA/Sources/Storage/ATADeviceInterface.cxx
@@ -30,7 +30,7 @@ ATADeviceInterface::~ATADeviceInterface()
 
 /// @brief Returns the name of the device interface.
 /// @return it's name as a string.
-const char* ATADeviceInterface::Name() const
+const Char* ATADeviceInterface::Name() const
 {
 	return "ATADeviceInterface";
 }
diff --git a/dev/ZKA/Sources/Storage/NVMEDeviceInterface.cxx b/dev/ZKA/Sources/Storage/NVMEDeviceInterface.cxx
index 7d07bf4b..5809a5e6 100644
--- a/dev/ZKA/Sources/Storage/NVMEDeviceInterface.cxx
+++ b/dev/ZKA/Sources/Storage/NVMEDeviceInterface.cxx
@@ -21,7 +21,7 @@ namespace Kernel
 			fCleanup();
 	}
 
-	const char* NVMEDeviceInterface::Name() const
+	const Char* NVMEDeviceInterface::Name() const
 	{
 		return ("NVMEDeviceInterface");
 	}
diff --git a/dev/ZKA/Sources/String.cxx b/dev/ZKA/Sources/String.cxx
index 8c928aa5..2681dddd 100644
--- a/dev/ZKA/Sources/String.cxx
+++ b/dev/ZKA/Sources/String.cxx
@@ -93,7 +93,7 @@ namespace Kernel
 		return ErrorOr<StringView>(view);
 	}
 
-	const char* StringBuilder::FromInt(const char* fmt, int i)
+	const Char* StringBuilder::FromInt(const Char* fmt, int i)
 	{
 		if (!fmt)
 			return ("-1");
@@ -134,12 +134,12 @@ namespace Kernel
 		return ret; /* Copy that ret into a buffer, 'ALLOCA' allocates to the stack */
 	}
 
-	const char* StringBuilder::FromBool(const char* fmt, bool i)
+	const Char* StringBuilder::FromBool(const Char* fmt, bool i)
 	{
 		if (!fmt)
 			return ("?");
 
-		const char* boolean_expr = i ? "true" : "false";
+		const Char* boolean_expr = i ? "true" : "false";
 		char*		ret			 = (char*)ALLOCA((sizeof(char) * i) ? 4 : 5 + rt_string_len(fmt));
 
 		if (!ret)
@@ -169,7 +169,7 @@ namespace Kernel
 		return ret;
 	}
 
-	bool StringBuilder::Equals(const char* lhs, const char* rhs)
+	bool StringBuilder::Equals(const Char* lhs, const Char* rhs)
 	{
 		if (rt_string_len(rhs) != rt_string_len(lhs))
 			return false;
@@ -194,7 +194,7 @@ namespace Kernel
 		return true;
 	}
 
-	const char* StringBuilder::Format(const char* fmt, const char* fmt2)
+	const Char* StringBuilder::Format(const Char* fmt, const Char* fmt2)
 	{
 		if (!fmt || !fmt2)
 			return ("?");
diff --git a/dev/ZKA/Sources/Utils.cxx b/dev/ZKA/Sources/Utils.cxx
index 5673c5fd..1557ce7d 100644
--- a/dev/ZKA/Sources/Utils.cxx
+++ b/dev/ZKA/Sources/Utils.cxx
@@ -66,7 +66,7 @@ namespace Kernel
 	{
 		if (!src || len < 1)
 			return nullptr;
-			
+
 		char* start = reinterpret_cast<Char*>(src);
 
 		while (len)
@@ -184,7 +184,7 @@ namespace Kernel
 		return chr == '\n';
 	}
 
-	voidPtr rt_string_in_string(const char* in, const char* needle)
+	voidPtr rt_string_in_string(const Char* in, const Char* needle)
 	{
 		for (SizeT i = 0; i < rt_string_len(in); ++i)
 		{
@@ -197,7 +197,7 @@ namespace Kernel
 
 	// @brief Checks for a string start at the character.
 
-	char* rt_string_has_char(char* str, const char chr)
+	char* rt_string_has_char(char* str, const Char chr)
 	{
 		while (*str != chr)
 		{
@@ -237,7 +237,7 @@ EXTERN_C void* memmove(void* dst, void* src, Kernel::SizeT len)
 }
 
 /// @brief strlen definition in C++.
-EXTERN_C Kernel::SizeT strlen(const char* whatToCheck)
+EXTERN_C Kernel::SizeT strlen(const Char* whatToCheck)
 {
 	return Kernel::rt_string_len(whatToCheck);
 }
@@ -254,4 +254,4 @@ EXTERN_C Kernel::SizeT strcmp(char* dst, char* src, Kernel::SizeT len)
 	return Kernel::rt_string_cmp(src, dst, len);
 }
 
-#endif // __FREESTANDING__
\ No newline at end of file
+#endif // __FREESTANDING__
diff --git a/dev/ZKA/StorageKit/AHCI.hxx b/dev/ZKA/StorageKit/AHCI.hxx
index 81d0c5bf..3e9567a5 100644
--- a/dev/ZKA/StorageKit/AHCI.hxx
+++ b/dev/ZKA/StorageKit/AHCI.hxx
@@ -25,7 +25,7 @@ namespace Kernel
 		AHCIDeviceInterface& operator=(const AHCIDeviceInterface&) = default;
 		AHCIDeviceInterface(const AHCIDeviceInterface&)			   = default;
 
-		const char* Name() const override;
+		const Char* Name() const override;
 
 	private:
 		void (*fCleanup)(void) = {nullptr};
diff --git a/dev/ZKA/StorageKit/ATA.hxx b/dev/ZKA/StorageKit/ATA.hxx
index 23437ca8..da2988e5 100644
--- a/dev/ZKA/StorageKit/ATA.hxx
+++ b/dev/ZKA/StorageKit/ATA.hxx
@@ -31,7 +31,7 @@ namespace Kernel
 		ATADeviceInterface& operator=(const ATADeviceInterface&) = default;
 		ATADeviceInterface(const ATADeviceInterface&)			 = default;
 
-		const char* Name() const override;
+		const Char* Name() const override;
 
 	private:
 		void (*fCleanup)(void) = { nullptr };
diff --git a/dev/ZKA/StorageKit/NVME.hxx b/dev/ZKA/StorageKit/NVME.hxx
index 9d42ce9d..c0231f57 100644
--- a/dev/ZKA/StorageKit/NVME.hxx
+++ b/dev/ZKA/StorageKit/NVME.hxx
@@ -25,7 +25,7 @@ namespace Kernel
 		NVMEDeviceInterface& operator=(const NVMEDeviceInterface&) = default;
 		NVMEDeviceInterface(const NVMEDeviceInterface&)			   = default;
 
-		const char* Name() const override;
+		const Char* Name() const override;
 
 	public:
 		OwnPtr<MountpointInterface*> operator()(UInt32 dmaLow, UInt32 dmaHigh, SizeT sz);