diff --git a/components/lazmapviewer/examples/plugin_demos/markerselectdrag_demo/MarkerSelectAndDrag_Demo.lpi b/components/lazmapviewer/examples/plugin_demos/markereditor_demo/MarkerEditor_Demo.lpi
similarity index 92%
rename from components/lazmapviewer/examples/plugin_demos/markerselectdrag_demo/MarkerSelectAndDrag_Demo.lpi
rename to components/lazmapviewer/examples/plugin_demos/markereditor_demo/MarkerEditor_Demo.lpi
index 5b8cbb10b..fe5aaded3 100644
--- a/components/lazmapviewer/examples/plugin_demos/markerselectdrag_demo/MarkerSelectAndDrag_Demo.lpi
+++ b/components/lazmapviewer/examples/plugin_demos/markereditor_demo/MarkerEditor_Demo.lpi
@@ -5,7 +5,7 @@
     <PathDelim Value="\"/>
     <General>
       <SessionStorage Value="InProjectDir"/>
-      <Title Value="MarkerSelectAndDrag_Demo"/>
+      <Title Value="Marker Editor Demo"/>
       <Scaled Value="True"/>
       <ResourceType Value="res"/>
       <UseXPManifest Value="True"/>
@@ -33,7 +33,7 @@
     </RequiredPackages>
     <Units>
       <Unit>
-        <Filename Value="MarkerSelectAndDrag_Demo.lpr"/>
+        <Filename Value="MarkerEditor_Demo.lpr"/>
         <IsPartOfProject Value="True"/>
       </Unit>
       <Unit>
@@ -50,7 +50,7 @@
     <Version Value="11"/>
     <PathDelim Value="\"/>
     <Target>
-      <Filename Value="MarkerSelectAndDrag_Demo"/>
+      <Filename Value="MarkerEditor_Demo"/>
     </Target>
     <SearchPaths>
       <IncludeFiles Value="$(ProjOutDir)"/>
diff --git a/components/lazmapviewer/examples/plugin_demos/markerselectdrag_demo/MarkerSelectAndDrag_Demo.lpr b/components/lazmapviewer/examples/plugin_demos/markereditor_demo/MarkerEditor_Demo.lpr
similarity index 93%
rename from components/lazmapviewer/examples/plugin_demos/markerselectdrag_demo/MarkerSelectAndDrag_Demo.lpr
rename to components/lazmapviewer/examples/plugin_demos/markereditor_demo/MarkerEditor_Demo.lpr
index d7156fc53..b91bd664c 100644
--- a/components/lazmapviewer/examples/plugin_demos/markerselectdrag_demo/MarkerSelectAndDrag_Demo.lpr
+++ b/components/lazmapviewer/examples/plugin_demos/markereditor_demo/MarkerEditor_Demo.lpr
@@ -1,4 +1,4 @@
-program MarkerSelectAndDrag_Demo;
+program MarkerEditor_Demo;
 
 {$mode objfpc}{$H+}
 
diff --git a/components/lazmapviewer/examples/plugin_demos/markerselectdrag_demo/main.lfm b/components/lazmapviewer/examples/plugin_demos/markereditor_demo/main.lfm
similarity index 99%
rename from components/lazmapviewer/examples/plugin_demos/markerselectdrag_demo/main.lfm
rename to components/lazmapviewer/examples/plugin_demos/markereditor_demo/main.lfm
index b0cd9ce4c..02b461e4a 100644
--- a/components/lazmapviewer/examples/plugin_demos/markerselectdrag_demo/main.lfm
+++ b/components/lazmapviewer/examples/plugin_demos/markereditor_demo/main.lfm
@@ -3,7 +3,7 @@ object MainForm: TMainForm
   Height = 566
   Top = 157
   Width = 833
-  Caption = 'Marker Select & Drag Demo'
+  Caption = 'Marker Editor Demo'
   ClientHeight = 566
   ClientWidth = 833
   LCLVersion = '4.99.0.0'
diff --git a/components/lazmapviewer/examples/plugin_demos/markerselectdrag_demo/main.pas b/components/lazmapviewer/examples/plugin_demos/markereditor_demo/main.pas
similarity index 100%
rename from components/lazmapviewer/examples/plugin_demos/markerselectdrag_demo/main.pas
rename to components/lazmapviewer/examples/plugin_demos/markereditor_demo/main.pas