diff --git a/.github/labeler.yml b/.github/labeler.yml
index f2dcedad2..3c1a626c7 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -16,7 +16,7 @@ integration:elasticsearch:
 
 integration:google-vertex:
   - changed-files:
-      - any-glob-to-any-file: "integrations/google-vertex/**/*"
+      - any-glob-to-any-file: "integrations/google_vertex/**/*"
       - any-glob-to-any-file: ".github/workflows/google_vertex.yml"
 
 integration:gradient:
@@ -26,7 +26,7 @@ integration:gradient:
 
 integration:instructor-embedders:
   - changed-files:
-      - any-glob-to-any-file: "integrations/instructor-embedders/**/*"
+      - any-glob-to-any-file: "integrations/instructor_embedders/**/*"
       - any-glob-to-any-file: ".github/workflows/instructor_embedders.yml"
 
 integration:jina:
diff --git a/.github/workflows/google_vertex.yml b/.github/workflows/google_vertex.yml
index 7be3973bf..cf60d3229 100644
--- a/.github/workflows/google_vertex.yml
+++ b/.github/workflows/google_vertex.yml
@@ -7,12 +7,12 @@ on:
     - cron: "0 0 * * *"
   pull_request:
     paths:
-      - "integrations/google-vertex/**"
-      - ".github/workflows/google-vertex.yml"
+      - "integrations/google_vertex/**"
+      - ".github/workflows/google_vertex.yml"
 
 defaults:
   run:
-    working-directory: integrations/google-vertex
+    working-directory: integrations/google_vertex
 
 concurrency:
   group: google-vertex-${{ github.head_ref }}
diff --git a/.github/workflows/instructor_embedders.yml b/.github/workflows/instructor_embedders.yml
index 05ecfb05f..4145408e2 100644
--- a/.github/workflows/instructor_embedders.yml
+++ b/.github/workflows/instructor_embedders.yml
@@ -5,12 +5,12 @@ on:
     - cron: "0 0 * * *"
   pull_request:
     paths:
-      - 'integrations/instructor-embedders/**'
+      - 'integrations/instructor_embedders/**'
       - '.github/workflows/instructor_embedders.yml'
 
 defaults:
   run:
-    working-directory: integrations/instructor-embedders
+    working-directory: integrations/instructor_embedders
 
 jobs:
   test:
diff --git a/README.md b/README.md
index 2dc547050..4de6092c9 100644
--- a/README.md
+++ b/README.md
@@ -65,9 +65,9 @@ deepset-haystack
 | [chroma-haystack](integrations/chroma/)                                         | Document Store      | [![PyPI - Version](https://img.shields.io/pypi/v/chroma-haystack.svg)](https://pypi.org/project/chroma-haystack)                                         | [![Test / chroma](https://github.com/deepset-ai/haystack-core-integrations/actions/workflows/chroma.yml/badge.svg)](https://github.com/deepset-ai/haystack-core-integrations/actions/workflows/chroma.yml)                                                               |
 | [cohere-haystack](integrations/cohere/)                                         | Embedder, Generator | [![PyPI - Version](https://img.shields.io/pypi/v/cohere-haystack.svg)](https://pypi.org/project/cohere-haystack)                                         | [![Test / cohere](https://github.com/deepset-ai/haystack-core-integrations/actions/workflows/cohere.yml/badge.svg)](https://github.com/deepset-ai/haystack-core-integrations/actions/workflows/cohere.yml)                                                               |
 | [elasticsearch-haystack](integrations/elasticsearch/)                           | Document Store      | [![PyPI - Version](https://img.shields.io/pypi/v/elasticsearch-haystack.svg)](https://pypi.org/project/elasticsearch-haystack)                           | [![Test / elasticsearch](https://github.com/deepset-ai/haystack-core-integrations/actions/workflows/elasticsearch.yml/badge.svg)](https://github.com/deepset-ai/haystack-core-integrations/actions/workflows/elasticsearch.yml)                                          |
-| [google-vertex-haystack](integrations/google-vertex/)                           | Generator           | [![PyPI - Version](https://img.shields.io/pypi/v/google-vertex-haystack.svg)](https://pypi.org/project/google-vertex-haystack)                           | [![Test / google-vertex](https://github.com/deepset-ai/haystack-core-integrations/actions/workflows/google_vertex.yml/badge.svg)](https://github.com/deepset-ai/haystack-core-integrations/actions/workflows/google_vertex.yml)                                          |
+| [google-vertex-haystack](integrations/google_vertex/)                           | Generator           | [![PyPI - Version](https://img.shields.io/pypi/v/google-vertex-haystack.svg)](https://pypi.org/project/google-vertex-haystack)                           | [![Test / google-vertex](https://github.com/deepset-ai/haystack-core-integrations/actions/workflows/google_vertex.yml/badge.svg)](https://github.com/deepset-ai/haystack-core-integrations/actions/workflows/google_vertex.yml)                                          |
 | [gradient-haystack](integrations/gradient/)                                     | Embedder, Generator | [![PyPI - Version](https://img.shields.io/pypi/v/gradient-haystack.svg)](https://pypi.org/project/gradient-haystack)                                     | [![Test / gradient](https://github.com/deepset-ai/haystack-core-integrations/actions/workflows/gradient.yml/badge.svg)](https://github.com/deepset-ai/haystack-core-integrations/actions/workflows/gradient.yml)                                                         |
-| [instructor-embedders-haystack](integrations/instructor-embedders/)             | Embedder            | [![PyPI - Version](https://img.shields.io/pypi/v/instructor-embedders-haystack.svg)](https://pypi.org/project/instructor-embedders-haystack)             | [![Test / instructor-embedders](https://github.com/deepset-ai/haystack-core-integrations/actions/workflows/instructor_embedders.yml/badge.svg)](https://github.com/deepset-ai/haystack-core-integrations/actions/workflows/instructor_embedders.yml)                     |
+| [instructor-embedders-haystack](integrations/instructor_embedders/)             | Embedder            | [![PyPI - Version](https://img.shields.io/pypi/v/instructor-embedders-haystack.svg)](https://pypi.org/project/instructor-embedders-haystack)             | [![Test / instructor-embedders](https://github.com/deepset-ai/haystack-core-integrations/actions/workflows/instructor_embedders.yml/badge.svg)](https://github.com/deepset-ai/haystack-core-integrations/actions/workflows/instructor_embedders.yml)                     |
 | [opensearch-haystack](integrations/opensearch/)                                 | Document Store      | [![PyPI - Version](https://img.shields.io/pypi/v/opensearch-haystack.svg)](https://pypi.org/project/opensearch-haystack)                                 | [![Test / opensearch](https://github.com/deepset-ai/haystack-core-integrations/actions/workflows/opensearch.yml/badge.svg)](https://github.com/deepset-ai/haystack-core-integrations/actions/workflows/opensearch.yml)                                                   |
 | [qdrant-haystack](integrations/qdrant/)                                         | Document Store      | [![PyPI - Version](https://img.shields.io/pypi/v/qdrant-haystack.svg?color=orange)](https://pypi.org/project/qdrant-haystack)                            | [![Test / qdrant](https://github.com/deepset-ai/haystack-core-integrations/actions/workflows/qdrant.yml/badge.svg)](https://github.com/deepset-ai/haystack-core-integrations/actions/workflows/qdrant.yml)                                                               |
 | [unstructured-fileconverter-haystack](integrations/unstructured/fileconverter/) | File converter      | [![PyPI - Version](https://img.shields.io/pypi/v/unstructured-fileconverter-haystack.svg)](https://pypi.org/project/unstructured-fileconverter-haystack) | [![Test / unstructured / fileconverter](https://github.com/deepset-ai/haystack-core-integrations/actions/workflows/unstructured_fileconverter.yml/badge.svg)](https://github.com/deepset-ai/haystack-core-integrations/actions/workflows/unstructured_fileconverter.yml) |
diff --git a/integrations/google-vertex/LICENSE.txt b/integrations/google_vertex/LICENSE.txt
similarity index 100%
rename from integrations/google-vertex/LICENSE.txt
rename to integrations/google_vertex/LICENSE.txt
diff --git a/integrations/google-vertex/README.md b/integrations/google_vertex/README.md
similarity index 100%
rename from integrations/google-vertex/README.md
rename to integrations/google_vertex/README.md
diff --git a/integrations/google-vertex/pyproject.toml b/integrations/google_vertex/pyproject.toml
similarity index 92%
rename from integrations/google-vertex/pyproject.toml
rename to integrations/google_vertex/pyproject.toml
index b773742e2..1d15a4270 100644
--- a/integrations/google-vertex/pyproject.toml
+++ b/integrations/google_vertex/pyproject.toml
@@ -29,17 +29,17 @@ dependencies = [
 ]
 
 [project.urls]
-Documentation = "https://github.com/deepset-ai/haystack-core-integrations/tree/main/integrations/google-vertex#readme"
+Documentation = "https://github.com/deepset-ai/haystack-core-integrations/tree/main/integrations/google_vertex#readme"
 Issues = "https://github.com/deepset-ai/haystack-core-integrations/issues"
-Source = "https://github.com/deepset-ai/haystack-core-integrations/tree/main/integrations/google-vertex"
+Source = "https://github.com/deepset-ai/haystack-core-integrations/tree/main/integrations/google_vertex"
 
 [tool.hatch.version]
 source = "vcs"
-tag-pattern = 'integrations\/google-vertex-v(?P<version>.*)'
+tag-pattern = 'integrations\/google_vertex-v(?P<version>.*)'
 
 [tool.hatch.version.raw-options]
 root = "../.."
-git_describe_command = 'git describe --tags --match="integrations/google-vertex-v[0-9]*"'
+git_describe_command = 'git describe --tags --match="integrations/google_vertex-v[0-9]*"'
 
 [tool.hatch.envs.default]
 dependencies = [
@@ -150,8 +150,8 @@ omit = [
 ]
 
 [tool.coverage.paths]
-google_vertex_haystack = ["src/google_vertex_haystack", "*/google-vertex-haystack/src/google_vertex_haystack"]
-tests = ["tests", "*/google-vertex-haystack/tests"]
+google_vertex_haystack = ["src/google_vertex_haystack", "*/google_vertex/src/google_vertex_haystack"]
+tests = ["tests", "*/google_vertex_haystack/tests"]
 
 [tool.coverage.report]
 exclude_lines = [
diff --git a/integrations/google-vertex/src/google_vertex_haystack/__init__.py b/integrations/google_vertex/src/google_vertex_haystack/__init__.py
similarity index 100%
rename from integrations/google-vertex/src/google_vertex_haystack/__init__.py
rename to integrations/google_vertex/src/google_vertex_haystack/__init__.py
diff --git a/integrations/google-vertex/src/google_vertex_haystack/generators/__init__.py b/integrations/google_vertex/src/google_vertex_haystack/generators/__init__.py
similarity index 100%
rename from integrations/google-vertex/src/google_vertex_haystack/generators/__init__.py
rename to integrations/google_vertex/src/google_vertex_haystack/generators/__init__.py
diff --git a/integrations/google-vertex/src/google_vertex_haystack/generators/captioner.py b/integrations/google_vertex/src/google_vertex_haystack/generators/captioner.py
similarity index 100%
rename from integrations/google-vertex/src/google_vertex_haystack/generators/captioner.py
rename to integrations/google_vertex/src/google_vertex_haystack/generators/captioner.py
diff --git a/integrations/google-vertex/src/google_vertex_haystack/generators/chat/gemini.py b/integrations/google_vertex/src/google_vertex_haystack/generators/chat/gemini.py
similarity index 100%
rename from integrations/google-vertex/src/google_vertex_haystack/generators/chat/gemini.py
rename to integrations/google_vertex/src/google_vertex_haystack/generators/chat/gemini.py
diff --git a/integrations/google-vertex/src/google_vertex_haystack/generators/code_generator.py b/integrations/google_vertex/src/google_vertex_haystack/generators/code_generator.py
similarity index 100%
rename from integrations/google-vertex/src/google_vertex_haystack/generators/code_generator.py
rename to integrations/google_vertex/src/google_vertex_haystack/generators/code_generator.py
diff --git a/integrations/google-vertex/src/google_vertex_haystack/generators/gemini.py b/integrations/google_vertex/src/google_vertex_haystack/generators/gemini.py
similarity index 100%
rename from integrations/google-vertex/src/google_vertex_haystack/generators/gemini.py
rename to integrations/google_vertex/src/google_vertex_haystack/generators/gemini.py
diff --git a/integrations/google-vertex/src/google_vertex_haystack/generators/image_generator.py b/integrations/google_vertex/src/google_vertex_haystack/generators/image_generator.py
similarity index 100%
rename from integrations/google-vertex/src/google_vertex_haystack/generators/image_generator.py
rename to integrations/google_vertex/src/google_vertex_haystack/generators/image_generator.py
diff --git a/integrations/google-vertex/src/google_vertex_haystack/generators/question_answering.py b/integrations/google_vertex/src/google_vertex_haystack/generators/question_answering.py
similarity index 100%
rename from integrations/google-vertex/src/google_vertex_haystack/generators/question_answering.py
rename to integrations/google_vertex/src/google_vertex_haystack/generators/question_answering.py
diff --git a/integrations/google-vertex/src/google_vertex_haystack/generators/text_generator.py b/integrations/google_vertex/src/google_vertex_haystack/generators/text_generator.py
similarity index 100%
rename from integrations/google-vertex/src/google_vertex_haystack/generators/text_generator.py
rename to integrations/google_vertex/src/google_vertex_haystack/generators/text_generator.py
diff --git a/integrations/google-vertex/tests/__init__.py b/integrations/google_vertex/tests/__init__.py
similarity index 100%
rename from integrations/google-vertex/tests/__init__.py
rename to integrations/google_vertex/tests/__init__.py
diff --git a/integrations/google-vertex/tests/test_captioner.py b/integrations/google_vertex/tests/test_captioner.py
similarity index 100%
rename from integrations/google-vertex/tests/test_captioner.py
rename to integrations/google_vertex/tests/test_captioner.py
diff --git a/integrations/google-vertex/tests/test_code_generator.py b/integrations/google_vertex/tests/test_code_generator.py
similarity index 100%
rename from integrations/google-vertex/tests/test_code_generator.py
rename to integrations/google_vertex/tests/test_code_generator.py
diff --git a/integrations/google-vertex/tests/test_image_generator.py b/integrations/google_vertex/tests/test_image_generator.py
similarity index 100%
rename from integrations/google-vertex/tests/test_image_generator.py
rename to integrations/google_vertex/tests/test_image_generator.py
diff --git a/integrations/google-vertex/tests/test_question_answering.py b/integrations/google_vertex/tests/test_question_answering.py
similarity index 100%
rename from integrations/google-vertex/tests/test_question_answering.py
rename to integrations/google_vertex/tests/test_question_answering.py
diff --git a/integrations/google-vertex/tests/test_text_generator.py b/integrations/google_vertex/tests/test_text_generator.py
similarity index 100%
rename from integrations/google-vertex/tests/test_text_generator.py
rename to integrations/google_vertex/tests/test_text_generator.py
diff --git a/integrations/instructor-embedders/LICENSE.txt b/integrations/instructor_embedders/LICENSE.txt
similarity index 100%
rename from integrations/instructor-embedders/LICENSE.txt
rename to integrations/instructor_embedders/LICENSE.txt
diff --git a/integrations/instructor-embedders/README.md b/integrations/instructor_embedders/README.md
similarity index 100%
rename from integrations/instructor-embedders/README.md
rename to integrations/instructor_embedders/README.md
diff --git a/integrations/instructor-embedders/instructor_embedders_haystack/__init__.py b/integrations/instructor_embedders/instructor_embedders_haystack/__init__.py
similarity index 100%
rename from integrations/instructor-embedders/instructor_embedders_haystack/__init__.py
rename to integrations/instructor_embedders/instructor_embedders_haystack/__init__.py
diff --git a/integrations/instructor-embedders/instructor_embedders_haystack/embedding_backend/__init__.py b/integrations/instructor_embedders/instructor_embedders_haystack/embedding_backend/__init__.py
similarity index 100%
rename from integrations/instructor-embedders/instructor_embedders_haystack/embedding_backend/__init__.py
rename to integrations/instructor_embedders/instructor_embedders_haystack/embedding_backend/__init__.py
diff --git a/integrations/instructor-embedders/instructor_embedders_haystack/embedding_backend/instructor_backend.py b/integrations/instructor_embedders/instructor_embedders_haystack/embedding_backend/instructor_backend.py
similarity index 100%
rename from integrations/instructor-embedders/instructor_embedders_haystack/embedding_backend/instructor_backend.py
rename to integrations/instructor_embedders/instructor_embedders_haystack/embedding_backend/instructor_backend.py
diff --git a/integrations/instructor-embedders/instructor_embedders_haystack/instructor_document_embedder.py b/integrations/instructor_embedders/instructor_embedders_haystack/instructor_document_embedder.py
similarity index 100%
rename from integrations/instructor-embedders/instructor_embedders_haystack/instructor_document_embedder.py
rename to integrations/instructor_embedders/instructor_embedders_haystack/instructor_document_embedder.py
diff --git a/integrations/instructor-embedders/instructor_embedders_haystack/instructor_text_embedder.py b/integrations/instructor_embedders/instructor_embedders_haystack/instructor_text_embedder.py
similarity index 100%
rename from integrations/instructor-embedders/instructor_embedders_haystack/instructor_text_embedder.py
rename to integrations/instructor_embedders/instructor_embedders_haystack/instructor_text_embedder.py
diff --git a/integrations/instructor-embedders/pyproject.toml b/integrations/instructor_embedders/pyproject.toml
similarity index 95%
rename from integrations/instructor-embedders/pyproject.toml
rename to integrations/instructor_embedders/pyproject.toml
index 31834c259..63fb9703b 100644
--- a/integrations/instructor-embedders/pyproject.toml
+++ b/integrations/instructor_embedders/pyproject.toml
@@ -50,17 +50,17 @@ dependencies = [
 dev = ["pytest"]
 
 [project.urls]
-Documentation = "https://github.com/deepset-ai/haystack-core-integrations/tree/main/components/instructor-embedders#readme"
+Documentation = "https://github.com/deepset-ai/haystack-core-integrations/tree/main/integrations/instructor_embedders#readme"
 Issues = "https://github.com/deepset-ai/haystack-core-integrations/issues"
-Source = "https://github.com/deepset-ai/haystack-core-integrations/tree/main/components/instructor-embedders"
+Source = "https://github.com/deepset-ai/haystack-core-integrations/tree/main/integrations/instructor_embedders"
 
 [tool.hatch.version]
 source = "vcs"
-tag-pattern = 'integrations\/instructor-embedders-v(?P<version>.*)'
+tag-pattern = 'integrations\/instructor_embedders-v(?P<version>.*)'
 
 [tool.hatch.version.raw-options]
 root = "../.."
-git_describe_command = 'git describe --tags --match="integrations/instructor-embedders-v[0-9]*"'
+git_describe_command = 'git describe --tags --match="integrations/instructor_embedders-v[0-9]*"'
 
 [tool.hatch.envs.default]
 dependencies = ["pytest", "pytest-cov"]
diff --git a/integrations/instructor-embedders/tests/__init__.py b/integrations/instructor_embedders/tests/__init__.py
similarity index 100%
rename from integrations/instructor-embedders/tests/__init__.py
rename to integrations/instructor_embedders/tests/__init__.py
diff --git a/integrations/instructor-embedders/tests/test_instructor_backend.py b/integrations/instructor_embedders/tests/test_instructor_backend.py
similarity index 100%
rename from integrations/instructor-embedders/tests/test_instructor_backend.py
rename to integrations/instructor_embedders/tests/test_instructor_backend.py
diff --git a/integrations/instructor-embedders/tests/test_instructor_document_embedder.py b/integrations/instructor_embedders/tests/test_instructor_document_embedder.py
similarity index 100%
rename from integrations/instructor-embedders/tests/test_instructor_document_embedder.py
rename to integrations/instructor_embedders/tests/test_instructor_document_embedder.py
diff --git a/integrations/instructor-embedders/tests/test_instructor_text_embedder.py b/integrations/instructor_embedders/tests/test_instructor_text_embedder.py
similarity index 100%
rename from integrations/instructor-embedders/tests/test_instructor_text_embedder.py
rename to integrations/instructor_embedders/tests/test_instructor_text_embedder.py