diff --git a/Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfo.meta b/Assets/GameMain/Scripts/Presentation/Main/ItemTooltip.meta
similarity index 100%
rename from Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfo.meta
rename to Assets/GameMain/Scripts/Presentation/Main/ItemTooltip.meta
diff --git a/Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfo/ItemTooltipContext.cs b/Assets/GameMain/Scripts/Presentation/Main/ItemTooltip/ItemTooltipContext.cs
similarity index 100%
rename from Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfo/ItemTooltipContext.cs
rename to Assets/GameMain/Scripts/Presentation/Main/ItemTooltip/ItemTooltipContext.cs
diff --git a/Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfo/ItemTooltipContext.cs.meta b/Assets/GameMain/Scripts/Presentation/Main/ItemTooltip/ItemTooltipContext.cs.meta
similarity index 100%
rename from Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfo/ItemTooltipContext.cs.meta
rename to Assets/GameMain/Scripts/Presentation/Main/ItemTooltip/ItemTooltipContext.cs.meta
diff --git a/Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfo/ItemTooltipController.cs b/Assets/GameMain/Scripts/Presentation/Main/ItemTooltip/ItemTooltipController.cs
similarity index 86%
rename from Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfo/ItemTooltipController.cs
rename to Assets/GameMain/Scripts/Presentation/Main/ItemTooltip/ItemTooltipController.cs
index 2ac4ec0..34dbcaa 100644
--- a/Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfo/ItemTooltipController.cs
+++ b/Assets/GameMain/Scripts/Presentation/Main/ItemTooltip/ItemTooltipController.cs
@@ -17,15 +17,15 @@ namespace SepCore.UI
 
         protected override void SubscribeCustomEvents()
         {
-            GameEntry.Event.Subscribe(ItemTooltipLockEventArgs.EventId, ItemTooltipInfoLock);
-            GameEntry.Event.Subscribe(ItemTooltipHideEventArgs.EventId, ItemTooltipHide);
+            GameEntry.Event.Subscribe(DisplayItemLockEventArgs.EventId, OnDisplayItemLock);
+            GameEntry.Event.Subscribe(DisplayItemHideEventArgs.EventId, OnDisplayItemHide);
             GameEntry.Event.Subscribe(ItemTooltipRecycleEventArgs.EventId, ItemTooltipRecycle);
         }
 
         protected override void UnsubscribeCustomEvents()
         {
-            GameEntry.Event.Unsubscribe(ItemTooltipLockEventArgs.EventId, ItemTooltipInfoLock);
-            GameEntry.Event.Unsubscribe(ItemTooltipHideEventArgs.EventId, ItemTooltipHide);
+            GameEntry.Event.Unsubscribe(DisplayItemLockEventArgs.EventId, OnDisplayItemLock);
+            GameEntry.Event.Unsubscribe(DisplayItemHideEventArgs.EventId, OnDisplayItemHide);
             GameEntry.Event.Unsubscribe(ItemTooltipRecycleEventArgs.EventId, ItemTooltipRecycle);
         }
 
@@ -109,9 +109,9 @@ namespace SepCore.UI
 
         #region Event Handlers
 
-        private void ItemTooltipInfoLock(object sender, GameEventArgs e)
+        private void OnDisplayItemLock(object sender, GameEventArgs e)
         {
-            if (e is not ItemTooltipLockEventArgs)
+            if (e is not DisplayItemLockEventArgs)
             {
                 return;
             }
@@ -119,9 +119,9 @@ namespace SepCore.UI
             _locked = true;
         }
 
-        private void ItemTooltipHide(object sender, GameEventArgs e)
+        private void OnDisplayItemHide(object sender, GameEventArgs e)
         {
-            if (e is not ItemTooltipHideEventArgs args)
+            if (e is not DisplayItemHideEventArgs args)
             {
                 return;
             }
diff --git a/Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfo/ItemTooltipController.cs.meta b/Assets/GameMain/Scripts/Presentation/Main/ItemTooltip/ItemTooltipController.cs.meta
similarity index 100%
rename from Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfo/ItemTooltipController.cs.meta
rename to Assets/GameMain/Scripts/Presentation/Main/ItemTooltip/ItemTooltipController.cs.meta
diff --git a/Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfo/ItemTooltipForm.cs b/Assets/GameMain/Scripts/Presentation/Main/ItemTooltip/ItemTooltipForm.cs
similarity index 100%
rename from Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfo/ItemTooltipForm.cs
rename to Assets/GameMain/Scripts/Presentation/Main/ItemTooltip/ItemTooltipForm.cs
diff --git a/Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfo/ItemTooltipForm.cs.meta b/Assets/GameMain/Scripts/Presentation/Main/ItemTooltip/ItemTooltipForm.cs.meta
similarity index 100%
rename from Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfo/ItemTooltipForm.cs.meta
rename to Assets/GameMain/Scripts/Presentation/Main/ItemTooltip/ItemTooltipForm.cs.meta