diff --git a/packages/acpype/package.py b/packages/acpype/package.py
index cff6bc8e256aecf14dc6d587c6fbcd44a39fbcd7..c6382b7606550090684d5a87cc6b0bb0e97ff74a 100644
--- a/packages/acpype/package.py
+++ b/packages/acpype/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 class Acpype(PythonPackage):
     """A tool based in Python to use Antechamber to generate topologies for chemical 
diff --git a/packages/apbs/package.py b/packages/apbs/package.py
index f7f45c6ea1c76fd9101bcf8baa74340db0b9534e..bbfac340f94f8b3491634cfec2302e57426d09f8 100644
--- a/packages/apbs/package.py
+++ b/packages/apbs/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class Apbs(CMakePackage):
diff --git a/packages/build-brainscales/package.py b/packages/build-brainscales/package.py
index 2419107cdbc9b70fe901fc93c7a22672e7494f6c..327501d101c4c8dab64673d6e6ee312fe5c2eed8 100644
--- a/packages/build-brainscales/package.py
+++ b/packages/build-brainscales/package.py
@@ -7,7 +7,7 @@ import os
 import unittest.mock
 import xml.etree.ElementTree as ET
 
-from spack import *
+from spack.package import *
 from spack.util.environment import EnvironmentModifications
 import spack.build_environment
 
diff --git a/packages/clb-nb-utils/package.py b/packages/clb-nb-utils/package.py
index d75ae48cc2d63f98ed9a5e5aaf32d655abd59d5f..40660252e78d0458524652e8faf7bd145adb240a 100644
--- a/packages/clb-nb-utils/package.py
+++ b/packages/clb-nb-utils/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 # Usage
 # from clb_nb_utils import oauth
diff --git a/packages/genpybind/package.py b/packages/genpybind/package.py
index 012d2e5b6821740b5b4ad197afb84a598411823b..bca2c483d2f79a76a2afae784fecb1e3a6567d3a 100644
--- a/packages/genpybind/package.py
+++ b/packages/genpybind/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class Genpybind(WafPackage):
diff --git a/packages/hxtorch/package.py b/packages/hxtorch/package.py
index d4a5ea66992015f94a3bfdad4077394df019c082..7d3a26bf0a69a91251374cc9d56ea8cb8dc82a67 100644
--- a/packages/hxtorch/package.py
+++ b/packages/hxtorch/package.py
@@ -7,7 +7,7 @@ import os
 import unittest.mock
 import xml.etree.ElementTree as ET
 
-from spack import *
+from spack.package import *
 from spack.util.environment import EnvironmentModifications
 import spack.build_environment
 
diff --git a/packages/inja/package.py b/packages/inja/package.py
index f8f653e46f2a8154d31c02525946b96fc2ee55c0..47a2074310e92a1d2402fe2d0c403d2eac3379f2 100644
--- a/packages/inja/package.py
+++ b/packages/inja/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class Inja(CMakePackage):
diff --git a/packages/jaxsnn/package.py b/packages/jaxsnn/package.py
index b2b3329696d60c417f627406876c1494b4320b45..8cca2481583aecf70a920c68c717dcaaa6e077bb 100644
--- a/packages/jaxsnn/package.py
+++ b/packages/jaxsnn/package.py
@@ -7,7 +7,7 @@ import os
 import unittest.mock
 import xml.etree.ElementTree as ET
 
-from spack import *
+from spack.package import *
 from spack.util.environment import EnvironmentModifications
 import spack.build_environment
 
diff --git a/packages/nest/package.py b/packages/nest/package.py
index e97b81c84e96693f21df6c14ffbe75d9b436758f..d8e127da26d4541886ddc5f8ffe2ddfb31488413 100644
--- a/packages/nest/package.py
+++ b/packages/nest/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 import re
 
 
diff --git a/packages/oppulance/package.py b/packages/oppulance/package.py
index 7e0d22b69536eb1ee6095a26d8062ab738a7d749..7dc37d0a584950d5cfb427e2294fd8ba01055efe 100644
--- a/packages/oppulance/package.py
+++ b/packages/oppulance/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 import unittest.mock
 
 
diff --git a/packages/psmisc/package.py b/packages/psmisc/package.py
index f1a675302850224aa54367cfa9935455368b5964..4b727f196e2af72d4257c57e0dc54b3bd44566ca 100644
--- a/packages/psmisc/package.py
+++ b/packages/psmisc/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class Psmisc(AutotoolsPackage):
diff --git a/packages/py-annarchy/package.py b/packages/py-annarchy/package.py
index 4368d1e01bff0165b9c77550190780df1d4b3690..9fb9cab9c4150afaf27ad7f47af3cb512975bfca 100644
--- a/packages/py-annarchy/package.py
+++ b/packages/py-annarchy/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyAnnarchy(PythonPackage):
diff --git a/packages/py-bct/package.py b/packages/py-bct/package.py
index bfa61d91ea28b6386346087a38a3b2156f2f41bf..97ecec1b5973b981e39d3c23ca0bdb59d4fa82f6 100644
--- a/packages/py-bct/package.py
+++ b/packages/py-bct/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyBct(PythonPackage):
diff --git a/packages/py-biobb-analysis/package.py b/packages/py-biobb-analysis/package.py
index 9c580af04384d385d1539d04ad91d5afd4cec188..79ce6edc61cd8bd07325625e446a40026e4419ec 100644
--- a/packages/py-biobb-analysis/package.py
+++ b/packages/py-biobb-analysis/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 class PyBiobbAnalysis(PythonPackage):
     """Biobb_analysis is the Biobb module collection to perform analysis 
diff --git a/packages/py-biobb-chemistry/package.py b/packages/py-biobb-chemistry/package.py
index c30b809245e1e2161716bc65aff4a2b1798e5638..969a5058fcd50d0f9b59ccb84e905ba7b2dde3a6 100644
--- a/packages/py-biobb-chemistry/package.py
+++ b/packages/py-biobb-chemistry/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 class PyBiobbChemistry(PythonPackage):
     """Biobb_chemistry is the Biobb module collection to perform chemistry 
diff --git a/packages/py-cerebstats/package.py b/packages/py-cerebstats/package.py
index 5b1d386525d217c45cf5be7f4ee9363b059686ef..5c3a6f8ae265f1f91c466e1b325bc9a668c8cccd 100644
--- a/packages/py-cerebstats/package.py
+++ b/packages/py-cerebstats/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyCerebstats(PythonPackage):
diff --git a/packages/py-cerebunit/package.py b/packages/py-cerebunit/package.py
index d4a700540034e996f3f1e8438514e4a7214f872e..62e29223170f036f0db46ffb272ade1b74732b2f 100644
--- a/packages/py-cerebunit/package.py
+++ b/packages/py-cerebunit/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyCerebunit(PythonPackage):
diff --git a/packages/py-clang-format/package.py b/packages/py-clang-format/package.py
index 7be2c0212ea4da4b900765e3a66ef99f36649ac9..19d742733242f349132f13bafbeaf19b7fb36cf8 100644
--- a/packages/py-clang-format/package.py
+++ b/packages/py-clang-format/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyClangFormat(PythonPackage):
diff --git a/packages/py-cons/package.py b/packages/py-cons/package.py
index 77b2e1ab75a93b90f833d2a7106680c558c8d2de..e114b5b552088e8cc9bc86c94739ee65dce86b84 100644
--- a/packages/py-cons/package.py
+++ b/packages/py-cons/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyCons(PythonPackage):
diff --git a/packages/py-dicthash/package.py b/packages/py-dicthash/package.py
index 2fd2daf001fd42c3bc1486cdd4679b7c771dd300..55ae9198300f5e0c32bcc5985b5e24abdf2b5736 100644
--- a/packages/py-dicthash/package.py
+++ b/packages/py-dicthash/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyDicthash(PythonPackage):
diff --git a/packages/py-etuples/package.py b/packages/py-etuples/package.py
index d3462437bf2ef7a81b7dc483c235230960249f98..d8cca9f610812e1bc6d0e65d5567cff55ec92da3 100644
--- a/packages/py-etuples/package.py
+++ b/packages/py-etuples/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyEtuples(PythonPackage):
diff --git a/packages/py-flask-restx/package.py b/packages/py-flask-restx/package.py
index 171f1039e58691e4844c10a2a8eca24c8120fe3d..7f9c45ecedb8c9eb79e3cf4627effb1a671529d9 100644
--- a/packages/py-flask-restx/package.py
+++ b/packages/py-flask-restx/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyFlaskRestx(PythonPackage):
diff --git a/packages/py-formencode/package.py b/packages/py-formencode/package.py
index f78e0e63f1772c1a50117283b3035eacc3530bf4..56c94e3d84de2265ad82336e1b0c3512cb634f7d 100644
--- a/packages/py-formencode/package.py
+++ b/packages/py-formencode/package.py
@@ -3,8 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
-
+from spack.package import *
 
 class PyFormencode(PythonPackage):
     """
diff --git a/packages/py-frites/package.py b/packages/py-frites/package.py
index 67c8f204f52b086f49780e26fdb7ce3366381889..59aaca93dd4bedaa89e658c8c17ba8d7ec458e62 100644
--- a/packages/py-frites/package.py
+++ b/packages/py-frites/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyFrites(PythonPackage):
diff --git a/packages/py-hbp-archive/package.py b/packages/py-hbp-archive/package.py
index 580ec106d86883a5c6811c04a155ea8c62b775b5..6f9921b08146940f1f51e25a7a6c54ce2dcfb3ee 100644
--- a/packages/py-hbp-archive/package.py
+++ b/packages/py-hbp-archive/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyHbpArchive(PythonPackage):
diff --git a/packages/py-hbp-neuromorphic-platform/package.py b/packages/py-hbp-neuromorphic-platform/package.py
index 065024975d41698ba4fb19ea51141ba432654f51..3308957b28b080e6bf5dbc93b4bf1517629610e2 100644
--- a/packages/py-hbp-neuromorphic-platform/package.py
+++ b/packages/py-hbp-neuromorphic-platform/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyHbpNeuromorphicPlatform(PythonPackage):
diff --git a/packages/py-hippounit/package.py b/packages/py-hippounit/package.py
index 0317272cb9f6542c6f3c153a668dd2aa7db85f03..0a6c294fa58ea03e1c8bfaf0c511f536f0c4ecfe 100644
--- a/packages/py-hippounit/package.py
+++ b/packages/py-hippounit/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyHippounit(PythonPackage):
diff --git a/packages/py-junitparser/package.py b/packages/py-junitparser/package.py
index 5f93f3e2b456f411f8bdd0dbb7fae34daa4e5b58..b794a44cb0182c61a165cfe2ef988212e26b0a5c 100644
--- a/packages/py-junitparser/package.py
+++ b/packages/py-junitparser/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyJunitparser(PythonPackage):
diff --git a/packages/py-lems/package.py b/packages/py-lems/package.py
index 456c8676e5c866e3422a520dfe1919b7f2fc5751..ff0173af5fd4a85c7bf92f9303fab7749a432c08 100644
--- a/packages/py-lems/package.py
+++ b/packages/py-lems/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyLems(PythonPackage):
diff --git a/packages/py-lfpy/package.py b/packages/py-lfpy/package.py
index bc3a1ee4f5877b6956908c892dee62912539c053..27cba28be2837b87327d3d676173e314a4c37b26 100644
--- a/packages/py-lfpy/package.py
+++ b/packages/py-lfpy/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyLfpy(PythonPackage):
diff --git a/packages/py-lfpykit/package.py b/packages/py-lfpykit/package.py
index 3768a8c4321d3f7cc21a191781546ef645baf9ca..ccabc6237dc1a9acff365f46007dbe260f330556 100644
--- a/packages/py-lfpykit/package.py
+++ b/packages/py-lfpykit/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyLfpykit(PythonPackage):
diff --git a/packages/py-libneuroml/package.py b/packages/py-libneuroml/package.py
index d660b23e3b85e7dbd0d424b4afd509349ddbc282..babb2b2109d43a15922b542e3fdcf4ee1c003207 100644
--- a/packages/py-libneuroml/package.py
+++ b/packages/py-libneuroml/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyLibneuroml(PythonPackage):
diff --git a/packages/py-logical-unification/package.py b/packages/py-logical-unification/package.py
index 7ba1620e4eac73cede7806e73f3648bf6a99a53b..e4c453c155f6fc4800f248adc03408f7935ac440 100644
--- a/packages/py-logical-unification/package.py
+++ b/packages/py-logical-unification/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyLogicalUnification(PythonPackage):
diff --git a/packages/py-mini-kanren/package.py b/packages/py-mini-kanren/package.py
index 2d24eb02cdfad669bc3213da38ded284d27701b9..d777ee616f3675d7dc5d2ea64d0ef7f271ade82c 100644
--- a/packages/py-mini-kanren/package.py
+++ b/packages/py-mini-kanren/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyMiniKanren(PythonPackage):
diff --git a/packages/py-mmcif-pdbx/package.py b/packages/py-mmcif-pdbx/package.py
index 02daf8fcf5e087ab9d8f1f1fcb9874d7d632d921..25dfc8ed8d4262aff0ec4b354c3434117b9b7eaa 100644
--- a/packages/py-mmcif-pdbx/package.py
+++ b/packages/py-mmcif-pdbx/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyMmcifPdbx(PythonPackage):
diff --git a/packages/py-morphounit/package.py b/packages/py-morphounit/package.py
index 3884482e7a01eb3d44abfff10aa237d8a4eb73e3..382a6d499d5110d2db29834f05a4cce25cf0d335 100644
--- a/packages/py-morphounit/package.py
+++ b/packages/py-morphounit/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyMorphounit(PythonPackage):
diff --git a/packages/py-nameparser/package.py b/packages/py-nameparser/package.py
index a3e3eb71c693d049e0353fa76c0d0495aa72f7ae..f4eb768bc25dc24c06d3dcc1862e7f477deffffc 100644
--- a/packages/py-nameparser/package.py
+++ b/packages/py-nameparser/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyNameparser(PythonPackage):
diff --git a/packages/py-neo/package.py b/packages/py-neo/package.py
index 90054098bda90a43f35d71205ae655a665335f5b..3ce2a9bcf03ca38b51b65d2aad63bba046e0e858 100644
--- a/packages/py-neo/package.py
+++ b/packages/py-neo/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyNeo(PythonPackage):
diff --git a/packages/py-nested-dict/package.py b/packages/py-nested-dict/package.py
index 5fc5ff008e6f642d8774a0f2a464d0db35afd28b..96e9b79b25015008223e125cf3007703f8d761ea 100644
--- a/packages/py-nested-dict/package.py
+++ b/packages/py-nested-dict/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyNestedDict(PythonPackage):
diff --git a/packages/py-nestml/package.py b/packages/py-nestml/package.py
index a5ea9b1b3a5c6dd6168c9588fedc39ad6d87ef38..d3437f3b0c596efeb1f3e8e6340e5b863ef54774 100644
--- a/packages/py-nestml/package.py
+++ b/packages/py-nestml/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyNestml(PythonPackage):
diff --git a/packages/py-nflows/package.py b/packages/py-nflows/package.py
index 72f82caf53201553d401c127bdff0cffa99ea3a1..b6c32ffe803fe8658a524aeb1783a44c8e249dd5 100644
--- a/packages/py-nflows/package.py
+++ b/packages/py-nflows/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 class PyNflows(PythonPackage):
     """It is a comprehensive collection of normalizing flows using PyTorch."""
diff --git a/packages/py-nnmt/package.py b/packages/py-nnmt/package.py
index 7b722a7fee4d9a543b4d9bca4eb4d3add77c0c8a..c605bd72faad6ac398aa1d985034b657192af9ac 100644
--- a/packages/py-nnmt/package.py
+++ b/packages/py-nnmt/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyNnmt(PythonPackage):
diff --git a/packages/py-odetoolbox/package.py b/packages/py-odetoolbox/package.py
index 3ebd6e6809e50f4160d3c87b7e24c1784673b79e..c5ccc4598f2d12725e8bcf818f751023121c2ef3 100644
--- a/packages/py-odetoolbox/package.py
+++ b/packages/py-odetoolbox/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyOdetoolbox(PythonPackage):
diff --git a/packages/py-pdb2pqr/package.py b/packages/py-pdb2pqr/package.py
index 1e87023a3d2a26d29df51a38b217a425bc77b579..b737eb38bdf27206188f62f2231c67a67c834d4e 100644
--- a/packages/py-pdb2pqr/package.py
+++ b/packages/py-pdb2pqr/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyPdb2pqr(PythonPackage):
diff --git a/packages/py-propka/package.py b/packages/py-propka/package.py
index edb466b49b7b69217d34c89e907f99de65c18573..b75a09b390ba0034f9f040a2eb8abff53bca53e3 100644
--- a/packages/py-propka/package.py
+++ b/packages/py-propka/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyPropka(PythonPackage):
diff --git a/packages/py-pyaescrypt/package.py b/packages/py-pyaescrypt/package.py
index d0b38eb1a08622b0058f40f8ae0c3164bd5a2d2c..ab15e7f7f13d0166c3d0f8de3e1f8c32f7633543 100644
--- a/packages/py-pyaescrypt/package.py
+++ b/packages/py-pyaescrypt/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyPyaescrypt(PythonPackage):
diff --git a/packages/py-pycatch22/package.py b/packages/py-pycatch22/package.py
index 68c4be093beccec50bf5b4f096db249371d598f7..6707282efa8d5959b63452b723d23733ad49219d 100644
--- a/packages/py-pycatch22/package.py
+++ b/packages/py-pycatch22/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyPycatch22(PythonPackage):
diff --git a/packages/py-pyknos/package.py b/packages/py-pyknos/package.py
index e9449a6da430ac64be9ca1f1fe3128aa32843576..151fd07774f02285d20b542c5eca6bde22ba738f 100644
--- a/packages/py-pyknos/package.py
+++ b/packages/py-pyknos/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyPyknos(PythonPackage):
diff --git a/packages/py-pymc/package.py b/packages/py-pymc/package.py
index b7dc999f41c53366467e19aa4cf65113b0dea464..453829ab8801d6a43daaa523fc314b51dedbe921 100644
--- a/packages/py-pymc/package.py
+++ b/packages/py-pymc/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyPymc(PythonPackage):
diff --git a/packages/py-pynn/package.py b/packages/py-pynn/package.py
index f75382bc5ece397b20c23a9d7958b8da1d6d6d4c..73df7c20246dab2fce62e68dfab14744a4cf7d61 100644
--- a/packages/py-pynn/package.py
+++ b/packages/py-pynn/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyPynn(PythonPackage):
diff --git a/packages/py-pyspike/package.py b/packages/py-pyspike/package.py
index ddf17e7e28afbf190937694dbdbee31b1f486edb..c0ce25b614669004ce05439e27c51526f7844230 100644
--- a/packages/py-pyspike/package.py
+++ b/packages/py-pyspike/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyPyspike(PythonPackage):
diff --git a/packages/py-pyswarms/package.py b/packages/py-pyswarms/package.py
index 60c85b395664a45380c31c46ecbe29e4b671445c..f9d9454093e454c334af53b3356d51292bb6f370 100644
--- a/packages/py-pyswarms/package.py
+++ b/packages/py-pyswarms/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyPyswarms(PythonPackage):
diff --git a/packages/py-pytensor/package.py b/packages/py-pytensor/package.py
index 4c04539334675f9185af0f5a10aadae5b8c07cdd..b47935f442337dee0893f841f44eb2bfaa84f9e0 100644
--- a/packages/py-pytensor/package.py
+++ b/packages/py-pytensor/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 class PyPytensor(PythonPackage):
     """Python library that allows one to define, optimize, and efficiently evaluate mathematical expressions involving
diff --git a/packages/py-python-keycloak/package.py b/packages/py-python-keycloak/package.py
index 44c4d5621b4da96a66c8c977ae862573ee8038e2..b7f3d7cc543fab3748f0138487c478a9474f4500 100644
--- a/packages/py-python-keycloak/package.py
+++ b/packages/py-python-keycloak/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 class PyPythonKeycloak(PythonPackage):
     """python-keycloak is a Python package providing access to the Keycloak API"""
diff --git a/packages/py-pyunicore/package.py b/packages/py-pyunicore/package.py
index 1d6b71b3934b1bc3c12e4bd4836f7ecd5b9cade0..0eb54988eb86e24c4f8d4bbad25a6703d9791686 100644
--- a/packages/py-pyunicore/package.py
+++ b/packages/py-pyunicore/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyPyunicore(PythonPackage):
diff --git a/packages/py-quantities-scidash/package.py b/packages/py-quantities-scidash/package.py
index 08fcee3226e59c98f233ac417d935f629e96f610..f075e7fa2f20a0957935ce9595f48ef70940a547 100644
--- a/packages/py-quantities-scidash/package.py
+++ b/packages/py-quantities-scidash/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyQuantitiesScidash(PythonPackage):
diff --git a/packages/py-quantities/package.py b/packages/py-quantities/package.py
index ffe38173d9ee0e877cb4186d8258da672e9bcc79..e5d14e955da39044aa594a24aad4fe0c37057124 100644
--- a/packages/py-quantities/package.py
+++ b/packages/py-quantities/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyQuantities(PythonPackage):
diff --git a/packages/py-sbi/package.py b/packages/py-sbi/package.py
index a560cd93431e33171296d3d6019fb1c4eade6851..5e1c50dfe2eb46ade0d0b8258d87c79cc0e78d21 100644
--- a/packages/py-sbi/package.py
+++ b/packages/py-sbi/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PySbi(PythonPackage):
diff --git a/packages/py-sciunit/package.py b/packages/py-sciunit/package.py
index 5684040b930e5b61085a29c3216f538e9cdfe8a8..ca8cf891e03f38612b0d136fea0f23e149126cea 100644
--- a/packages/py-sciunit/package.py
+++ b/packages/py-sciunit/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PySciunit(PythonPackage):
diff --git a/packages/py-snudda/package.py b/packages/py-snudda/package.py
index 621df60f17519b7c43ceebb2a20821ab414bb7ec..f8458a3fc7cf8fc6a2b1752265c13a2531e31d98 100644
--- a/packages/py-snudda/package.py
+++ b/packages/py-snudda/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PySnudda(PythonPackage):
diff --git a/packages/py-tvb-contrib/package.py b/packages/py-tvb-contrib/package.py
index 8f940f0c848371104ec561627db5e211b03fa380..7a136a1a2c6af2aaad47d26e3bd4adcc495a23ce 100644
--- a/packages/py-tvb-contrib/package.py
+++ b/packages/py-tvb-contrib/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyTvbContrib(PythonPackage):
diff --git a/packages/py-tvb-data/package.py b/packages/py-tvb-data/package.py
index 1e5e93536d775ae5b201a53e836ed0b89ad32b5a..abe486cdf1638533f6c0a72ba6921eb4efeaa210 100644
--- a/packages/py-tvb-data/package.py
+++ b/packages/py-tvb-data/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyTvbData(PythonPackage):
diff --git a/packages/py-tvb-ext-bucket/package.py b/packages/py-tvb-ext-bucket/package.py
index 3d5e7c2b127d5272f4c6fe542a3d0a791b64d80e..29fdae03f54907831d42980d75592040b0be5f71 100644
--- a/packages/py-tvb-ext-bucket/package.py
+++ b/packages/py-tvb-ext-bucket/package.py
@@ -1,4 +1,4 @@
-from spack import *
+from spack.package import *
 
 
 class PyTvbExtBucket(PythonPackage):
diff --git a/packages/py-tvb-framework/package.py b/packages/py-tvb-framework/package.py
index fb1ebc2fa1c37c6dc5223ee662a5fa0a56a9007e..12c01e6aa9dcfb3b77db9816234cd7f355b7053d 100644
--- a/packages/py-tvb-framework/package.py
+++ b/packages/py-tvb-framework/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyTvbFramework(PythonPackage):
diff --git a/packages/py-tvb-gdist/package.py b/packages/py-tvb-gdist/package.py
index 34f7012742fbcf81419920a575e60b3310d97144..38cfa771eef2466f8f9e194f4235e65f0b309b54 100644
--- a/packages/py-tvb-gdist/package.py
+++ b/packages/py-tvb-gdist/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyTvbGdist(PythonPackage):
diff --git a/packages/py-tvb-library/package.py b/packages/py-tvb-library/package.py
index c624a1025e1690f4f194b195c0d8dfe181f5b284..8386fb5ab4516a8038d2460bbff6155bfd38f5a3 100644
--- a/packages/py-tvb-library/package.py
+++ b/packages/py-tvb-library/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyTvbLibrary(PythonPackage):
diff --git a/packages/py-tvb-multiscale/package.py b/packages/py-tvb-multiscale/package.py
index b57b8f03b4376d6a3d5de7ec91522913ebd5e0c6..176f55327f4f4daf051f2e1163f01e15c779c0be 100644
--- a/packages/py-tvb-multiscale/package.py
+++ b/packages/py-tvb-multiscale/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyTvbMultiscale(PythonPackage):
diff --git a/packages/py-tvb-storage/package.py b/packages/py-tvb-storage/package.py
index d25e769018a1022597ea93dde6d4ad9d31a166e5..4c6f89ad4693a41ed50bbb03bca45be68eebc485 100644
--- a/packages/py-tvb-storage/package.py
+++ b/packages/py-tvb-storage/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyTvbStorage(PythonPackage):
diff --git a/packages/py-tvb-widgets/package.py b/packages/py-tvb-widgets/package.py
index 855ac583d2f6e12fb0f6363d983ec4910c07b3b2..07dd8cf136a463e37d2a25741d841936c19efe59 100644
--- a/packages/py-tvb-widgets/package.py
+++ b/packages/py-tvb-widgets/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyTvbWidgets(PythonPackage):
diff --git a/packages/py-umnn/package.py b/packages/py-umnn/package.py
index 545b1ec0d4470791d52a4c3e330eb0cfaeefc7b4..6cc012827ac7a98731fc830b212d20787b434cc6 100644
--- a/packages/py-umnn/package.py
+++ b/packages/py-umnn/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyUmnn(PythonPackage):
diff --git a/packages/py-vbi/package.py b/packages/py-vbi/package.py
index 0ac988a2822897fc1d51da03e51f43cd6c15b908..9c4258de656375cb0cfde924b6ec1e9d1a180871 100644
--- a/packages/py-vbi/package.py
+++ b/packages/py-vbi/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyVbi(PythonPackage, CudaPackage):
diff --git a/packages/py-viziphant/package.py b/packages/py-viziphant/package.py
index 22281cb4192f1dee28d7a1a731607241a1202868..8f409f9c9d1e9f2159a229667d70495ae0878a4a 100644
--- a/packages/py-viziphant/package.py
+++ b/packages/py-viziphant/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyViziphant(PythonPackage):
diff --git a/packages/py-zuko/package.py b/packages/py-zuko/package.py
index 9c2222731d6865b11507c988baa21701e72704a1..5e712df77c6fe096dbc4dca4a1e25b039f58fb35 100644
--- a/packages/py-zuko/package.py
+++ b/packages/py-zuko/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class PyZuko(PythonPackage):
diff --git a/packages/pynn-brainscales/package.py b/packages/pynn-brainscales/package.py
index e0836671c8eda681192af053e2685a220d7a1e43..2a4a0a1044f57a2c769c036bc600744c909bec21 100644
--- a/packages/pynn-brainscales/package.py
+++ b/packages/pynn-brainscales/package.py
@@ -7,7 +7,7 @@ import os
 import unittest.mock
 import xml.etree.ElementTree as ET
 
-from spack import *
+from spack.package import *
 from spack.util.environment import EnvironmentModifications
 import spack.build_environment
 
diff --git a/packages/sda/package.py b/packages/sda/package.py
index 77f19f542653b9449ba51f712b91766434b54f4d..3fb569c51bd738aff8791f4d2ddc68df8d4dd12e 100644
--- a/packages/sda/package.py
+++ b/packages/sda/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class Sda(MakefilePackage):
diff --git a/packages/wf-biobb/package.py b/packages/wf-biobb/package.py
index 28ff7c410ab8693c1cf4b77ef821e3ce0090be6f..61d14695f658cd8948fb70a2b52bf801e22842ed 100644
--- a/packages/wf-biobb/package.py
+++ b/packages/wf-biobb/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class WfBiobb(BundlePackage):
diff --git a/packages/wf-brainscales2-demos/package.py b/packages/wf-brainscales2-demos/package.py
index 1dc5b24b44c99dcf6d34e1fe7b28052d17dc5d8c..02592a1d99a675b4d4c80682fb4b47d25b11e440 100644
--- a/packages/wf-brainscales2-demos/package.py
+++ b/packages/wf-brainscales2-demos/package.py
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from glob import glob
-from spack import *
+from spack.package import *
 import os
 
 
diff --git a/packages/wf-bsb/package.py b/packages/wf-bsb/package.py
index 2e843818fe7a321b2c9d699c07a44524e2bf0e4b..37ec15a79afb4728cd801739dd647ac0bcd0fd2b 100644
--- a/packages/wf-bsb/package.py
+++ b/packages/wf-bsb/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class WfBsb(BundlePackage):
diff --git a/packages/wf-custom-python/package.py b/packages/wf-custom-python/package.py
index 84ebe4ccde56d79e8ad7ac85243744905f82c485..6fae2ed13da3e7286c7d5cdeea8b9965cf92e9ec 100644
--- a/packages/wf-custom-python/package.py
+++ b/packages/wf-custom-python/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class WfCustomPython(BundlePackage):
diff --git a/packages/wf-human-multi-area-model/package.py b/packages/wf-human-multi-area-model/package.py
index 5bcefe0d68f89a317a81109d36b88b26caa5cdb1..d5246fc8cfa6e7e444589afc257c0ece55efd9b5 100644
--- a/packages/wf-human-multi-area-model/package.py
+++ b/packages/wf-human-multi-area-model/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class WfHumanMultiAreaModel(Package):
diff --git a/packages/wf-multi-area-model/package.py b/packages/wf-multi-area-model/package.py
index 51d59bb3c96b62c4a04b55a29e1c9e44690197db..fa4828a0c1cb0b79dcb4af0d7448f9e92dc91890 100644
--- a/packages/wf-multi-area-model/package.py
+++ b/packages/wf-multi-area-model/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class WfMultiAreaModel(Package):
diff --git a/packages/wf-protein-association-rates/package.py b/packages/wf-protein-association-rates/package.py
index b20c409a0b63bdb32f1e264ee4673cc739880ee9..3d13eb8decfa1191767337bc0f8f021130e7f39c 100644
--- a/packages/wf-protein-association-rates/package.py
+++ b/packages/wf-protein-association-rates/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class WfProteinAssociationRates(BundlePackage):
diff --git a/packages/wf-uq-akar4/package.py b/packages/wf-uq-akar4/package.py
index 10c3fb8fc0e9558add75b39603fe7101f3ece61b..5e819976fba1f6b61fc0b940e967064d53814f44 100644
--- a/packages/wf-uq-akar4/package.py
+++ b/packages/wf-uq-akar4/package.py
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class WfUqAkar4(BundlePackage):