diff --git a/pype/hooks/fusion/prelaunch.py b/pype/hooks/fusion/prelaunch.py
index 69e91eda05..5c9535c11f 100644
--- a/pype/hooks/fusion/prelaunch.py
+++ b/pype/hooks/fusion/prelaunch.py
@@ -2,7 +2,7 @@ import os
 import traceback
 import importlib
 from pype.lib import PypeHook
-from pypeapp import Logger
+from pype.api import Logger
 from pype.hosts.fusion import utils
 
 
diff --git a/pype/hooks/resolve/prelaunch.py b/pype/hooks/resolve/prelaunch.py
index a122b87868..50cfee7a1c 100644
--- a/pype/hooks/resolve/prelaunch.py
+++ b/pype/hooks/resolve/prelaunch.py
@@ -2,7 +2,7 @@ import os
 import traceback
 import importlib
 from pype.lib import PypeHook
-from pypeapp import Logger
+from pype.api import Logger
 from pype.hosts.resolve import utils
 
 
diff --git a/pype/hosts/fusion/pipeline.py b/pype/hosts/fusion/pipeline.py
index d593f2b615..22a80076da 100644
--- a/pype/hosts/fusion/pipeline.py
+++ b/pype/hosts/fusion/pipeline.py
@@ -6,7 +6,7 @@ import os
 from avalon.tools import workfiles
 from avalon import api as avalon
 from pyblish import api as pyblish
-from pypeapp import Logger
+from pype.api import Logger
 from pype import PLUGINS_DIR
 
 log = Logger().get_logger(__name__, "fusion")
diff --git a/pype/hosts/fusion/utility_scripts/Pype_menu.py b/pype/hosts/fusion/utility_scripts/Pype_menu.py
index 3d6a4607e1..6c2324f66d 100644
--- a/pype/hosts/fusion/utility_scripts/Pype_menu.py
+++ b/pype/hosts/fusion/utility_scripts/Pype_menu.py
@@ -2,7 +2,7 @@ import os
 import sys
 import pype
 
-from pypeapp import Logger
+from pype.api import Logger
 
 log = Logger().get_logger(__name__)
 
diff --git a/pype/hosts/fusion/utils.py b/pype/hosts/fusion/utils.py
index 40e28f6473..15fa52e938 100644
--- a/pype/hosts/fusion/utils.py
+++ b/pype/hosts/fusion/utils.py
@@ -7,7 +7,7 @@ Fusion tools for setting environment
 import os
 import shutil
 
-from pypeapp import Logger
+from pype.api import Logger
 
 log = Logger().get_logger(__name__, "fusion")
 
diff --git a/pype/hosts/hiero/lib.py b/pype/hosts/hiero/lib.py
index a508343bfa..0db9b92b3d 100644
--- a/pype/hosts/hiero/lib.py
+++ b/pype/hosts/hiero/lib.py
@@ -108,7 +108,6 @@ def reload_config():
         "avalon.pipeline",
         "pyblish",
         "pyblish_lite",
-        "pypeapp",
         "{}.api".format(AVALON_CONFIG),
         "{}.templates".format(AVALON_CONFIG),
         "{}.hosts.hiero.lib".format(AVALON_CONFIG),
diff --git a/pype/hosts/resolve/utils.py b/pype/hosts/resolve/utils.py
index e11cc64b3b..cb042a88e0 100644
--- a/pype/hosts/resolve/utils.py
+++ b/pype/hosts/resolve/utils.py
@@ -8,7 +8,7 @@ import sys
 import os
 import shutil
 
-from pypeapp import Logger
+from pype.api import Logger
 log = Logger().get_logger(__name__, "resolve")
 
 
diff --git a/pype/hosts/resolve/workio.py b/pype/hosts/resolve/workio.py
index 9d8d320a3c..da74ebdeb1 100644
--- a/pype/hosts/resolve/workio.py
+++ b/pype/hosts/resolve/workio.py
@@ -1,7 +1,7 @@
 """Host API required Work Files tool"""
 
 import os
-from pypeapp import Logger
+from pype.api import Logger
 from . import (
     get_project_manager,
     get_current_project,
diff --git a/pype/plugins/global/publish/submit_publish_job.py b/pype/plugins/global/publish/submit_publish_job.py
index b8bf240c06..86b79f5ae0 100644
--- a/pype/plugins/global/publish/submit_publish_job.py
+++ b/pype/plugins/global/publish/submit_publish_job.py
@@ -1019,7 +1019,7 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin):
                     get publish_path
 
         Args:
-            anatomy (pypeapp.lib.anatomy.Anatomy):
+            anatomy (pype.lib.anatomy.Anatomy):
             template_data (dict): pre-calculated collected data for process
             asset (string): asset name
             subset (string): subset name (actually group name of subset)
diff --git a/pype/tools/texture_copy/app.py b/pype/tools/texture_copy/app.py
index cda7b5a443..ad8f239d2f 100644
--- a/pype/tools/texture_copy/app.py
+++ b/pype/tools/texture_copy/app.py
@@ -4,7 +4,7 @@ import click
 from avalon import io, api
 from pprint import pprint
 
-from pypeapp.lib.Terminal import Terminal
+from pype.lib import Terminal
 from pype.api import Anatomy
 
 import shutil
diff --git a/pype/widgets/project_settings.py b/pype/widgets/project_settings.py
index 28c6215915..c69d55fb39 100644
--- a/pype/widgets/project_settings.py
+++ b/pype/widgets/project_settings.py
@@ -1,11 +1,11 @@
 
 
-from pypeapp import style
 from avalon.vendor.Qt import QtCore, QtGui, QtWidgets
 import os
 import getpass
 import platform
 
+from avalon import style
 import ftrack_api