diff --git a/scwx-qt/source/scwx/qt/map/draw_layer.cpp b/scwx-qt/source/scwx/qt/map/draw_layer.cpp
index a0ad64e6..91dace1c 100644
--- a/scwx-qt/source/scwx/qt/map/draw_layer.cpp
+++ b/scwx-qt/source/scwx/qt/map/draw_layer.cpp
@@ -80,7 +80,7 @@ void DrawLayer::Initialize()
    ImGuiInitialize();
 }
 
-void DrawLayer::StartImGuiFrame()
+void DrawLayer::ImGuiFrameStart()
 {
    auto defaultFont = manager::FontManager::Instance().GetImGuiFont(
       types::FontCategory::Default);
@@ -95,7 +95,7 @@ void DrawLayer::StartImGuiFrame()
    ImGui::PushFont(defaultFont->font());
 }
 
-void DrawLayer::EndImGuiFrame()
+void DrawLayer::ImGuiFrameEnd()
 {
    // Pop default font
    ImGui::PopFont();
@@ -145,9 +145,9 @@ void DrawLayer::ImGuiSelectContext()
 
 void DrawLayer::Render(const QMapLibre::CustomLayerRenderParameters& params)
 {
-   StartImGuiFrame();
+   ImGuiFrameStart();
    RenderWithoutImGui(params);
-   EndImGuiFrame();
+   ImGuiFrameEnd();
 }
 
 void DrawLayer::Deinitialize()
diff --git a/scwx-qt/source/scwx/qt/map/draw_layer.hpp b/scwx-qt/source/scwx/qt/map/draw_layer.hpp
index a6fd685a..8bfe8a5d 100644
--- a/scwx-qt/source/scwx/qt/map/draw_layer.hpp
+++ b/scwx-qt/source/scwx/qt/map/draw_layer.hpp
@@ -32,8 +32,8 @@ public:
 
 protected:
    void AddDrawItem(const std::shared_ptr<gl::draw::DrawItem>& drawItem);
-   void StartImGuiFrame();
-   void EndImGuiFrame();
+   void ImGuiFrameStart();
+   void ImGuiFrameEnd();
    void ImGuiInitialize();
    void
    RenderWithoutImGui(const QMapLibre::CustomLayerRenderParameters& params);
diff --git a/scwx-qt/source/scwx/qt/map/overlay_layer.cpp b/scwx-qt/source/scwx/qt/map/overlay_layer.cpp
index 1f7110a2..53557222 100644
--- a/scwx-qt/source/scwx/qt/map/overlay_layer.cpp
+++ b/scwx-qt/source/scwx/qt/map/overlay_layer.cpp
@@ -292,7 +292,7 @@ void OverlayLayer::Render(const QMapLibre::CustomLayerRenderParameters& params)
    auto&                settings         = context()->settings();
    const float          pixelRatio       = context()->pixel_ratio();
 
-   StartImGuiFrame();
+   ImGuiFrameStart();
 
    p->sweepTimePicked_ = false;
 
@@ -493,7 +493,7 @@ void OverlayLayer::Render(const QMapLibre::CustomLayerRenderParameters& params)
    p->lastFontSize_          = ImGui::GetFontSize();
    p->lastColorTableMargins_ = colorTableMargins;
 
-   EndImGuiFrame();
+   ImGuiFrameEnd();
 
    SCWX_GL_CHECK_ERROR();
 }
diff --git a/scwx-qt/source/scwx/qt/map/radar_site_layer.cpp b/scwx-qt/source/scwx/qt/map/radar_site_layer.cpp
index 7398ab36..1cb5e222 100644
--- a/scwx-qt/source/scwx/qt/map/radar_site_layer.cpp
+++ b/scwx-qt/source/scwx/qt/map/radar_site_layer.cpp
@@ -86,7 +86,7 @@ void RadarSiteLayer::Render(
    p->halfWidth_     = params.width * 0.5f;
    p->halfHeight_    = params.height * 0.5f;
 
-   StartImGuiFrame();
+   ImGuiFrameStart();
    // Radar site ImGui windows shouldn't have padding
    ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2 {0.0f, 0.0f});
 
@@ -96,7 +96,7 @@ void RadarSiteLayer::Render(
    }
 
    ImGui::PopStyleVar();
-   EndImGuiFrame();
+   ImGuiFrameEnd();
 
    SCWX_GL_CHECK_ERROR();
 }