diff --git a/media-sound/teamspeak-server-bin/files/teamspeak3-server-bin.rc b/media-sound/teamspeak-server-bin/files/teamspeak-server-bin.rc
similarity index 100%
rename from media-sound/teamspeak-server-bin/files/teamspeak3-server-bin.rc
rename to media-sound/teamspeak-server-bin/files/teamspeak-server-bin.rc
diff --git a/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.7.2.ebuild b/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.7.2.ebuild
index d8a2c76..489ef1d 100644
--- a/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.7.2.ebuild
+++ b/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.7.2.ebuild
@@ -52,16 +52,16 @@ src_install() {
 	# Install the runtime FS layout.
 	insinto /etc/teamspeak3-server
 	doins "${FILESDIR}/server.conf"
+	keepdir /{etc,var/{lib,log,run}}/teamspeak3-server
 	newins "${dest}/tsdns/tsdns_settings.ini.sample" tsdns_settings.ini
 	dosym "${D}"/etc/teamspeak3-server/tsdns_settings.ini /opt/teamspeak3-server/tsdns/tsdns_settings.ini
 
 	# Install the init script and systemd unit.
-	newinitd "${FILESDIR}/${P}.rc" teamspeak3-server
+	newinitd "${FILESDIR}/${PN}.rc" teamspeak3-server
 	newinitd "${FILESDIR}/teamspeak3-tsdns-server.rc" teamspeak3-tsdns-server
 	systemd_dounit "${FILESDIR}/systemd/teamspeak3.service"
 	systemd_dotmpfilesd "${FILESDIR}/systemd/teamspeak3.conf"
 
-	keepdir /{etc,var/{lib,log,run}}/teamspeak3-server
 	# Fix up permissions.
 	fowners teamspeak3 /{etc,var/{lib,log,run}}/teamspeak3-server
 	fperms 700 /{etc,var/{lib,log,run}}/teamspeak3-server