diff --git a/Penumbra/Collections/Cache/CollectionCacheManager.cs b/Penumbra/Collections/Cache/CollectionCacheManager.cs
index a40a6b5d..8c30f434 100644
--- a/Penumbra/Collections/Cache/CollectionCacheManager.cs
+++ b/Penumbra/Collections/Cache/CollectionCacheManager.cs
@@ -1,5 +1,5 @@
 using Dalamud.Plugin.Services;
-using OtterGui.Classes;
+using Luna;
 using Penumbra.Api;
 using Penumbra.Api.Enums;
 using Penumbra.Collections.Manager;
@@ -17,7 +17,7 @@ using Penumbra.String.Classes;
 
 namespace Penumbra.Collections.Cache;
 
-public class CollectionCacheManager : IDisposable, Luna.IService
+public class CollectionCacheManager : IDisposable, IService
 {
     private readonly  FrameworkManager    _framework;
     private readonly  CommunicatorService _communicator;
diff --git a/Penumbra/Collections/Cache/GlobalEqpCache.cs b/Penumbra/Collections/Cache/GlobalEqpCache.cs
index a73d6970..105fb8c6 100644
--- a/Penumbra/Collections/Cache/GlobalEqpCache.cs
+++ b/Penumbra/Collections/Cache/GlobalEqpCache.cs
@@ -1,4 +1,4 @@
-using OtterGui.Classes;
+using Luna;
 using Penumbra.GameData.Structs;
 using Penumbra.Meta.Manipulations;
 using Penumbra.Mods.Editor;
diff --git a/Penumbra/Collections/Cache/MetaCacheBase.cs b/Penumbra/Collections/Cache/MetaCacheBase.cs
index 98a87e3f..83a906fb 100644
--- a/Penumbra/Collections/Cache/MetaCacheBase.cs
+++ b/Penumbra/Collections/Cache/MetaCacheBase.cs
@@ -1,4 +1,4 @@
-using OtterGui.Classes;
+using Luna;
 using Penumbra.Meta;
 using Penumbra.Meta.Manipulations;
 using Penumbra.Mods.Editor;
diff --git a/Penumbra/Collections/Manager/CollectionStorage.cs b/Penumbra/Collections/Manager/CollectionStorage.cs
index 38b3b9d9..0463a00b 100644
--- a/Penumbra/Collections/Manager/CollectionStorage.cs
+++ b/Penumbra/Collections/Manager/CollectionStorage.cs
@@ -1,6 +1,5 @@
 using Dalamud.Interface.ImGuiNotification;
 using Luna;
-using OtterGui.Classes;
 using Penumbra.Communication;
 using Penumbra.Mods;
 using Penumbra.Mods.Editor;
diff --git a/Penumbra/Collections/Manager/InheritanceManager.cs b/Penumbra/Collections/Manager/InheritanceManager.cs
index 4b962bc1..78a25a90 100644
--- a/Penumbra/Collections/Manager/InheritanceManager.cs
+++ b/Penumbra/Collections/Manager/InheritanceManager.cs
@@ -1,6 +1,5 @@
 using Dalamud.Interface.ImGuiNotification;
 using Luna;
-using OtterGui.Classes;
 using Penumbra.Communication;
 using Penumbra.Mods.Manager;
 using Penumbra.Services;
diff --git a/Penumbra/CommandHandler.cs b/Penumbra/CommandHandler.cs
index 72a47448..8a3e502c 100644
--- a/Penumbra/CommandHandler.cs
+++ b/Penumbra/CommandHandler.cs
@@ -2,7 +2,7 @@ using Dalamud.Game.Command;
 using Dalamud.Game.Text.SeStringHandling;
 using Dalamud.Plugin.Services;
 using Dalamud.Bindings.ImGui;
-using OtterGui.Classes;
+using Luna;
 using Penumbra.Api.Api;
 using Penumbra.Api.Enums;
 using Penumbra.Collections;
@@ -16,7 +16,7 @@ using Penumbra.UI.Knowledge;
 
 namespace Penumbra;
 
-public class CommandHandler : IDisposable, Luna.IApiService
+public class CommandHandler : IDisposable, IApiService
 {
     private const string CommandName = "/penumbra";
 
diff --git a/Penumbra/Interop/Hooks/PostProcessing/ShaderReplacementFixer.cs b/Penumbra/Interop/Hooks/PostProcessing/ShaderReplacementFixer.cs
index d37ea03e..a7964223 100644
--- a/Penumbra/Interop/Hooks/PostProcessing/ShaderReplacementFixer.cs
+++ b/Penumbra/Interop/Hooks/PostProcessing/ShaderReplacementFixer.cs
@@ -3,7 +3,7 @@ using FFXIVClientStructs.FFXIV.Client.Graphics.Kernel;
 using FFXIVClientStructs.FFXIV.Client.Graphics.Render;
 using FFXIVClientStructs.FFXIV.Client.Graphics.Scene;
 using FFXIVClientStructs.FFXIV.Client.System.Resource.Handle;
-using OtterGui.Classes;
+using Luna;
 using Penumbra.Communication;
 using Penumbra.GameData;
 using Penumbra.GameData.Files.MaterialStructs;
@@ -17,7 +17,7 @@ using ModelRenderer = Penumbra.Interop.Services.ModelRenderer;
 
 namespace Penumbra.Interop.Hooks.PostProcessing;
 
-public sealed unsafe class ShaderReplacementFixer : IDisposable, Luna.IRequiredService
+public sealed unsafe class ShaderReplacementFixer : IDisposable, IRequiredService
 {
     public static ReadOnlySpan<byte> SkinShpkName
         => "skin.shpk"u8;
diff --git a/Penumbra/Interop/PathResolving/MetaState.cs b/Penumbra/Interop/PathResolving/MetaState.cs
index 0228870c..79edaf39 100644
--- a/Penumbra/Interop/PathResolving/MetaState.cs
+++ b/Penumbra/Interop/PathResolving/MetaState.cs
@@ -1,5 +1,5 @@
 using FFXIVClientStructs.FFXIV.Client.Graphics.Scene;
-using OtterGui.Classes;
+using Luna;
 using Penumbra.Collections;
 using Penumbra.Api.Enums;
 using Penumbra.GameData.Structs;
diff --git a/Penumbra/Services/PcpService.cs b/Penumbra/Services/PcpService.cs
index e9d9d5a3..d5e1ba42 100644
--- a/Penumbra/Services/PcpService.cs
+++ b/Penumbra/Services/PcpService.cs
@@ -1,8 +1,8 @@
 using Dalamud.Game.ClientState.Objects.Types;
 using FFXIVClientStructs.FFXIV.Client.Game.Object;
+using Luna;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using OtterGui.Classes;
 using Penumbra.Collections;
 using Penumbra.Collections.Manager;
 using Penumbra.Communication;
@@ -20,7 +20,7 @@ using Penumbra.String.Classes;
 
 namespace Penumbra.Services;
 
-public class PcpService : Luna.IApiService, IDisposable
+public class PcpService : IApiService, IDisposable
 {
     public const string Extension = ".pcp";