4 files changed, 10 insertions, 11 deletions
diff --git a/src/core/function/basic/ChannelObject.h b/src/core/function/basic/ChannelObject.h
index 66c60511..752837e9 100644
--- a/src/core/function/basic/ChannelObject.h
+++ b/src/core/function/basic/ChannelObject.h
@@ -36,7 +36,7 @@ namespace GpgFrontend {
  * @brief object which in channel system is called "channel"
  *
  */
-class GPGFRONTEND_CORE_EXPORT ChannelObject {
+class GF_CORE_EXPORT ChannelObject {
  public:
   /**
    * @brief Construct a new Default Channel Object object
diff --git a/src/core/function/basic/GpgFunctionObject.h b/src/core/function/basic/GpgFunctionObject.h
index fea400aa..b9cb2581 100644
--- a/src/core/function/basic/GpgFunctionObject.h
+++ b/src/core/function/basic/GpgFunctionObject.h
@@ -30,7 +30,6 @@
 
 #include <mutex>
 
-#include "core/GpgFrontendCoreExport.h"
 #include "core/function/basic/ChannelObject.h"
 #include "core/function/basic/SingletonStorage.h"
 #include "core/function/basic/SingletonStorageCollection.h"
@@ -39,15 +38,15 @@
 
 namespace GpgFrontend {
 
-auto GPGFRONTEND_CORE_EXPORT GetChannelObjectInstance(
-    const std::type_info& type, int channel) -> ChannelObject*;
+auto GF_CORE_EXPORT GetChannelObjectInstance(const std::type_info& type,
+                                             int channel) -> ChannelObject*;
 
-auto GPGFRONTEND_CORE_EXPORT CreateChannelObjectInstance(
+auto GF_CORE_EXPORT CreateChannelObjectInstance(
     const std::type_info& type, int channel,
     SecureUniquePtr<ChannelObject> channel_object) -> ChannelObject*;
 
-auto GPGFRONTEND_CORE_EXPORT
-GetGlobalFunctionObjectTypeLock(const std::type_info& type) -> std::mutex&;
+auto GF_CORE_EXPORT GetGlobalFunctionObjectTypeLock(const std::type_info& type)
+    -> std::mutex&;
 
 /**
  * @brief
diff --git a/src/core/function/basic/SingletonStorage.h b/src/core/function/basic/SingletonStorage.h
index 574a16ec..867fe7e0 100644
--- a/src/core/function/basic/SingletonStorage.h
+++ b/src/core/function/basic/SingletonStorage.h
@@ -37,7 +37,7 @@ class ChannelObject;
 
 using ChannelObjectPtr = SecureUniquePtr<ChannelObject>;
 
-class GPGFRONTEND_CORE_EXPORT SingletonStorage {
+class GF_CORE_EXPORT SingletonStorage {
  public:
   /**
    * @brief
@@ -80,8 +80,8 @@ class GPGFRONTEND_CORE_EXPORT SingletonStorage {
    * @param p_obj
    * @return T*
    */
-  auto SetObjectInChannel(int channel,
-                          ChannelObjectPtr p_obj) -> ChannelObject*;
+  auto SetObjectInChannel(int channel, ChannelObjectPtr p_obj)
+      -> ChannelObject*;
 
  private:
   class Impl;
diff --git a/src/core/function/basic/SingletonStorageCollection.h b/src/core/function/basic/SingletonStorageCollection.h
index 42dd8515..24f84eec 100644
--- a/src/core/function/basic/SingletonStorageCollection.h
+++ b/src/core/function/basic/SingletonStorageCollection.h
@@ -36,7 +36,7 @@ class SingletonStorage;
 using SingletonStoragePtr =
     std::unique_ptr<SingletonStorage, SecureObjectDeleter<SingletonStorage>>;
 
-class GPGFRONTEND_CORE_EXPORT SingletonStorageCollection {
+class GF_CORE_EXPORT SingletonStorageCollection {
  public:
   /**
    * @brief