Initial attempt at mass renaming

12 files changed, 178 insertions, 178 deletions

diff --git a/packaging/debian/changelog b/packaging/debian/changelog
index ef96f736a..6dbe63243 100644
--- a/packaging/debian/changelog
+++ b/packaging/debian/changelog
@@ -1,49 +1,49 @@
-manaplus (1.6.4.23-2) UNRELEASED; urgency=medium
+manaverse (1.6.4.23-2) UNRELEASED; urgency=medium
 
   * Adjust debian/copyright.
 
  -- Patrick Matthäi <pmatthaei@debian.org>  Sun, 24 Apr 2016 12:16:34 +0200
 
-manaplus (1.6.4.23-1) unstable; urgency=medium
+manaverse (1.6.4.23-1) unstable; urgency=medium
 
   * New upstream release.
 
  -- Patrick Matthäi <pmatthaei@debian.org>  Sun, 24 Apr 2016 11:49:16 +0200
 
-manaplus (1.6.4.9-1) unstable; urgency=medium
+manaverse (1.6.4.9-1) unstable; urgency=medium
 
   * New upstream release.
   * Override false positive spelling-error-in-binary lintian warning.
 
  -- Patrick Matthäi <pmatthaei@debian.org>  Sun, 17 Apr 2016 12:22:55 +0200
 
-manaplus (1.6.3.26-1) unstable; urgency=medium
+manaverse (1.6.3.26-1) unstable; urgency=medium
 
   * New upstream release.
 
  -- Patrick Matthäi <pmatthaei@debian.org>  Wed, 30 Mar 2016 10:17:53 +0200
 
-manaplus (1.6.3.12-1) unstable; urgency=medium
+manaverse (1.6.3.12-1) unstable; urgency=medium
 
   * New upstream release.
   * Enable full hardening.
 
  -- Patrick Matthäi <pmatthaei@debian.org>  Thu, 17 Mar 2016 19:25:51 +0100
 
-manaplus (1.6.2.13-1) unstable; urgency=medium
+manaverse (1.6.2.13-1) unstable; urgency=medium
 
   * New upstream release.
   * Bump Standards-Version to 3.9.7 (no changes required).
 
  -- Patrick Matthäi <pmatthaei@debian.org>  Tue, 16 Feb 2016 13:24:18 +0100
 
-manaplus (1.6.1.30-1) unstable; urgency=medium
+manaverse (1.6.1.30-1) unstable; urgency=medium
 
   * New upstream release.
 
  -- Patrick Matthäi <pmatthaei@debian.org>  Mon, 01 Feb 2016 14:16:42 +0100
 
-manaplus (1.6.1.16-1) unstable; urgency=medium
+manaverse (1.6.1.16-1) unstable; urgency=medium
 
   * New upstream release.
   * Adjust debian/copyright.
@@ -52,20 +52,20 @@ manaplus (1.6.1.16-1) unstable; urgency=medium
 
  -- Patrick Matthäi <pmatthaei@debian.org>  Mon, 18 Jan 2016 10:09:13 +0100
 
-manaplus (1.6.1.2-1) unstable; urgency=medium
+manaverse (1.6.1.2-1) unstable; urgency=medium
 
   * New upstream release.
   * Adjust debian/copyright.
 
  -- Patrick Matthäi <pmatthaei@debian.org>  Mon, 04 Jan 2016 11:48:33 +0100
 
-manaplus (1.5.12.19-1) unstable; urgency=medium
+manaverse (1.5.12.19-1) unstable; urgency=medium
 
   * New upstream release.
 
  -- Patrick Matthäi <pmatthaei@debian.org>  Mon, 21 Dec 2015 13:36:58 +0100
 
-manaplus (1.5.12.5-1) unstable; urgency=medium
+manaverse (1.5.12.5-1) unstable; urgency=medium
 
   * New upstream release.
     - Adjust file list in debian/copyright.
@@ -74,48 +74,48 @@ manaplus (1.5.12.5-1) unstable; urgency=medium
 
  -- Patrick Matthäi <pmatthaei@debian.org>  Wed, 16 Dec 2015 10:42:32 +0100
 
-manaplus (1.5.11.7-1) unstable; urgency=medium
+manaverse (1.5.11.7-1) unstable; urgency=medium
 
   * New upstream release.
   * Adjust debian/copyright.
 
  -- Patrick Matthäi <pmatthaei@debian.org>  Wed, 11 Nov 2015 13:33:42 +0100
 
-manaplus (1.5.10.24-1) unstable; urgency=medium
+manaverse (1.5.10.24-1) unstable; urgency=medium
 
   * New upstream release.
   * Adjust debian/copyright.
 
  -- Patrick Matthäi <pmatthaei@debian.org>  Mon, 26 Oct 2015 17:56:26 +0100
 
-manaplus (1.5.10.10-1) unstable; urgency=medium
+manaverse (1.5.10.10-1) unstable; urgency=medium
 
   * New upstream release.
 
  -- Patrick Matthäi <pmatthaei@debian.org>  Mon, 12 Oct 2015 16:01:14 +0200
 
-manaplus (1.5.9.26-1) unstable; urgency=medium
+manaverse (1.5.9.26-1) unstable; urgency=medium
 
   * New upstream release.
   * Adjust debian/copyright.
 
  -- Patrick Matthäi <pmatthaei@debian.org>  Tue, 06 Oct 2015 10:15:05 +0200
 
-manaplus (1.5.9.12-1) unstable; urgency=medium
+manaverse (1.5.9.12-1) unstable; urgency=medium
 
   * New upstream release.
   * Adjust debian/copyright.
 
  -- Patrick Matthäi <pmatthaei@debian.org>  Mon, 21 Sep 2015 14:21:46 +0200
 
-manaplus (1.5.8.29-1) unstable; urgency=medium
+manaverse (1.5.8.29-1) unstable; urgency=medium
 
   * New upstream release.
   * Fix some debian/copyright lintian warnings.
 
  -- Patrick Matthäi <pmatthaei@debian.org>  Wed, 02 Sep 2015 20:27:04 +0200
 
-manaplus (1.5.8.15-1) unstable; urgency=medium
+manaverse (1.5.8.15-1) unstable; urgency=medium
 
   * New upstream release.
     - Adjust debian/copyright.
@@ -123,108 +123,108 @@ manaplus (1.5.8.15-1) unstable; urgency=medium
 
  -- Patrick Matthäi <pmatthaei@debian.org>  Thu, 27 Aug 2015 19:32:00 +0200
 
-manaplus (1.5.8.1-1) unstable; urgency=medium
+manaverse (1.5.8.1-1) unstable; urgency=medium
 
   * New upstream release.
 
  -- Patrick Matthäi <pmatthaei@debian.org>  Tue, 04 Aug 2015 10:56:05 +0200
 
-manaplus (1.5.7.18-1) unstable; urgency=medium
+manaverse (1.5.7.18-1) unstable; urgency=medium
 
   * New upstream release.
 
  -- Patrick Matthäi <pmatthaei@debian.org>  Mon, 27 Jul 2015 17:58:54 +0200
 
-manaplus (1.5.7.4-1) unstable; urgency=low
+manaverse (1.5.7.4-1) unstable; urgency=low
 
   * New upstream release.
   * Remove around 3700 useless lines from debian/copyright.
 
  -- Patrick Matthäi <pmatthaei@debian.org>  Tue, 07 Jul 2015 10:12:39 +0200
 
-manaplus (1.5.6.20-1) unstable; urgency=low
+manaverse (1.5.6.20-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Patrick Matthäi <pmatthaei@debian.org>  Mon, 22 Jun 2015 10:46:24 +0200
 
-manaplus (1.5.6.6-1) unstable; urgency=low
+manaverse (1.5.6.6-1) unstable; urgency=low
 
   * New upstream release.
     - Adjust debian/copyright.
 
  -- Patrick Matthäi <pmatthaei@debian.org>  Tue, 16 Jun 2015 13:36:42 +0200
 
-manaplus (1.5.5.23-1) unstable; urgency=low
+manaverse (1.5.5.23-1) unstable; urgency=low
 
   * New upstream release.
     - Adjust debian/copyright.
 
  -- Patrick Matthäi <pmatthaei@debian.org>  Fri, 29 May 2015 11:51:16 +0200
 
-manaplus (1.5.5.9-1) unstable; urgency=low
+manaverse (1.5.5.9-1) unstable; urgency=low
 
   * New upstream release.
     - Adjust debian/copyright.
 
  -- Patrick Matthäi <pmatthaei@debian.org>  Tue, 12 May 2015 20:07:43 +0200
 
-manaplus (1.5.4.25-1) unstable; urgency=low
+manaverse (1.5.4.25-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Patrick Matthäi <pmatthaei@debian.org>  Sun, 26 Apr 2015 13:46:44 +0200
 
-manaplus (1.5.4.11-1) unstable; urgency=low
+manaverse (1.5.4.11-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Patrick Matthäi <pmatthaei@debian.org>  Mon, 13 Apr 2015 18:42:23 +0200
 
-manaplus (1.5.3.14-1) unstable; urgency=low
+manaverse (1.5.3.14-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Patrick Matthäi <pmatthaei@debian.org>  Tue, 17 Mar 2015 15:42:44 +0100
 
-manaplus (1.5.2.28-1) unstable; urgency=low
+manaverse (1.5.2.28-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Patrick Matthäi <pmatthaei@debian.org>  Mon, 02 Mar 2015 08:40:07 +0100
 
-manaplus (1.5.2.14-1) unstable; urgency=low
+manaverse (1.5.2.14-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Patrick Matthäi <pmatthaei@debian.org>  Sat, 14 Feb 2015 16:30:45 +0100
 
-manaplus (1.5.1.31-1) unstable; urgency=low
+manaverse (1.5.1.31-1) unstable; urgency=low
 
   * New upstream release.
   * Fix some wildcard-matches-nothing-in-dep5-copyright warnings.
 
  -- Patrick Matthäi <pmatthaei@debian.org>  Thu, 05 Feb 2015 10:52:57 +0100
 
-manaplus (1.5.1.17-1) unstable; urgency=low
+manaverse (1.5.1.17-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Patrick Matthäi <pmatthaei@debian.org>  Mon, 19 Jan 2015 19:32:00 +0100
 
-manaplus (1.5.1.3-1) unstable; urgency=low
+manaverse (1.5.1.3-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Patrick Matthäi <pmatthaei@debian.org>  Wed, 07 Jan 2015 11:00:54 +0100
 
-manaplus (1.4.12.20-1) unstable; urgency=low
+manaverse (1.4.12.20-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Patrick Matthäi <pmatthaei@debian.org>  Tue, 30 Dec 2014 19:26:33 +0100
 
-manaplus (1.4.12.6-1) unstable; urgency=low
+manaverse (1.4.12.6-1) unstable; urgency=low
 
   [ Andrei Karas ]
   * Updated debian/copyright.
@@ -234,13 +234,13 @@ manaplus (1.4.12.6-1) unstable; urgency=low
 
  -- Patrick Matthäi <pmatthaei@debian.org>  Fri, 12 Dec 2014 18:24:32 +0100
 
-manaplus (1.4.11.8-1) unstable; urgency=low
+manaverse (1.4.11.8-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Patrick Matthäi <pmatthaei@debian.org>  Sun, 09 Nov 2014 21:20:57 +0100
 
-manaplus (1.4.10.25-1) unstable; urgency=low
+manaverse (1.4.10.25-1) unstable; urgency=low
 
   [ Andrei Karas ]
   * Updated debian/copyright.
@@ -250,38 +250,38 @@ manaplus (1.4.10.25-1) unstable; urgency=low
 
  -- Patrick Matthäi <pmatthaei@debian.org>  Mon, 27 Oct 2014 18:15:40 +0100
 
-manaplus (1.4.10.11-1) unstable; urgency=medium
+manaverse (1.4.10.11-1) unstable; urgency=medium
 
   * New upstream release.
 
  -- Patrick Matthäi <pmatthaei@debian.org>  Sun, 12 Oct 2014 12:23:57 +0200
 
-manaplus (1.4.9.27-1) unstable; urgency=medium
+manaverse (1.4.9.27-1) unstable; urgency=medium
 
   * New upstream release.
   * Bump Standards-Version to 3.9.6 (no changes required).
 
  -- Patrick Matthäi <pmatthaei@debian.org>  Tue, 30 Sep 2014 18:10:18 +0200
 
-manaplus (1.4.9.14-1) unstable; urgency=medium
+manaverse (1.4.9.14-1) unstable; urgency=medium
 
   * New upstream release.
 
  -- Patrick Matthäi <pmatthaei@debian.org>  Wed, 17 Sep 2014 10:40:04 +0200
 
-manaplus (1.4.8.30-1) unstable; urgency=medium
+manaverse (1.4.8.30-1) unstable; urgency=medium
 
   * New upstream release.
 
  -- Patrick Matthäi <pmatthaei@debian.org>  Wed, 03 Sep 2014 10:15:37 +0200
 
-manaplus (1.4.8.16-1) unstable; urgency=medium
+manaverse (1.4.8.16-1) unstable; urgency=medium
 
   * New upstream release.
 
  -- Patrick Matthäi <pmatthaei@debian.org>  Wed, 20 Aug 2014 09:15:48 +0200
 
-manaplus (1.4.8.2-1) unstable; urgency=medium
+manaverse (1.4.8.2-1) unstable; urgency=medium
 
   [ Andrei Karas ]
   * Enable parallel building (Closes: #755944)
@@ -291,62 +291,62 @@ manaplus (1.4.8.2-1) unstable; urgency=medium
 
  -- Patrick Matthäi <pmatthaei@debian.org>  Thu, 07 Aug 2014 10:14:44 +0200
 
-manaplus (1.4.7.19-1) unstable; urgency=medium
+manaverse (1.4.7.19-1) unstable; urgency=medium
 
   * New upstream release.
 
  -- Patrick Matthäi <pmatthaei@debian.org>  Thu, 24 Jul 2014 19:07:38 +0200
 
-manaplus (1.4.7.5-1) unstable; urgency=medium
+manaverse (1.4.7.5-1) unstable; urgency=medium
 
   * New upstream release.
   * Switch away from hardening-wrapper.
 
  -- Patrick Matthäi <pmatthaei@debian.org>  Mon, 07 Jul 2014 13:21:59 +0200
 
-manaplus (1.4.6.7-1) unstable; urgency=medium
+manaverse (1.4.6.7-1) unstable; urgency=medium
 
   * New upstream release.
 
  -- Patrick Matthäi <pmatthaei@debian.org>  Tue, 10 Jun 2014 10:47:30 +0200
 
-manaplus (1.4.5.24-1) unstable; urgency=medium
+manaverse (1.4.5.24-1) unstable; urgency=medium
 
   * New upstream release.
 
  -- Patrick Matthäi <pmatthaei@debian.org>  Tue, 27 May 2014 10:43:52 +0200
 
-manaplus (1.4.5.10-1) unstable; urgency=medium
+manaverse (1.4.5.10-1) unstable; urgency=medium
 
   * New upstream release.
 
  -- Patrick Matthäi <pmatthaei@debian.org>  Sat, 10 May 2014 22:13:42 +0200
 
-manaplus (1.4.4.26-1) unstable; urgency=medium
+manaverse (1.4.4.26-1) unstable; urgency=medium
 
   * New upstream release.
 
  -- Patrick Matthäi <pmatthaei@debian.org>  Mon, 28 Apr 2014 09:57:12 +0200
 
-manaplus (1.4.4.12-1) unstable; urgency=medium
+manaverse (1.4.4.12-1) unstable; urgency=medium
 
   * New upstream release.
 
  -- Patrick Matthäi <pmatthaei@debian.org>  Mon, 14 Apr 2014 21:15:45 +0200
 
-manaplus (1.4.3.29-1) unstable; urgency=low
+manaverse (1.4.3.29-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Patrick Matthäi <pmatthaei@debian.org>  Mon, 31 Mar 2014 11:43:54 +0200
 
-manaplus (1.4.3.15-1) unstable; urgency=low
+manaverse (1.4.3.15-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Patrick Matthäi <pmatthaei@debian.org>  Mon, 17 Mar 2014 10:03:57 +0100
 
-manaplus (1.4.3.1.1-1) unstable; urgency=low
+manaverse (1.4.3.1.1-1) unstable; urgency=low
 
   [ Andrei Karas ]
   * Remove guichan from dependency.
@@ -356,13 +356,13 @@ manaplus (1.4.3.1.1-1) unstable; urgency=low
 
  -- Patrick Matthäi <pmatthaei@debian.org>  Thu, 06 Mar 2014 09:57:20 +0100
 
-manaplus (1.4.2.15-1) unstable; urgency=low
+manaverse (1.4.2.15-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Patrick Matthäi <pmatthaei@debian.org>  Thu, 20 Feb 2014 11:25:50 +0100
 
-manaplus (1.4.2.1-1) unstable; urgency=low
+manaverse (1.4.2.1-1) unstable; urgency=low
 
   [ Andrei Karas ]
   * Add missing directories into package
@@ -373,19 +373,19 @@ manaplus (1.4.2.1-1) unstable; urgency=low
 
  -- Patrick Matthäi <pmatthaei@debian.org>  Wed, 12 Feb 2014 09:14:45 +0100
 
-manaplus (1.4.1.18-1) unstable; urgency=low
+manaverse (1.4.1.18-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Patrick Matthäi <pmatthaei@debian.org>  Mon, 20 Jan 2014 10:44:16 +0100
 
-manaplus (1.4.1.4-1) unstable; urgency=low
+manaverse (1.4.1.4-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Patrick Matthäi <pmatthaei@debian.org>  Fri, 10 Jan 2014 11:00:12 +0100
 
-manaplus (1.3.12.22-1) unstable; urgency=low
+manaverse (1.3.12.22-1) unstable; urgency=low
 
   [ Andrei Karas ]
   * Update copyright file.
@@ -396,19 +396,19 @@ manaplus (1.3.12.22-1) unstable; urgency=low
 
  -- Patrick Matthäi <pmatthaei@debian.org>  Fri, 03 Jan 2014 11:32:13 +0100
 
-manaplus (1.3.11.24-1) unstable; urgency=low
+manaverse (1.3.11.24-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Patrick Matthäi <pmatthaei@debian.org>  Mon, 02 Dec 2013 13:52:14 +0100
 
-manaplus (1.3.11.10-1) unstable; urgency=low
+manaverse (1.3.11.10-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Patrick Matthäi <pmatthaei@debian.org>  Mon, 18 Nov 2013 15:19:44 +0100
 
-manaplus (1.3.10.27.2-1) unstable; urgency=low
+manaverse (1.3.10.27.2-1) unstable; urgency=low
 
   * New upstream release.
   * Bump Standards-Version to 3.9.5 (no changes needed).
@@ -416,26 +416,26 @@ manaplus (1.3.10.27.2-1) unstable; urgency=low
 
  -- Patrick Matthäi <pmatthaei@debian.org>  Fri, 08 Nov 2013 11:57:04 +0100
 
-manaplus (1.3.10.12-1) unstable; urgency=low
+manaverse (1.3.10.12-1) unstable; urgency=low
 
   * New upstream release.
   * Overwrite false positive lintian warning about a spelling error.
 
  -- Patrick Matthäi <pmatthaei@debian.org>  Tue, 15 Oct 2013 10:30:56 +0200
 
-manaplus (1.3.9.29-1) unstable; urgency=low
+manaverse (1.3.9.29-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Patrick Matthäi <pmatthaei@debian.org>  Mon, 07 Oct 2013 10:26:14 +0200
 
-manaplus (1.3.9.15-1) unstable; urgency=low
+manaverse (1.3.9.15-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Patrick Matthäi <pmatthaei@debian.org>  Tue, 17 Sep 2013 10:35:51 +0200
 
-manaplus (1.3.9.1-1) unstable; urgency=low
+manaverse (1.3.9.1-1) unstable; urgency=low
 
   [ Andrei Karas ]
   * Add new files to copyright file.
@@ -445,19 +445,19 @@ manaplus (1.3.9.1-1) unstable; urgency=low
 
  -- Patrick Matthäi <pmatthaei@debian.org>  Mon, 02 Sep 2013 10:54:55 +0200
 
-manaplus (1.3.8.18-1) unstable; urgency=low
+manaverse (1.3.8.18-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Patrick Matthäi <pmatthaei@debian.org>  Wed, 21 Aug 2013 08:50:08 +0200
 
-manaplus (1.3.8.4-1) unstable; urgency=low
+manaverse (1.3.8.4-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Patrick Matthäi <pmatthaei@debian.org>  Tue, 13 Aug 2013 10:18:49 +0200
 
-manaplus (1.3.7.21-1) unstable; urgency=low
+manaverse (1.3.7.21-1) unstable; urgency=low
 
   [ Andrei Karas ]
   * Add new files to copyright file.
@@ -467,13 +467,13 @@ manaplus (1.3.7.21-1) unstable; urgency=low
 
  -- Patrick Matthäi <pmatthaei@debian.org>  Tue, 23 Jul 2013 12:48:43 +0200
 
-manaplus (1.3.7.7.1-1) unstable; urgency=low
+manaverse (1.3.7.7.1-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Patrick Matthäi <pmatthaei@debian.org>  Thu, 11 Jul 2013 10:09:41 +0200
 
-manaplus (1.3.6.9-1) unstable; urgency=low
+manaverse (1.3.6.9-1) unstable; urgency=low
 
   [ Andrei Karas ]
   * Add new files to copyright file.
@@ -483,7 +483,7 @@ manaplus (1.3.6.9-1) unstable; urgency=low
 
  -- Patrick Matthäi <pmatthaei@debian.org>  Mon, 10 Jun 2013 10:53:26 +0200
 
-manaplus (1.3.5.26-1) unstable; urgency=low
+manaverse (1.3.5.26-1) unstable; urgency=low
 
   [ Andrei Karas ]
   * Add new files to copyright file.
@@ -494,7 +494,7 @@ manaplus (1.3.5.26-1) unstable; urgency=low
 
  -- Patrick Matthäi <pmatthaei@debian.org>  Mon, 27 May 2013 09:14:03 +0200
 
-manaplus (1.3.5.12-1) unstable; urgency=low
+manaverse (1.3.5.12-1) unstable; urgency=low
 
   [ Andrei Karas ]
   * Add new files to copyright file.
@@ -504,7 +504,7 @@ manaplus (1.3.5.12-1) unstable; urgency=low
 
  -- Patrick Matthäi <pmatthaei@debian.org>  Sat, 18 May 2013 21:06:29 +0200
 
-manaplus (1.3.4.28-1) unstable; urgency=low
+manaverse (1.3.4.28-1) unstable; urgency=low
 
   [ Andrei Karas ]
   * Add new files to copyright file.
@@ -514,7 +514,7 @@ manaplus (1.3.4.28-1) unstable; urgency=low
 
  -- Patrick Matthäi <pmatthaei@debian.org>  Sun, 05 May 2013 21:01:43 +0200
 
-manaplus (1.3.4.14-1) unstable; urgency=low
+manaverse (1.3.4.14-1) unstable; urgency=low
 
   [ Andrei Karas ]
   * Initial release (Closes: #627141)
diff --git a/packaging/debian/control b/packaging/debian/control
index 406256830..db0f97bb4 100644
--- a/packaging/debian/control
+++ b/packaging/debian/control
@@ -1,4 +1,4 @@
-Source: manaplus
+Source: manaverse
 Section: games
 Priority: optional
 Homepage: http://manaplus.org/
@@ -21,7 +21,7 @@ Build-Depends: debhelper (>= 9),
  dh-autoreconf,
  autopoint
 
-Package: manaplus
+Package: manaverse
 Architecture: any
 Depends: ${shlibs:Depends},
  ${misc:Depends},
@@ -31,7 +31,7 @@ Depends: ${shlibs:Depends},
  xdg-utils
 Suggests: mumble
 Description: Extended client for Evol Online and The Mana World
- ManaPlus is an extended client for Evol Online, The Mana World, and similar
+ ManaVerse is an extended client for Evol Online, The Mana World, and similar
  servers based on a fork of eAthena. Evol Online is a 2D fantasy-style game
  which aims to create a friendly environment for interacting with others where
  people can escape reality and enjoy themselves. The Mana World (TMW) is a
@@ -43,27 +43,27 @@ Section: debug
 Architecture: any
 Priority: extra
 Depends: ${misc:Depends},
- manaplus (= ${binary:Version})
+ manaverse (= ${binary:Version})
 Description: Extended client for Evol Online and The Mana World (debugging symbols)
- ManaPlus is an extended client for Evol Online, The Mana World, and similar
+ ManaVerse is an extended client for Evol Online, The Mana World, and similar
  servers based on a fork of eAthena. Evol Online is a 2D fantasy-style game
  which aims to create a friendly environment for interacting with others where
  people can escape reality and enjoy themselves. The Mana World (TMW) is a
  serious effort to create an innovative free and open source MMORPG.
  TMW uses 2D graphics and aims to create a large and diverse interactive world.
  .
- This package provides debugging symbols for the manaplus package.
+ This package provides debugging symbols for the manaverse package.
 
 Package: manaplus-data
 Architecture: all
 Depends: ${misc:Depends},
  ttf-dejavu-core,
  fonts-liberation
-Recommends: manaplus,
+Recommends: manaverse,
  fonts-mplus,
  fonts-wqy-microhei
 Description: Extended client for Evol Online and The Mana World (data files)
- ManaPlus is an extended client for Evol Online, The Mana World, and similar
+ ManaVerse is an extended client for Evol Online, The Mana World, and similar
  servers based on a fork of eAthena. Evol Online is a 2D fantasy-style game
  which aims to create a friendly environment for interacting with others where
  people can escape reality and enjoy themselves. The Mana World (TMW) is a
diff --git a/packaging/debian/copyright b/packaging/debian/copyright
index 846ea7e19..a9d8cd5e8 100644
--- a/packaging/debian/copyright
+++ b/packaging/debian/copyright
@@ -1,6 +1,6 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: manaplus
-Source: http://download.evolonline.org/manaplus/download/
+Upstream-Name: manaverse
+Source: http://download.germantmw.de/manaplus/download/
 
 Files: *
 Copyright: 2004-2009  The Mana World Development Team
@@ -47,7 +47,7 @@ License: zlib
  This file is part of Stones of Nvwa:
       http://sourceforge.net/projects/nvwa
  .
- original version changed for ManaPlus
+ original version changed for ManaVerse
 
 Files: src/sdl2gfx/*
 Copyright: 2001-2012  Andreas Schiffler
@@ -518,22 +518,22 @@ License: public-domain
 Files: data/themes/golden-delicious/*
 Copyright: 2012-2013 Francesco Miglietta
            2013 t3st3r
-           2012-2014 ManaPlus developers
+           2012-2014 ManaVerse developers
 License: CC-BY-SA-3.0
 
 Files: data/themes/jewelry/*
 Copyright: 2012-2013 Francesco Miglietta
-           2012-2014 ManaPlus developers
+           2012-2014 ManaVerse developers
 License: CC-BY-SA-3.0
 
 Files: data/themes/pink/*
 Copyright: 2011 Aline Ferraz de Souza
-           2011-2014 ManaPlus developers
+           2011-2014 ManaVerse developers
 License: CC-BY-SA-3.0
 
 Files: data/themes/unity/*
 Copyright: 2011 Aline Ferraz de Souza
-           2011-2014 ManaPlus developers
+           2011-2014 ManaVerse developers
 License: CC-BY-SA-3.0
 
 Files: data/graphics/gui/target-cursor-in-range-l.xml
diff --git a/packaging/debian/manaplus.lintian-overrides b/packaging/debian/manaplus.lintian-overrides
index fb8da9244..ce640d2ea 100644
--- a/packaging/debian/manaplus.lintian-overrides
+++ b/packaging/debian/manaplus.lintian-overrides
@@ -1,3 +1,3 @@
-manaplus: spelling-error-in-binary usr/games/manaplus dont don't
-manaplus: spelling-error-in-binary usr/games/manaplus standart standard
-manaplus: spelling-error-in-binary usr/games/manaplus spaw spawn
+manaverse: spelling-error-in-binary usr/games/manaplus dont don't
+manaverse: spelling-error-in-binary usr/games/manaplus standart standard
+manaverse: spelling-error-in-binary usr/games/manaplus spaw spawn
diff --git a/packaging/debian/manaplus.menu b/packaging/debian/manaplus.menu
index df633b0e9..02a9f0ee4 100644
--- a/packaging/debian/manaplus.menu
+++ b/packaging/debian/manaplus.menu
@@ -1,5 +1,5 @@
-?package(manaplus):needs="X11" section="Games/Adventure" \
- title="ManaPlus" \
- longtitle="ManaPlus is a 2D MMORPG client." \
+?package(manaverse):needs="X11" section="Games/Adventure" \
+ title="ManaVerse" \
+ longtitle="ManaVerse is a 2D MMORPG client." \
  command="/usr/games/manaplus" \
  icon="/usr/share/pixmaps/manaplus.xpm"
diff --git a/packaging/debian/source.lintian-overrides b/packaging/debian/source.lintian-overrides
index 615c5ddde..86de4d849 100644
--- a/packaging/debian/source.lintian-overrides
+++ b/packaging/debian/source.lintian-overrides
@@ -1,2 +1,2 @@
-manaplus source: dep5-copyright-license-name-not-unique
-manaplus source: missing-license-paragraph-in-dep5-copyright gpl-2
+manaverse source: dep5-copyright-license-name-not-unique
+manaverse source: missing-license-paragraph-in-dep5-copyright gpl-2
diff --git a/packaging/debian/watch b/packaging/debian/watch
index 1641bca30..ee00ae4a4 100644
--- a/packaging/debian/watch
+++ b/packaging/debian/watch
@@ -1,2 +1,2 @@
 version=3
-opts=pgpsigurlmangle=s/$/.sig/ http://download.evolonline.org/manaplus/download/latest/manaplus-([\d+.]+)\.tar\.xz
+opts=pgpsigurlmangle=s/$/.sig/ http://download.germantmw.de/manaplus/download/latest/manaplus-([\d+.]+)\.tar\.xz
diff --git a/packaging/nacl/ports/manaplus/pkg_info b/packaging/nacl/ports/manaplus/pkg_info
index 314dfb0b7..4772aa305 100644
--- a/packaging/nacl/ports/manaplus/pkg_info
+++ b/packaging/nacl/ports/manaplus/pkg_info
@@ -1,4 +1,4 @@
-NAME=manaplus
+NAME=manaverse
 VERSION=1
 #URL=https://gitlab.com/manaplus/manaplus.git@master
 LICENSE=GPL
diff --git a/packaging/openSUSE Build Service/manaplus.spec b/packaging/openSUSE Build Service/manaplus.spec
index 852f6422c..80b45fb8d 100644
--- a/packaging/openSUSE Build Service/manaplus.spec
+++ b/packaging/openSUSE Build Service/manaplus.spec
@@ -1,11 +1,11 @@
-Name:		manaplus
+Name:		manaverse
 Version:	1.1.6.26
 Release:	1
 Summary:	A client for Evol Online and The Mana World: 2D MMORPG
 Group:		Games/Other
 License:	GPLv2+
-Url:		http://manaplus.evolonline.org/
-Source0:	http://download.evolonline.org/manaplus/download/%{version}/%{name}-%{version}.tar.bz2
+Url:		http://manaplus.germantmw.de/
+Source0:	http://download.germantmw.de/manaplus/download/%{version}/%{name}-%{version}.tar.bz2
 BuildRoot:	%{_topdir}/%{name}-%{version}-root
 
 BuildRequires:	gcc-c++
@@ -25,7 +25,7 @@ Provides:	evolonline-client = %{version}-%{release}
 Provides:	manaworld-client = %{version}-%{release}
 
 %description
-ManaPlus is extended client for Evol Online, The Mana World and similar
+ManaVerse is extended client for Evol Online, The Mana World and similar
 servers based on eAthena fork.
 As a 2D style game, Evol Online aims to create a friendly environment where 
 people can escape reality and interact with others while enjoying themselves 
@@ -73,7 +73,7 @@ rm -rf %{buildroot}
 * Fri Apr 08 2011 alien <alien> 1.1.4.3-1.mga1
 + Revision: 82020
 - Update to new version 1.1.4.3
-- manaplus is now primarily for Evol Online, updating Summary and Description and add Provides
+- manaverse is now primarily for Evol Online, updating Summary and Description and add Provides
 - suggests mumble
 
 * Sat Feb 26 2011 alien <alien> 1.1.2.20-1.mga1
@@ -83,7 +83,7 @@ rm -rf %{buildroot}
 - Remove unneeded mv files
 - Remove BuildRoot
 - use tmw spec file as basis
-- imported package manaplus
+- imported package manaverse
 
 
 * Sun Jan 31 2010 Jérôme Brenier <incubusss@mandriva.org> 0.0.29.1-3mdv2010.1
diff --git a/packaging/switch/CMakeLists.txt.switch b/packaging/switch/CMakeLists.txt.switch
index 3895c9b0f..780fed317 100644
--- a/packaging/switch/CMakeLists.txt.switch
+++ b/packaging/switch/CMakeLists.txt.switch
@@ -25,7 +25,7 @@ elseif (PLATFORM_SWITCH)
     set(BUILD_SHARED_LIBS OFF CACHE INTERNAL "Shared libs not available")
 endif ()
 
-project(ManaPlus)
+project(ManaVerse)
 
 file(GLOB SOURCES src/*.cpp)
 set(SOURCES_DIRS src/being src/enums/being src/fs src/gui src/input
@@ -39,9 +39,9 @@ endforeach (DIR)
 
 set(INCLUDES src src/sdl2gfx)
 
-set(FLAGS -DPACKAGE_NAME=\"ManaPlus\" -DPACKAGE_TARNAME=\"manaplus\" -DPACKAGE_VERSION=\"1.9.3.23\"
-        -DPACKAGE_STRING=\"ManaPlus\ 1.9.3.23\" -DPACKAGE_BUGREPORT=\"akaras@inbox.ru\" -DPACKAGE_URL=\"\"
-        -DPACKAGE=\"manaplus\" -DVERSION=\"1.9.3.23\" -DTIME_WITH_SYS_TIME=1 -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1
+set(FLAGS -DPACKAGE_NAME=\"ManaVerse\" -DPACKAGE_TARNAME=\"manaverse\" -DPACKAGE_VERSION=\"1.9.3.23\"
+        -DPACKAGE_STRING=\"ManaVerse\ 1.9.3.23\" -DPACKAGE_BUGREPORT=\"akaras@inbox.ru\" -DPACKAGE_URL=\"\"
+        -DPACKAGE=\"manaverse\" -DVERSION=\"1.9.3.23\" -DTIME_WITH_SYS_TIME=1 -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1
         -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1
         -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_SYS_SELECT_H=1 -DHAVE_SYS_SOCKET_H=1
         -DSELECT_TYPE_ARG1=int -DSELECT_TYPE_ARG234=\(fd_set\ \\*\) -DSELECT_TYPE_ARG5=\(struct\ timeval\ \\*\)
diff --git a/packaging/windows/evol.nsi b/packaging/windows/evol.nsi
index 1aa27088a..ccf3aade4 100644
--- a/packaging/windows/evol.nsi
+++ b/packaging/windows/evol.nsi
@@ -3,8 +3,8 @@
 ; like the old install script.
 ;
 ; DLLDIR - directory containing required dlls
-; EXEDIR - directory containing manaplus.exe
-; EXESUFFIX - offset to SRCDIR pointing to a directory containing manaplus.exe
+; EXEDIR - directory containing manaverse.exe
+; EXESUFFIX - offset to SRCDIR pointing to a directory containing manaverse.exe
 ; PRODUCT_VERSION - software version
 ; UPX - upx binary name
 ;
@@ -46,7 +46,7 @@ RequestExecutionLevel admin
 !endif
 
 ;--- (and without !defines ) ---
-!System "${UPX} --best --crp-ms=999999 --compress-icons=0 --nrv2d ${EXEDIR}\manaplus.exe"
+!System "${UPX} --best --crp-ms=999999 --compress-icons=0 --nrv2d ${EXEDIR}\manaverse.exe"
 
 !define MULTIUSER_INSTALLMODE_COMMANDLINE
 !define MULTIUSER_EXECUTIONLEVEL "admin"
@@ -58,8 +58,8 @@ RequestExecutionLevel admin
   !define PRODUCT_VERSION "1.1"
 !endif
 !define PRODUCT_PUBLISHER "Evol Online Delopment Team"
-!define PRODUCT_WEB_SITE "http://www.evolonline.org/"
-!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\manaplus.exe"
+!define PRODUCT_WEB_SITE "http://www.germantmw.de/"
+!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\manaverse.exe"
 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
 !define PRODUCT_UNINST_ROOT_KEY "SHCTX"
 
@@ -102,12 +102,12 @@ RequestExecutionLevel admin
 !define MUI_FINISHPAGE_SHOWREADME 'notepad.exe "$\"$INSTDIR\README$\""'
 !define MUI_PAGE_CUSTOMFUNCTION_PRE changeFinishImage
 !define MUI_FINISHPAGE_LINK "Visit EvolOnline website for the latest news, FAQs and support"
-!define MUI_FINISHPAGE_LINK_LOCATION "http://www.evolonline.org/"
+!define MUI_FINISHPAGE_LINK_LOCATION "http://www.germantmw.de/"
 !insertmacro MUI_PAGE_FINISH
 
 Function RunEvol
 SetOutPath $INSTDIR
-Exec "$INSTDIR\manaplus.exe $INSTDIR\evol.manaplus"
+Exec "$INSTDIR\manaverse.exe $INSTDIR\evol.manaplus"
 FunctionEnd
 
 Function changeFinishImage
@@ -262,7 +262,7 @@ Section "Core files (required)" SecCore
   SetOverwrite ifnewer
   SetOutPath "$INSTDIR"
 
-  File "${EXEDIR}\manaplus.exe"
+  File "${EXEDIR}\manaverse.exe"
   File "${DLLDIR}\SDL.dll"
   File "${DLLDIR}\SDL_image.dll"
 ;  File "${DLLDIR}\SDL_mixer.dll"
@@ -344,7 +344,7 @@ Section "Core files (required)" SecCore
   SetOutPath "$INSTDIR\data\help\idx"
   File "${SRCDIR}\data\help\idx\*.idx"
   SetOutPath "$INSTDIR\data\icons\"
-  File "${SRCDIR}\data\icons\manaplus.ico"
+  File "${SRCDIR}\data\icons\manaverse.ico"
   SetOutPath "$INSTDIR\data\music\"
   File "${SRCDIR}\data\music\*.ogg"
   SetOutPath "$INSTDIR\data\perserver\default\"
@@ -364,14 +364,14 @@ Section "Create Shortcuts" SecShortcuts
   SetOutPath "$INSTDIR"
   SetOverwrite ifnewer
   CreateDirectory "$SMPROGRAMS\EvolOnline"
-  CreateShortCut "$SMPROGRAMS\EvolOnline\EvolOnline.lnk" '"$INSTDIR\manaplus.exe"' '"$INSTDIR\evol.manaplus"' "$INSTDIR\manaplus.exe" 1
-  CreateShortCut "$SMPROGRAMS\EvolOnline\EvolOnline (no opengl).lnk" '"$INSTDIR\manaplus.exe"' '"--no-opengl" "$INSTDIR\evol.manaplus"' "$INSTDIR\manaplus.exe" 1
-  CreateShortCut "$SMPROGRAMS\EvolOnline\EvolOnline (safemode).lnk" '"$INSTDIR\manaplus.exe"' '"--safemode" "$INSTDIR\evol.manaplus"' "$INSTDIR\manaplus.exe" 1
-  CreateShortCut "$SMPROGRAMS\EvolOnline\EvolOnline (tests).lnk" '"$INSTDIR\manaplus.exe"' '"--tests" "$INSTDIR\evol.manaplus"' "$INSTDIR\manaplus.exe" 1
-  CreateShortCut "$DESKTOP\EvolOnline.lnk" '"$INSTDIR\manaplus.exe"' '"$INSTDIR\evol.manaplus"' "$INSTDIR\manaplus.exe" 1
-  CreateShortCut "$DESKTOP\EvolOnline (tests).lnk" '"$INSTDIR\manaplus.exe"' '"--tests" "$INSTDIR\evol.manaplus"' "$INSTDIR\manaplus.exe" 1
-
-  ${registerExtension} "$INSTDIR\manaplus.exe" ".manaplus" "ManaPlus brandings"
+  CreateShortCut "$SMPROGRAMS\EvolOnline\EvolOnline.lnk" '"$INSTDIR\manaverse.exe"' '"$INSTDIR\evol.manaplus"' "$INSTDIR\manaverse.exe" 1
+  CreateShortCut "$SMPROGRAMS\EvolOnline\EvolOnline (no opengl).lnk" '"$INSTDIR\manaverse.exe"' '"--no-opengl" "$INSTDIR\evol.manaplus"' "$INSTDIR\manaverse.exe" 1
+  CreateShortCut "$SMPROGRAMS\EvolOnline\EvolOnline (safemode).lnk" '"$INSTDIR\manaverse.exe"' '"--safemode" "$INSTDIR\evol.manaplus"' "$INSTDIR\manaverse.exe" 1
+  CreateShortCut "$SMPROGRAMS\EvolOnline\EvolOnline (tests).lnk" '"$INSTDIR\manaverse.exe"' '"--tests" "$INSTDIR\evol.manaplus"' "$INSTDIR\manaverse.exe" 1
+  CreateShortCut "$DESKTOP\EvolOnline.lnk" '"$INSTDIR\manaverse.exe"' '"$INSTDIR\evol.manaplus"' "$INSTDIR\manaverse.exe" 1
+  CreateShortCut "$DESKTOP\EvolOnline (tests).lnk" '"$INSTDIR\manaverse.exe"' '"--tests" "$INSTDIR\evol.manaplus"' "$INSTDIR\manaverse.exe" 1
+
+  ${registerExtension} "$INSTDIR\manaverse.exe" ".manaplus" "ManaVerse brandings"
 SectionEnd
 
 Section /o "Portable" SecPortable
@@ -386,20 +386,20 @@ Section /o "Debugger" SecDebug
   File "${DLLDIR}\libexpat-1.dll"
   File "${DLLDIR}\libreadline6.dll"
   File "${DLLDIR}\libtermcap.dll"
-  File "${EXEDIR}\manaplusd.exe"
+  File "${EXEDIR}\manaversed.exe"
   ${If} ${SectionIsSelected} ${SecShortcuts}
-    CreateShortCut "$SMPROGRAMS\EvolOnline\EvolOnline (debug).lnk" '"$INSTDIR\gdb.exe"' '"$INSTDIR\manaplusd.exe"' "$INSTDIR\manaplusd.exe" 1
-    CreateShortCut "$DESKTOP\EvolOnline (debug).lnk" '"$INSTDIR\gdb.exe"' '"$INSTDIR\manaplusd.exe"' "$INSTDIR\manaplusd.exe" 1
+    CreateShortCut "$SMPROGRAMS\EvolOnline\EvolOnline (debug).lnk" '"$INSTDIR\gdb.exe"' '"$INSTDIR\manaversed.exe"' "$INSTDIR\manaversed.exe" 1
+    CreateShortCut "$DESKTOP\EvolOnline (debug).lnk" '"$INSTDIR\gdb.exe"' '"$INSTDIR\manaversed.exe"' "$INSTDIR\manaversed.exe" 1
   ${EndIf}
 SectionEnd
 
 Section /o "Profiler" SecProfiler
   SetOutPath "$INSTDIR"
-  File "${EXEDIR}\manaplusp.exe"
+  File "${EXEDIR}\manaversep.exe"
 
   ${If} ${SectionIsSelected} ${SecShortcuts}
-    CreateShortCut "$SMPROGRAMS\EvolOnline\EvolOnline (profiler).lnk" '"$INSTDIR\manaplusp.exe"' '"$INSTDIR\evol.manaplus"' "$INSTDIR\manaplus.exe" 1
-    CreateShortCut "$DESKTOP\EvolOnline (profiler).lnk" '"$INSTDIR\manaplusp.exe"' '"$INSTDIR\evol.manaplus"' "$INSTDIR\manaplus.exe" 1
+    CreateShortCut "$SMPROGRAMS\EvolOnline\EvolOnline (profiler).lnk" '"$INSTDIR\manaversep.exe"' '"$INSTDIR\evol.manaplus"' "$INSTDIR\manaverse.exe" 1
+    CreateShortCut "$DESKTOP\EvolOnline (profiler).lnk" '"$INSTDIR\manaversep.exe"' '"$INSTDIR\evol.manaplus"' "$INSTDIR\manaverse.exe" 1
   ${EndIf}
 SectionEnd
 
@@ -428,7 +428,7 @@ SectionEnd
 
 Section -AdditionalIcons
   WriteIniStr "$INSTDIR\${PRODUCT_NAME}.url" "InternetShortcut" "URL" "${PRODUCT_WEB_SITE}"
-  WriteIniStr "$INSTDIR\ManaPlus.url" "InternetShortcut" "URL" "http://manaplus.evolonline.org/"
+  WriteIniStr "$INSTDIR\ManaVerse.url" "InternetShortcut" "URL" "http://manaplus.germantmw.de/"
   CreateShortCut "$SMPROGRAMS\EvolOnline\Website.lnk" "$INSTDIR\${PRODUCT_NAME}.url"
   CreateShortCut "$SMPROGRAMS\EvolOnline\Readme.lnk" "notepad.exe" "$INSTDIR\README.txt"
   CreateShortCut "$SMPROGRAMS\EvolOnline\FAQ.lnk" "$INSTDIR\docs\FAQ.txt"
@@ -437,10 +437,10 @@ SectionEnd
 
 Section -Post
   WriteUninstaller "$INSTDIR\uninst.exe"
-  WriteRegStr SHCTX "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\manaplus.exe"
+  WriteRegStr SHCTX "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\manaverse.exe"
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)"
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe"
-  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\manaplus.exe"
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\manaverse.exe"
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}"
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}"
@@ -483,6 +483,6 @@ Section Uninstall
 
   DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
   DeleteRegKey SHCTX "${PRODUCT_DIR_REGKEY}"
-  ${unregisterExtension} ".manaplus" "ManaPlus brandings"
+  ${unregisterExtension} ".manaplus" "ManaVerse brandings"
   SetAutoClose true
 SectionEnd
diff --git a/packaging/windows/setup.nsi b/packaging/windows/setup.nsi
index 1c159c7cd..8148e8df7 100644
--- a/packaging/windows/setup.nsi
+++ b/packaging/windows/setup.nsi
@@ -3,8 +3,8 @@
 ; like the old install script.
 ;
 ; DLLDIR - directory containing required dlls
-; EXEDIR - directory containing manaplus.exe
-; EXESUFFIX - offset to SRCDIR pointing to a directory containing manaplus.exe
+; EXEDIR - directory containing manaverse.exe
+; EXESUFFIX - offset to SRCDIR pointing to a directory containing manaverse.exe
 ; PRODUCT_VERSION - software version
 ; UPX - upx binary name
 ;
@@ -46,20 +46,20 @@ RequestExecutionLevel admin
 !endif
 
 ;--- (and without !defines ) ---
-!System "${UPX} --best --crp-ms=999999 --compress-icons=0 --nrv2d ${EXEDIR}\manaplus.exe"
+!System "${UPX} --best --crp-ms=999999 --compress-icons=0 --nrv2d ${EXEDIR}\manaverse.exe"
 
 !define MULTIUSER_INSTALLMODE_COMMANDLINE
 !define MULTIUSER_EXECUTIONLEVEL "admin"
 !include "MultiUser.nsh"
 
 ; HM NIS Edit helper defines
-!define PRODUCT_NAME "ManaPlus"
+!define PRODUCT_NAME "ManaVerse"
 !ifndef PRODUCT_VERSION
   !define PRODUCT_VERSION "1.1"
 !endif
 !define PRODUCT_PUBLISHER "ManaPlus Development Team"
-!define PRODUCT_WEB_SITE "http://manaplus.evolonline.org/"
-!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\manaplus.exe"
+!define PRODUCT_WEB_SITE "http://manaplus.germantmw.de/"
+!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\manaverse.exe"
 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
 !define PRODUCT_UNINST_ROOT_KEY "SHCTX"
 
@@ -71,9 +71,9 @@ RequestExecutionLevel admin
 ; MUI Settings
 !define MUI_ABORTWARNING
 ;!define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\win-install.ico"
-!define MUI_ICON "${SRCDIR}\data\icons\manaplus.ico"
+!define MUI_ICON "${SRCDIR}\data\icons\manaverse.ico"
 ;!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\win-uninstall.ico"
-!define MUI_UNICON "${SRCDIR}\data\icons\manaplus.ico"
+!define MUI_UNICON "${SRCDIR}\data\icons\manaverse.ico"
 
 ;Language Selection Dialog Settings
 ;Remember the installer language
@@ -101,13 +101,13 @@ RequestExecutionLevel admin
 !define MUI_FINISHPAGE_RUN_FUNCTION RunMana
 !define MUI_FINISHPAGE_SHOWREADME 'notepad.exe "$\"$INSTDIR\README$\""'
 !define MUI_PAGE_CUSTOMFUNCTION_PRE changeFinishImage
-!define MUI_FINISHPAGE_LINK "Visit ManaPlus website for the latest news, FAQs and support"
-!define MUI_FINISHPAGE_LINK_LOCATION "http://manaplus.evolonline.org/"
+!define MUI_FINISHPAGE_LINK "Visit ManaVerse website for the latest news, FAQs and support"
+!define MUI_FINISHPAGE_LINK_LOCATION "http://manaplus.germantmw.de/"
 !insertmacro MUI_PAGE_FINISH
 
 Function RunMana
 SetOutPath $INSTDIR
-Exec "$INSTDIR\manaplus.exe"
+Exec "$INSTDIR\manaverse.exe"
 FunctionEnd
 
 Function changeFinishImage
@@ -259,7 +259,7 @@ Section "Core files (required)" SecCore
   SetOverwrite ifnewer
   SetOutPath "$INSTDIR"
 
-  File "${EXEDIR}\manaplus.exe"
+  File "${EXEDIR}\manaverse.exe"
   File "${DLLDIR}\SDL.dll"
   File "${DLLDIR}\SDL_image.dll"
 ;  File "${DLLDIR}\SDL_mixer.dll"
@@ -341,7 +341,7 @@ Section "Core files (required)" SecCore
   SetOutPath "$INSTDIR\data\help\idx"
   File "${SRCDIR}\data\help\idx\*.idx"
   SetOutPath "$INSTDIR\data\icons\"
-  File "${SRCDIR}\data\icons\manaplus.ico"
+  File "${SRCDIR}\data\icons\manaverse.ico"
   SetOutPath "$INSTDIR\data\music"
   File "${SRCDIR}\data\music\*.ogg"
   SetOutPath "$INSTDIR\data\perserver\default\"
@@ -355,14 +355,14 @@ Section "Create Shortcuts" SecShortcuts
   SetOutPath "$INSTDIR"
   SetOverwrite ifnewer
   CreateDirectory "$SMPROGRAMS\Mana"
-  CreateShortCut "$SMPROGRAMS\Mana\ManaPlus.lnk" "$INSTDIR\manaplus.exe"
-  CreateShortCut "$SMPROGRAMS\Mana\ManaPlus (no opengl).lnk" "$INSTDIR\manaplus.exe" --no-opengl
-  CreateShortCut "$SMPROGRAMS\Mana\ManaPlus (safemode).lnk" "$INSTDIR\manaplus.exe" --safemode
-  CreateShortCut "$SMPROGRAMS\Mana\ManaPlus (tests).lnk" "$INSTDIR\manaplus.exe" --tests
-  CreateShortCut "$DESKTOP\ManaPlus.lnk" "$INSTDIR\manaplus.exe"
-  CreateShortCut "$DESKTOP\ManaPlus (tests).lnk" "$INSTDIR\manaplus.exe" --tests
-
-  ${registerExtension} "$INSTDIR\manaplus.exe" ".manaplus" "ManaPlus brandings"
+  CreateShortCut "$SMPROGRAMS\Mana\ManaVerse.lnk" "$INSTDIR\manaverse.exe"
+  CreateShortCut "$SMPROGRAMS\Mana\ManaVerse (no opengl).lnk" "$INSTDIR\manaverse.exe" --no-opengl
+  CreateShortCut "$SMPROGRAMS\Mana\ManaVerse (safemode).lnk" "$INSTDIR\manaverse.exe" --safemode
+  CreateShortCut "$SMPROGRAMS\Mana\ManaVerse (tests).lnk" "$INSTDIR\manaverse.exe" --tests
+  CreateShortCut "$DESKTOP\ManaVerse.lnk" "$INSTDIR\manaverse.exe"
+  CreateShortCut "$DESKTOP\ManaVerse (tests).lnk" "$INSTDIR\manaverse.exe" --tests
+
+  ${registerExtension} "$INSTDIR\manaverse.exe" ".manaplus" "ManaVerse brandings"
 SectionEnd
 
 Section /o "Portable" SecPortable
@@ -377,19 +377,19 @@ Section /o "Debugger" SecDebug
   File "${DLLDIR}\libexpat-1.dll"
   File "${DLLDIR}\libreadline6.dll"
   File "${DLLDIR}\libtermcap.dll"
-  File "${EXEDIR}\manaplusd.exe"
+  File "${EXEDIR}\manaversed.exe"
   ${If} ${SectionIsSelected} ${SecShortcuts}
-    CreateShortCut "$SMPROGRAMS\Mana\ManaPlus (debug).lnk" '"$INSTDIR\gdb.exe"' '"$INSTDIR\manaplusd.exe"' "$INSTDIR\manaplusd.exe"
-    CreateShortCut "$DESKTOP\ManaPlus (debug).lnk" '"$INSTDIR\gdb.exe"' '"$INSTDIR\manaplusd.exe"' "$INSTDIR\manaplusd.exe"
+    CreateShortCut "$SMPROGRAMS\Mana\ManaVerse (debug).lnk" '"$INSTDIR\gdb.exe"' '"$INSTDIR\manaversed.exe"' "$INSTDIR\manaversed.exe"
+    CreateShortCut "$DESKTOP\ManaVerse (debug).lnk" '"$INSTDIR\gdb.exe"' '"$INSTDIR\manaversed.exe"' "$INSTDIR\manaversed.exe"
   ${EndIf}
 SectionEnd
 
 Section /o "Profiler" SecProfiler
   SetOutPath "$INSTDIR"
-  File "${EXEDIR}\manaplusp.exe"
+  File "${EXEDIR}\manaversep.exe"
   ${If} ${SectionIsSelected} ${SecShortcuts}
-    CreateShortCut "$SMPROGRAMS\Mana\ManaPlus (profiler).lnk" "$INSTDIR\manaplusp.exe"
-    CreateShortCut "$DESKTOP\ManaPlus (profiler).lnk" "$INSTDIR\manaplusp.exe"
+    CreateShortCut "$SMPROGRAMS\Mana\ManaVerse (profiler).lnk" "$INSTDIR\manaversep.exe"
+    CreateShortCut "$DESKTOP\ManaVerse (profiler).lnk" "$INSTDIR\manaversep.exe"
   ${EndIf}
 SectionEnd
 
@@ -411,8 +411,8 @@ Section "Evol Online shortcuts" SecEvol
   SetOutPath "$INSTDIR\data\evol\icons"
   File "${SRCDIR}\data\evol\icons\*.ico"
 
-  CreateShortCut "$SMPROGRAMS\Mana\EvolOnline.lnk" '"$INSTDIR\manaplus.exe"' '"$INSTDIR\evol.manaplus"' "$INSTDIR\manaplus.exe" 1
-  CreateShortCut "$DESKTOP\EvolOnline.lnk" '"$INSTDIR\manaplus.exe"' '"$INSTDIR\evol.manaplus"' "$INSTDIR\manaplus.exe" 1
+  CreateShortCut "$SMPROGRAMS\Mana\EvolOnline.lnk" '"$INSTDIR\manaverse.exe"' '"$INSTDIR\evol.manaplus"' "$INSTDIR\manaverse.exe" 1
+  CreateShortCut "$DESKTOP\EvolOnline.lnk" '"$INSTDIR\manaverse.exe"' '"$INSTDIR\evol.manaplus"' "$INSTDIR\manaverse.exe" 1
 SectionEnd
 
 Section "Translations" SecTrans
@@ -443,10 +443,10 @@ SectionEnd
 
 Section -Post
   WriteUninstaller "$INSTDIR\uninst.exe"
-  WriteRegStr SHCTX "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\manaplus.exe"
+  WriteRegStr SHCTX "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\manaverse.exe"
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)"
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe"
-  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\manaplus.exe"
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\manaverse.exe"
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}"
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}"
@@ -463,16 +463,16 @@ Section Uninstall
   Delete "$INSTDIR\*.*"
 
   Delete "$SMPROGRAMS\Mana\Uninstall.lnk"
-  Delete "$DESKTOP\ManaPlus.lnk"
-  Delete "$DESKTOP\ManaPlus (debug).lnk"
-  Delete "$DESKTOP\ManaPlus (profiler).lnk"
-  Delete "$DESKTOP\ManaPlus (tests).lnk"
-  Delete "$SMPROGRAMS\Mana\ManaPlus.lnk"
-  Delete "$SMPROGRAMS\Mana\ManaPlus (debug).lnk"
-  Delete "$SMPROGRAMS\Mana\ManaPlus (profiler).lnk"
-  Delete "$SMPROGRAMS\Mana\ManaPlus (no opengl).lnk"
-  Delete "$SMPROGRAMS\Mana\ManaPlus (safemode).lnk"
-  Delete "$SMPROGRAMS\Mana\ManaPlus (tests).lnk"
+  Delete "$DESKTOP\ManaVerse.lnk"
+  Delete "$DESKTOP\ManaVerse (debug).lnk"
+  Delete "$DESKTOP\ManaVerse (profiler).lnk"
+  Delete "$DESKTOP\ManaVerse (tests).lnk"
+  Delete "$SMPROGRAMS\Mana\ManaVerse.lnk"
+  Delete "$SMPROGRAMS\Mana\ManaVerse (debug).lnk"
+  Delete "$SMPROGRAMS\Mana\ManaVerse (profiler).lnk"
+  Delete "$SMPROGRAMS\Mana\ManaVerse (no opengl).lnk"
+  Delete "$SMPROGRAMS\Mana\ManaVerse (safemode).lnk"
+  Delete "$SMPROGRAMS\Mana\ManaVerse (tests).lnk"
   Delete "$SMPROGRAMS\Mana\Website.lnk"
   Delete "$SMPROGRAMS\Mana\Readme.lnk"
   Delete "$SMPROGRAMS\Mana\FAQ.lnk"
@@ -489,6 +489,6 @@ Section Uninstall
 
   DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
   DeleteRegKey SHCTX "${PRODUCT_DIR_REGKEY}"
-  ${unregisterExtension} ".manaplus" "ManaPlus brandings"
+  ${unregisterExtension} ".manaplus" "ManaVerse brandings"
   SetAutoClose true
 SectionEnd