diff --git a/classes/obmc-phosphor-py-daemon.bbclass b/classes/obmc-phosphor-py-daemon.bbclass
index 35c2714..9cb8bfd 100644
--- a/classes/obmc-phosphor-py-daemon.bbclass
+++ b/classes/obmc-phosphor-py-daemon.bbclass
@@ -5,13 +5,11 @@
 inherit obmc-phosphor-license
 
 RDEPENDS_${PN} += "python-dbus python-pygobject"
-SRC_URI += " \
-        file://${PN}.py \
-        "
-S = "${WORKDIR}"
+INSTALL_NAME ?= "${PN}"
+SCRIPT_NAME ?= "${INSTALL_NAME}.py"
 
 do_install_append() {
         # install the script
         install -d ${D}${sbindir}
-        install -m 0755 ${WORKDIR}/${PN}.py ${D}${sbindir}/${PN}
+        install -m 0755 ${S}/${SCRIPT_NAME} ${D}${sbindir}/${INSTALL_NAME}
 }
diff --git a/common/recipes-phosphor/obmc-phosphor-chassis/obmc-phosphor-chassisd.bb b/common/recipes-phosphor/obmc-phosphor-chassis/obmc-phosphor-chassisd.bb
index ad642a3..d7a8ed9 100644
--- a/common/recipes-phosphor/obmc-phosphor-chassis/obmc-phosphor-chassisd.bb
+++ b/common/recipes-phosphor/obmc-phosphor-chassis/obmc-phosphor-chassisd.bb
@@ -4,3 +4,6 @@
 
 inherit obmc-phosphor-chassis-mgmt
 inherit obmc-phosphor-pydbus-service
+
+S = "${WORKDIR}"
+SRC_URI += "file://${PN}.py"
diff --git a/common/recipes-phosphor/obmc-phosphor-event/obmc-phosphor-eventd.bb b/common/recipes-phosphor/obmc-phosphor-event/obmc-phosphor-eventd.bb
index 998648c..b5a54da 100644
--- a/common/recipes-phosphor/obmc-phosphor-event/obmc-phosphor-eventd.bb
+++ b/common/recipes-phosphor/obmc-phosphor-event/obmc-phosphor-eventd.bb
@@ -4,3 +4,6 @@
 
 inherit obmc-phosphor-event-mgmt
 inherit obmc-phosphor-pydbus-service
+
+S = "${WORKDIR}"
+SRC_URI += "file://${PN}.py"
diff --git a/common/recipes-phosphor/obmc-phosphor-example-pydbus/obmc-phosphor-example-pydbus.bb b/common/recipes-phosphor/obmc-phosphor-example-pydbus/obmc-phosphor-example-pydbus.bb
index c140c9b..1446a73 100644
--- a/common/recipes-phosphor/obmc-phosphor-example-pydbus/obmc-phosphor-example-pydbus.bb
+++ b/common/recipes-phosphor/obmc-phosphor-example-pydbus/obmc-phosphor-example-pydbus.bb
@@ -11,8 +11,10 @@
 
 client = "pyclient-sample"
 SRC_URI += "file://${client}.py"
+SRC_URI += "file://${PN}.py"
+S = "${WORKDIR}"
 
 do_install_append() {
         install -d ${D}${bindir}
-        install -m 0755 ${WORKDIR}/${client}.py ${D}${bindir}/${client}
+        install -m 0755 ${S}/${client}.py ${D}${bindir}/${client}
 }
diff --git a/common/recipes-phosphor/obmc-phosphor-flash/obmc-phosphor-flashd.bb b/common/recipes-phosphor/obmc-phosphor-flash/obmc-phosphor-flashd.bb
index bd4b1af..6e4c04a 100644
--- a/common/recipes-phosphor/obmc-phosphor-flash/obmc-phosphor-flashd.bb
+++ b/common/recipes-phosphor/obmc-phosphor-flash/obmc-phosphor-flashd.bb
@@ -4,3 +4,6 @@
 
 inherit obmc-phosphor-flash-mgmt
 inherit obmc-phosphor-pydbus-service
+
+S = "${WORKDIR}"
+SRC_URI += "file://${PN}.py"
diff --git a/common/recipes-phosphor/obmc-phosphor-policy/obmc-phosphor-policyd.bb b/common/recipes-phosphor/obmc-phosphor-policy/obmc-phosphor-policyd.bb
index 664760e..05471d5 100644
--- a/common/recipes-phosphor/obmc-phosphor-policy/obmc-phosphor-policyd.bb
+++ b/common/recipes-phosphor/obmc-phosphor-policy/obmc-phosphor-policyd.bb
@@ -4,3 +4,6 @@
 
 inherit obmc-phosphor-policy-mgmt
 inherit obmc-phosphor-pydbus-service
+
+S = "${WORKDIR}"
+SRC_URI += "file://${PN}.py"
diff --git a/common/recipes-phosphor/obmc-phosphor-sensor/obmc-phosphor-sensord.bb b/common/recipes-phosphor/obmc-phosphor-sensor/obmc-phosphor-sensord.bb
index fc646a5..7a82fb5 100644
--- a/common/recipes-phosphor/obmc-phosphor-sensor/obmc-phosphor-sensord.bb
+++ b/common/recipes-phosphor/obmc-phosphor-sensor/obmc-phosphor-sensord.bb
@@ -4,3 +4,6 @@
 
 inherit obmc-phosphor-sensor-mgmt
 inherit obmc-phosphor-pydbus-service
+
+S = "${WORKDIR}"
+SRC_URI += "file://${PN}.py"
diff --git a/common/recipes-phosphor/obmc-phosphor-sys/obmc-phosphor-sysd.bb b/common/recipes-phosphor/obmc-phosphor-sys/obmc-phosphor-sysd.bb
index 3dc9a64..bcb5d32 100644
--- a/common/recipes-phosphor/obmc-phosphor-sys/obmc-phosphor-sysd.bb
+++ b/common/recipes-phosphor/obmc-phosphor-sys/obmc-phosphor-sysd.bb
@@ -4,3 +4,6 @@
 
 inherit obmc-phosphor-system-mgmt
 inherit obmc-phosphor-pydbus-service
+
+S = "${WORKDIR}"
+SRC_URI += "file://${PN}.py"