diff --git a/pybis/.gitignore b/api-openbis-python3-pybis/.gitignore
similarity index 100%
rename from pybis/.gitignore
rename to api-openbis-python3-pybis/.gitignore
diff --git a/pybis/.obis/config.json b/api-openbis-python3-pybis/.obis/config.json
similarity index 100%
rename from pybis/.obis/config.json
rename to api-openbis-python3-pybis/.obis/config.json
diff --git a/pybis/README.md b/api-openbis-python3-pybis/README.md
similarity index 100%
rename from pybis/README.md
rename to api-openbis-python3-pybis/README.md
diff --git a/pybis/README.rst b/api-openbis-python3-pybis/README.rst
similarity index 100%
rename from pybis/README.rst
rename to api-openbis-python3-pybis/README.rst
diff --git a/pybis/docs/meeting-notes/2016-08-30-meeting.md b/api-openbis-python3-pybis/docs/meeting-notes/2016-08-30-meeting.md
similarity index 100%
rename from pybis/docs/meeting-notes/2016-08-30-meeting.md
rename to api-openbis-python3-pybis/docs/meeting-notes/2016-08-30-meeting.md
diff --git a/pybis/docs/roadmap/bigdata-usecases.md b/api-openbis-python3-pybis/docs/roadmap/bigdata-usecases.md
similarity index 100%
rename from pybis/docs/roadmap/bigdata-usecases.md
rename to api-openbis-python3-pybis/docs/roadmap/bigdata-usecases.md
diff --git a/pybis/src/python/.gitignore b/api-openbis-python3-pybis/src/python/.gitignore
similarity index 100%
rename from pybis/src/python/.gitignore
rename to api-openbis-python3-pybis/src/python/.gitignore
diff --git a/pybis/src/python/CHANGELOG.md b/api-openbis-python3-pybis/src/python/CHANGELOG.md
similarity index 100%
rename from pybis/src/python/CHANGELOG.md
rename to api-openbis-python3-pybis/src/python/CHANGELOG.md
diff --git a/pybis/src/python/CONTRIBUTING.md b/api-openbis-python3-pybis/src/python/CONTRIBUTING.md
similarity index 100%
rename from pybis/src/python/CONTRIBUTING.md
rename to api-openbis-python3-pybis/src/python/CONTRIBUTING.md
diff --git a/pybis/src/python/HOWTO_UPLOAD_TO_PYPI b/api-openbis-python3-pybis/src/python/HOWTO_UPLOAD_TO_PYPI
similarity index 100%
rename from pybis/src/python/HOWTO_UPLOAD_TO_PYPI
rename to api-openbis-python3-pybis/src/python/HOWTO_UPLOAD_TO_PYPI
diff --git a/pybis/src/python/LICENSE b/api-openbis-python3-pybis/src/python/LICENSE
similarity index 100%
rename from pybis/src/python/LICENSE
rename to api-openbis-python3-pybis/src/python/LICENSE
diff --git a/pybis/src/python/MANIFEST.in b/api-openbis-python3-pybis/src/python/MANIFEST.in
similarity index 100%
rename from pybis/src/python/MANIFEST.in
rename to api-openbis-python3-pybis/src/python/MANIFEST.in
diff --git a/pybis/src/python/README.md b/api-openbis-python3-pybis/src/python/README.md
similarity index 100%
rename from pybis/src/python/README.md
rename to api-openbis-python3-pybis/src/python/README.md
diff --git a/pybis/src/python/README.rst b/api-openbis-python3-pybis/src/python/README.rst
similarity index 100%
rename from pybis/src/python/README.rst
rename to api-openbis-python3-pybis/src/python/README.rst
diff --git a/pybis/src/python/pybis playground localhost.ipynb b/api-openbis-python3-pybis/src/python/pybis playground localhost.ipynb
similarity index 100%
rename from pybis/src/python/pybis playground localhost.ipynb
rename to api-openbis-python3-pybis/src/python/pybis playground localhost.ipynb
diff --git a/pybis/src/python/pybis/__init__.py b/api-openbis-python3-pybis/src/python/pybis/__init__.py
similarity index 100%
rename from pybis/src/python/pybis/__init__.py
rename to api-openbis-python3-pybis/src/python/pybis/__init__.py
diff --git a/pybis/src/python/pybis/attachment.py b/api-openbis-python3-pybis/src/python/pybis/attachment.py
similarity index 100%
rename from pybis/src/python/pybis/attachment.py
rename to api-openbis-python3-pybis/src/python/pybis/attachment.py
diff --git a/pybis/src/python/pybis/attribute.py b/api-openbis-python3-pybis/src/python/pybis/attribute.py
similarity index 100%
rename from pybis/src/python/pybis/attribute.py
rename to api-openbis-python3-pybis/src/python/pybis/attribute.py
diff --git a/pybis/src/python/pybis/data_set.py b/api-openbis-python3-pybis/src/python/pybis/data_set.py
similarity index 100%
rename from pybis/src/python/pybis/data_set.py
rename to api-openbis-python3-pybis/src/python/pybis/data_set.py
diff --git a/pybis/src/python/pybis/dataset.py b/api-openbis-python3-pybis/src/python/pybis/dataset.py
similarity index 100%
rename from pybis/src/python/pybis/dataset.py
rename to api-openbis-python3-pybis/src/python/pybis/dataset.py
diff --git a/pybis/src/python/pybis/definitions.py b/api-openbis-python3-pybis/src/python/pybis/definitions.py
similarity index 100%
rename from pybis/src/python/pybis/definitions.py
rename to api-openbis-python3-pybis/src/python/pybis/definitions.py
diff --git a/pybis/src/python/pybis/entity_type.py b/api-openbis-python3-pybis/src/python/pybis/entity_type.py
similarity index 100%
rename from pybis/src/python/pybis/entity_type.py
rename to api-openbis-python3-pybis/src/python/pybis/entity_type.py
diff --git a/pybis/src/python/pybis/experiment.py b/api-openbis-python3-pybis/src/python/pybis/experiment.py
similarity index 100%
rename from pybis/src/python/pybis/experiment.py
rename to api-openbis-python3-pybis/src/python/pybis/experiment.py
diff --git a/pybis/src/python/pybis/group.py b/api-openbis-python3-pybis/src/python/pybis/group.py
similarity index 100%
rename from pybis/src/python/pybis/group.py
rename to api-openbis-python3-pybis/src/python/pybis/group.py
diff --git a/pybis/src/python/pybis/material.py b/api-openbis-python3-pybis/src/python/pybis/material.py
similarity index 100%
rename from pybis/src/python/pybis/material.py
rename to api-openbis-python3-pybis/src/python/pybis/material.py
diff --git a/pybis/src/python/pybis/openbis_object.py b/api-openbis-python3-pybis/src/python/pybis/openbis_object.py
similarity index 100%
rename from pybis/src/python/pybis/openbis_object.py
rename to api-openbis-python3-pybis/src/python/pybis/openbis_object.py
diff --git a/pybis/src/python/pybis/person.py b/api-openbis-python3-pybis/src/python/pybis/person.py
similarity index 100%
rename from pybis/src/python/pybis/person.py
rename to api-openbis-python3-pybis/src/python/pybis/person.py
diff --git a/pybis/src/python/pybis/project.py b/api-openbis-python3-pybis/src/python/pybis/project.py
similarity index 100%
rename from pybis/src/python/pybis/project.py
rename to api-openbis-python3-pybis/src/python/pybis/project.py
diff --git a/pybis/src/python/pybis/property.py b/api-openbis-python3-pybis/src/python/pybis/property.py
similarity index 100%
rename from pybis/src/python/pybis/property.py
rename to api-openbis-python3-pybis/src/python/pybis/property.py
diff --git a/pybis/src/python/pybis/pybis.py b/api-openbis-python3-pybis/src/python/pybis/pybis.py
similarity index 100%
rename from pybis/src/python/pybis/pybis.py
rename to api-openbis-python3-pybis/src/python/pybis/pybis.py
diff --git a/pybis/src/python/pybis/role_assignment.py b/api-openbis-python3-pybis/src/python/pybis/role_assignment.py
similarity index 100%
rename from pybis/src/python/pybis/role_assignment.py
rename to api-openbis-python3-pybis/src/python/pybis/role_assignment.py
diff --git a/pybis/src/python/pybis/sample.py b/api-openbis-python3-pybis/src/python/pybis/sample.py
similarity index 100%
rename from pybis/src/python/pybis/sample.py
rename to api-openbis-python3-pybis/src/python/pybis/sample.py
diff --git a/pybis/src/python/pybis/scripts/cli.py b/api-openbis-python3-pybis/src/python/pybis/scripts/cli.py
similarity index 100%
rename from pybis/src/python/pybis/scripts/cli.py
rename to api-openbis-python3-pybis/src/python/pybis/scripts/cli.py
diff --git a/pybis/src/python/pybis/semantic_annotation.py b/api-openbis-python3-pybis/src/python/pybis/semantic_annotation.py
similarity index 100%
rename from pybis/src/python/pybis/semantic_annotation.py
rename to api-openbis-python3-pybis/src/python/pybis/semantic_annotation.py
diff --git a/pybis/src/python/pybis/space.py b/api-openbis-python3-pybis/src/python/pybis/space.py
similarity index 100%
rename from pybis/src/python/pybis/space.py
rename to api-openbis-python3-pybis/src/python/pybis/space.py
diff --git a/pybis/src/python/pybis/tag.py b/api-openbis-python3-pybis/src/python/pybis/tag.py
similarity index 100%
rename from pybis/src/python/pybis/tag.py
rename to api-openbis-python3-pybis/src/python/pybis/tag.py
diff --git a/pybis/src/python/pybis/things.py b/api-openbis-python3-pybis/src/python/pybis/things.py
similarity index 100%
rename from pybis/src/python/pybis/things.py
rename to api-openbis-python3-pybis/src/python/pybis/things.py
diff --git a/pybis/src/python/pybis/utils.py b/api-openbis-python3-pybis/src/python/pybis/utils.py
similarity index 100%
rename from pybis/src/python/pybis/utils.py
rename to api-openbis-python3-pybis/src/python/pybis/utils.py
diff --git a/pybis/src/python/pybis/vocabulary.py b/api-openbis-python3-pybis/src/python/pybis/vocabulary.py
similarity index 100%
rename from pybis/src/python/pybis/vocabulary.py
rename to api-openbis-python3-pybis/src/python/pybis/vocabulary.py
diff --git a/pybis/src/python/pyproject.toml b/api-openbis-python3-pybis/src/python/pyproject.toml
similarity index 100%
rename from pybis/src/python/pyproject.toml
rename to api-openbis-python3-pybis/src/python/pyproject.toml
diff --git a/pybis/src/python/setup.cfg b/api-openbis-python3-pybis/src/python/setup.cfg
similarity index 100%
rename from pybis/src/python/setup.cfg
rename to api-openbis-python3-pybis/src/python/setup.cfg
diff --git a/pybis/src/python/setup.py b/api-openbis-python3-pybis/src/python/setup.py
similarity index 100%
rename from pybis/src/python/setup.py
rename to api-openbis-python3-pybis/src/python/setup.py
diff --git a/pybis/src/python/tests/conftest.py b/api-openbis-python3-pybis/src/python/tests/conftest.py
similarity index 100%
rename from pybis/src/python/tests/conftest.py
rename to api-openbis-python3-pybis/src/python/tests/conftest.py
diff --git a/pybis/src/python/tests/test_dataset.py b/api-openbis-python3-pybis/src/python/tests/test_dataset.py
similarity index 100%
rename from pybis/src/python/tests/test_dataset.py
rename to api-openbis-python3-pybis/src/python/tests/test_dataset.py
diff --git a/pybis/src/python/tests/test_experiment.py b/api-openbis-python3-pybis/src/python/tests/test_experiment.py
similarity index 100%
rename from pybis/src/python/tests/test_experiment.py
rename to api-openbis-python3-pybis/src/python/tests/test_experiment.py
diff --git a/pybis/src/python/tests/test_group.py b/api-openbis-python3-pybis/src/python/tests/test_group.py
similarity index 100%
rename from pybis/src/python/tests/test_group.py
rename to api-openbis-python3-pybis/src/python/tests/test_group.py
diff --git a/pybis/src/python/tests/test_imports.py b/api-openbis-python3-pybis/src/python/tests/test_imports.py
similarity index 100%
rename from pybis/src/python/tests/test_imports.py
rename to api-openbis-python3-pybis/src/python/tests/test_imports.py
diff --git a/pybis/src/python/tests/test_material.py b/api-openbis-python3-pybis/src/python/tests/test_material.py
similarity index 100%
rename from pybis/src/python/tests/test_material.py
rename to api-openbis-python3-pybis/src/python/tests/test_material.py
diff --git a/pybis/src/python/tests/test_openbis.py b/api-openbis-python3-pybis/src/python/tests/test_openbis.py
similarity index 100%
rename from pybis/src/python/tests/test_openbis.py
rename to api-openbis-python3-pybis/src/python/tests/test_openbis.py
diff --git a/pybis/src/python/tests/test_person.py b/api-openbis-python3-pybis/src/python/tests/test_person.py
similarity index 100%
rename from pybis/src/python/tests/test_person.py
rename to api-openbis-python3-pybis/src/python/tests/test_person.py
diff --git a/pybis/src/python/tests/test_plugin.py b/api-openbis-python3-pybis/src/python/tests/test_plugin.py
similarity index 100%
rename from pybis/src/python/tests/test_plugin.py
rename to api-openbis-python3-pybis/src/python/tests/test_plugin.py
diff --git a/pybis/src/python/tests/test_project.py b/api-openbis-python3-pybis/src/python/tests/test_project.py
similarity index 100%
rename from pybis/src/python/tests/test_project.py
rename to api-openbis-python3-pybis/src/python/tests/test_project.py
diff --git a/pybis/src/python/tests/test_sample.py b/api-openbis-python3-pybis/src/python/tests/test_sample.py
similarity index 100%
rename from pybis/src/python/tests/test_sample.py
rename to api-openbis-python3-pybis/src/python/tests/test_sample.py
diff --git a/pybis/src/python/tests/test_space.py b/api-openbis-python3-pybis/src/python/tests/test_space.py
similarity index 100%
rename from pybis/src/python/tests/test_space.py
rename to api-openbis-python3-pybis/src/python/tests/test_space.py
diff --git a/pybis/src/python/tests/test_tag.py b/api-openbis-python3-pybis/src/python/tests/test_tag.py
similarity index 100%
rename from pybis/src/python/tests/test_tag.py
rename to api-openbis-python3-pybis/src/python/tests/test_tag.py
diff --git a/pybis/src/python/tests/test_vocabulary.py b/api-openbis-python3-pybis/src/python/tests/test_vocabulary.py
similarity index 100%
rename from pybis/src/python/tests/test_vocabulary.py
rename to api-openbis-python3-pybis/src/python/tests/test_vocabulary.py
diff --git a/pybis/src/python/tests/testfile b/api-openbis-python3-pybis/src/python/tests/testfile
similarity index 100%
rename from pybis/src/python/tests/testfile
rename to api-openbis-python3-pybis/src/python/tests/testfile
diff --git a/pybis/src/python/tests/todo_test_external_dms.py b/api-openbis-python3-pybis/src/python/tests/todo_test_external_dms.py
similarity index 100%
rename from pybis/src/python/tests/todo_test_external_dms.py
rename to api-openbis-python3-pybis/src/python/tests/todo_test_external_dms.py
diff --git a/openbis_standard_technologies/build.gradle b/openbis_standard_technologies/build.gradle
index 7d1d18154b6ba4b08366e7c71c3fb79934a45f01..c127b4b6773f973b365f3cbd7fb3f3b7a74e5628 100644
--- a/openbis_standard_technologies/build.gradle
+++ b/openbis_standard_technologies/build.gradle
@@ -462,7 +462,7 @@ task zipBdlServer(type: Zip, dependsOn: project(':server-external-data-store').t
 
 task pybisZip(type: Zip) {
     baseName 'pybis'
-    from '../pybis/'
+    from '../api-openbis-python3-pybis/'
 }
 
 task obisZip(type: Zip) {