diff --git a/how-to-merge-after-rename.txt b/how-to-merge-after-rename.txt
new file mode 100644
index 0000000000000000000000000000000000000000..f41ed1c575550956cfeffeecd29f945e1fb446d7
--- /dev/null
+++ b/how-to-merge-after-rename.txt
@@ -0,0 +1,11 @@
+git merge linkahead-rename-step-1
+# resolve potential conflicts and commit
+rm -rf src/linkahead
+git mv src/caosdb/ src/linkahead
+rm -rf src/caosdb
+python3 create_slim_linkahead_wrapper.py
+git add src
+git ci -m "MAINT: rename caosdb to linkahead (module)"
+git merge linkahead-rename-step-2
+# resolve potential conflicts and commit
+git merge dev
diff --git a/setup.py b/setup.py
index f5bc6afcb28ac1c80ac951cc2141f883e8953634..7a56630a2a51185fc0237e8db5030423591790fb 100755
--- a/setup.py
+++ b/setup.py
@@ -188,7 +188,10 @@ def setup_package():
         package_data={
             'linkahead': ['cert/indiscale.ca.crt', 'schema-pycaosdb-ini.yml'],
         },
-        scripts=["src/linkahead/utils/linkahead_admin.py"]
+        scripts=[
+            "src/linkahead/utils/caosdb_admin.py",
+            "src/linkahead/utils/linkahead_admin.py"
+        ]
     )
     try:
         setup(**metadata)
diff --git a/src/doc/tutorials/errors.rst b/src/doc/tutorials/errors.rst
index ed0c786905c4a3868902863364a753c5df37b082..a66b7c7607f6f3bcac7a843ed8dc09893b4b99a2 100644
--- a/src/doc/tutorials/errors.rst
+++ b/src/doc/tutorials/errors.rst
@@ -16,11 +16,11 @@ following. For more information on specific error types, see also the
 
 .. note::
 
-   Starting from PyLinkAhead 0.5, the error handling has changed
+   Starting from PyCaosDB 0.5, the error handling has changed
    significantly. New error classes have been introduced and the
    behavior of ``TransactionError`` and ``EntityError`` has been
    re-worked. In the following, only the "new" errors are
-   discussed. Please refer to the documentation of PyLinkAhead 0.4.1 and
+   discussed. Please refer to the documentation of PyCaosDB 0.4.1 and
    earlier for the old error handling.
 
 LinkAheadException