diff --git a/.gitattributes b/.gitattributes
index 49cb5049c9..be2bf14d26 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -644,8 +644,8 @@ components/memds/tmemdataset.png -text svneol=unset#image/png
 components/messagecomposer/messagecomposer.lfm svneol=native#text/plain
 components/messagecomposer/messagecomposer.lrs svneol=native#text/plain
 components/messagecomposer/messagecomposer.pas svneol=native#text/plain
-components/messagecomposer/messagescomposerpkg.lpk svneol=native#text/plain
-components/messagecomposer/messagescomposerpkg.pas svneol=native#text/plain
+components/messagecomposer/messagecomposerpkg.lpk svneol=native#text/plain
+components/messagecomposer/messagecomposerpkg.pas svneol=native#text/plain
 components/mpaslex/mpaslex.pp svneol=native#text/pascal
 components/opengl/agl.pp svneol=native#text/plain
 components/opengl/example/mainunit.lfm svneol=native#text/plain
@@ -3478,7 +3478,7 @@ packager/globallinks/lazparadox-0.lpl svneol=native#text/plain
 packager/globallinks/lazreport-0.9.5.lpl svneol=native#text/plain
 packager/globallinks/lazthread-0.lpl svneol=native#text/plain
 packager/globallinks/macosfiles-0.lpl svneol=native#text/plain
-packager/globallinks/messagescomposerpkg-0.lpl svneol=native#text/plain
+packager/globallinks/messagecomposerpkg-0.lpl svneol=native#text/plain
 packager/globallinks/popupnotifierlaz-0.lpl svneol=native#text/plain
 packager/globallinks/prettyformat-0.lpl svneol=native#text/plain
 packager/globallinks/prettymessages-0.lpl svneol=native#text/plain
diff --git a/components/messagecomposer/messagescomposerpkg.lpk b/components/messagecomposer/messagecomposerpkg.lpk
similarity index 97%
rename from components/messagecomposer/messagescomposerpkg.lpk
rename to components/messagecomposer/messagecomposerpkg.lpk
index 666f03993b..7371d786b5 100644
--- a/components/messagecomposer/messagescomposerpkg.lpk
+++ b/components/messagecomposer/messagecomposerpkg.lpk
@@ -2,7 +2,7 @@
 <CONFIG>
   <Package Version="3">
     <PathDelim Value="\"/>
-    <Name Value="messagescomposerpkg"/>
+    <Name Value="messagecomposerpkg"/>
     <CompilerOptions>
       <Version Value="5"/>
       <PathDelim Value="\"/>
diff --git a/components/messagecomposer/messagescomposerpkg.pas b/components/messagecomposer/messagecomposerpkg.pas
similarity index 100%
rename from components/messagecomposer/messagescomposerpkg.pas
rename to components/messagecomposer/messagecomposerpkg.pas
diff --git a/packager/globallinks/messagecomposerpkg-0.lpl b/packager/globallinks/messagecomposerpkg-0.lpl
new file mode 100644
index 0000000000..a92c94ea2c
--- /dev/null
+++ b/packager/globallinks/messagecomposerpkg-0.lpl
@@ -0,0 +1,2 @@
+$(LazarusDir)/components/messagecomposer/messagecomposerpkg.lpk
+
diff --git a/packager/globallinks/messagescomposerpkg-0.lpl b/packager/globallinks/messagescomposerpkg-0.lpl
deleted file mode 100644
index 5db8931134..0000000000
--- a/packager/globallinks/messagescomposerpkg-0.lpl
+++ /dev/null
@@ -1,2 +0,0 @@
-$(LazarusDir)/components/messagecomposer/messagescomposerpkg.lpk
-