From 07e90f0f96633d21ad8d36bec9ac1a1bb17f1f37 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Thu, 12 Mar 2015 16:12:38 -0500
Subject: [PATCH] change pypungi imports to pungi

---
 pungi/compose.py                             | 10 ++++----
 pungi/gather.py                              |  2 +-
 pungi/linker.py                              |  2 +-
 pungi/metadata.py                            |  4 +--
 pungi/paths.py                               |  2 +-
 pungi/phases/base.py                         |  2 +-
 pungi/phases/buildinstall.py                 | 12 ++++-----
 pungi/phases/createiso.py                    | 16 ++++++------
 pungi/phases/createrepo.py                   |  6 ++---
 pungi/phases/extra_files.py                  |  8 +++---
 pungi/phases/gather/__init__.py              | 16 ++++++------
 pungi/phases/gather/link.py                  |  2 +-
 pungi/phases/gather/method.py                |  2 +-
 pungi/phases/gather/methods/method_deps.py   | 16 ++++++------
 pungi/phases/gather/methods/method_nodeps.py | 12 ++++-----
 pungi/phases/gather/source.py                |  2 +-
 pungi/phases/gather/sources/source_comps.py  |  6 ++---
 pungi/phases/gather/sources/source_json.py   |  4 +--
 pungi/phases/gather/sources/source_none.py   |  4 +--
 pungi/phases/init.py                         | 10 ++++----
 pungi/phases/live_images.py                  | 10 ++++----
 pungi/phases/pkgset/__init__.py              |  8 +++---
 pungi/phases/pkgset/common.py                |  8 +++---
 pungi/phases/pkgset/pkgsets.py               |  4 +--
 pungi/phases/pkgset/source.py                |  2 +-
 pungi/phases/pkgset/sources/source_koji.py   | 12 ++++-----
 pungi/phases/pkgset/sources/source_repos.py  | 26 ++++++++++----------
 pungi/phases/product_img.py                  | 10 ++++----
 pungi/phases/test.py                         | 10 ++++----
 pungi/wrappers/scm.py                        |  2 +-
 30 files changed, 115 insertions(+), 115 deletions(-)

diff --git a/pungi/compose.py b/pungi/compose.py
index 66712312..67c30752 100644
--- a/pungi/compose.py
+++ b/pungi/compose.py
@@ -29,11 +29,11 @@ import shutil
 import kobo.log
 from productmd import ComposeInfo, ImageManifest
 
-from pypungi.wrappers.variants import VariantsXmlParser
-from pypungi.paths import Paths
-from pypungi.wrappers.scm import get_file_from_scm
-from pypungi.util import makedirs
-from pypungi.metadata import compose_to_composeinfo
+from pungi.wrappers.variants import VariantsXmlParser
+from pungi.paths import Paths
+from pungi.wrappers.scm import get_file_from_scm
+from pungi.util import makedirs
+from pungi.metadata import compose_to_composeinfo
 
 
 def get_compose_dir(topdir, conf, compose_type="production", compose_date=None, compose_respin=None, compose_label=None, already_exists_callbacks=None):
diff --git a/pungi/gather.py b/pungi/gather.py
index 9ef07233..3f2b344c 100644
--- a/pungi/gather.py
+++ b/pungi/gather.py
@@ -1430,7 +1430,7 @@ class Pungi(PungiBase):
         cmd.append(self.topdir)
 
         self.logger.info(" ".join(cmd))
-        pypungi.util._doRunCommand(cmd, self.logger)
+        pungi.util._doRunCommand(cmd, self.logger)
 
         # write out the tree data for snake
         self.writeinfo('tree: %s' % self.mkrelative(self.topdir))
diff --git a/pungi/linker.py b/pungi/linker.py
index d739c6dc..12691ee2 100644
--- a/pungi/linker.py
+++ b/pungi/linker.py
@@ -23,7 +23,7 @@ import kobo.log
 from kobo.shortcuts import relative_path
 from kobo.threads import WorkerThread, ThreadPool
 
-from pypungi.util import makedirs
+from pungi.util import makedirs
 
 
 class LinkerPool(ThreadPool):
diff --git a/pungi/metadata.py b/pungi/metadata.py
index d7b63537..63d35b95 100644
--- a/pungi/metadata.py
+++ b/pungi/metadata.py
@@ -24,8 +24,8 @@ import productmd.treeinfo.product
 from productmd import get_major_version
 from kobo.shortcuts import relative_path
 
-from pypungi.compose_metadata.discinfo import write_discinfo as create_discinfo
-from pypungi.compose_metadata.discinfo import write_media_repo as create_media_repo
+from pungi.compose_metadata.discinfo import write_discinfo as create_discinfo
+from pungi.compose_metadata.discinfo import write_media_repo as create_media_repo
 
 
 def get_description(compose, variant, arch):
diff --git a/pungi/paths.py b/pungi/paths.py
index 1c4eee00..5db13713 100644
--- a/pungi/paths.py
+++ b/pungi/paths.py
@@ -23,7 +23,7 @@ __all__ = (
 import errno
 import os
 
-from pypungi.util import makedirs
+from pungi.util import makedirs
 
 
 class Paths(object):
diff --git a/pungi/phases/base.py b/pungi/phases/base.py
index cbfcd0b3..2fea9242 100644
--- a/pungi/phases/base.py
+++ b/pungi/phases/base.py
@@ -15,7 +15,7 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
-from pypungi.checks import validate_options
+from pungi.checks import validate_options
 
 
 class PhaseBase(object):
diff --git a/pungi/phases/buildinstall.py b/pungi/phases/buildinstall.py
index 758b072c..1a606075 100644
--- a/pungi/phases/buildinstall.py
+++ b/pungi/phases/buildinstall.py
@@ -28,12 +28,12 @@ from kobo.threads import ThreadPool, WorkerThread
 from kobo.shortcuts import run, read_checksum_file, relative_path
 from productmd.imagemanifest import Image
 
-from pypungi.util import get_buildroot_rpms, get_volid
-from pypungi.wrappers.lorax import LoraxWrapper
-from pypungi.wrappers.kojiwrapper import KojiWrapper
-from pypungi.wrappers.iso import IsoWrapper
-from pypungi.wrappers.scm import get_file_from_scm
-from pypungi.phases.base import PhaseBase
+from pungi.util import get_buildroot_rpms, get_volid
+from pungi.wrappers.lorax import LoraxWrapper
+from pungi.wrappers.kojiwrapper import KojiWrapper
+from pungi.wrappers.iso import IsoWrapper
+from pungi.wrappers.scm import get_file_from_scm
+from pungi.phases.base import PhaseBase
 
 
 class BuildinstallPhase(PhaseBase):
diff --git a/pungi/phases/createiso.py b/pungi/phases/createiso.py
index cb439a1d..79ed6f52 100644
--- a/pungi/phases/createiso.py
+++ b/pungi/phases/createiso.py
@@ -27,14 +27,14 @@ from productmd.imagemanifest import Image
 from kobo.threads import ThreadPool, WorkerThread
 from kobo.shortcuts import run, read_checksum_file, relative_path
 
-from pypungi.wrappers.iso import IsoWrapper
-from pypungi.wrappers.createrepo import CreaterepoWrapper
-from pypungi.wrappers.kojiwrapper import KojiWrapper
-from pypungi.wrappers.jigdo import JigdoWrapper
-from pypungi.phases.base import PhaseBase
-from pypungi.util import makedirs, get_volid
-from pypungi.media_split import MediaSplitter
-from pypungi.compose_metadata.discinfo import read_discinfo, write_discinfo
+from pungi.wrappers.iso import IsoWrapper
+from pungi.wrappers.createrepo import CreaterepoWrapper
+from pungi.wrappers.kojiwrapper import KojiWrapper
+from pungi.wrappers.jigdo import JigdoWrapper
+from pungi.phases.base import PhaseBase
+from pungi.util import makedirs, get_volid
+from pungi.media_split import MediaSplitter
+from pungi.compose_metadata.discinfo import read_discinfo, write_discinfo
 
 
 class CreateisoPhase(PhaseBase):
diff --git a/pungi/phases/createrepo.py b/pungi/phases/createrepo.py
index 861d2d21..6bcd83df 100644
--- a/pungi/phases/createrepo.py
+++ b/pungi/phases/createrepo.py
@@ -29,9 +29,9 @@ import threading
 from kobo.threads import ThreadPool, WorkerThread
 from kobo.shortcuts import run, relative_path
 
-from pypungi.wrappers.scm import get_dir_from_scm
-from pypungi.wrappers.createrepo import CreaterepoWrapper
-from pypungi.phases.base import PhaseBase
+from pungi.wrappers.scm import get_dir_from_scm
+from pungi.wrappers.createrepo import CreaterepoWrapper
+from pungi.phases.base import PhaseBase
 
 
 createrepo_lock = threading.Lock()
diff --git a/pungi/phases/extra_files.py b/pungi/phases/extra_files.py
index 3c73e2a3..ed09ba23 100644
--- a/pungi/phases/extra_files.py
+++ b/pungi/phases/extra_files.py
@@ -22,10 +22,10 @@ import pipes
 
 from kobo.shortcuts import run
 
-from pypungi.util import get_arch_variant_data, pkg_is_rpm
-from pypungi.arch import split_name_arch
-from pypungi.wrappers.scm import get_file_from_scm, get_dir_from_scm
-from pypungi.phases.base import PhaseBase
+from pungi.util import get_arch_variant_data, pkg_is_rpm
+from pungi.arch import split_name_arch
+from pungi.wrappers.scm import get_file_from_scm, get_dir_from_scm
+from pungi.phases.base import PhaseBase
 
 
 class ExtraFilesPhase(PhaseBase):
diff --git a/pungi/phases/gather/__init__.py b/pungi/phases/gather/__init__.py
index d93dbee7..9bed7b04 100644
--- a/pungi/phases/gather/__init__.py
+++ b/pungi/phases/gather/__init__.py
@@ -23,26 +23,26 @@ import json
 from kobo.rpmlib import parse_nvra
 from productmd import RpmManifest
 
-from pypungi.wrappers.scm import get_file_from_scm
+from pungi.wrappers.scm import get_file_from_scm
 from link import link_files
 
-from pypungi.util import get_arch_variant_data, get_arch_data
-from pypungi.phases.base import PhaseBase
-from pypungi.arch import split_name_arch, get_compatible_arches
+from pungi.util import get_arch_variant_data, get_arch_data
+from pungi.phases.base import PhaseBase
+from pungi.arch import split_name_arch, get_compatible_arches
 
 
 def get_gather_source(name):
-    import pypungi.phases.gather.sources
+    import pungi.phases.gather.sources
     from source import GatherSourceContainer
-    GatherSourceContainer.register_module(pypungi.phases.gather.sources)
+    GatherSourceContainer.register_module(pungi.phases.gather.sources)
     container = GatherSourceContainer()
     return container["GatherSource%s" % name]
 
 
 def get_gather_method(name):
-    import pypungi.phases.gather.methods
+    import pungi.phases.gather.methods
     from method import GatherMethodContainer
-    GatherMethodContainer.register_module(pypungi.phases.gather.methods)
+    GatherMethodContainer.register_module(pungi.phases.gather.methods)
     container = GatherMethodContainer()
     return container["GatherMethod%s" % name]
 
diff --git a/pungi/phases/gather/link.py b/pungi/phases/gather/link.py
index d5ae0db9..1655bbc7 100644
--- a/pungi/phases/gather/link.py
+++ b/pungi/phases/gather/link.py
@@ -20,7 +20,7 @@ import os
 
 import kobo.rpmlib
 
-from pypungi.linker import LinkerThread, LinkerPool
+from pungi.linker import LinkerThread, LinkerPool
 
 
 # TODO: global Linker instance - to keep hardlinks on dest?
diff --git a/pungi/phases/gather/method.py b/pungi/phases/gather/method.py
index 7cbda6bd..0a13d185 100644
--- a/pungi/phases/gather/method.py
+++ b/pungi/phases/gather/method.py
@@ -17,7 +17,7 @@
 
 import kobo.plugins
 
-from pypungi.checks import validate_options
+from pungi.checks import validate_options
 
 
 class GatherMethodBase(kobo.plugins.Plugin):
diff --git a/pungi/phases/gather/methods/method_deps.py b/pungi/phases/gather/methods/method_deps.py
index 0f79e62f..50fa0c70 100644
--- a/pungi/phases/gather/methods/method_deps.py
+++ b/pungi/phases/gather/methods/method_deps.py
@@ -20,17 +20,17 @@ import tempfile
 
 from kobo.shortcuts import run
 
-from pypungi.util import rmtree
-from pypungi.wrappers.pungi import PungiWrapper
+from pungi.util import rmtree
+from pungi.wrappers.pungi import PungiWrapper
 
-from pypungi.arch import tree_arch_to_yum_arch
-import pypungi.phases.gather
+from pungi.arch import tree_arch_to_yum_arch
+import pungi.phases.gather
 
 
-import pypungi.phases.gather.method
+import pungi.phases.gather.method
 
 
-class GatherMethodDeps(pypungi.phases.gather.method.GatherMethodBase):
+class GatherMethodDeps(pungi.phases.gather.method.GatherMethodBase):
     enabled = True
     config_options = (
         {
@@ -84,7 +84,7 @@ def write_pungi_config(compose, arch, variant, packages, groups, filter_packages
         repos = {"pungi-repo": repo_path}
 
     lookaside_repos = {}
-    for i, repo_url in enumerate(pypungi.phases.gather.get_lookaside_repos(compose, arch, variant)):
+    for i, repo_url in enumerate(pungi.phases.gather.get_lookaside_repos(compose, arch, variant)):
         lookaside_repos["lookaside-repo-%s" % i] = repo_url
 
     packages_str = []
@@ -140,7 +140,7 @@ def resolve_deps(compose, arch, variant):
         selfhosting = False
 
     lookaside_repos = {}
-    for i, repo_url in enumerate(pypungi.phases.gather.get_lookaside_repos(compose, arch, variant)):
+    for i, repo_url in enumerate(pungi.phases.gather.get_lookaside_repos(compose, arch, variant)):
         lookaside_repos["lookaside-repo-%s" % i] = repo_url
 
     yum_arch = tree_arch_to_yum_arch(arch)
diff --git a/pungi/phases/gather/methods/method_nodeps.py b/pungi/phases/gather/methods/method_nodeps.py
index 667817be..4adec1e2 100644
--- a/pungi/phases/gather/methods/method_nodeps.py
+++ b/pungi/phases/gather/methods/method_nodeps.py
@@ -15,13 +15,13 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
-import pypungi.arch
-from pypungi.util import pkg_is_rpm, pkg_is_srpm, pkg_is_debug
+import pungi.arch
+from pungi.util import pkg_is_rpm, pkg_is_srpm, pkg_is_debug
 
-import pypungi.phases.gather.method
+import pungi.phases.gather.method
 
 
-class GatherMethodNodeps(pypungi.phases.gather.method.GatherMethodBase):
+class GatherMethodNodeps(pungi.phases.gather.method.GatherMethodBase):
     enabled = True
     config_options = (
         {
@@ -42,10 +42,10 @@ class GatherMethodNodeps(pypungi.phases.gather.method.GatherMethodBase):
         seen_rpms = {}
         seen_srpms = {}
 
-        valid_arches = pypungi.arch.get_valid_arches(arch, multilib=True)
+        valid_arches = pungi.arch.get_valid_arches(arch, multilib=True)
         compatible_arches = {}
         for i in valid_arches:
-            compatible_arches[i] = pypungi.arch.get_compatible_arches(i)
+            compatible_arches[i] = pungi.arch.get_compatible_arches(i)
 
         for i in global_pkgset:
             pkg = global_pkgset[i]
diff --git a/pungi/phases/gather/source.py b/pungi/phases/gather/source.py
index 747ac9b6..d8b0a112 100644
--- a/pungi/phases/gather/source.py
+++ b/pungi/phases/gather/source.py
@@ -17,7 +17,7 @@
 
 import kobo.plugins
 
-from pypungi.checks import validate_options
+from pungi.checks import validate_options
 
 
 class GatherSourceBase(kobo.plugins.Plugin):
diff --git a/pungi/phases/gather/sources/source_comps.py b/pungi/phases/gather/sources/source_comps.py
index f101455e..0e3d5cc2 100644
--- a/pungi/phases/gather/sources/source_comps.py
+++ b/pungi/phases/gather/sources/source_comps.py
@@ -26,11 +26,11 @@ set([(rpm_name, rpm_arch or None)])
 """
 
 
-from pypungi.wrappers.comps import CompsWrapper
-import pypungi.phases.gather.source
+from pungi.wrappers.comps import CompsWrapper
+import pungi.phases.gather.source
 
 
-class GatherSourceComps(pypungi.phases.gather.source.GatherSourceBase):
+class GatherSourceComps(pungi.phases.gather.source.GatherSourceBase):
     enabled = True
     config_options = (
         {
diff --git a/pungi/phases/gather/sources/source_json.py b/pungi/phases/gather/sources/source_json.py
index c6cf1642..e9143e8a 100644
--- a/pungi/phases/gather/sources/source_json.py
+++ b/pungi/phases/gather/sources/source_json.py
@@ -34,10 +34,10 @@ set([(rpm_name, rpm_arch or None)])
 
 import json
 
-import pypungi.phases.gather.source
+import pungi.phases.gather.source
 
 
-class GatherSourceJson(pypungi.phases.gather.source.GatherSourceBase):
+class GatherSourceJson(pungi.phases.gather.source.GatherSourceBase):
     enabled = True
     config_options = (
         {
diff --git a/pungi/phases/gather/sources/source_none.py b/pungi/phases/gather/sources/source_none.py
index 0e0855f7..ce836a92 100644
--- a/pungi/phases/gather/sources/source_none.py
+++ b/pungi/phases/gather/sources/source_none.py
@@ -26,10 +26,10 @@ set()
 """
 
 
-import pypungi.phases.gather.source
+import pungi.phases.gather.source
 
 
-class GatherSourceNone(pypungi.phases.gather.source.GatherSourceBase):
+class GatherSourceNone(pungi.phases.gather.source.GatherSourceBase):
     enabled = True
 
     config_options = (
diff --git a/pungi/phases/init.py b/pungi/phases/init.py
index f0f82266..7dbdc650 100644
--- a/pungi/phases/init.py
+++ b/pungi/phases/init.py
@@ -21,11 +21,11 @@ import shutil
 
 from kobo.shortcuts import run
 
-from pypungi.phases.base import PhaseBase
-from pypungi.phases.gather import write_prepopulate_file
-from pypungi.wrappers.createrepo import CreaterepoWrapper
-from pypungi.wrappers.comps import CompsWrapper
-from pypungi.wrappers.scm import get_file_from_scm
+from pungi.phases.base import PhaseBase
+from pungi.phases.gather import write_prepopulate_file
+from pungi.wrappers.createrepo import CreaterepoWrapper
+from pungi.wrappers.comps import CompsWrapper
+from pungi.wrappers.scm import get_file_from_scm
 
 
 class InitPhase(PhaseBase):
diff --git a/pungi/phases/live_images.py b/pungi/phases/live_images.py
index f439fb4e..95b26991 100644
--- a/pungi/phases/live_images.py
+++ b/pungi/phases/live_images.py
@@ -27,11 +27,11 @@ import tempfile
 from kobo.threads import ThreadPool, WorkerThread
 from kobo.shortcuts import run
 
-from pypungi.wrappers.kojiwrapper import KojiWrapper
-from pypungi.wrappers.iso import IsoWrapper
-from pypungi.wrappers.scm import get_file_from_scm
-from pypungi.phases.base import PhaseBase
-from pypungi.util import get_arch_variant_data
+from pungi.wrappers.kojiwrapper import KojiWrapper
+from pungi.wrappers.iso import IsoWrapper
+from pungi.wrappers.scm import get_file_from_scm
+from pungi.phases.base import PhaseBase
+from pungi.util import get_arch_variant_data
 
 
 # HACK: define cmp in python3
diff --git a/pungi/phases/pkgset/__init__.py b/pungi/phases/pkgset/__init__.py
index 5dfba416..67f296ec 100644
--- a/pungi/phases/pkgset/__init__.py
+++ b/pungi/phases/pkgset/__init__.py
@@ -19,9 +19,9 @@ import os
 
 from kobo.shortcuts import force_list
 
-import pypungi.phases.pkgset.pkgsets
-from pypungi.arch import get_valid_arches
-from pypungi.phases.base import PhaseBase
+import pungi.phases.pkgset.pkgsets
+from pungi.arch import get_valid_arches
+from pungi.phases.base import PhaseBase
 
 
 class PkgsetPhase(PhaseBase):
@@ -56,7 +56,7 @@ def populate_arch_pkgsets(compose, path_prefix, global_pkgset):
         compose.log_info("Populating package set for arch: %s" % arch)
         is_multilib = arch in compose.conf["multilib_arches"]
         arches = get_valid_arches(arch, is_multilib, add_src=True)
-        pkgset = pypungi.phases.pkgset.pkgsets.PackageSetBase(compose.conf["sigkeys"], logger=compose._logger, arches=arches)
+        pkgset = pungi.phases.pkgset.pkgsets.PackageSetBase(compose.conf["sigkeys"], logger=compose._logger, arches=arches)
         pkgset.merge(global_pkgset, arch, arches)
         pkgset.save_file_list(compose.paths.work.package_list(arch=arch), remove_path_prefix=path_prefix)
         result[arch] = pkgset
diff --git a/pungi/phases/pkgset/common.py b/pungi/phases/pkgset/common.py
index 6ae32bf2..1458fff2 100644
--- a/pungi/phases/pkgset/common.py
+++ b/pungi/phases/pkgset/common.py
@@ -19,9 +19,9 @@ import os
 
 from kobo.shortcuts import run, force_list, relative_path
 
-import pypungi.phases.pkgset.pkgsets
-from pypungi.arch import get_valid_arches
-from pypungi.wrappers.createrepo import CreaterepoWrapper
+import pungi.phases.pkgset.pkgsets
+from pungi.arch import get_valid_arches
+from pungi.wrappers.createrepo import CreaterepoWrapper
 
 
 # TODO: per arch?
@@ -31,7 +31,7 @@ def populate_arch_pkgsets(compose, path_prefix, global_pkgset):
         compose.log_info("Populating package set for arch: %s" % arch)
         is_multilib = arch in compose.conf["multilib_arches"]
         arches = get_valid_arches(arch, is_multilib, add_src=True)
-        pkgset = pypungi.phases.pkgset.pkgsets.PackageSetBase(compose.conf["sigkeys"], logger=compose._logger, arches=arches)
+        pkgset = pungi.phases.pkgset.pkgsets.PackageSetBase(compose.conf["sigkeys"], logger=compose._logger, arches=arches)
         pkgset.merge(global_pkgset, arch, arches)
         pkgset.save_file_list(compose.paths.work.package_list(arch=arch), remove_path_prefix=path_prefix)
         result[arch] = pkgset
diff --git a/pungi/phases/pkgset/pkgsets.py b/pungi/phases/pkgset/pkgsets.py
index 1c2ea6ca..3bb81a4f 100644
--- a/pungi/phases/pkgset/pkgsets.py
+++ b/pungi/phases/pkgset/pkgsets.py
@@ -29,8 +29,8 @@ import kobo.rpmlib
 
 from kobo.threads import WorkerThread, ThreadPool
 
-from pypungi.util import pkg_is_srpm
-from pypungi.arch import get_valid_arches
+from pungi.util import pkg_is_srpm
+from pungi.arch import get_valid_arches
 
 
 class ReaderPool(ThreadPool):
diff --git a/pungi/phases/pkgset/source.py b/pungi/phases/pkgset/source.py
index 7ddf3343..164bf7ae 100644
--- a/pungi/phases/pkgset/source.py
+++ b/pungi/phases/pkgset/source.py
@@ -17,7 +17,7 @@
 
 import kobo.plugins
 
-from pypungi.checks import validate_options
+from pungi.checks import validate_options
 
 
 class PkgsetSourceBase(kobo.plugins.Plugin):
diff --git a/pungi/phases/pkgset/sources/source_koji.py b/pungi/phases/pkgset/sources/source_koji.py
index a393ba98..1c0da891 100644
--- a/pungi/phases/pkgset/sources/source_koji.py
+++ b/pungi/phases/pkgset/sources/source_koji.py
@@ -21,16 +21,16 @@ import json
 
 import koji
 
-import pypungi.phases.pkgset.pkgsets
-from pypungi.arch import get_valid_arches
+import pungi.phases.pkgset.pkgsets
+from pungi.arch import get_valid_arches
 
-from pypungi.phases.pkgset.common import create_arch_repos, create_global_repo, populate_arch_pkgsets
+from pungi.phases.pkgset.common import create_arch_repos, create_global_repo, populate_arch_pkgsets
 
 
-import pypungi.phases.pkgset.source
+import pungi.phases.pkgset.source
 
 
-class PkgsetSourceKoji(pypungi.phases.pkgset.source.PkgsetSourceBase):
+class PkgsetSourceKoji(pungi.phases.pkgset.source.PkgsetSourceBase):
     enabled = True
     config_options = (
         {
@@ -121,7 +121,7 @@ def populate_global_pkgset(compose, koji_proxy, path_prefix, compose_tag, event_
         pkgset = pickle.load(open(global_pkgset_path, "r"))
     else:
         compose.log_info(msg)
-        pkgset = pypungi.phases.pkgset.pkgsets.KojiPackageSet(koji_proxy, compose.conf["sigkeys"], logger=compose._logger, arches=ALL_ARCHES)
+        pkgset = pungi.phases.pkgset.pkgsets.KojiPackageSet(koji_proxy, compose.conf["sigkeys"], logger=compose._logger, arches=ALL_ARCHES)
         pkgset.populate(compose_tag, event_id, inherit=inherit)
         f = open(global_pkgset_path, "w")
         data = pickle.dumps(pkgset)
diff --git a/pungi/phases/pkgset/sources/source_repos.py b/pungi/phases/pkgset/sources/source_repos.py
index d40ccd06..0e0b3330 100644
--- a/pungi/phases/pkgset/sources/source_repos.py
+++ b/pungi/phases/pkgset/sources/source_repos.py
@@ -20,20 +20,20 @@ import cPickle as pickle
 
 from kobo.shortcuts import run
 
-import pypungi.phases.pkgset.pkgsets
-from pypungi.arch import get_valid_arches
-from pypungi.util import makedirs
-from pypungi.wrappers.pungi import PungiWrapper
+import pungi.phases.pkgset.pkgsets
+from pungi.arch import get_valid_arches
+from pungi.util import makedirs
+from pungi.wrappers.pungi import PungiWrapper
 
-from pypungi.phases.pkgset.common import create_global_repo, create_arch_repos, populate_arch_pkgsets
-from pypungi.phases.gather import get_prepopulate_packages
-from pypungi.linker import LinkerThread, LinkerPool
+from pungi.phases.pkgset.common import create_global_repo, create_arch_repos, populate_arch_pkgsets
+from pungi.phases.gather import get_prepopulate_packages
+from pungi.linker import LinkerThread, LinkerPool
 
 
-import pypungi.phases.pkgset.source
+import pungi.phases.pkgset.source
 
 
-class PkgsetSourceRepos(pypungi.phases.pkgset.source.PkgsetSourceBase):
+class PkgsetSourceRepos(pungi.phases.pkgset.source.PkgsetSourceBase):
     enabled = True
     config_options = (
         {
@@ -136,7 +136,7 @@ def populate_global_pkgset(compose, file_list, path_prefix):
         pkgset = pickle.load(open(global_pkgset_path, "r"))
     else:
         compose.log_info(msg)
-        pkgset = pypungi.phases.pkgset.pkgsets.FilelistPackageSet(compose.conf["sigkeys"], logger=compose._logger, arches=ALL_ARCHES)
+        pkgset = pungi.phases.pkgset.pkgsets.FilelistPackageSet(compose.conf["sigkeys"], logger=compose._logger, arches=ALL_ARCHES)
         pkgset.populate(file_list)
         f = open(global_pkgset_path, "w")
         data = pickle.dumps(pkgset)
@@ -162,9 +162,9 @@ def write_pungi_config(compose, arch, variant, repos=None, comps_repo=None, pack
 
     # TODO move to a function
     gather_source = "GatherSource%s" % compose.conf["gather_source"]
-    from pypungi.phases.gather.source import GatherSourceContainer
-    import pypungi.phases.gather.sources
-    GatherSourceContainer.register_module(pypungi.phases.gather.sources)
+    from pungi.phases.gather.source import GatherSourceContainer
+    import pungi.phases.gather.sources
+    GatherSourceContainer.register_module(pungi.phases.gather.sources)
     container = GatherSourceContainer()
     SourceClass = container[gather_source]
     src = SourceClass(compose)
diff --git a/pungi/phases/product_img.py b/pungi/phases/product_img.py
index 5334abec..4792b6fa 100644
--- a/pungi/phases/product_img.py
+++ b/pungi/phases/product_img.py
@@ -45,11 +45,11 @@ import pipes
 
 from kobo.shortcuts import run
 
-from pypungi.arch import split_name_arch
-from pypungi.util import makedirs, pkg_is_rpm
-from pypungi.phases.base import PhaseBase
-from pypungi.wrappers.iso import IsoWrapper
-from pypungi.wrappers.scm import get_file_from_scm, get_dir_from_scm
+from pungi.arch import split_name_arch
+from pungi.util import makedirs, pkg_is_rpm
+from pungi.phases.base import PhaseBase
+from pungi.wrappers.iso import IsoWrapper
+from pungi.wrappers.scm import get_file_from_scm, get_dir_from_scm
 
 
 class ProductimgPhase(PhaseBase):
diff --git a/pungi/phases/test.py b/pungi/phases/test.py
index 38770f3b..ad329f00 100644
--- a/pungi/phases/test.py
+++ b/pungi/phases/test.py
@@ -19,11 +19,11 @@ import tempfile
 
 from kobo.shortcuts import run
 
-from pypungi.wrappers.repoclosure import RepoclosureWrapper
-from pypungi.arch import get_valid_arches
-from pypungi.phases.base import PhaseBase
-from pypungi.phases.gather import get_lookaside_repos
-from pypungi.util import rmtree
+from pungi.wrappers.repoclosure import RepoclosureWrapper
+from pungi.arch import get_valid_arches
+from pungi.phases.base import PhaseBase
+from pungi.phases.gather import get_lookaside_repos
+from pungi.util import rmtree
 
 
 class TestPhase(PhaseBase):
diff --git a/pungi/wrappers/scm.py b/pungi/wrappers/scm.py
index 0c484a13..88cf77d5 100644
--- a/pungi/wrappers/scm.py
+++ b/pungi/wrappers/scm.py
@@ -24,7 +24,7 @@ import time
 
 import kobo.log
 from kobo.shortcuts import run, force_list
-from pypungi.util import explode_rpm_package, makedirs
+from pungi.util import explode_rpm_package, makedirs
 
 
 class ScmBase(kobo.log.LoggingBase):