diff --git a/cloudinit/ssh_key.go b/cloudinit/ssh_key.go
index fb89219..598bd01 100644
--- a/cloudinit/ssh_key.go
+++ b/cloudinit/ssh_key.go
@@ -19,7 +19,7 @@ func AuthorizeSSHKeys(keys []string) error {
 	// also ends with a newline
 	joined := fmt.Sprintf("%s\n", strings.Join(keys, "\n"))
 
-	cmd := exec.Command("update-ssh-keys", "-u", "core", "-a", "coreos-init")
+	cmd := exec.Command("update-ssh-keys", "-u", "core", "-a", "coreos-cloudinit")
 	stdin, err := cmd.StdinPipe()
 	if err != nil {
 		return err
diff --git a/cloudinit/systemd.go b/cloudinit/systemd.go
index 2b14a04..e7c5f7e 100644
--- a/cloudinit/systemd.go
+++ b/cloudinit/systemd.go
@@ -22,12 +22,12 @@ func StartUnit(name string) error {
 
 func ExecuteScript(scriptPath string) error {
 	props := []dbus.Property{
-		dbus.PropDescription("Unit generated and executed by coreos-init on behalf of user"),
+		dbus.PropDescription("Unit generated and executed by coreos-cloudinit on behalf of user"),
 		dbus.PropExecStart([]string{"/bin/bash", scriptPath}, false),
 	}
 
 	base := path.Base(scriptPath)
-	name := fmt.Sprintf("coreos-init-%s.service", base)
+	name := fmt.Sprintf("coreos-cloudinit-%s.service", base)
 
 	log.Printf("Creating transient systemd unit '%s'", name)