diff --git a/packages/lang/python/python-atpython/Makefile b/packages/lang/python/python-atsdk/Makefile
similarity index 63%
rename from packages/lang/python/python-atpython/Makefile
rename to packages/lang/python/python-atsdk/Makefile
index 53fb4ea..d475f29 100644
--- a/packages/lang/python/python-atpython/Makefile
+++ b/packages/lang/python/python-atsdk/Makefile
@@ -5,24 +5,22 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_NAME:=at_python
-PKG_VERSION:=0.0.2
+PKG_NAME:=atsdk
+PKG_VERSION:=0.2.0
 PKG_RELEASE:=1
 
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/atsign-foundation/at_python
-PKG_SOURCE_VERSION:=4da03279fa174a1fa2ab59b3d6e4aeb2b4f8d978
+PYPI_NAME:=atsdk
+PKG_HASH:=52f4b56597bdc25725b6e1cf9842800b4194def8b2691d0e9c0bb393f97a486e
 
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE
 PKG_MAINTAINER:=Chris Swan <@cpswan>
 
-PKG_BUILD_DEPENDS:=python-poetry-core/host
-
+include $(TOPDIR)/feeds/packages/lang/python/pypi.mk
 include $(INCLUDE_DIR)/package.mk
 include $(TOPDIR)/feeds/packages/lang/python/python3-package.mk
 
-define Package/python3-atpython
+define Package/python3-atsdk
   SECTION:=lang
   CATEGORY:=Languages
   SUBMENU:=Python
@@ -39,10 +37,10 @@ define Package/python3-atpython
       +python3-six
 endef
 
-define Package/python3-atpython/description
+define Package/python3-atsdk/description
 The atPlatform for Python developers
 endef
 
-$(eval $(call Py3Package,python3-atpython))
-$(eval $(call BuildPackage,python3-atpython))
-$(eval $(call BuildPackage,python3-atpython-src))
+$(eval $(call Py3Package,python3-atsdk))
+$(eval $(call BuildPackage,python3-atsdk))
+$(eval $(call BuildPackage,python3-atsdk-src))
diff --git a/packages/lang/python/python-sshnpdpy/Makefile b/packages/lang/python/python-sshnpd/Makefile
similarity index 59%
rename from packages/lang/python/python-sshnpdpy/Makefile
rename to packages/lang/python/python-sshnpd/Makefile
index 092850c..3610f70 100644
--- a/packages/lang/python/python-sshnpdpy/Makefile
+++ b/packages/lang/python/python-sshnpd/Makefile
@@ -5,26 +5,22 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_NAME:=sshnpdpy
-PKG_VERSION:=0.3.0
+PKG_NAME:=sshnpd
+PKG_VERSION:=0.4.1
 PKG_RELEASE:=1
 
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/atsign-foundation/sshnoports
-PKG_SOURCE_VERSION:=074699a29e31688dcba8b79fd55433e25c68355e
-
-PKG_BUILD_DEPENDS:=python-poetry-core/host
-
-PYTHON3_PKG_SETUP_DIR=packages/sshnpdpy
+PYPI_NAME:=sshnpd
+PKG_HASH:=3bb3bd1f00409598b2b7e8c70eb3acdb81c614224f64671d47b2c53a19dab1a4
 
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE
 PKG_MAINTAINER:=Chris Swan <@cpswan>
 
+include $(TOPDIR)/feeds/packages/lang/python/pypi.mk
 include $(INCLUDE_DIR)/package.mk
 include $(TOPDIR)/feeds/packages/lang/python/python3-package.mk
 
-define Package/python3-sshnpdpy
+define Package/python3-sshnpd
   SECTION:=lang
   CATEGORY:=Languages
   SUBMENU:=Python
@@ -32,7 +28,7 @@ define Package/python3-sshnpdpy
   URL:=https://github.com/atsign-foundation/at_python
   DEPENDS:=\
       +python3-light \
-      +python3-atpython \
+      +python3-atsdk \
       +python3-bcrypt \
       +python3-cffi \
       +python3-cryptography \
@@ -41,10 +37,10 @@ define Package/python3-sshnpdpy
       +python3-pynacl
 endef
 
-define Package/python3-sshnpdpy/description
+define Package/python3-sshnpd/description
 Atsign SSH No Ports daemon in Python
 endef
 
-$(eval $(call Py3Package,python3-sshnpdpy))
-$(eval $(call BuildPackage,python3-sshnpdpy))
-$(eval $(call BuildPackage,python3-sshnpdpy-src))
+$(eval $(call Py3Package,python3-sshnpd))
+$(eval $(call BuildPackage,python3-sshnpd))
+$(eval $(call BuildPackage,python3-sshnpd-src))