diff --git a/bin/layers/local_panel/local_panel.cpp b/bin/layers/local_panel/local_panel.cpp
index 44fb369..3cccfdd 100755
--- a/bin/layers/local_panel/local_panel.cpp
+++ b/bin/layers/local_panel/local_panel.cpp
@@ -15,7 +15,7 @@ namespace sandbox
     if (ImGui::Button("RUN 2", ImVec2(28, 30))) 
     {
       VE::event e { "target_id", test_event::TEST_EVEN , std::string("test event message") };
-      EMIT(e);
+      VE_EMIT(e);
     }
 
     VE_PUSH_FONT(ICON, 18);
@@ -23,7 +23,7 @@ namespace sandbox
     if (ImGui::Button(VE::style::icon::ICON_STOP, ImVec2(28, 30))) 
     {
       VE::event e { "target_id", test_event::TEST_EVEN , std::string("test icon button") };
-      EMIT(e);
+      VE_EMIT(e);
     }
 
     ImGui::Text(VE::style::icon::ICON_PAINT_BRUSH, "  Paint" );
diff --git a/bin/layers/test_panel/test_panel.cpp b/bin/layers/test_panel/test_panel.cpp
index 6c965c4..3f25c57 100755
--- a/bin/layers/test_panel/test_panel.cpp
+++ b/bin/layers/test_panel/test_panel.cpp
@@ -19,7 +19,7 @@ namespace sandbox
     if (ImGui::Button("RUN", ImVec2(28, 30))) 
     {
       VE::event e { "target_id", test_event::TEST_EVEN , std::string("test event message") };
-      EMIT(e);
+      VE_EMIT(e);
     }
 
     ImGui::End();
diff --git a/src/glfw/glfw.cpp b/src/glfw/glfw.cpp
index ba409c2..4c52c3b 100755
--- a/src/glfw/glfw.cpp
+++ b/src/glfw/glfw.cpp
@@ -140,7 +140,7 @@ namespace VE
 				}
       }
 
-      EMIT(e);
+      VE_EMIT(e);
     });
   }
 
@@ -173,7 +173,7 @@ namespace VE
 				}
 			}
 
-      EMIT(e);
+      VE_EMIT(e);
 		});
 
 		glfwSetScrollCallback(m_win, [](GLFWwindow* w, double xOffset, double yOffset)
@@ -181,7 +181,7 @@ namespace VE
       try
       {
         event e{ event_target::VE, event_type::MOUSE_SCROLL, std::pair<float, float>{ static_cast<float>(xOffset), static_cast<float>(yOffset) } };
-        EMIT(e);
+        VE_EMIT(e);
       }
       catch(std::exception& e)
       {
@@ -194,7 +194,7 @@ namespace VE
       try
       {
         event e{ event_target::VE, event_type::MOUSE_CURSOR_POSITION, std::pair<float, float>{ static_cast<float>(xPos), static_cast<float>(yPos) } };
-        EMIT(e);
+        VE_EMIT(e);
       }
       catch(std::exception& e)
       {
@@ -216,7 +216,7 @@ namespace VE
       try
       {
         event e{ event_target::VE, event_type::WINDOW_RESIZE, std::pair<float, float>{ static_cast<float>(width), static_cast<float>(height) } };
-        EMIT(e);
+        VE_EMIT(e);
       }
       catch(std::exception& e)
       {
@@ -229,7 +229,7 @@ namespace VE
       try
       {
         event e{ event_target::VE, event_type::WINDOW_CLOSE, nullptr };
-        EMIT(e);
+        VE_EMIT(e);
       }
       catch(std::exception& e)
       {
@@ -242,7 +242,7 @@ namespace VE
       try
       {
         event e{ event_target::VE, event_type::WINDOW_FOCUS, focused };
-        EMIT(e);
+        VE_EMIT(e);
       }
       catch(std::exception& e)
       {
diff --git a/src/utils/define.hpp b/src/utils/define.hpp
index 7ed1591..ab5b358 100755
--- a/src/utils/define.hpp
+++ b/src/utils/define.hpp
@@ -10,7 +10,7 @@
     void on_event(VE::event e) override
 
 #define VE_CONNECT(DEF_CLASS, DEF_FUNCTION) VE::event_manager::instance().connect(std::bind(&DEF_CLASS::DEF_FUNCTION, this, std::placeholders::_1));
-#define EMIT(e) VE::event_manager::instance().emit(e)
+#define VE_EMIT(e) VE::event_manager::instance().emit(e)
 
 #define VE_PUSH_FONT(def_font, def_size)\
   ImGui::PushFont(VE::style::fonts::get_font(VE::style::fonts::font_type::def_font, def_size))