7 files changed, 15 insertions, 15 deletions
diff --git a/src/backend/__init__.py b/src/backend/__init__.py
index d1dca43..2f87096 100644
--- a/src/backend/__init__.py
+++ b/src/backend/__init__.py
@@ -1,13 +1,11 @@
-from .binpkgsrc_cln import *
-from .binpkgsrc_inst import *
-from .binpkgsrc_unst import *
-from .binpkgsrc_upg import *
 from .checkenv import *
 from .dlbinpkg import *
 from .getclr import *
 from .getenv import *
 from .getfs import *
 from .killemerge import *
+from .pkgadd import *
+from .pkgremove import *
 from .purgeenv import *
 from .recoverdb import *
 from .solvedeps import *
@@ -21,4 +19,6 @@ from .syncall import *
 from .syncdb import *
 from .syncenv import *
 from .syncspm import *
+from .sysclean import *
 from .sysinfo import *
+from .sysupgrade import *
diff --git a/src/backend/binpkgsrc_inst.py b/src/backend/pkgadd.py
index 091502b..091502b 100644
--- a/src/backend/binpkgsrc_inst.py
+++ b/src/backend/pkgadd.py
diff --git a/src/backend/binpkgsrc_unst.py b/src/backend/pkgremove.py
index b039f96..b039f96 100644
--- a/src/backend/binpkgsrc_unst.py
+++ b/src/backend/pkgremove.py
diff --git a/src/backend/binpkgsrc_cln.py b/src/backend/sysclean.py
index 937c8ec..937c8ec 100644
--- a/src/backend/binpkgsrc_cln.py
+++ b/src/backend/sysclean.py
diff --git a/src/backend/binpkgsrc_upg.py b/src/backend/sysupgrade.py
index f8b01d2..f8b01d2 100644
--- a/src/backend/binpkgsrc_upg.py
+++ b/src/backend/sysupgrade.py
diff --git a/src/frontend/cli/sisyphus-cli.py b/src/frontend/cli/sisyphus-cli.py
index 34ce260..4e7d856 100755
--- a/src/frontend/cli/sisyphus-cli.py
+++ b/src/frontend/cli/sisyphus-cli.py
@@ -135,10 +135,10 @@ def install(pkgname: List[str],
         sisyphus install -e --nodeps vivaldi\n
     """
     if ebuild:
-        sisyphus.binpkgsrc_inst.start(
+        sisyphus.pkgadd.start(
             pkgname, ebuild=True, gfx_ui=False, oneshot=oneshot, nodeps=nodeps)
     else:
-        sisyphus.binpkgsrc_inst.start(
+        sisyphus.pkgadd.start(
             pkgname, ebuild=False, gfx_ui=False, oneshot=oneshot, nodeps=nodeps)
 
 
@@ -165,10 +165,10 @@ def uninstall(pkgname: List[str], force: bool = typer.Option(False, "--force", "
         sisyphus uninstall openrc -f            # this will succeed, but the system will no longer boot\n
     """
     if force:
-        sisyphus.binpkgsrc_unst.start(
+        sisyphus.pkgremove.start(
             pkgname, depclean=False, gfx_ui=False, unmerge=True)
     else:
-        sisyphus.binpkgsrc_unst.start(
+        sisyphus.pkgremove.start(
             pkgname, depclean=True, gfx_ui=False, unmerge=False)
 
 
@@ -186,7 +186,7 @@ def autoremove():
     * Examples:\n
         sisyphus autoremove\n
     """
-    sisyphus.binpkgsrc_cln.start(gfx_ui=False)
+    sisyphus.sysclean.start(gfx_ui=False)
 
 
 @app.command("autoclean")
@@ -233,9 +233,9 @@ def upgrade(
         sisyphus upgrade -e\n
     """
     if ebuild:
-        sisyphus.binpkgsrc_upg.start(ebuild=True, gfx_ui=False)
+        sisyphus.sysupgrade.start(ebuild=True, gfx_ui=False)
     else:
-        sisyphus.binpkgsrc_upg.start(ebuild=False, gfx_ui=False)
+        sisyphus.sysupgrade.start(ebuild=False, gfx_ui=False)
 
 
 @app.command("spmsync")
diff --git a/src/frontend/gui/sisyphus-gui.py b/src/frontend/gui/sisyphus-gui.py
index 8fc62b8..1eb4b72 100644
--- a/src/frontend/gui/sisyphus-gui.py
+++ b/src/frontend/gui/sisyphus-gui.py
@@ -461,7 +461,7 @@ class MainWorker(QtCore.QObject):
     def startInstall(self):
         self.started.emit()
         pkgname = Sisyphus.pkgname
-        sisyphus.binpkgsrc_inst.start(
+        sisyphus.pkgadd.start(
             pkgname, ebuild=False, gfx_ui=True, oneshot=False, nodeps=False)
         self.finished.emit()
 
@@ -469,20 +469,20 @@ class MainWorker(QtCore.QObject):
     def startUninstall(self):
         self.started.emit()
         pkgname = Sisyphus.pkgname
-        sisyphus.binpkgsrc_unst.start(
+        sisyphus.pkgremove.start(
             pkgname, depclean=True, gfx_ui=True, unmerge=False)
         self.finished.emit()
 
     @QtCore.pyqtSlot()
     def startUpgrade(self):
         self.started.emit()
-        sisyphus.binpkgsrc_upg.start(ebuild=False, gfx_ui=True)
+        sisyphus.sysupgrade.start(ebuild=False, gfx_ui=True)
         self.finished.emit()
 
     @QtCore.pyqtSlot()
     def startAutoremove(self):
         self.started.emit()
-        sisyphus.binpkgsrc_cln.start(gfx_ui=True)
+        sisyphus.sysclean.start(gfx_ui=True)
         self.finished.emit()