diff --git a/Dalamud.CorePlugin/PluginImpl.cs b/Dalamud.CorePlugin/PluginImpl.cs
index f23544cc0..348beab88 100644
--- a/Dalamud.CorePlugin/PluginImpl.cs
+++ b/Dalamud.CorePlugin/PluginImpl.cs
@@ -35,7 +35,7 @@ namespace Dalamud.CorePlugin
 
                 this.windowSystem.AddWindow(new PluginWindow(Dalamud.Instance));
 
-                this.Interface.UiBuilder.OnBuildUi += this.OnDraw;
+                this.Interface.UiBuilder.Draw += this.OnDraw;
                 this.Interface.UiBuilder.OnOpenConfigUi += this.OnOpenConfigUi;
 
                 this.Interface.CommandManager.AddHandler("/di", new(this.OnCommand) { HelpMessage = $"Access the {this.Name} plugin." });
@@ -51,7 +51,7 @@ namespace Dalamud.CorePlugin
         {
             this.Interface.CommandManager.RemoveHandler("/di");
 
-            this.Interface.UiBuilder.OnBuildUi -= this.OnDraw;
+            this.Interface.UiBuilder.Draw -= this.OnDraw;
 
             this.windowSystem.RemoveAllWindows();
 
diff --git a/Dalamud/Interface/Internal/DalamudInterface.cs b/Dalamud/Interface/Internal/DalamudInterface.cs
index 82d328623..ab70b15b2 100644
--- a/Dalamud/Interface/Internal/DalamudInterface.cs
+++ b/Dalamud/Interface/Internal/DalamudInterface.cs
@@ -84,7 +84,7 @@ namespace Dalamud.Interface.Internal
             this.windowSystem.AddWindow(this.settingsWindow);
             this.windowSystem.AddWindow(this.selfTestWindow);
 
-            this.dalamud.InterfaceManager.OnDraw += this.OnDraw;
+            this.dalamud.InterfaceManager.Draw += this.OnDraw;
 
             Log.Information("Windows added");
         }
@@ -106,7 +106,7 @@ namespace Dalamud.Interface.Internal
         /// <inheritdoc/>
         public void Dispose()
         {
-            this.dalamud.InterfaceManager.OnDraw -= this.OnDraw;
+            this.dalamud.InterfaceManager.Draw -= this.OnDraw;
 
             this.windowSystem.RemoveAllWindows();
 
diff --git a/Dalamud/Interface/Internal/InterfaceManager.cs b/Dalamud/Interface/Internal/InterfaceManager.cs
index 93c6cf311..82ae2812c 100644
--- a/Dalamud/Interface/Internal/InterfaceManager.cs
+++ b/Dalamud/Interface/Internal/InterfaceManager.cs
@@ -131,7 +131,7 @@ namespace Dalamud.Interface.Internal
         /// <summary>
         /// This event gets called by a plugin UiBuilder when read
         /// </summary>
-        public event RawDX11Scene.BuildUIDelegate OnDraw;
+        public event RawDX11Scene.BuildUIDelegate Draw;
 
         /// <summary>
         /// Gets the default ImGui font.
@@ -620,7 +620,7 @@ namespace Dalamud.Interface.Internal
             this.LastImGuiIoPtr = ImGui.GetIO();
             this.lastWantCapture = this.LastImGuiIoPtr.WantCaptureMouse;
 
-            this.OnDraw?.Invoke();
+            this.Draw?.Invoke();
         }
     }
 }
diff --git a/Dalamud/Interface/UiBuilder.cs b/Dalamud/Interface/UiBuilder.cs
index adf404978..27769b74e 100644
--- a/Dalamud/Interface/UiBuilder.cs
+++ b/Dalamud/Interface/UiBuilder.cs
@@ -35,14 +35,14 @@ namespace Dalamud.Interface
             this.stopwatch = new Stopwatch();
             this.namespaceName = namespaceName;
 
-            this.dalamud.InterfaceManager.OnDraw += this.OnDraw;
+            this.dalamud.InterfaceManager.Draw += this.OnDraw;
         }
 
         /// <summary>
         /// The delegate that gets called when Dalamud is ready to draw your windows or overlays.
         /// When it is called, you can use static ImGui calls.
         /// </summary>
-        public event RawDX11Scene.BuildUIDelegate OnBuildUi;
+        public event RawDX11Scene.BuildUIDelegate Draw;
 
         /// <summary>
         /// Event that is fired when the plugin should open its configuration interface.
@@ -195,7 +195,7 @@ namespace Dalamud.Interface
         /// </summary>
         public void Dispose()
         {
-            this.dalamud.InterfaceManager.OnDraw -= this.OnDraw;
+            this.dalamud.InterfaceManager.Draw -= this.OnDraw;
         }
 
         /// <summary>
@@ -237,12 +237,12 @@ namespace Dalamud.Interface
 
             try
             {
-                this.OnBuildUi?.Invoke();
+                this.Draw?.Invoke();
             }
             catch (Exception ex)
             {
                 Log.Error(ex, "[{0}] UiBuilder OnBuildUi caught exception", this.namespaceName);
-                this.OnBuildUi = null;
+                this.Draw = null;
                 this.OnOpenConfigUi = null;
 
                 this.hasErrorWindow = true;