feat: Improve libSystem's architecture and implementation.

fix: Fix NeKit's Ref, and ErrorOr classes.

fix: Fix userland tools.

next:

 - Finish the latest tickets and then release nekernel 0.0.3

Signed-off-by: Amlal El Mahrouss <amlal@nekernel.org>

26 files changed, 101 insertions, 102 deletions

diff --git a/dev/kernel/HALKit/AMD64/HalSchedulerCorePrimitives.cc b/dev/kernel/HALKit/AMD64/HalSchedulerCorePrimitives.cc
index 0c468e14..1dbce4ac 100644
--- a/dev/kernel/HALKit/AMD64/HalSchedulerCorePrimitives.cc
+++ b/dev/kernel/HALKit/AMD64/HalSchedulerCorePrimitives.cc
@@ -22,7 +22,7 @@ EXTERN_C Void __zka_pure_call(USER_PROCESS* process) {
 /// @param stack_ptr the frame pointer.
 /***********************************************************************************/
 
-EXTERN_C Bool hal_check_stack(HAL::StackFramePtr stack_ptr) {
+EXTERN_C Bool hal_check_task(HAL::StackFramePtr stack_ptr) {
   if (!stack_ptr) return No;
 
   return stack_ptr->SP != 0 && stack_ptr->IP != 0;
diff --git a/dev/kernel/HALKit/ARM64/HalSchedulerCorePrimitives.cc b/dev/kernel/HALKit/ARM64/HalSchedulerCorePrimitives.cc
index ee286639..10f95e29 100644
--- a/dev/kernel/HALKit/ARM64/HalSchedulerCorePrimitives.cc
+++ b/dev/kernel/HALKit/ARM64/HalSchedulerCorePrimitives.cc
@@ -22,7 +22,7 @@ EXTERN_C Void __zka_pure_call(USER_PROCESS* process) {
 /// @param stack_ptr the frame pointer.

 /***********************************************************************************/

 

-EXTERN_C Bool hal_check_stack(HAL::StackFramePtr stack_ptr) {

+EXTERN_C Bool hal_check_task(HAL::StackFramePtr stack_ptr) {

   if (!stack_ptr) return No;

 

   return stack_ptr->SP != 0 && stack_ptr->IP != 0;

diff --git a/dev/kernel/KernelKit/DeviceMgr.h b/dev/kernel/KernelKit/DeviceMgr.h
index 7c7b9da3..0a21710d 100644
--- a/dev/kernel/KernelKit/DeviceMgr.h
+++ b/dev/kernel/KernelKit/DeviceMgr.h
@@ -41,6 +41,8 @@ class IOBuf;
 template <typename T>
 class IDeviceObject {
  public:
+  IDeviceObject() = default;
+  
   explicit IDeviceObject(void (*Out)(IDeviceObject<T>*, T), void (*In)(IDeviceObject<T>*, T))
       : fOut(Out), fIn(In) {}
 
diff --git a/dev/kernel/NeKit/ErrorOr.h b/dev/kernel/NeKit/ErrorOr.h
index d7751b7e..5e983d09 100644
--- a/dev/kernel/NeKit/ErrorOr.h
+++ b/dev/kernel/NeKit/ErrorOr.h
@@ -18,13 +18,13 @@ using ErrorT = UInt;
 template <typename T>
 class ErrorOr final {
  public:
-  ErrorOr()  = default;
+  explicit ErrorOr()  = default;
   ~ErrorOr() = default;
 
  public:
-  explicit ErrorOr(Int32 err) : mId(err) {}
+  explicit ErrorOr(Int32 err) : mRef((T*)RTL_ALLOCA(sizeof(T))), mId(err) {}
 
-  explicit ErrorOr(nullPtr Null) {}
+  explicit ErrorOr(nullPtr) {}
 
   explicit ErrorOr(T* Class) : mRef(Class) {}
 
@@ -48,7 +48,7 @@ class ErrorOr final {
 
  private:
   Ref<T> mRef;
-  UInt32 mId{0};
+  Int32 mId{0};
 };
 
 using ErrorOrAny = ErrorOr<voidPtr>;
diff --git a/dev/kernel/NeKit/Ref.h b/dev/kernel/NeKit/Ref.h
index 9920aa6f..9380bab4 100644
--- a/dev/kernel/NeKit/Ref.h
+++ b/dev/kernel/NeKit/Ref.h
@@ -11,46 +11,39 @@
 #include <KernelKit/HeapMgr.h>
 #include <NeKit/Defines.h>
 #include <NeKit/KernelPanic.h>
+#include <CompilerKit/CompilerKit.h>
 
 namespace Kernel {
 template <typename T>
 class Ref final {
  public:
-  Ref() = default;
-
-  ~Ref() {
-    if (mm_is_valid_ptr(fClass)) delete fClass;
-  }
+  explicit Ref() = default;
+  ~Ref() = default;
 
  public:
-  Ref(T* cls) : fClass(cls) {}
-
-  Ref(T cls) : fClass(nullptr) { fClass = &cls; }
+  Ref(T* cls) : fClass(*cls) {}
+  Ref(T cls) : fClass(cls) {}
 
   Ref& operator=(T ref) {
-    fClass = &ref;
+    fClass = ref;
     return *this;
   }
 
+  NE_COPY_DEFAULT(Ref);
+
  public:
-  T operator->() const {
-    MUST_PASS(*fClass);
-    return *fClass;
-  }
+  T operator->() const { return fClass; }
 
-  T& Leak() noexcept { return *fClass; }
+  T& Leak() noexcept { return fClass; }
 
-  T& TryLeak() const noexcept {
-    MUST_PASS(*fClass);
-    return *fClass;
-  }
+  T& TryLeak() const noexcept { return fClass; }
 
-  T operator*() { return *fClass; }
+  T operator*() { return fClass; }
 
-  operator bool() noexcept { return fClass; }
+  operator bool() noexcept { return true; }
 
  private:
-  T* fClass{nullptr};
+  T fClass;
 };
 
 template <typename T>
@@ -70,7 +63,7 @@ class NonNullRef final {
   NonNullRef(const NonNullRef<T>& ref)            = default;
 
  private:
-  Ref<T> fRef{nullptr};
+  Ref<T> fRef{};
 };
 }  // namespace Kernel
 
diff --git a/dev/kernel/src/HardwareThreadScheduler.cc b/dev/kernel/src/HardwareThreadScheduler.cc
index 78bad9d6..e3255326 100644
--- a/dev/kernel/src/HardwareThreadScheduler.cc
+++ b/dev/kernel/src/HardwareThreadScheduler.cc
@@ -20,7 +20,7 @@ namespace Kernel {
 /// @note Those symbols are needed in order to switch and validate the stack.
 /***********************************************************************************/
 
-EXTERN_C Bool hal_check_stack(HAL::StackFramePtr frame);
+EXTERN_C Bool hal_check_task(HAL::StackFramePtr frame);
 EXTERN_C Bool mp_register_task(HAL::StackFramePtr frame, ProcessID pid);
 
 STATIC HardwareThreadScheduler kHardwareThreadScheduler;
@@ -96,7 +96,7 @@ Bool HardwareThread::Switch(HAL::StackFramePtr frame) {
     return NO;
   }
 
-  if (!hal_check_stack(frame)) {
+  if (!hal_check_task(frame)) {
     return NO;
   }
 
diff --git a/dev/kernel/src/KString.cc b/dev/kernel/src/KString.cc
index 9f332cdf..f5732280 100644
--- a/dev/kernel/src/KString.cc
+++ b/dev/kernel/src/KString.cc
@@ -64,7 +64,7 @@ bool KString::operator!=(const Char* rhs) const {
 }
 
 ErrorOr<KString> KStringBuilder::Construct(const Char* data) {
-  if (!data || *data == 0) return {};
+  if (!data || *data == 0) return ErrorOr<KString>(new KString(0));
 
   KString* view = new KString(rt_string_len(data));
   (*view) += data;
diff --git a/dev/kernel/src/Pmm.cc b/dev/kernel/src/Pmm.cc
index b9fba20e..7f5050f9 100644
--- a/dev/kernel/src/Pmm.cc
+++ b/dev/kernel/src/Pmm.cc
@@ -35,7 +35,7 @@ Ref<PTEWrapper> Pmm::RequestPage(Boolean user, Boolean readWrite) {
 
   if (pt.fPresent) {
     kout << "[PMM]: Allocation failed.\r";
-    return {};
+    return {pt};
   }
 
   return Ref<PTEWrapper>(pt);
diff --git a/dev/libSystem/AsmProc.h b/dev/libSystem/AsmProc.h
deleted file mode 100644
index b707d533..00000000
--- a/dev/libSystem/AsmProc.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/* -------------------------------------------
-
-  Copyright (C) 2025, Amlal El Mahrouss, all rights reserved.
-
-------------------------------------------- */
-
-#pragma once
-
-#include <libSystem/System.h>
-#include <cstdarg>
-
-IMPORT_C VoidPtr sci_syscall_arg_1(SizeT id);
-IMPORT_C VoidPtr sci_syscall_arg_2(SizeT id, VoidPtr arg1);
-IMPORT_C VoidPtr sci_syscall_arg_3(SizeT id, VoidPtr arg1, VoidPtr arg3);
-IMPORT_C VoidPtr sci_syscall_arg_4(SizeT id, VoidPtr arg1, VoidPtr arg3, VoidPtr arg4);
diff --git a/dev/libSystem/Codes.h b/dev/libSystem/Err.h
index 0451df64..e9fe013b 100644
--- a/dev/libSystem/Codes.h
+++ b/dev/libSystem/Err.h
@@ -8,7 +8,7 @@
 
 #include <libSystem/Macros.h>
 
-/// @file Codes.h
+/// @file Err.h
 /// @brief Process Codes type and values.
 /// @author Amlal El Mahrouss (amlal@nekernel.org)
 
diff --git a/dev/libSystem/SecurityPolicy.h b/dev/libSystem/Jail.h
index 812f52e2..6a9259fc 100644
--- a/dev/libSystem/SecurityPolicy.h
+++ b/dev/libSystem/Jail.h
@@ -8,5 +8,8 @@
 
 #include <libSystem/System.h>
 
-/// @file SecurityPolicy.h
-/// @brief Hardened Security Policy, used to restrict access to certain system calls.
\ No newline at end of file
+/// @file Jail.h
+/// @brief NeKernel Jail System
+
+struct JAIL_INFO;
+struct JAIL;
\ No newline at end of file
diff --git a/dev/libSystem/Macros.h b/dev/libSystem/Macros.h
index 52dc904c..5b3a5ce1 100644
--- a/dev/libSystem/Macros.h
+++ b/dev/libSystem/Macros.h
@@ -64,19 +64,19 @@ typedef char             Char;
 typedef decltype(nullptr) nullPtr;
 typedef nullPtr           NullPtr;
 
-#define SCI_COPY_DELETE(KLASS)             \
+#define LIBSYS_COPY_DELETE(KLASS)             \
   KLASS& operator=(const KLASS&) = delete; \
   KLASS(const KLASS&)            = delete;
 
-#define SCI_COPY_DEFAULT(KLASS)             \
+#define LIBSYS_COPY_DEFAULT(KLASS)             \
   KLASS& operator=(const KLASS&) = default; \
   KLASS(const KLASS&)            = default;
 
-#define SCI_MOVE_DELETE(KLASS)        \
+#define LIBSYS_MOVE_DELETE(KLASS)        \
   KLASS& operator=(KLASS&&) = delete; \
   KLASS(KLASS&&)            = delete;
 
-#define SCI_MOVE_DEFAULT(KLASS)        \
+#define LIBSYS_MOVE_DEFAULT(KLASS)        \
   KLASS& operator=(KLASS&&) = default; \
   KLASS(KLASS&&)            = default;
 
@@ -123,4 +123,4 @@ IMPORT_C void _rtl_assert(Bool expr, const Char* origin);
 #define tib_cast(X) ((UInt64) gib_cast(X) * 1024)
 #endif
 
-#define SCI_UNUSED(X) ((void) X)
+#define LIBSYS_UNUSED(X) ((void) X)
diff --git a/dev/libSystem/Syscall.h b/dev/libSystem/Syscall.h
new file mode 100644
index 00000000..21f8287c
--- /dev/null
+++ b/dev/libSystem/Syscall.h
@@ -0,0 +1,19 @@
+/* -------------------------------------------
+
+  Copyright (C) 2025, Amlal El Mahrouss, all rights reserved.
+
+------------------------------------------- */
+
+#pragma once
+
+#include <libSystem/System.h>
+#include <cstdarg>
+
+#ifndef SYSCALL_HASH
+#define SYSCALL_HASH(str) (UInt64)str
+#endif // !SYSCALL_HASH
+
+IMPORT_C VoidPtr libsys_syscall_arg_1(SizeT id);
+IMPORT_C VoidPtr libsys_syscall_arg_2(SizeT id, VoidPtr arg1);
+IMPORT_C VoidPtr libsys_syscall_arg_3(SizeT id, VoidPtr arg1, VoidPtr arg3);
+IMPORT_C VoidPtr libsys_syscall_arg_4(SizeT id, VoidPtr arg1, VoidPtr arg3, VoidPtr arg4);
diff --git a/dev/libSystem/System.h b/dev/libSystem/System.h
index 920ea2b2..88e1f173 100644
--- a/dev/libSystem/System.h
+++ b/dev/libSystem/System.h
@@ -7,8 +7,8 @@ Purpose: System Call Interface.
 

 ------------------------------------------- */

 

-#ifndef SCI_SYSTEM_CALLS_H

-#define SCI_SYSTEM_CALLS_H

+#ifndef LIBSYS_SYSTEM_CALLS_H

+#define LIBSYS_SYSTEM_CALLS_H

 

 #include <libSystem/Macros.h>

 

@@ -16,12 +16,12 @@ Purpose: System Call Interface.
 /// @brief Types API.

 // ------------------------------------------------------------------------------------------ //

 

-struct RefType {

-  UInt32  __hash;

-  VoidPtr __self;

+struct REF_TYPE {

+  UInt64  __hash; /// @brief Hash of the syscall

+  VoidPtr __self; /// @brief Syscall self value.

 };

 

-typedef RefType* Ref;

+typedef REF_TYPE* Ref;

 

 typedef Ref IORef;

 typedef Ref FSRef;

@@ -382,4 +382,4 @@ IMPORT_C Char* StrFmt(const Char* fmt, ...);
 

 IMPORT_C UInt64 StrMathToNumber(const Char* in, const Char** endp, const SInt16 base);

 

-#endif  // ifndef SCI_SYSTEM_CALLS_H

+#endif  // ifndef LIBSYS_SYSTEM_CALLS_H

diff --git a/dev/libSystem/src/GNUmakefile b/dev/libSystem/src/Makefile
index 9b901f9f..41c99c4d 100644
--- a/dev/libSystem/src/GNUmakefile
+++ b/dev/libSystem/src/Makefile
@@ -9,8 +9,8 @@ FLAGS=-f win64
 .PHONY: error
 error:
 	@echo "==> Invalid rule."
-	@echo "==> Use sci_asm_io_<arch> instead."
+	@echo "==> Use libsys_asm_io_<arch> instead."
 
-.PHONY: sci_asm_io_x64
-sci_asm_io_x64:
-	$(ASM) $(FLAGS) SystemCalls+IO.asm -o SystemCalls+IO.stub.obj
+.PHONY: libsys_asm_io_x64
+libsys_asm_io_x64:
+	$(ASM) $(FLAGS) SystemProc.asm -o SystemProc.asm.obj
diff --git a/dev/libSystem/src/System.cc b/dev/libSystem/src/SystemAPI.cc
index 1c28303d..37e835c1 100644
--- a/dev/libSystem/src/System.cc
+++ b/dev/libSystem/src/SystemAPI.cc
@@ -4,11 +4,11 @@
 

 ------------------------------------------- */

 

-#include <libSystem/AsmProc.h>

+#include <libSystem/Syscall.h>

 #include <libSystem/System.h>

 

-/// @file SystemCalls.cc

-/// @brief Source file for the memory functions/syscalls for libSystem.sys

+/// @file SystemAPI.cc

+/// @brief System wide API for NeKernel.

 

 IMPORT_C VoidPtr MmCopyMemory(_Input VoidPtr dest, _Input VoidPtr src, _Input SizeT len) {

   if (!len || !dest || !src) {

@@ -46,22 +46,17 @@ IMPORT_C VoidPtr MmFillMemory(_Input VoidPtr dest, _Input SizeT len, _Input UInt
   return dest;

 }

 

-//-----------------------------------------------------------------------------------------------------------//

-/// @brief Systems Calls implementation.

-/// @internal

-//-----------------------------------------------------------------------------------------------------------//

-

 IMPORT_C Ref IoOpenFile(_Input const Char* path, _Input const Char* drv_letter) {

-  return sci_syscall_arg_3(1, reinterpret_cast<VoidPtr>(const_cast<Char*>(path)),

+  return (Ref)libsys_syscall_arg_3(SYSCALL_HASH('IoOpenFile'), reinterpret_cast<VoidPtr>(const_cast<Char*>(path)),

                            reinterpret_cast<VoidPtr>(const_cast<Char*>(drv_letter)));

 }

 

 IMPORT_C Void IoCloseFile(_Input Ref desc) {

-  sci_syscall_arg_2(2, desc);

+  libsys_syscall_arg_2(2, desc);

 }

 

 IMPORT_C UInt64 IoSeekFile(_Input Ref desc, _Input UInt64 off) {

-  auto ret = (volatile UInt64*) sci_syscall_arg_3(3, reinterpret_cast<VoidPtr>(desc),

+  auto ret = (volatile UInt64*) libsys_syscall_arg_3(SYSCALL_HASH('IoSeekFile'), reinterpret_cast<VoidPtr>(desc),

                                                   reinterpret_cast<VoidPtr>(&off));

 

   MUST_PASS((*ret) != ~0UL);

@@ -69,7 +64,7 @@ IMPORT_C UInt64 IoSeekFile(_Input Ref desc, _Input UInt64 off) {
 }

 

 IMPORT_C UInt64 IoTellFile(_Input Ref desc) {

-  auto ret = (volatile UInt64*) sci_syscall_arg_2(4, reinterpret_cast<VoidPtr>(desc));

+  auto ret = (volatile UInt64*) libsys_syscall_arg_2(SYSCALL_HASH('IoTellFile'), reinterpret_cast<VoidPtr>(desc));

   return *ret;

 }

 

@@ -78,8 +73,8 @@ IMPORT_C SInt32 PrintOut(_Input IORef desc, const char* fmt, ...) {
 

   va_start(args, fmt);

 

-  auto ret = (volatile UInt64*) sci_syscall_arg_4(

-      5, reinterpret_cast<VoidPtr>(desc), reinterpret_cast<VoidPtr>(const_cast<Char*>(fmt)), args);

+  auto ret = (volatile UInt64*) libsys_syscall_arg_4(

+      SYSCALL_HASH('PrintOut'), reinterpret_cast<VoidPtr>(desc), reinterpret_cast<VoidPtr>(const_cast<Char*>(fmt)), args);

 

   va_end(args);

 

@@ -90,5 +85,7 @@ IMPORT_C Void _rtl_assert(Bool expr, const Char* origin) {
   if (!expr) {

     PrintOut(nullptr, "Assertion failed: %s\r", origin);

     PrintOut(nullptr, "Origin: %s\r", origin);

+

+    libsys_syscall_arg_1(SYSCALL_HASH('_rtl_debug_break'));

   }

 }

diff --git a/dev/libSystem/src/SystemCalls+IO.asm b/dev/libSystem/src/SystemProc.asm
index 097046af..bc41059a 100644
--- a/dev/libSystem/src/SystemCalls+IO.asm
+++ b/dev/libSystem/src/SystemProc.asm
@@ -11,12 +11,12 @@
 
 section .text
 
-global sci_syscall_arg_1
-global sci_syscall_arg_2
-global sci_syscall_arg_3
-global sci_syscall_arg_4
+global libsys_syscall_arg_1
+global libsys_syscall_arg_2
+global libsys_syscall_arg_3
+global libsys_syscall_arg_4
 
-sci_syscall_arg_1:
+libsys_syscall_arg_1:
     push rbp
     mov rbp, rsp
 
@@ -27,7 +27,7 @@ sci_syscall_arg_1:
 
     ret
 
-sci_syscall_arg_2:
+libsys_syscall_arg_2:
     push rbp
     mov rbp, rsp
 
@@ -38,7 +38,7 @@ sci_syscall_arg_2:
 
     ret
 
-sci_syscall_arg_3:
+libsys_syscall_arg_3:
     push rbp
     mov rbp, rsp
 
@@ -51,7 +51,7 @@ sci_syscall_arg_3:
 
     ret
 
-sci_syscall_arg_4:
+libsys_syscall_arg_4:
     push rbp
     mov rbp, rsp
 
diff --git a/public/frameworks/CoreFoundation.fwrk/headers/Object.h b/public/frameworks/CoreFoundation.fwrk/headers/Object.h
index 1692f20e..5cb2050a 100644
--- a/public/frameworks/CoreFoundation.fwrk/headers/Object.h
+++ b/public/frameworks/CoreFoundation.fwrk/headers/Object.h
@@ -19,6 +19,6 @@ class CFObject {
   explicit CFObject() = default;
   virtual ~CFObject() = default;
 
-  SCI_COPY_DEFAULT(CFObject);
+  LIBSYS_COPY_DEFAULT(CFObject);
 };
 }  // namespace CF
\ No newline at end of file
diff --git a/public/tools/ld.dyn/src/CommandLine.cc b/public/tools/ld.dyn/src/CommandLine.cc
index e76c34a7..70a0dbd9 100644
--- a/public/tools/ld.dyn/src/CommandLine.cc
+++ b/public/tools/ld.dyn/src/CommandLine.cc
@@ -11,8 +11,8 @@
 #define DYNLIB_FLAG "-dyn"
 
 SInt32 _NeMain(SInt32 argc, Char* argv[]) {
-  SCI_UNUSED(argc);
-  SCI_UNUSED(argv);
+  LIBSYS_UNUSED(argc);
+  LIBSYS_UNUSED(argv);
 
   PrintOut(nullptr, "%s", "ld.dyn: Dynamic Loader.\n");
   PrintOut(nullptr, "%s", "ld.dyn: © 2024-2025 Amlal El Mahrouss, All rights reserved.\n");
diff --git a/public/tools/ld.fwrk/src/CommandLine.cc b/public/tools/ld.fwrk/src/CommandLine.cc
index e7a6e5ca..853a4ef7 100644
--- a/public/tools/ld.fwrk/src/CommandLine.cc
+++ b/public/tools/ld.fwrk/src/CommandLine.cc
@@ -9,8 +9,8 @@
 /// @brief This program loads a code framework into Kernel's memory.
 
 SInt32 _NeMain(SInt32 argc, Char* argv[]) {
-  SCI_UNUSED(argc);
-  SCI_UNUSED(argv);
+  LIBSYS_UNUSED(argc);
+  LIBSYS_UNUSED(argv);
 
   PrintOut(nullptr, "%s", "ld.fwrk: Framework Loader.\n");
   PrintOut(nullptr, "%s", "ld.fwrk: © 2024-2025 Amlal El Mahrouss, All rights reserved.\n");
diff --git a/public/tools/manual/src/CommandLine.cc b/public/tools/manual/src/CommandLine.cc
index 0704384a..68594c09 100644
--- a/public/tools/manual/src/CommandLine.cc
+++ b/public/tools/manual/src/CommandLine.cc
@@ -1,8 +1,8 @@
 #include <libSystem/System.h>
 
 SInt32 _NeMain(SInt32 argc, Char* argv[]) {
-  SCI_UNUSED(argc);
-  SCI_UNUSED(argv);
+  LIBSYS_UNUSED(argc);
+  LIBSYS_UNUSED(argv);
 
   if (argc < 2) {
     PrintOut(nullptr, "HELP: manual <tutorial_name>\n");
diff --git a/public/tools/mk.fwrk/src/CommandLine.cc b/public/tools/mk.fwrk/src/CommandLine.cc
index 4ef7240a..423dc12f 100644
--- a/public/tools/mk.fwrk/src/CommandLine.cc
+++ b/public/tools/mk.fwrk/src/CommandLine.cc
@@ -7,7 +7,7 @@
 #include <Framework.h>
 #include <Steps.h>
 
-#include <libSystem/ProcessCodes.h>
+#include <libSystem/Err.h>
 
 #include <CoreFoundation.fwrk/headers/Array.h>
 
diff --git a/public/tools/mk.hefs/src/CommandLine.cc b/public/tools/mk.hefs/src/CommandLine.cc
index 711009d5..0b38386a 100644
--- a/public/tools/mk.hefs/src/CommandLine.cc
+++ b/public/tools/mk.hefs/src/CommandLine.cc
@@ -9,8 +9,8 @@
 /// @brief Placeholder program.
 
 SInt32 _NeMain(SInt32 argc, Char* argv[]) {
-  SCI_UNUSED(argc);
-  SCI_UNUSED(argv);
+  LIBSYS_UNUSED(argc);
+  LIBSYS_UNUSED(argv);
 
   return EXIT_FAILURE;
 }
diff --git a/public/tools/mk.nefs/src/CommandLine.cc b/public/tools/mk.nefs/src/CommandLine.cc
index 711009d5..0b38386a 100644
--- a/public/tools/mk.nefs/src/CommandLine.cc
+++ b/public/tools/mk.nefs/src/CommandLine.cc
@@ -9,8 +9,8 @@
 /// @brief Placeholder program.
 
 SInt32 _NeMain(SInt32 argc, Char* argv[]) {
-  SCI_UNUSED(argc);
-  SCI_UNUSED(argv);
+  LIBSYS_UNUSED(argc);
+  LIBSYS_UNUSED(argv);
 
   return EXIT_FAILURE;
 }
diff --git a/public/tools/ping/src/CommandLine.cc b/public/tools/ping/src/CommandLine.cc
index f5c82b80..580d7973 100644
--- a/public/tools/ping/src/CommandLine.cc
+++ b/public/tools/ping/src/CommandLine.cc
@@ -1,7 +1,7 @@
 #include <libSystem/System.h>
 
 SInt32 _NeMain(SInt32 argc, Char* argv[]) {
-  SCI_UNUSED(argc);
+  LIBSYS_UNUSED(argc);
 
   if (argc < 2) {
     PrintOut(nullptr, "HELP: ping <hostname>\n");
diff --git a/setup_x64_project.sh b/setup_x64_project.sh
index ba7d4b3f..d1b6ea87 100755
--- a/setup_x64_project.sh
+++ b/setup_x64_project.sh
@@ -6,7 +6,7 @@
 
 cd dev/user
 cd src
-make sci_asm_io_x64
+make libsys_asm_io_x64
 cd ..
 btb libSystem.json
 cd ../ddk