2 files changed, 8 insertions, 6 deletions
diff --git a/include/CoreRuntime/cplusplus/utility.hpp b/include/CoreRuntime/cplusplus/utility.hpp
index a427c44..81da627 100644
--- a/include/CoreRuntime/cplusplus/utility.hpp
+++ b/include/CoreRuntime/cplusplus/utility.hpp
@@ -3,10 +3,11 @@
 // Licensed under the Apache License, Version 2.0 (see LICENSE file)
 // Official repository: https://github.com/ne-foss-org/nectar
 
-#ifndef LIBCXX_UTILITY_H
-#define LIBCXX_UTILITY_H
+#ifndef CRK_UTILITY_HPP
+#define CRK_UTILITY_HPP
 
 namespace std {
+
 /// @brief Forward object.
 /// @tparam Args the object type.
 /// @param arg the object.
@@ -24,6 +25,7 @@ template <typename Args>
 inline auto move(Args&& arg) -> Args&& {
   return static_cast<Args&&>(arg);
 }
+
 }  // namespace std
 
-#endif  // LIBCXX_UTILITY_H
+#endif  // CRK_UTILITY_HPP
diff --git a/include/CoreRuntime/nec/exports.hpp b/include/CoreRuntime/nec/exports.hpp
index 3fea960..7e02641 100644
--- a/include/CoreRuntime/nec/exports.hpp
+++ b/include/CoreRuntime/nec/exports.hpp
@@ -6,10 +6,10 @@
 
 #pragma once
 
-#include <CoreRuntime/C++/abi/abi.hpp>
-#include <CoreRuntime/C++/abi/new.hpp>
+#include <CoreRuntime/cplusplus/abi/abi.hpp>
+#include <CoreRuntime/cplusplus/abi/new.hpp>
 
 /// @brief The Nectar FFI.
-namespace nectar_lang {
+namespace nec::abi {
 
 }