diff --git a/components/lazmapviewer/example/main.lfm b/components/lazmapviewer/example/main.lfm
index 659292085..91249977b 100644
--- a/components/lazmapviewer/example/main.lfm
+++ b/components/lazmapviewer/example/main.lfm
@@ -1,7 +1,7 @@
 object MainForm: TMainForm
-  Left = 258
+  Left = 345
   Height = 545
-  Top = 127
+  Top = 121
   Width = 869
   Caption = 'MainForm'
   ClientHeight = 545
@@ -364,7 +364,7 @@ object MainForm: TMainForm
   end
   object GeoNames: TMVGeoNames
     OnNameFound = GeoNamesNameFound
-    left = 416
-    top = 232
+    left = 328
+    top = 224
   end
 end
diff --git a/components/lazmapviewer/source/mvdragobj.pas b/components/lazmapviewer/source/mvdragobj.pas
index 72e295664..49c9bf1bf 100644
--- a/components/lazmapviewer/source/mvdragobj.pas
+++ b/components/lazmapviewer/source/mvdragobj.pas
@@ -15,7 +15,7 @@
   along with this library; if not, write to the Free Software Foundation,
   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 }
-unit mvdragobj;
+unit mvDragObj;
 
 {$mode objfpc}{$H+}
 
diff --git a/components/lazmapviewer/source/mvextradata.pas b/components/lazmapviewer/source/mvextradata.pas
index bc4876705..a8597bc6d 100644
--- a/components/lazmapviewer/source/mvextradata.pas
+++ b/components/lazmapviewer/source/mvextradata.pas
@@ -1,4 +1,4 @@
-unit mvextradata;
+unit mvExtraData;
 
 {$mode objfpc}{$H+}
 
diff --git a/components/lazmapviewer/source/mvgpsobj.pas b/components/lazmapviewer/source/mvgpsobj.pas
index 87ebd84be..c3ebb636b 100644
--- a/components/lazmapviewer/source/mvgpsobj.pas
+++ b/components/lazmapviewer/source/mvgpsobj.pas
@@ -15,7 +15,7 @@
   You should have received a copy of the GNU Library General Public License
   along with this library; if not, write to the Free Software Foundation,
   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-}unit mvgpsobj;
+}unit mvGpsObj;
 
 {$mode objfpc}{$H+}
 
diff --git a/components/lazmapviewer/source/mvmapviewer.pas b/components/lazmapviewer/source/mvmapviewer.pas
index 8a24710a4..56cb31105 100644
--- a/components/lazmapviewer/source/mvmapviewer.pas
+++ b/components/lazmapviewer/source/mvmapviewer.pas
@@ -17,7 +17,7 @@
   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 }
 
-unit MvMapViewer;
+unit mvMapViewer;
 
 {$MODE objfpc}{$H+}
 
diff --git a/components/lazmapviewer/source/mvtypes.pas b/components/lazmapviewer/source/mvtypes.pas
index 69a4f9323..646fcd6b4 100644
--- a/components/lazmapviewer/source/mvtypes.pas
+++ b/components/lazmapviewer/source/mvtypes.pas
@@ -18,7 +18,7 @@
   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 }
 
-unit mvtypes;
+unit mvTypes;
 
 {$mode objfpc}{$H+}