diff --git a/var/spack/repos/builtin/packages/awscli-v2/package.py b/var/spack/repos/builtin/packages/awscli-v2/package.py
index a8eac2f35be585..e04e34165e38d1 100644
--- a/var/spack/repos/builtin/packages/awscli-v2/package.py
+++ b/var/spack/repos/builtin/packages/awscli-v2/package.py
@@ -6,7 +6,7 @@
 from spack.package import *
 
 
-class AwscliV2(AutotoolsPackage):
+class AwscliV2(PythonPackage):
     """This package provides a unified command line interface to Amazon Web Services."""
 
     homepage = "https://docs.aws.amazon.com/cli"
@@ -19,14 +19,14 @@ class AwscliV2(AutotoolsPackage):
     depends_on("python@3.8:", type=("build", "run"))
     depends_on("py-flit-core@3.7.1:3.8.0", type=("build"))
     depends_on("py-pip@22:23", type=("build"))
-    depends_on("py-colorama@0.2.5:0.4.6")
-    depends_on("py-docutils@0.10:0.19")
-    depends_on("py-cryptography@3.3.2:40.0.1")
-    depends_on("py-ruamel-yaml@0.15:0.17.21")
-    depends_on("py-ruamel-yaml-clib@0.2:0.2.7")
-    depends_on("py-prompt-toolkit@3.0.24:3.0.38")
-    depends_on("py-distro@1.5:1.8")
-    depends_on("awscrt@0.16.4:0.16.16")
-    depends_on("py-python-dateutil@2.1:2")
-    depends_on("py-jmespath@0.7.1:1.0")
-    depends_on("py-urllib3@1.25.4:1.26")
+    depends_on("py-colorama@0.2.5:0.4.6", type=("build", "run"))
+    depends_on("py-docutils@0.10:0.19", type=("build", "run"))
+    depends_on("py-cryptography@3.3.2:40.0.1", type=("build", "run"))
+    depends_on("py-ruamel-yaml@0.15:0.17.21", type=("build", "run"))
+    depends_on("py-ruamel-yaml-clib@0.2:0.2.7", type=("build", "run"))
+    depends_on("py-prompt-toolkit@3.0.24:3.0.38", type=("build", "run"))
+    depends_on("py-distro@1.5:1.8", type=("build", "run"))
+    depends_on("py-awscrt@0.16.4:0.16.16", type=("build", "run"))
+    depends_on("py-python-dateutil@2.1:2", type=("build", "run"))
+    depends_on("py-jmespath@0.7.1:1.0", type=("build", "run"))
+    depends_on("py-urllib3@1.25.4:1.26", type=("build", "run"))
diff --git a/var/spack/repos/builtin/packages/awscrt/package.py b/var/spack/repos/builtin/packages/py-awscrt/package.py
similarity index 87%
rename from var/spack/repos/builtin/packages/awscrt/package.py
rename to var/spack/repos/builtin/packages/py-awscrt/package.py
index eb64d486ed2a17..652e7164a6f445 100644
--- a/var/spack/repos/builtin/packages/awscrt/package.py
+++ b/var/spack/repos/builtin/packages/py-awscrt/package.py
@@ -6,7 +6,7 @@
 from spack.package import *
 
 
-class Awscrt(PythonPackage):
+class PyAwscrt(PythonPackage):
     """Python 3 bindings for the AWS Common Runtime."""
 
     homepage = "https://docs.aws.amazon.com/sdkref/latest/guide/common-runtime.html"
@@ -16,5 +16,4 @@ class Awscrt(PythonPackage):
 
     version("0.16.16", sha256="13075df2c1d7942fe22327b6483274517ee0f6ae765c4e6b6ae9ef5b4c43a827")
 
-    depends_on("python@3.7:", type=("build", "run"))
     depends_on("py-setuptools", type=("build"))