diff --git a/src/lightning_app/cli/app-template/tests/test_placeholdername_app.py b/src/lightning_app/cli/app-template/tests/test_placeholdername_app.py
index da2bca5907..fffc137db5 100644
--- a/src/lightning_app/cli/app-template/tests/test_placeholdername_app.py
+++ b/src/lightning_app/cli/app-template/tests/test_placeholdername_app.py
@@ -10,7 +10,7 @@ import io
 import os
 from contextlib import redirect_stdout
 
-from lightning.app.testing.testing import application_testing, LightningTestApp
+from lightning_app.testing.testing import application_testing, LightningTestApp
 
 
 class LightningAppTestInt(LightningTestApp):
diff --git a/src/lightning_app/cli/cmd_init.py b/src/lightning_app/cli/cmd_init.py
index 91ba61364c..e3fbf4f680 100644
--- a/src/lightning_app/cli/cmd_init.py
+++ b/src/lightning_app/cli/cmd_init.py
@@ -126,7 +126,7 @@ def component(component_name: str) -> None:
     ⚡ Use the component inside an app: ⚡
 
     from {name_for_files} import TemplateComponent
-    import lightning.app as la
+    import lightning_app as la
 
     class LitApp(la.LightningFlow):
         def __init__(self) -> None:
diff --git a/src/lightning_app/cli/pl-app-template/app.py b/src/lightning_app/cli/pl-app-template/app.py
index 01bc0106f2..7f3d5965b5 100644
--- a/src/lightning_app/cli/pl-app-template/app.py
+++ b/src/lightning_app/cli/pl-app-template/app.py
@@ -4,10 +4,10 @@ from typing import Dict, List, Optional, Union
 from core.components import TensorBoard, WeightsAndBiases
 from core.components.script_runner import ScriptRunner
 
-from lightning.app import LightningApp, LightningFlow
-from lightning.app.frontend import StaticWebFrontend
-from lightning.app.storage import Path
-from lightning.app.utilities.packaging.cloud_compute import CloudCompute
+from lightning_app import LightningApp, LightningFlow
+from lightning_app.frontend import StaticWebFrontend
+from lightning_app.storage import Path
+from lightning_app.utilities.packaging.cloud_compute import CloudCompute
 
 
 class ReactUI(LightningFlow):
diff --git a/src/lightning_app/cli/pl-app-template/core/callbacks.py b/src/lightning_app/cli/pl-app-template/core/callbacks.py
index 573672526c..8dddc96dd0 100644
--- a/src/lightning_app/cli/pl-app-template/core/callbacks.py
+++ b/src/lightning_app/cli/pl-app-template/core/callbacks.py
@@ -4,7 +4,7 @@ from typing import Any, Dict, TYPE_CHECKING, Union
 from core.state import ProgressBarState, TrainerState
 
 import pytorch_lightning as pl
-from lightning.app.storage import Path
+from lightning_app.storage import Path
 from lightning_app.utilities.app_helpers import Logger
 from pytorch_lightning import Callback
 from pytorch_lightning.callbacks.progress.base import get_standard_metrics
diff --git a/src/lightning_app/cli/pl-app-template/core/components/logger/tensorboard.py b/src/lightning_app/cli/pl-app-template/core/components/logger/tensorboard.py
index 6f5b2eb563..cd7f406dd5 100644
--- a/src/lightning_app/cli/pl-app-template/core/components/logger/tensorboard.py
+++ b/src/lightning_app/cli/pl-app-template/core/components/logger/tensorboard.py
@@ -2,8 +2,8 @@ import subprocess
 import time
 from typing import Dict, List
 
-from lightning.app import BuildConfig, LightningFlow, LightningWork
-from lightning.app.storage import Path
+from lightning_app import BuildConfig, LightningFlow, LightningWork
+from lightning_app.storage import Path
 
 
 class TensorBoard(LightningFlow):
diff --git a/src/lightning_app/cli/pl-app-template/core/components/logger/weights_and_biases.py b/src/lightning_app/cli/pl-app-template/core/components/logger/weights_and_biases.py
index c0fbbadc7c..a3fb0131cb 100644
--- a/src/lightning_app/cli/pl-app-template/core/components/logger/weights_and_biases.py
+++ b/src/lightning_app/cli/pl-app-template/core/components/logger/weights_and_biases.py
@@ -1,7 +1,7 @@
 import os
 from typing import Dict, List, Optional, TYPE_CHECKING
 
-from lightning.app import LightningFlow
+from lightning_app import LightningFlow
 
 if TYPE_CHECKING:
     import wandb
diff --git a/src/lightning_app/cli/pl-app-template/core/components/script_runner/script_runner.py b/src/lightning_app/cli/pl-app-template/core/components/script_runner/script_runner.py
index 7cef61a2a5..2cecd69de3 100644
--- a/src/lightning_app/cli/pl-app-template/core/components/script_runner/script_runner.py
+++ b/src/lightning_app/cli/pl-app-template/core/components/script_runner/script_runner.py
@@ -2,11 +2,10 @@ import sys
 import traceback
 from typing import Any, Dict, List, Optional, Tuple
 
-from lightning.app.components.python import TracerPythonScript
-from lightning.app.storage import Path
-from lightning.app.utilities.packaging.build_config import BuildConfig
-from lightning.app.utilities.tracer import Tracer
-from lightning_app.utilities.packaging.build_config import load_requirements
+from lightning_app.components.python import TracerPythonScript
+from lightning_app.storage import Path
+from lightning_app.utilities.packaging.build_config import BuildConfig, load_requirements
+from lightning_app.utilities.tracer import Tracer
 
 
 class ScriptRunner(TracerPythonScript):
diff --git a/src/lightning_app/cli/pl-app-template/tests/core/test_callbacks.py b/src/lightning_app/cli/pl-app-template/tests/core/test_callbacks.py
index d7fb5c1064..ed058d7ce7 100644
--- a/src/lightning_app/cli/pl-app-template/tests/core/test_callbacks.py
+++ b/src/lightning_app/cli/pl-app-template/tests/core/test_callbacks.py
@@ -5,7 +5,7 @@ import pytest
 from core.callbacks import PLAppArtifactsTracker, PLAppProgressTracker, PLAppSummary
 from core.components.script_runner import ScriptRunner
 
-from lightning.app.storage import Path
+from lightning_app.storage import Path
 from pytorch_lightning import LightningModule, Trainer
 from pytorch_lightning.loggers import TensorBoardLogger
 
diff --git a/src/lightning_app/cli/react-ui-template/example_app.py b/src/lightning_app/cli/react-ui-template/example_app.py
index e99f61e38a..865715863f 100644
--- a/src/lightning_app/cli/react-ui-template/example_app.py
+++ b/src/lightning_app/cli/react-ui-template/example_app.py
@@ -3,7 +3,7 @@
 from pathlib import Path
 
 import lightning as L
-from lightning.app import frontend
+from lightning_app import frontend
 
 
 class YourComponent(L.LightningFlow):
diff --git a/src/lightning_app/components/training.py b/src/lightning_app/components/training.py
index 78790f10a3..dd4cd2e32f 100644
--- a/src/lightning_app/components/training.py
+++ b/src/lightning_app/components/training.py
@@ -126,8 +126,8 @@ class LightningTrainingComponent(LightningFlow):
         Example::
 
             from lightning import LightningApp
-            from lightning.app.components.training import LightningTrainingComponent
-            from lightning.app.utilities.packaging.cloud_compute import CloudCompute
+            from lightning_app.components.training import LightningTrainingComponent
+            from lightning_app.utilities.packaging.cloud_compute import CloudCompute
 
             app = LightningApp(
                 LightningTrainingComponent(
diff --git a/src/lightning_app/core/app.py b/src/lightning_app/core/app.py
index 4acace02fe..879b7fcf4e 100644
--- a/src/lightning_app/core/app.py
+++ b/src/lightning_app/core/app.py
@@ -57,9 +57,9 @@ class LightningApp:
         created by other users.
 
         The Lightning App alternatively run an event loop triggered by delta changes sent from
-        either :class:`~lightning.app.core.work.LightningWork` or from the Lightning UI.
+        either :class:`~lightning_app.core.work.LightningWork` or from the Lightning UI.
         Once deltas are received, the Lightning App runs
-        the :class:`~lightning.app.core.flow.LightningFlow` provided.
+        the :class:`~lightning_app.core.flow.LightningFlow` provided.
 
         Arguments:
             root: The root LightningFlow component, that defines all the app's nested components, running infinitely.
@@ -77,7 +77,7 @@ class LightningApp:
         .. doctest::
 
             >>> from lightning import LightningFlow, LightningApp
-            >>> from lightning.app.runners import MultiProcessRuntime
+            >>> from lightning_app.runners import MultiProcessRuntime
             >>> class RootFlow(LightningFlow):
             ...     def run(self):
             ...         print("Hello World!")
diff --git a/src/lightning_app/frontend/panel/panel_frontend.py b/src/lightning_app/frontend/panel/panel_frontend.py
index cb08a7d534..7e005499e7 100644
--- a/src/lightning_app/frontend/panel/panel_frontend.py
+++ b/src/lightning_app/frontend/panel/panel_frontend.py
@@ -50,7 +50,7 @@ class PanelFrontend(Frontend):
     .. code-block:: python
 
         import lightning as L
-        from lightning.app.frontend.panel import PanelFrontend
+        from lightning_app.frontend.panel import PanelFrontend
 
 
         class LitPanel(L.LightningFlow):
diff --git a/src/lightning_app/utilities/logs_socket_api.py b/src/lightning_app/utilities/logs_socket_api.py
index 479f142cd5..8cc635f43c 100644
--- a/src/lightning_app/utilities/logs_socket_api.py
+++ b/src/lightning_app/utilities/logs_socket_api.py
@@ -5,7 +5,7 @@ from urllib.parse import urlparse
 from lightning_cloud.openapi import ApiClient, AuthServiceApi, V1LoginRequest
 from websocket import WebSocketApp
 
-from lightning.app.core import constants
+from lightning_app.core import constants
 from lightning_app.utilities.login import Auth