diff --git a/container.go b/container.go
index dfa19ab0c..9ee91a4c5 100644
--- a/container.go
+++ b/container.go
@@ -1119,7 +1119,7 @@ func (container *Container) releaseNetwork() {
 	container.NetworkSettings = &NetworkSettings{}
 }
 
-// FIXME: replace this with a control socket within docker-init
+// FIXME: replace this with a control socket within dockerinit
 func (container *Container) waitLxc() error {
 	for {
 		output, err := exec.Command("lxc-info", "-n", container.ID).CombinedOutput()
diff --git a/docker-init/docker-init.go b/dockerinit/dockerinit.go
similarity index 100%
rename from docker-init/docker-init.go
rename to dockerinit/dockerinit.go
diff --git a/lxc_template.go b/lxc_template.go
index 37232a89d..382c16029 100644
--- a/lxc_template.go
+++ b/lxc_template.go
@@ -94,7 +94,7 @@ lxc.mount.entry = devpts {{$ROOTFS}}/dev/pts devpts newinstance,ptmxmode=0666,no
 #lxc.mount.entry = varlock {{$ROOTFS}}/var/lock tmpfs size=1024k,nosuid,nodev,noexec 0 0
 lxc.mount.entry = shm {{$ROOTFS}}/dev/shm tmpfs size=65536k,nosuid,nodev,noexec 0 0
 
-# Inject docker-init
+# Inject dockerinit
 lxc.mount.entry = {{.SysInitPath}} {{$ROOTFS}}/.dockerinit none bind,ro 0 0
 
 # In order to get a working DNS environment, mount bind (ro) the host's /etc/resolv.conf into the container
diff --git a/sysinit/sysinit.go b/sysinit/sysinit.go
index cc1673c8c..a37db7242 100644
--- a/sysinit/sysinit.go
+++ b/sysinit/sysinit.go
@@ -97,7 +97,7 @@ func executeProgram(name string, args []string) {
 // up the environment before running the actual process
 func SysInit() {
 	if len(os.Args) <= 1 {
-		fmt.Println("You should not invoke docker-init manually")
+		fmt.Println("You should not invoke dockerinit manually")
 		os.Exit(1)
 	}
 	var u = flag.String("u", "", "username or uid")