diff --git a/RecastDemo/Include/Sample.h b/RecastDemo/Include/Sample.h
index 8f1e1599..6501c623 100644
--- a/RecastDemo/Include/Sample.h
+++ b/RecastDemo/Include/Sample.h
@@ -99,12 +99,12 @@ struct SampleTool
 	virtual void init(Sample* sample) = 0;
 	virtual void reset() = 0;
 
-	virtual void drawMenuUI() = 0;
-
 	virtual void singleStep() = 0;
 	virtual void update(float dt) = 0;
 	virtual void render() = 0;
-	virtual void renderOverlay(double* proj, double* model, int* view) = 0;
+
+	virtual void drawMenuUI() = 0;
+	virtual void drawOverlayUI(double* proj, double* model, int* view) = 0;
 
 	virtual void onClick(const float* rayStartPos, const float* rayHitPos, bool shift) = 0;
 	virtual void onToggle() = 0;
diff --git a/RecastDemo/Include/Tool_ConvexVolume.h b/RecastDemo/Include/Tool_ConvexVolume.h
index 809020c3..8541c660 100644
--- a/RecastDemo/Include/Tool_ConvexVolume.h
+++ b/RecastDemo/Include/Tool_ConvexVolume.h
@@ -50,5 +50,5 @@ public:
 	void singleStep() override {}
 	void update(const float) override {}
 	void render() override;
-	void renderOverlay(double* proj, double* model, int* view) override;
+	void drawOverlayUI(double* proj, double* model, int* view) override;
 };
diff --git a/RecastDemo/Include/Tool_Crowd.h b/RecastDemo/Include/Tool_Crowd.h
index c8cd9b87..b1111f89 100644
--- a/RecastDemo/Include/Tool_Crowd.h
+++ b/RecastDemo/Include/Tool_Crowd.h
@@ -126,5 +126,5 @@ public:
 	void singleStep() override;
 	void update(float dt) override;
 	void render() override;
-	void renderOverlay(double* proj, double* model, int* view) override;
+	void drawOverlayUI(double* proj, double* model, int* view) override;
 };
diff --git a/RecastDemo/Include/Tool_NavMeshPrune.h b/RecastDemo/Include/Tool_NavMeshPrune.h
index dbbb2430..e4196aa3 100644
--- a/RecastDemo/Include/Tool_NavMeshPrune.h
+++ b/RecastDemo/Include/Tool_NavMeshPrune.h
@@ -49,5 +49,5 @@ public:
 	void singleStep() override {}
 	void update(const float /*dt*/) override {}
 	void render() override;
-	void renderOverlay(double* proj, double* model, int* view) override;
+	void drawOverlayUI(double* proj, double* model, int* view) override;
 };
diff --git a/RecastDemo/Include/Tool_NavMeshTester.h b/RecastDemo/Include/Tool_NavMeshTester.h
index 9b04d99b..e30cb251 100644
--- a/RecastDemo/Include/Tool_NavMeshTester.h
+++ b/RecastDemo/Include/Tool_NavMeshTester.h
@@ -103,7 +103,7 @@ public:
 	void singleStep() override;
 	void update(const float dt) override;
 	void render() override;
-	void renderOverlay(double* proj, double* model, int* view) override;
+	void drawOverlayUI(double* proj, double* model, int* view) override;
 
 	void recalc();
 	void drawAgent(const float* pos, float r, float h, float c, const unsigned int col) const;
diff --git a/RecastDemo/Include/Tool_OffMeshConnection.h b/RecastDemo/Include/Tool_OffMeshConnection.h
index d5baabe5..81cd8f1b 100644
--- a/RecastDemo/Include/Tool_OffMeshConnection.h
+++ b/RecastDemo/Include/Tool_OffMeshConnection.h
@@ -48,5 +48,5 @@ public:
 	void singleStep() override;
 	void update(const float dt) override;
 	void render() override;
-	void renderOverlay(double* proj, double* model, int* view) override;
+	void drawOverlayUI(double* proj, double* model, int* view) override;
 };
diff --git a/RecastDemo/Source/Sample_SoloMesh.cpp b/RecastDemo/Source/Sample_SoloMesh.cpp
index 2df40410..651f9db6 100644
--- a/RecastDemo/Source/Sample_SoloMesh.cpp
+++ b/RecastDemo/Source/Sample_SoloMesh.cpp
@@ -331,7 +331,7 @@ void Sample_SoloMesh::renderOverlay(double* proj, double* model, int* view)
 {
 	if (tool)
 	{
-		tool->renderOverlay(proj, model, view);
+		tool->drawOverlayUI(proj, model, view);
 	}
 	renderOverlayToolStates(proj, model, view);
 }
diff --git a/RecastDemo/Source/Sample_TempObstacles.cpp b/RecastDemo/Source/Sample_TempObstacles.cpp
index 43e63dd8..c785bc65 100644
--- a/RecastDemo/Source/Sample_TempObstacles.cpp
+++ b/RecastDemo/Source/Sample_TempObstacles.cpp
@@ -814,7 +814,7 @@ public:
 		}
 	}
 
-	void renderOverlay(double* proj, double* model, int* view) override
+	void drawOverlayUI(double* proj, double* model, int* view) override
 	{
 		if (m_hitPosSet)
 		{
@@ -875,7 +875,7 @@ public:
 	void singleStep() override {}
 	void update(const float /*dt*/) override {}
 	void render() override {}
-	void renderOverlay(double* /*proj*/, double* /*model*/, int* /*view*/) override {}
+	void drawOverlayUI(double* /*proj*/, double* /*model*/, int* /*view*/) override {}
 };
 
 Sample_TempObstacles::Sample_TempObstacles()
@@ -1197,7 +1197,7 @@ void Sample_TempObstacles::renderOverlay(double* proj, double* model, int* view)
 {
 	if (tool)
 	{
-		tool->renderOverlay(proj, model, view);
+		tool->drawOverlayUI(proj, model, view);
 	}
 	renderOverlayToolStates(proj, model, view);
 
diff --git a/RecastDemo/Source/Sample_TileMesh.cpp b/RecastDemo/Source/Sample_TileMesh.cpp
index 248126d6..d8fbb544 100644
--- a/RecastDemo/Source/Sample_TileMesh.cpp
+++ b/RecastDemo/Source/Sample_TileMesh.cpp
@@ -177,7 +177,7 @@ public:
 		glLineWidth(1.0f);
 	}
 
-	void renderOverlay(double* proj, double* model, int* view) override
+	void drawOverlayUI(double* proj, double* model, int* view) override
 	{
 		GLdouble x, y, z;
 		if (m_hitPosSet && gluProject(m_hitPos[0], m_hitPos[1], m_hitPos[2], model, proj, view, &x, &y, &z))
@@ -557,7 +557,7 @@ void Sample_TileMesh::renderOverlay(double* proj, double* model, int* view)
 
 	if (tool)
 	{
-		tool->renderOverlay(proj, model, view);
+		tool->drawOverlayUI(proj, model, view);
 	}
 	renderOverlayToolStates(proj, model, view);
 }
diff --git a/RecastDemo/Source/Tool_ConvexVolume.cpp b/RecastDemo/Source/Tool_ConvexVolume.cpp
index 00e2ca41..bfc278e0 100644
--- a/RecastDemo/Source/Tool_ConvexVolume.cpp
+++ b/RecastDemo/Source/Tool_ConvexVolume.cpp
@@ -293,7 +293,7 @@ void ConvexVolumeTool::render()
 	dd.end();
 }
 
-void ConvexVolumeTool::renderOverlay(double* /*proj*/, double* /*model*/, int* /*view*/)
+void ConvexVolumeTool::drawOverlayUI(double* /*proj*/, double* /*model*/, int* /*view*/)
 {
 	// Tool help
 	if (!numPoints)
diff --git a/RecastDemo/Source/Tool_Crowd.cpp b/RecastDemo/Source/Tool_Crowd.cpp
index c95e1f58..f097cd19 100644
--- a/RecastDemo/Source/Tool_Crowd.cpp
+++ b/RecastDemo/Source/Tool_Crowd.cpp
@@ -1207,7 +1207,7 @@ void CrowdTool::update(const float dt)
 
 void CrowdTool::render() {}
 
-void CrowdTool::renderOverlay(double* /*proj*/, double* /*model*/, int* /*view*/)
+void CrowdTool::drawOverlayUI(double* /*proj*/, double* /*model*/, int* /*view*/)
 {
 	// Tool help
 	if (mode == ToolMode::CREATE)
diff --git a/RecastDemo/Source/Tool_NavMeshPrune.cpp b/RecastDemo/Source/Tool_NavMeshPrune.cpp
index edd5eefb..114e43a9 100644
--- a/RecastDemo/Source/Tool_NavMeshPrune.cpp
+++ b/RecastDemo/Source/Tool_NavMeshPrune.cpp
@@ -324,7 +324,7 @@ void NavMeshPruneTool::render()
 	}
 }
 
-void NavMeshPruneTool::renderOverlay(double* /*proj*/, double* /*model*/, int* /*view*/)
+void NavMeshPruneTool::drawOverlayUI(double* /*proj*/, double* /*model*/, int* /*view*/)
 {
 	DrawScreenspaceText(280.0f, 40.0f, IM_COL32(255, 255, 255, 192), "LMB: Click fill area.");
 }
diff --git a/RecastDemo/Source/Tool_NavMeshTester.cpp b/RecastDemo/Source/Tool_NavMeshTester.cpp
index c0c1c84d..1ffc2665 100644
--- a/RecastDemo/Source/Tool_NavMeshTester.cpp
+++ b/RecastDemo/Source/Tool_NavMeshTester.cpp
@@ -1495,7 +1495,7 @@ void NavMeshTesterTool::render()
 	}
 }
 
-void NavMeshTesterTool::renderOverlay(double* proj, double* model, int* view)
+void NavMeshTesterTool::drawOverlayUI(double* proj, double* model, int* view)
 {
 	GLdouble x, y, z;
 
diff --git a/RecastDemo/Source/Tool_OffMeshConnection.cpp b/RecastDemo/Source/Tool_OffMeshConnection.cpp
index 7baf0931..5e5ab5ad 100644
--- a/RecastDemo/Source/Tool_OffMeshConnection.cpp
+++ b/RecastDemo/Source/Tool_OffMeshConnection.cpp
@@ -147,7 +147,7 @@ void OffMeshConnectionTool::render()
 	}
 }
 
-void OffMeshConnectionTool::renderOverlay(double* proj, double* model, int* view)
+void OffMeshConnectionTool::drawOverlayUI(double* proj, double* model, int* view)
 {
 	GLdouble x, y, z;