diff --git a/net-dns/check_dane/Manifest b/net-dns/check_dane/Manifest
deleted file mode 100644
index 94f6d81..0000000
--- a/net-dns/check_dane/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST check_dane-0.1.tar.gz 16010 BLAKE2B 732be35ac9039e49890200f0c76004f66ca27167e6ee39dce31b4cf675b9102150e656ef440a47fea17744198b1ec0fa7980f8530f4626518b08c92f5110c35c SHA512 4abe3fbe273d371739d941558c332f93b98f8656902148ed351738cd67a941356827b24c5ce0c33eb222bbe9dfd0bc79b699be4d4f86ed1f644c20bdac43ada1
-DIST check_dane-1.0.tar.gz 16732 BLAKE2B 6c38dc369dfb41b7060bc7d45c0a9717d9a3150afc8215425c645b06b7d04eb0f71684d9b72e31c921a5fd3a7a54fa3777fc9bc3670f78dcb16c4e48e9ba0fbf SHA512 c10d7f8ecda249799a81aa41670922daf0a46679aae9c9f9a8e6f0073bcd1a87da04d10a946cb60359f21713aefcee2fa906f11c9f2fa1e70cd95f78aafd9eb0
-DIST check_dane-1.1.tar.gz 17052 BLAKE2B c9a0bab7464df2967e8ff95bc8b3a1a9fb4dc4be6b48dfe8b09f4552ddf69f5b6fd722edb28d735a160ad14d12131b4f1166c9c67717e5733e9b55ad9e4acf3e SHA512 b27675ca62245b93f9bab7a49d307106a9df79e04172eb66258f499ecd3bb455bdace1daeab3feecc98d0f60b11e8b1fbc5f00fff160e75412f5db9bfcca3ac8
diff --git a/net-dns/nagios-check_dane/Manifest b/net-dns/nagios-check_dane/Manifest
new file mode 100644
index 0000000..8a44797
--- /dev/null
+++ b/net-dns/nagios-check_dane/Manifest
@@ -0,0 +1,3 @@
+DIST nagios-check_dane-0.1.tar.gz 16010 BLAKE2B 732be35ac9039e49890200f0c76004f66ca27167e6ee39dce31b4cf675b9102150e656ef440a47fea17744198b1ec0fa7980f8530f4626518b08c92f5110c35c SHA512 4abe3fbe273d371739d941558c332f93b98f8656902148ed351738cd67a941356827b24c5ce0c33eb222bbe9dfd0bc79b699be4d4f86ed1f644c20bdac43ada1
+DIST nagios-check_dane-1.0.tar.gz 16732 BLAKE2B 6c38dc369dfb41b7060bc7d45c0a9717d9a3150afc8215425c645b06b7d04eb0f71684d9b72e31c921a5fd3a7a54fa3777fc9bc3670f78dcb16c4e48e9ba0fbf SHA512 c10d7f8ecda249799a81aa41670922daf0a46679aae9c9f9a8e6f0073bcd1a87da04d10a946cb60359f21713aefcee2fa906f11c9f2fa1e70cd95f78aafd9eb0
+DIST nagios-check_dane-1.1.tar.gz 17052 BLAKE2B c9a0bab7464df2967e8ff95bc8b3a1a9fb4dc4be6b48dfe8b09f4552ddf69f5b6fd722edb28d735a160ad14d12131b4f1166c9c67717e5733e9b55ad9e4acf3e SHA512 b27675ca62245b93f9bab7a49d307106a9df79e04172eb66258f499ecd3bb455bdace1daeab3feecc98d0f60b11e8b1fbc5f00fff160e75412f5db9bfcca3ac8
diff --git a/net-dns/check_dane/metadata.xml b/net-dns/nagios-check_dane/metadata.xml
similarity index 100%
rename from net-dns/check_dane/metadata.xml
rename to net-dns/nagios-check_dane/metadata.xml
diff --git a/net-dns/check_dane/check_dane-0.1.ebuild b/net-dns/nagios-check_dane/nagios-check_dane-0.1.ebuild
similarity index 77%
rename from net-dns/check_dane/check_dane-0.1.ebuild
rename to net-dns/nagios-check_dane/nagios-check_dane-0.1.ebuild
index 34713bf..1612fd6 100644
--- a/net-dns/check_dane/check_dane-0.1.ebuild
+++ b/net-dns/nagios-check_dane/nagios-check_dane-0.1.ebuild
@@ -3,10 +3,12 @@
 
 EAPI=7
 
+MY_PN=${PN/nagios-/}
+
 DESCRIPTION="Nagios/Icinga plugin for checking DANE/TLSA records"
 HOMEPAGE="https://github.com/debfx/check_dane"
 MY_GITHUB_AUTHOR="debfx"
-SRC_URI="https://github.com/${MY_GITHUB_AUTHOR}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/${MY_GITHUB_AUTHOR}/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -21,6 +23,8 @@ RDEPEND="${DEPEND}
 "
 BDEPEND=""
 
+S="${WORKDIR}/${MY_PN}-${PV}"
+
 src_install() {
 	exeinto /usr/lib64/nagios/plugins/
 	doexe check_dane
diff --git a/net-dns/check_dane/check_dane-1.0.ebuild b/net-dns/nagios-check_dane/nagios-check_dane-1.0.ebuild
similarity index 77%
rename from net-dns/check_dane/check_dane-1.0.ebuild
rename to net-dns/nagios-check_dane/nagios-check_dane-1.0.ebuild
index 34713bf..1612fd6 100644
--- a/net-dns/check_dane/check_dane-1.0.ebuild
+++ b/net-dns/nagios-check_dane/nagios-check_dane-1.0.ebuild
@@ -3,10 +3,12 @@
 
 EAPI=7
 
+MY_PN=${PN/nagios-/}
+
 DESCRIPTION="Nagios/Icinga plugin for checking DANE/TLSA records"
 HOMEPAGE="https://github.com/debfx/check_dane"
 MY_GITHUB_AUTHOR="debfx"
-SRC_URI="https://github.com/${MY_GITHUB_AUTHOR}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/${MY_GITHUB_AUTHOR}/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -21,6 +23,8 @@ RDEPEND="${DEPEND}
 "
 BDEPEND=""
 
+S="${WORKDIR}/${MY_PN}-${PV}"
+
 src_install() {
 	exeinto /usr/lib64/nagios/plugins/
 	doexe check_dane
diff --git a/net-dns/check_dane/check_dane-1.1.ebuild b/net-dns/nagios-check_dane/nagios-check_dane-1.1.ebuild
similarity index 77%
rename from net-dns/check_dane/check_dane-1.1.ebuild
rename to net-dns/nagios-check_dane/nagios-check_dane-1.1.ebuild
index 34713bf..1612fd6 100644
--- a/net-dns/check_dane/check_dane-1.1.ebuild
+++ b/net-dns/nagios-check_dane/nagios-check_dane-1.1.ebuild
@@ -3,10 +3,12 @@
 
 EAPI=7
 
+MY_PN=${PN/nagios-/}
+
 DESCRIPTION="Nagios/Icinga plugin for checking DANE/TLSA records"
 HOMEPAGE="https://github.com/debfx/check_dane"
 MY_GITHUB_AUTHOR="debfx"
-SRC_URI="https://github.com/${MY_GITHUB_AUTHOR}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/${MY_GITHUB_AUTHOR}/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -21,6 +23,8 @@ RDEPEND="${DEPEND}
 "
 BDEPEND=""
 
+S="${WORKDIR}/${MY_PN}-${PV}"
+
 src_install() {
 	exeinto /usr/lib64/nagios/plugins/
 	doexe check_dane