diff --git a/docs/concepts/orchestration/deployment.md b/docs/concepts/orchestration/deployment.md
index 8be2bcd2a9e84..025bc7e29f22b 100644
--- a/docs/concepts/orchestration/deployment.md
+++ b/docs/concepts/orchestration/deployment.md
@@ -270,7 +270,7 @@ In this case, the Deployment can be stopped by interrupting the thread or proces
 Alternatively, a `multiprocessing` or `threading` `Event` object can be passed to `.block()`, which stops the Deployment once set.
 
 ```python
-from jina-serve import Deployment
+from jina import Deployment
 import threading
 
 
@@ -301,7 +301,7 @@ A Deployment YAML can be exported as a Docker Compose YAML or Kubernetes YAML bu
 
 ````{tab} Python
 ```python
-from jina-serve import Deployment
+from jina import Deployment
 
 dep = Deployment()
 dep.to_docker_compose_yaml()
@@ -322,7 +322,7 @@ For advanced utilization of Docker Compose with Jina-serve, refer to {ref}`How t
 
 ````{tab} Python
 ```python
-from jina-serve import Deployment
+from jina import Deployment
 
 dep = Deployment
 dep.to_kubernetes_yaml('dep_k8s_configuration')
@@ -381,7 +381,7 @@ The logging configuration can be used as follows:
 
 ````{tab} Python
 ```python
-from jina-serve import Deployment
+from jina import Deployment
 
 dep = Deployment(log_config='./logging.json.yml')
 ```
@@ -408,7 +408,7 @@ gRPC is the default protocol used by a Deployment to expose Executors to the out
 HTTP can be used for a stand-alone Deployment (without being part of a Flow), which allows external services to connect via REST. 
 
 ```python
-from jina-serve import Deployment, Executor, requests
+from jina import Deployment, Executor, requests
 from docarray import DocList
 from docarray.documents import TextDoc
  
diff --git a/docs/concepts/orchestration/flow.md b/docs/concepts/orchestration/flow.md
index 1de1a3a5b2702..db40af2d48863 100644
--- a/docs/concepts/orchestration/flow.md
+++ b/docs/concepts/orchestration/flow.md
@@ -434,7 +434,7 @@ More Flow YAML specifications can be found in {ref}`Flow YAML Specification<flow
 Let's understand how Executors process Documents's inside a Flow, and how changes are chained and applied, affecting downstream Executors in the Flow.
 
 ```python 
-from jina-serve import Executor, requests, Flow
+from jina import Executor, requests, Flow
 from docarray import DocList, BaseDoc
 from docarray.documents import TextDoc
 
diff --git a/docs/concepts/orchestration/readiness.md b/docs/concepts/orchestration/readiness.md
index 0af6bd5fac58c..3adfd337143f6 100644
--- a/docs/concepts/orchestration/readiness.md
+++ b/docs/concepts/orchestration/readiness.md
@@ -95,7 +95,7 @@ True
 
 `````{tab} Deployment
 ```python
-from jina-serve import Deployment
+from jina import Deployment
 
 dep = Deployment(port=12345)
 
@@ -156,7 +156,7 @@ WARNI… Jina-serve@92986 message lost 100% (3/3)
 `````
 `````{tab} Flow
 ```python
-from jina-serve import Flow
+from jina import Flow
 
 f = Flow(port=12345)
 
diff --git a/docs/concepts/serving/executor/add-endpoints.md b/docs/concepts/serving/executor/add-endpoints.md
index 9843baad9c452..6db8a87b5bf04 100644
--- a/docs/concepts/serving/executor/add-endpoints.md
+++ b/docs/concepts/serving/executor/add-endpoints.md
@@ -19,7 +19,7 @@ from jina import requests
 {class}`~jina.requests` takes an optional `on=` parameter, which binds the decorated method to the specified route:
 
 ```python
-from jina-serve import Executor, requests
+from jina import Executor, requests
 import asyncio
 
 
diff --git a/docs/concepts/serving/executor/create.md b/docs/concepts/serving/executor/create.md
index b4c61589b8863..b31832be9be88 100644
--- a/docs/concepts/serving/executor/create.md
+++ b/docs/concepts/serving/executor/create.md
@@ -37,7 +37,7 @@ MyExecutor/
 
 - `executor.py` contains your Executor's main logic. The command should generate the following boilerplate code:
 ```python
-from jina-serve import Executor, requests
+from jina import Executor, requests
 from docarray import DocList, BaseDoc
 
 class MyExecutor(Executor):
@@ -60,7 +60,7 @@ If your Executor has `__init__`, it needs to carry `**kwargs` in the signature a
 in the body:
 
 ```python
-from jina-serve import Executor
+from jina import Executor
 
 
 class MyExecutor(Executor):
diff --git a/docs/get-started/create-app.md b/docs/get-started/create-app.md
index 2f68a1200d488..12de8e65349a0 100644
--- a/docs/get-started/create-app.md
+++ b/docs/get-started/create-app.md
@@ -141,7 +141,7 @@ emphasize-lines: 13-16
 import numpy as np
 import torch
 
-from jina-serve import Executor, requests
+from jina import Executor, requests
 
 
 class MyExecutor(Executor):
@@ -163,7 +163,7 @@ Kill the last server with `Ctrl-C` and restart the server with `jina flow --uses
 Modify `client.py` to call the `/crunch-numbers` endpoint:
 
 ```python
-from jina-serve import Client
+from jina import Client
 from docarray import DocList
 from docarray.documents.legacy import LegacyDocument
 
@@ -245,7 +245,7 @@ Now change the Client's code to use the deployed endpoint shown above:
 ---
 emphasize-lines: 6
 ---
-from jina-serve import Client
+from jina import Client
 from docarray import DocList
 from docarray.documents.legacy import LegacyDocument