diff --git a/components/lazmapviewer/example/main.lfm b/components/lazmapviewer/example/main.lfm
index 6b193f7c5..b17760722 100644
--- a/components/lazmapviewer/example/main.lfm
+++ b/components/lazmapviewer/example/main.lfm
@@ -21,6 +21,7 @@ object MainForm: TMainForm
     CachePath = '../../../../example_cache/'
     DefaultTrackColor = clBlue
     DefaultTrackWidth = 3
+    DownloadEngine = MapView.BuiltInDLE
     DrawingEngine = MapView.BuiltInDE
     Font.Color = clBlack
     MapProvider = 'OpenStreetMap Mapnik'
@@ -37,9 +38,9 @@ object MainForm: TMainForm
     Height = 640
     Top = 0
     Width = 275
-    ActivePage = PgConfig
+    ActivePage = PgData
     Align = alRight
-    TabIndex = 1
+    TabIndex = 0
     TabOrder = 1
     object PgData: TTabSheet
       Caption = 'Data'
diff --git a/components/lazmapviewer/lazmapviewer_bgra.lpk b/components/lazmapviewer/lazmapviewer_bgra.lpk
index d0090b347..2fa552fd3 100644
--- a/components/lazmapviewer/lazmapviewer_bgra.lpk
+++ b/components/lazmapviewer/lazmapviewer_bgra.lpk
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
-  <Package Version="4">
+  <Package Version="5">
     <PathDelim Value="\"/>
     <Name Value="lazmapviewer_bgra"/>
     <Type Value="RunAndDesignTime"/>
@@ -12,6 +12,8 @@
         <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
       </SearchPaths>
     </CompilerOptions>
+    <Description Value="Add-on to LazMapViewer: Contains the drawing engine based on the BGRABitmap library."/>
+    <Version Minor="2"/>
     <Files Count="1">
       <Item1>
         <Filename Value="source\addons\bgra_drawingengine\mvde_bgra.pas"/>
diff --git a/components/lazmapviewer/lazmapviewer_rgbgraphics.lpk b/components/lazmapviewer/lazmapviewer_rgbgraphics.lpk
index 007678cda..3c14f30af 100644
--- a/components/lazmapviewer/lazmapviewer_rgbgraphics.lpk
+++ b/components/lazmapviewer/lazmapviewer_rgbgraphics.lpk
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
-  <Package Version="4">
+  <Package Version="5">
     <PathDelim Value="\"/>
     <Name Value="lazmapviewer_rgbgraphics"/>
     <Type Value="RunAndDesignTime"/>
@@ -15,7 +15,7 @@
     </CompilerOptions>
     <Description Value="Add-on to LazMapViewer: Contains the drawing engine based on the RGBGraphics package."/>
     <License Value="GPL2 or later"/>
-    <Version Minor="1"/>
+    <Version Minor="2"/>
     <Files Count="1">
       <Item1>
         <Filename Value="source\addons\rgbgraphics_drawingengine\mvde_rgbgraphics.pas"/>
diff --git a/components/lazmapviewer/lazmapviewer_synapse.lpk b/components/lazmapviewer/lazmapviewer_synapse.lpk
index 59205628f..df0661e06 100644
--- a/components/lazmapviewer/lazmapviewer_synapse.lpk
+++ b/components/lazmapviewer/lazmapviewer_synapse.lpk
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
-  <Package Version="4">
+  <Package Version="5">
     <PathDelim Value="\"/>
     <Name Value="lazMapViewer_Synapse"/>
     <Type Value="RunAndDesignTime"/>
@@ -15,7 +15,7 @@
     </CompilerOptions>
     <Description Value="Add-on to LazMapViewer: Contains the download engine based on the Synapse library."/>
     <License Value="GPL2 or later"/>
-    <Version Minor="1"/>
+    <Version Minor="2"/>
     <Files Count="1">
       <Item1>
         <Filename Value="source\addons\synapse_downloadengine\mvdlesynapse.pas"/>
diff --git a/components/lazmapviewer/lazmapviewerpkg.lpk b/components/lazmapviewer/lazmapviewerpkg.lpk
index 751b427d2..bb8234f74 100644
--- a/components/lazmapviewer/lazmapviewerpkg.lpk
+++ b/components/lazmapviewer/lazmapviewerpkg.lpk
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
-  <Package Version="4">
+  <Package Version="5">
     <Name Value="lazMapViewerPkg"/>
     <Type Value="RunAndDesignTime"/>
     <Author Value="Maciej Kaczkowski, ti_dic, Werner Pamler"/>
@@ -14,7 +14,7 @@
     <Description Value="Component for viewing maps (Google, OpenStreetMap, etc). 
 This is a fork of MapViewer by ti_dic (https://sourceforge.net/p/roadbook/code/ci/master/tree/mapviewer/) which itself is based on the MapViewer by Maciej Kaczkowski (https://github.com/maciejkaczkowski/mapviewer)."/>
     <License Value="GPL2 or later"/>
-    <Version Minor="1"/>
+    <Version Minor="2"/>
     <Files Count="18">
       <Item1>
         <Filename Value="source/mvcache.pas"/>
@@ -83,11 +83,11 @@ This is a fork of MapViewer by ti_dic (https://sourceforge.net/p/roadbook/code/c
       </Item16>
       <Item17>
         <Filename Value="source/mvde_intfgraphics.pas"/>
-        <UnitName Value="mvde_intfgraphics"/>
+        <UnitName Value="mvDE_IntfGraphics"/>
       </Item17>
       <Item18>
         <Filename Value="source/mvde_lcl.pas"/>
-        <UnitName Value="mvde_lcl"/>
+        <UnitName Value="mvDE_LCL"/>
       </Item18>
     </Files>
     <RequiredPkgs Count="1">