Rename the program from ManaPlus to ManaVerse.

34 files changed, 110 insertions, 108 deletions

diff --git a/tools/ci/branches/.gitlab-ci_header.yml b/tools/ci/branches/.gitlab-ci_header.yml
index faeae1416..122e1d3d7 100644
--- a/tools/ci/branches/.gitlab-ci_header.yml
+++ b/tools/ci/branches/.gitlab-ci_header.yml
@@ -12,7 +12,7 @@ before_script:
   - ":; ${DOCKERRETRY} ${PMUPDATE} >logs/apt.log"
   - ":; ${DOCKERRETRY} ${PMINSTALL} ${PACKAGES} >>logs/apt.log"
   - ":; ./tools/ci/scripts/clonesrc.sh"
-  - ":; cd manaplus"
+  - ":; cd manaverse"
 
 image: debian:unstable
 
diff --git a/tools/ci/branches/ci_checks/.gitlab-ci.yml b/tools/ci/branches/ci_checks/.gitlab-ci.yml
index 57aa9ac1d..3864a34d8 100644
--- a/tools/ci/branches/ci_checks/.gitlab-ci.yml
+++ b/tools/ci/branches/ci_checks/.gitlab-ci.yml
@@ -2,7 +2,7 @@
   artifacts:
     paths:
     - logs
-    - manaplus/logs
+    - manaverse/logs
     when: always
     expire_in: 3 week
   dependencies: []
@@ -11,7 +11,7 @@
   artifacts:
     paths:
     - logs
-    - manaplus/logs
+    - manaverse/logs
     when: always
     expire_in: 3 week
   dependencies: []
diff --git a/tools/ci/branches/ci_clang4_5/.gitlab-ci.yml b/tools/ci/branches/ci_clang4_5/.gitlab-ci.yml
index ebc9c99e1..e2b326ea7 100644
--- a/tools/ci/branches/ci_clang4_5/.gitlab-ci.yml
+++ b/tools/ci/branches/ci_clang4_5/.gitlab-ci.yml
@@ -2,7 +2,7 @@
   artifacts:
     paths:
     - logs
-    - manaplus/logs
+    - manaverse/logs
     when: always
     expire_in: 3 week
   dependencies: []
@@ -11,7 +11,7 @@
   artifacts:
     paths:
     - logs
-    - manaplus/logs
+    - manaverse/logs
     when: always
     expire_in: 3 week
   dependencies: []
diff --git a/tools/ci/branches/ci_fedora/.gitlab-ci.yml b/tools/ci/branches/ci_fedora/.gitlab-ci.yml
index d6a8c7b44..25a434113 100644
--- a/tools/ci/branches/ci_fedora/.gitlab-ci.yml
+++ b/tools/ci/branches/ci_fedora/.gitlab-ci.yml
@@ -2,7 +2,7 @@
   artifacts:
     paths:
     - logs
-    - manaplus/logs
+    - manaverse/logs
     when: always
     expire_in: 3 week
   dependencies: []
@@ -11,7 +11,7 @@
   artifacts:
     paths:
     - logs
-    - manaplus/logs
+    - manaverse/logs
     when: always
     expire_in: 3 week
   dependencies: []
diff --git a/tools/ci/branches/ci_gcc-snapshot/.gitlab-ci.yml b/tools/ci/branches/ci_gcc-snapshot/.gitlab-ci.yml
index 91d5117f4..d59a664dd 100644
--- a/tools/ci/branches/ci_gcc-snapshot/.gitlab-ci.yml
+++ b/tools/ci/branches/ci_gcc-snapshot/.gitlab-ci.yml
@@ -2,7 +2,7 @@
   artifacts:
     paths:
     - logs
-    - manaplus/logs
+    - manaverse/logs
     when: always
     expire_in: 3 week
   dependencies: []
@@ -11,7 +11,7 @@
   artifacts:
     paths:
     - logs
-    - manaplus/logs
+    - manaverse/logs
     when: always
     expire_in: 3 week
   dependencies: []
diff --git a/tools/ci/branches/ci_gcc10/.gitlab-ci.yml b/tools/ci/branches/ci_gcc10/.gitlab-ci.yml
index 9acfd5a02..f5c71e33d 100644
--- a/tools/ci/branches/ci_gcc10/.gitlab-ci.yml
+++ b/tools/ci/branches/ci_gcc10/.gitlab-ci.yml
@@ -2,7 +2,7 @@
   artifacts:
     paths:
     - logs
-    - manaplus/logs
+    - manaverse/logs
     when: always
     expire_in: 3 week
   dependencies: []
@@ -11,7 +11,7 @@
   artifacts:
     paths:
     - logs
-    - manaplus/logs
+    - manaverse/logs
     when: always
     expire_in: 3 week
   dependencies: []
diff --git a/tools/ci/branches/ci_gcc10_tests/.gitlab-ci.yml b/tools/ci/branches/ci_gcc10_tests/.gitlab-ci.yml
index 57ef7311e..084601a79 100644
--- a/tools/ci/branches/ci_gcc10_tests/.gitlab-ci.yml
+++ b/tools/ci/branches/ci_gcc10_tests/.gitlab-ci.yml
@@ -2,7 +2,7 @@
   artifacts:
     paths:
     - logs
-    - manaplus/logs
+    - manaverse/logs
     when: always
     expire_in: 3 week
   dependencies: []
@@ -11,7 +11,7 @@
   artifacts:
     paths:
     - logs
-    - manaplus/logs
+    - manaverse/logs
     when: always
     expire_in: 3 week
   dependencies: []
diff --git a/tools/ci/branches/ci_gcc3/.gitlab-ci.yml b/tools/ci/branches/ci_gcc3/.gitlab-ci.yml
index 82b58be9b..958775269 100644
--- a/tools/ci/branches/ci_gcc3/.gitlab-ci.yml
+++ b/tools/ci/branches/ci_gcc3/.gitlab-ci.yml
@@ -2,7 +2,7 @@
   artifacts:
     paths:
     - logs
-    - manaplus/logs
+    - manaverse/logs
     when: always
     expire_in: 3 week
   dependencies: []
@@ -11,7 +11,7 @@
   artifacts:
     paths:
     - logs
-    - manaplus/logs
+    - manaverse/logs
     when: always
     expire_in: 3 week
   dependencies: []
@@ -22,7 +22,7 @@ gcc-3_sdl1:
   - ./tools/ci/jobs/gcc3.sh
   - ./tools/ci/scripts/runtests.sh
   - ./tools/ci/scripts/rundyecmd.sh
-  image: registry.gitlab.com/manaplus/images:gentoo_gcc3_sdl1
+  image: registry.gitlab.com/manaverse/images:gentoo_gcc3_sdl1
   <<: *job-push
   variables:
     PMUPDATE: "echo"
@@ -36,7 +36,7 @@ gcc-3_sdl2:
   - ./tools/ci/jobs/gcc3.sh --with-sdl2
   - ./tools/ci/scripts/runtests.sh
   - ./tools/ci/scripts/rundyecmd.sh
-  image: registry.gitlab.com/manaplus/images:gentoo_gcc3_sdl2
+  image: registry.gitlab.com/manaverse/images:gentoo_gcc3_sdl2
   <<: *job-push
   variables:
     PMUPDATE: "echo"
diff --git a/tools/ci/branches/ci_gcc49/.gitlab-ci.yml b/tools/ci/branches/ci_gcc49/.gitlab-ci.yml
index 5bb100707..cb4324d93 100644
--- a/tools/ci/branches/ci_gcc49/.gitlab-ci.yml
+++ b/tools/ci/branches/ci_gcc49/.gitlab-ci.yml
@@ -94,7 +94,8 @@ gentoo_gcc-4.9_tests:
   stage: build
   script:
   - ./tools/ci/jobs/gcc49_tests.sh --without-dyecmd --without-gameclient
-  image: registry.gitlab.com/manaplus/images:gentoo_gcc49_sdl1
+  image: registry.gitlab.com/manaverse/images:gentoo_gcc49_sdl1
+>>>>>>> 8f19f7358 (Rename the program from ManaPlus to ManaVerse.)
   <<: *job-push
   variables:
     PMUPDATE: "echo"
@@ -108,7 +109,8 @@ gentoo_gcc-4.9_tests_sdl2:
   stage: build
   script:
   - ./tools/ci/jobs/gcc49_tests.sh --without-dyecmd --without-gameclient --with-sdl2
-  image: registry.gitlab.com/manaplus/images:gentoo_gcc49_sdl2
+  image: registry.gitlab.com/manaverse/images:gentoo_gcc49_sdl2
+>>>>>>> 8f19f7358 (Rename the program from ManaPlus to ManaVerse.)
   <<: *job-push
   variables:
     PMUPDATE: "echo"
diff --git a/tools/ci/branches/ci_gcc4x/.gitlab-ci.yml b/tools/ci/branches/ci_gcc4x/.gitlab-ci.yml
index c657d6e08..f61d3385d 100644
--- a/tools/ci/branches/ci_gcc4x/.gitlab-ci.yml
+++ b/tools/ci/branches/ci_gcc4x/.gitlab-ci.yml
@@ -37,7 +37,7 @@ gcc-4.1_sdl1:
   - ./tools/ci/jobs/gcc41.sh
   - ./tools/ci/scripts/runtests.sh
   - ./tools/ci/scripts/rundyecmd.sh
-  image: registry.gitlab.com/manaplus/images:gentoo_gcc41_sdl1
+  image: registry.gitlab.com/manaverse/images:gentoo_gcc41_sdl1
   <<: *job-push
   variables:
     PMUPDATE: "echo"
@@ -53,7 +53,7 @@ gcc-4.1_sdl2:
   - ./tools/ci/jobs/gcc41.sh --with-sdl2
   - ./tools/ci/scripts/runtests.sh
   - ./tools/ci/scripts/rundyecmd.sh
-  image: registry.gitlab.com/manaplus/images:gentoo_gcc41_sdl2
+  image: registry.gitlab.com/manaverse/images:gentoo_gcc41_sdl2
   <<: *job-push
   variables:
     PMUPDATE: "echo"
@@ -69,7 +69,7 @@ gcc-4.3_sdl1:
   - ./tools/ci/jobs/gcc43.sh
   - ./tools/ci/scripts/runtests.sh
   - ./tools/ci/scripts/rundyecmd.sh
-  image: registry.gitlab.com/manaplus/images:gentoo_gcc43_sdl1
+  image: registry.gitlab.com/manaverse/images:gentoo_gcc43_sdl1
   <<: *job-push
   variables:
     PMUPDATE: "echo"
@@ -85,7 +85,7 @@ gcc-4.3_sdl2:
   - ./tools/ci/jobs/gcc43.sh --with-sdl2
   - ./tools/ci/scripts/runtests.sh
   - ./tools/ci/scripts/rundyecmd.sh
-  image: registry.gitlab.com/manaplus/images:gentoo_gcc43_sdl2
+  image: registry.gitlab.com/manaverse/images:gentoo_gcc43_sdl2
   <<: *job-push
   variables:
     PMUPDATE: "echo"
diff --git a/tools/ci/branches/ci_gcc5/.gitlab-ci.yml b/tools/ci/branches/ci_gcc5/.gitlab-ci.yml
index 4173c2060..8b8a2a0fa 100644
--- a/tools/ci/branches/ci_gcc5/.gitlab-ci.yml
+++ b/tools/ci/branches/ci_gcc5/.gitlab-ci.yml
@@ -2,7 +2,7 @@
   artifacts:
     paths:
     - logs
-    - manaplus/logs
+    - manaverse/logs
     when: always
     expire_in: 3 week
   dependencies: []
@@ -11,7 +11,7 @@
   artifacts:
     paths:
     - logs
-    - manaplus/logs
+    - manaverse/logs
     when: always
     expire_in: 3 week
   dependencies: []
diff --git a/tools/ci/branches/ci_gcc6/.gitlab-ci.yml b/tools/ci/branches/ci_gcc6/.gitlab-ci.yml
index 298300ff0..2e202b946 100644
--- a/tools/ci/branches/ci_gcc6/.gitlab-ci.yml
+++ b/tools/ci/branches/ci_gcc6/.gitlab-ci.yml
@@ -2,7 +2,7 @@
   artifacts:
     paths:
     - logs
-    - manaplus/logs
+    - manaverse/logs
     when: always
     expire_in: 3 week
   dependencies: []
@@ -11,7 +11,7 @@
   artifacts:
     paths:
     - logs
-    - manaplus/logs
+    - manaverse/logs
     when: always
     expire_in: 3 week
   dependencies: []
diff --git a/tools/ci/branches/ci_gcc6_tests/.gitlab-ci.yml b/tools/ci/branches/ci_gcc6_tests/.gitlab-ci.yml
index c7b82a9aa..b313e5fa8 100644
--- a/tools/ci/branches/ci_gcc6_tests/.gitlab-ci.yml
+++ b/tools/ci/branches/ci_gcc6_tests/.gitlab-ci.yml
@@ -2,7 +2,7 @@
   artifacts:
     paths:
     - logs
-    - manaplus/logs
+    - manaverse/logs
     when: always
     expire_in: 3 week
   dependencies: []
@@ -11,7 +11,7 @@
   artifacts:
     paths:
     - logs
-    - manaplus/logs
+    - manaverse/logs
     when: always
     expire_in: 3 week
   dependencies: []
diff --git a/tools/ci/branches/ci_gcc7/.gitlab-ci.yml b/tools/ci/branches/ci_gcc7/.gitlab-ci.yml
index 7586df0ae..e5ec598a0 100644
--- a/tools/ci/branches/ci_gcc7/.gitlab-ci.yml
+++ b/tools/ci/branches/ci_gcc7/.gitlab-ci.yml
@@ -2,7 +2,7 @@
   artifacts:
     paths:
     - logs
-    - manaplus/logs
+    - manaverse/logs
     when: always
     expire_in: 3 week
   dependencies: []
@@ -11,7 +11,7 @@
   artifacts:
     paths:
     - logs
-    - manaplus/logs
+    - manaverse/logs
     when: always
     expire_in: 3 week
   dependencies: []
diff --git a/tools/ci/branches/ci_gcc7_tests/.gitlab-ci.yml b/tools/ci/branches/ci_gcc7_tests/.gitlab-ci.yml
index f3504aef3..e13ffb391 100644
--- a/tools/ci/branches/ci_gcc7_tests/.gitlab-ci.yml
+++ b/tools/ci/branches/ci_gcc7_tests/.gitlab-ci.yml
@@ -2,7 +2,7 @@
   artifacts:
     paths:
     - logs
-    - manaplus/logs
+    - manaverse/logs
     when: always
     expire_in: 3 week
   dependencies: []
@@ -11,7 +11,7 @@
   artifacts:
     paths:
     - logs
-    - manaplus/logs
+    - manaverse/logs
     when: always
     expire_in: 3 week
   dependencies: []
diff --git a/tools/ci/branches/ci_gcc8/.gitlab-ci.yml b/tools/ci/branches/ci_gcc8/.gitlab-ci.yml
index 29aaee53a..c4ab85379 100644
--- a/tools/ci/branches/ci_gcc8/.gitlab-ci.yml
+++ b/tools/ci/branches/ci_gcc8/.gitlab-ci.yml
@@ -2,7 +2,7 @@
   artifacts:
     paths:
     - logs
-    - manaplus/logs
+    - manaverse/logs
     when: always
     expire_in: 3 week
   dependencies: []
@@ -11,7 +11,7 @@
   artifacts:
     paths:
     - logs
-    - manaplus/logs
+    - manaverse/logs
     when: always
     expire_in: 3 week
   dependencies: []
diff --git a/tools/ci/branches/ci_gcc8_tests/.gitlab-ci.yml b/tools/ci/branches/ci_gcc8_tests/.gitlab-ci.yml
index a39b9ebc5..ef62ea310 100644
--- a/tools/ci/branches/ci_gcc8_tests/.gitlab-ci.yml
+++ b/tools/ci/branches/ci_gcc8_tests/.gitlab-ci.yml
@@ -2,7 +2,7 @@
   artifacts:
     paths:
     - logs
-    - manaplus/logs
+    - manaverse/logs
     when: always
     expire_in: 3 week
   dependencies: []
@@ -11,7 +11,7 @@
   artifacts:
     paths:
     - logs
-    - manaplus/logs
+    - manaverse/logs
     when: always
     expire_in: 3 week
   dependencies: []
diff --git a/tools/ci/branches/ci_gcc9/.gitlab-ci.yml b/tools/ci/branches/ci_gcc9/.gitlab-ci.yml
index ff98223ed..1e0f4e672 100644
--- a/tools/ci/branches/ci_gcc9/.gitlab-ci.yml
+++ b/tools/ci/branches/ci_gcc9/.gitlab-ci.yml
@@ -2,7 +2,7 @@
   artifacts:
     paths:
     - logs
-    - manaplus/logs
+    - manaverse/logs
     when: always
     expire_in: 3 week
   dependencies: []
@@ -11,7 +11,7 @@
   artifacts:
     paths:
     - logs
-    - manaplus/logs
+    - manaverse/logs
     when: always
     expire_in: 3 week
   dependencies: []
diff --git a/tools/ci/branches/ci_gcc9_tests/.gitlab-ci.yml b/tools/ci/branches/ci_gcc9_tests/.gitlab-ci.yml
index 401ba0ae0..7c08e549d 100644
--- a/tools/ci/branches/ci_gcc9_tests/.gitlab-ci.yml
+++ b/tools/ci/branches/ci_gcc9_tests/.gitlab-ci.yml
@@ -2,7 +2,7 @@
   artifacts:
     paths:
     - logs
-    - manaplus/logs
+    - manaverse/logs
     when: always
     expire_in: 3 week
   dependencies: []
@@ -11,7 +11,7 @@
   artifacts:
     paths:
     - logs
-    - manaplus/logs
+    - manaverse/logs
     when: always
     expire_in: 3 week
   dependencies: []
diff --git a/tools/ci/branches/ci_glibcdebug/.gitlab-ci.yml b/tools/ci/branches/ci_glibcdebug/.gitlab-ci.yml
index 1952a8ec1..d5ad41856 100644
--- a/tools/ci/branches/ci_glibcdebug/.gitlab-ci.yml
+++ b/tools/ci/branches/ci_glibcdebug/.gitlab-ci.yml
@@ -2,7 +2,7 @@
   artifacts:
     paths:
     - logs
-    - manaplus/logs
+    - manaverse/logs
     when: always
     expire_in: 3 week
   dependencies: []
@@ -11,7 +11,7 @@
   artifacts:
     paths:
     - logs
-    - manaplus/logs
+    - manaverse/logs
     when: always
     expire_in: 3 week
   dependencies: []
diff --git a/tools/ci/branches/ci_main1/.gitlab-ci.yml b/tools/ci/branches/ci_main1/.gitlab-ci.yml
index 27ecc3655..66c25fc0f 100644
--- a/tools/ci/branches/ci_main1/.gitlab-ci.yml
+++ b/tools/ci/branches/ci_main1/.gitlab-ci.yml
@@ -2,7 +2,7 @@
   artifacts:
     paths:
     - logs
-    - manaplus/logs
+    - manaverse/logs
     when: always
     expire_in: 3 week
   dependencies: []
@@ -11,7 +11,7 @@
   artifacts:
     paths:
     - logs
-    - manaplus/logs
+    - manaverse/logs
     when: always
     expire_in: 3 week
   dependencies: []
@@ -89,7 +89,7 @@ gcc-gentoo_sdl1:
   script:
   - ./tools/ci/jobs/any_compiler.sh --enable-werror
   - ./tools/ci/scripts/runtests.sh
-  image: registry.gitlab.com/manaplus/images:gentoo_gcc_sdl1
+  image: registry.gitlab.com/manaverse/images:gentoo_gcc_sdl1
   <<: *job-push
   variables:
     LOGFILE: gcc.log
@@ -106,7 +106,7 @@ gcc-gentoo_sdl2:
   script:
   - ./tools/ci/jobs/any_compiler.sh --with-sdl2 --enable-werror
   - ./tools/ci/scripts/runtests.sh
-  image: registry.gitlab.com/manaplus/images:gentoo_gcc_sdl2
+  image: registry.gitlab.com/manaverse/images:gentoo_gcc_sdl2
   <<: *job-push
   variables:
     LOGFILE: gcc.log
diff --git a/tools/ci/branches/ci_mse/.gitlab-ci.yml b/tools/ci/branches/ci_mse/.gitlab-ci.yml
index 3f347f003..3552cc66c 100644
--- a/tools/ci/branches/ci_mse/.gitlab-ci.yml
+++ b/tools/ci/branches/ci_mse/.gitlab-ci.yml
@@ -2,7 +2,7 @@
   artifacts:
     paths:
     - logs
-    - manaplus/logs
+    - manaverse/logs
     when: always
     expire_in: 3 week
   dependencies: []
@@ -11,7 +11,7 @@
   artifacts:
     paths:
     - logs
-    - manaplus/logs
+    - manaverse/logs
     when: always
     expire_in: 3 week
   dependencies: []
diff --git a/tools/ci/branches/ci_mxe/.gitlab-ci.yml b/tools/ci/branches/ci_mxe/.gitlab-ci.yml
index a0d64cdcf..768054c94 100644
--- a/tools/ci/branches/ci_mxe/.gitlab-ci.yml
+++ b/tools/ci/branches/ci_mxe/.gitlab-ci.yml
@@ -6,7 +6,7 @@ stages:
   artifacts:
     paths:
     - logs
-    - manaplus/logs
+    - manaverse/logs
     when: always
     expire_in: 3 week
   dependencies: []
@@ -15,7 +15,7 @@ stages:
   artifacts:
     paths:
     - logs
-    - manaplus/logs
+    - manaverse/logs
     when: always
     expire_in: 3 week
   dependencies: []
@@ -32,7 +32,7 @@ mxe_gcc6_shared_32_testsbin:
     when: always
     expire_in: 1 week
   dependencies: []
-  image: registry.gitlab.com/manaplus/mxe:gcc6_shared_32
+  image: registry.gitlab.com/manaverse/mxe:gcc6_shared_32
   variables:
     PACKAGES: bash
     CROSS: i686-w64-mingw32.shared
@@ -51,7 +51,7 @@ mxe_gcc6_shared_64_testsbin:
     when: always
     expire_in: 1 week
   dependencies: []
-  image: registry.gitlab.com/manaplus/mxe:gcc6_shared_64
+  image: registry.gitlab.com/manaverse/mxe:gcc6_shared_64
   variables:
     PACKAGES: bash
     CROSS: x86_64-w64-mingw32.shared
diff --git a/tools/ci/branches/ci_site/.gitlab-ci.yml b/tools/ci/branches/ci_site/.gitlab-ci.yml
index 66fbe53d4..704c92c9a 100644
--- a/tools/ci/branches/ci_site/.gitlab-ci.yml
+++ b/tools/ci/branches/ci_site/.gitlab-ci.yml
@@ -17,7 +17,7 @@ before_script:
   artifacts:
     paths:
     - logs
-    - manaplus/logs
+    - manaverse/logs
     when: always
     expire_in: 3 week
   dependencies: []
@@ -26,7 +26,7 @@ before_script:
   artifacts:
     paths:
     - logs
-    - manaplus/logs
+    - manaverse/logs
     when: always
     expire_in: 3 week
   dependencies: []
@@ -35,7 +35,7 @@ gcc-6_tests_gcov:
   stage: build
   script:
   - ./tools/ci/scripts/clonesrc.sh
-  - cd manaplus
+  - cd manaverse
   - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc6_tests_gcov.sh --without-dyecmd --without-gameclient
   <<: *job-push
@@ -54,7 +54,7 @@ gcc-6_sdl2_tests_gcov:
   stage: build
   script:
   - ./tools/ci/scripts/clonesrc.sh
-  - cd manaplus
+  - cd manaverse
   - ./tools/ci/jobs/gcc6_sdl2_tests_gcov.sh --without-dyecmd --without-gameclient
   <<: *job-push
   variables:
@@ -72,12 +72,12 @@ doxygen:
   stage: build
   script:
   - ./tools/ci/scripts/clonesrc.sh
-  - cd manaplus
+  - cd manaverse
   - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/doxygen.sh
   artifacts:
     paths:
-    - manaplus/doxygen
+    - manaverse/doxygen
     expire_in: 3 week
     when: always
   dependencies: []
@@ -93,11 +93,11 @@ gitstats:
   stage: build
   script:
   - ./tools/ci/scripts/clonesrc.sh
-  - cd manaplus
+  - cd manaverse
   - ./tools/ci/jobs/gitstats.sh
   artifacts:
     paths:
-    - manaplus/stats
+    - manaverse/stats
     expire_in: 3 week
     when: always
   dependencies: []
@@ -111,12 +111,12 @@ gitstatsh:
   stage: build
   script:
   - ./tools/ci/scripts/clonesrc.sh
-  - cd manaplus
+  - cd manaverse
   - ./tools/ci/jobs/gitstatsh.sh
   image: debian:buster
   artifacts:
     paths:
-    - manaplus/stats2
+    - manaverse/stats2
     expire_in: 3 week
     when: always
   dependencies: []
@@ -132,10 +132,10 @@ pages:
   stage: stats
   script:
   - rm -rf artifacts || true
-  - mv manaplus artifacts
+  - mv manaverse artifacts
   - ./tools/ci/scripts/clonesrc.sh
-  - mv artifacts/* manaplus/
-  - cd manaplus
+  - mv artifacts/* manaverse/
+  - cd manaverse
   - ./tools/ci/jobs/pages.sh
   dependencies:
     - doxygen
diff --git a/tools/ci/branches/ci_xmllibs/.gitlab-ci.yml b/tools/ci/branches/ci_xmllibs/.gitlab-ci.yml
index ad0e743f8..17deae744 100644
--- a/tools/ci/branches/ci_xmllibs/.gitlab-ci.yml
+++ b/tools/ci/branches/ci_xmllibs/.gitlab-ci.yml
@@ -2,7 +2,7 @@
   artifacts:
     paths:
     - logs
-    - manaplus/logs
+    - manaverse/logs
     when: always
     expire_in: 3 week
   dependencies: []
@@ -11,7 +11,7 @@
   artifacts:
     paths:
     - logs
-    - manaplus/logs
+    - manaverse/logs
     when: always
     expire_in: 3 week
   dependencies: []
diff --git a/tools/ci/branches/master/.gitlab-ci.yml b/tools/ci/branches/master/.gitlab-ci.yml
index 7c560cfc4..d7c4e18bd 100644
--- a/tools/ci/branches/master/.gitlab-ci.yml
+++ b/tools/ci/branches/master/.gitlab-ci.yml
@@ -186,7 +186,7 @@ mxe_gcc6_shared_32:
   - ls /mxe
   - ./tools/ci/jobs/mxe_gcc6.sh
   <<: *job-push
-  image: registry.gitlab.com/manaplus/mxe:gcc6_shared_32
+  image: registry.gitlab.com/manaverse/mxe:gcc6_shared_32
   variables:
     PACKAGES: bash
     CROSS: i686-w64-mingw32.shared
@@ -199,7 +199,7 @@ mxe_gcc6_shared_64:
   - ls /mxe
   - ./tools/ci/jobs/mxe_gcc6.sh
   <<: *job-push
-  image: registry.gitlab.com/manaplus/mxe:gcc6_shared_64
+  image: registry.gitlab.com/manaverse/mxe:gcc6_shared_64
   variables:
     PACKAGES: bash
     CROSS: x86_64-w64-mingw32.shared
@@ -479,7 +479,7 @@ triggers:
   script:
   - ./tools/ci/scripts/downloadlib.sh ${LIBNAME} ${LIBVERSION}
   - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/jobs/gcc10.sh
-  - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/scripts/checkldd.sh src/manaplus
+  - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/scripts/checkldd.sh src/manaverse
   - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/scripts/runtests.sh
   <<: *job-push
   variables:
@@ -502,7 +502,7 @@ triggers:
   - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} env
   - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc10_sanitize.sh
   - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/runtests.sh
-  - ldd ./src/manaplus | grep "libasan"
+  - ldd ./src/manaverse | grep "libasan"
   <<: *job-push
   variables:
     LIBNAME: SDL
@@ -524,7 +524,7 @@ triggers:
   - ./tools/ci/scripts/downloadlib.sh ${LIBNAME} ${LIBVERSION}
   - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc10_sanitize.sh --with-sdl2
   - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/runtests.sh
-  - ldd ./src/manaplus | grep "libasan"
+  - ldd ./src/manaverse | grep "libasan"
   <<: *job-push
   variables:
     LIBNAME: SDL
@@ -549,7 +549,7 @@ triggers:
   - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} env
   - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc10_sanitize.sh
   - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/runtests.sh
-  - ldd ./src/manaplus | grep "libasan"
+  - ldd ./src/manaverse | grep "libasan"
   <<: *job-push
   variables:
     LIBNAME: SDL
@@ -573,7 +573,7 @@ triggers:
   - ./tools/ci/scripts/downloadlib.sh ${LIBNAME} ${LIBVERSION}
   - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc10_sanitize.sh --with-sdl2
   - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/runtests.sh
-  - ldd ./src/manaplus | grep "libasan"
+  - ldd ./src/manaverse | grep "libasan"
   <<: *job-push
   variables:
     LIBNAME: SDL
diff --git a/tools/ci/jobs/gitstatsh.sh b/tools/ci/jobs/gitstatsh.sh
index 376d31f43..e4f6dfbb9 100755
--- a/tools/ci/jobs/gitstatsh.sh
+++ b/tools/ci/jobs/gitstatsh.sh
@@ -13,7 +13,7 @@ check_error $?
 git log --stat --no-merges --summary --decorate=false >repo_log
 check_error $?
 cd gitstatsh/v1
-python main.py ManaPlus ../../repo_log
+python main.py ManaVerse ../../repo_log
 check_error $?
 mv web ../../stats2
 check_error $?
diff --git a/tools/ci/jobs/xcode.sh b/tools/ci/jobs/xcode.sh
index b07148b13..8649c6ba8 100755
--- a/tools/ci/jobs/xcode.sh
+++ b/tools/ci/jobs/xcode.sh
@@ -8,4 +8,4 @@ cd ../../Xcode || exit 1
 ./build.sh || exit 1
 ./pack.sh || exit 1
 ls -la build || exit 1
-cp build/manaplus.dmg "${artifacts}/" || exit 1
+cp build/manaverse.dmg "${artifacts}/" || exit 1
diff --git a/tools/ci/scripts/clonesrc.sh b/tools/ci/scripts/clonesrc.sh
index efb0596d3..60d231c9f 100755
--- a/tools/ci/scripts/clonesrc.sh
+++ b/tools/ci/scripts/clonesrc.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 
-rm -rf manaplus || true
-./tools/ci/scripts/retry.sh "git clone --branch master --depth ${GIT_DEPTH} https://gitlab.com/manaplus/manaplus.git manaplus" || exit 1
-mkdir manaplus/logs || exit 1
+rm -rf manaverse || true
+./tools/ci/scripts/retry.sh "git clone --branch master --depth ${GIT_DEPTH} https://git.themanaworld.org/mana/plus.git manaverse" || exit 1
+mkdir manaverse/logs || exit 1
diff --git a/tools/ci/scripts/init.sh b/tools/ci/scripts/init.sh
index cd716cf94..f994b13bb 100755
--- a/tools/ci/scripts/init.sh
+++ b/tools/ci/scripts/init.sh
@@ -248,7 +248,7 @@ function run_tarball {
     cd $1
     echo "tar xf ../*.tar.xz"
     tar xf ../*.tar.xz
-    cd manaplus*
+    cd manaverse*
 }
 
 function run_mplint {
diff --git a/tools/ci/scripts/rundyecmd.sh b/tools/ci/scripts/rundyecmd.sh
index fc399f822..c6807d91a 100755
--- a/tools/ci/scripts/rundyecmd.sh
+++ b/tools/ci/scripts/rundyecmd.sh
@@ -2,8 +2,8 @@
 
 function testdye {
     rm test1.png || true
-    echo ./src/dyecmd "data/icons/manaplus.png|$1" test1.png
-    ./src/dyecmd "data/icons/manaplus.png|$1" test1.png || exit 1
+    echo ./src/dyecmd "data/icons/manaverse.png|$1" test1.png
+    ./src/dyecmd "data/icons/manaverse.png|$1" test1.png || exit 1
     ls test1.png || exit 1
     rm test1.png || true
 }
diff --git a/tools/ci/scripts/runtest.sh b/tools/ci/scripts/runtest.sh
index 622e04da0..523bd4b41 100755
--- a/tools/ci/scripts/runtest.sh
+++ b/tools/ci/scripts/runtest.sh
@@ -6,19 +6,19 @@ function check_is_run {
         echo "Error: process look like crashed"
         cat logs/run.log
         echo "Run with gdb"
-        cp ./src/manaplus ./logs/
+        cp ./src/manaverse ./logs/
         cp -r core* ./logs/
         sleep 10
         COREFILE=$(find . -maxdepth 1 -name "core*" | head -n 1)
         if [[ -f "$COREFILE" ]]; then
-            gdb -c "$COREFILE" ./src/manaplus -ex "thread apply all bt" -ex "set pagination 0" -batch
+            gdb -c "$COREFILE" ./src/manaverse -ex "thread apply all bt" -ex "set pagination 0" -batch
         fi
         exit 1
     fi
 }
 
 function check_assert {
-    grep -A 20 "Assert:" "${HOME}/.local/share/mana/manaverse.log"
+    grep -A 20 "Assert:" "${HOME}/.local/share/manaverse/manaverse.log"
     if [ "$?" == 0 ]; then
         echo "Assert found in log"
         exit 1
@@ -31,9 +31,9 @@ function wait_for_servers_list {
         echo "wait for servers list ${n}"
         check_is_run
         # check here
-        grep "Skipping servers list update" "${HOME}/.local/share/mana/manaverse.log" && return
-        grep "Servers list updated" "${HOME}/.local/share/mana/manaverse.log" && return
-        grep "Error: servers list updating error" "${HOME}/.local/share/mana/manaverse.log"
+        grep "Skipping servers list update" "${HOME}/.local/share/manaverse/manaverse.log" && return
+        grep "Servers list updated" "${HOME}/.local/share/manaverse/manaverse.log" && return
+        grep "Error: servers list updating error" "${HOME}/.local/share/manaverse/manaverse.log"
         if [ "$?" == 0 ]; then
             echo "Servers list downloading error"
             exit 1
@@ -50,9 +50,9 @@ function wait_for_servers_list {
 }
 
 function run {
-    ./src/manaplus --hide-cursor --enable-ipc --renderer=0 >logs/run.log 2>&1 &
+    ./src/manaverse --hide-cursor --enable-ipc --renderer=0 >logs/run.log 2>&1 &
     export PID=$!
-    echo "manaplus PID: ${PID}"
+    echo "manaverse PID: ${PID}"
     sleep 15
     echo "pause after run"
     wait_for_servers_list
@@ -95,16 +95,16 @@ function send_command {
 }
 
 function check_exists {
-    if [ ! -f "logs/home/Desktop/ManaPlus/$1" ]; then
+    if [ ! -f "logs/home/Desktop/ManaVerse/$1" ]; then
         sleep 7
-        if [ ! -f "logs/home/Desktop/ManaPlus/$1" ]; then
+        if [ ! -f "logs/home/Desktop/ManaVerse/$1" ]; then
             echo "Error: image $1 not exists"
             exit 1
         fi
     fi
-    if [ ! -f "logs/home/Desktop/ManaPlus/$2" ]; then
+    if [ ! -f "logs/home/Desktop/ManaVerse/$2" ]; then
         sleep 7
-        if [ ! -f "logs/home/Desktop/ManaPlus/$2" ]; then
+        if [ ! -f "logs/home/Desktop/ManaVerse/$2" ]; then
             echo "Error: image $2 not exists"
             exit 1
         fi
@@ -113,7 +113,7 @@ function check_exists {
 
 function imagesdiff {
     check_exists "$1" "$2"
-    diff "logs/home/Desktop/ManaPlus/$1" "logs/home/Desktop/ManaPlus/$2"
+    diff "logs/home/Desktop/ManaVerse/$1" "logs/home/Desktop/ManaVerse/$2"
     if [ "$?" == 0 ]; then
         echo "Error: images '$1' and '$2' is same."
         exit 1
@@ -122,7 +122,7 @@ function imagesdiff {
 
 function imagessame {
     check_exists "$1" "$2"
-    diff "logs/home/Desktop/ManaPlus/$1" "logs/home/Desktop/ManaPlus/$2"
+    diff "logs/home/Desktop/ManaVerse/$1" "logs/home/Desktop/ManaVerse/$2"
     if [ "$?" != 0 ]; then
         echo "Error: images '$1' and '$2' is different."
         exit 1
@@ -233,7 +233,7 @@ imagesdiff new_server.png about.png
 send_command "/sendmousekey 500 20 1"
 send_command "/screenshot about.png"
 
-# open about manaplus page
+# open about manaverse page
 send_command "/sendmousekey 300 ${ABOUTYOFFSET} 1"
 send_command "/screenshot about2.png"
 imagesdiff about.png about2.png
diff --git a/tools/ci/scripts/runtests.sh b/tools/ci/scripts/runtests.sh
index 1afe5815f..cf781ff1b 100755
--- a/tools/ci/scripts/runtests.sh
+++ b/tools/ci/scripts/runtests.sh
@@ -22,12 +22,12 @@ echo "clean config runs"
 n=0
 while true; do
     echo "run test ${n}"
-    rm "${HOME}/.config/mana/mana/config.xml"
-    rm "/root/.config/mana/mana/config.xml"
-    rm "${HOME}/.config/mana/mana/serverlistplus.xml"
-    rm "/root/.config/mana/mana/serverlistplus.xml"
-    rm "${HOME}/.local/share/mana/manaverse.log"
-    rm "/root/.local/share/mana/manaverse.log"
+    rm "${HOME}/.config/mana/manaverse/config.xml"
+    rm "/root/.config/mana/manaverse/config.xml"
+    rm "${HOME}/.config/mana/manaverse/serverlistplus.xml"
+    rm "/root/.config/mana/manaverse/serverlistplus.xml"
+    rm "${HOME}/.local/share/manaverse/manaverse.log"
+    rm "/root/.local/share/manaverse/manaverse.log"
     ./tools/ci/scripts/runtest.sh
     if [ "$?" != 0 ]; then
         exit 1
@@ -45,8 +45,8 @@ echo "existing config runs"
 n=0
 while true; do
     echo "run test ${n}"
-    rm "${HOME}/.local/share/mana/manaverse.log"
-    rm "/root/.local/share/mana/manaverse.log"
+    rm "${HOME}/.local/share/manaverse/manaverse.log"
+    rm "/root/.local/share/manaverse/manaverse.log"
     ./tools/ci/scripts/runtest.sh
     if [ "$?" != 0 ]; then
         exit 1
diff --git a/tools/doxygen/doxygen.conf b/tools/doxygen/doxygen.conf
index 76ca1ea11..fcf2b170b 100644
--- a/tools/doxygen/doxygen.conf
+++ b/tools/doxygen/doxygen.conf
@@ -4,10 +4,10 @@ c# Doxyfile 1.8.8
 # Project related configuration options
 #---------------------------------------------------------------------------
 DOXYFILE_ENCODING      = UTF-8
-PROJECT_NAME           = "ManaPlus"
+PROJECT_NAME           = "ManaVerse"
 PROJECT_NUMBER         =
 PROJECT_BRIEF          =
-PROJECT_LOGO           = data/icons/manaplus.png
+PROJECT_LOGO           = data/icons/manaverse.png
 OUTPUT_DIRECTORY       = doxygen
 CREATE_SUBDIRS         = NO
 ALLOW_UNICODE_NAMES    = NO