diff --git a/nsinit/create.go b/namespaces/create.go
similarity index 92%
rename from nsinit/create.go
rename to namespaces/create.go
index d5cba464..60b2a2db 100644
--- a/nsinit/create.go
+++ b/namespaces/create.go
@@ -1,4 +1,4 @@
-package nsinit
+package namespaces
 
 import (
 	"os"
diff --git a/nsinit/exec.go b/namespaces/exec.go
similarity index 99%
rename from nsinit/exec.go
rename to namespaces/exec.go
index f266303f..288205ea 100644
--- a/nsinit/exec.go
+++ b/namespaces/exec.go
@@ -1,6 +1,6 @@
 // +build linux
 
-package nsinit
+package namespaces
 
 import (
 	"os"
diff --git a/nsinit/execin.go b/namespaces/execin.go
similarity index 99%
rename from nsinit/execin.go
rename to namespaces/execin.go
index 40b95093..09bf4058 100644
--- a/nsinit/execin.go
+++ b/namespaces/execin.go
@@ -1,6 +1,6 @@
 // +build linux
 
-package nsinit
+package namespaces
 
 import (
 	"fmt"
diff --git a/nsinit/init.go b/namespaces/init.go
similarity index 99%
rename from nsinit/init.go
rename to namespaces/init.go
index dc983161..b53c5666 100644
--- a/nsinit/init.go
+++ b/namespaces/init.go
@@ -1,6 +1,6 @@
 // +build linux
 
-package nsinit
+package namespaces
 
 import (
 	"fmt"
diff --git a/nsinit/pid.go b/namespaces/pid.go
similarity index 97%
rename from nsinit/pid.go
rename to namespaces/pid.go
index bba2f10e..8d97ec14 100644
--- a/nsinit/pid.go
+++ b/namespaces/pid.go
@@ -1,4 +1,4 @@
-package nsinit
+package namespaces
 
 import (
 	"fmt"
diff --git a/nsinit/std_term.go b/namespaces/std_term.go
similarity index 97%
rename from nsinit/std_term.go
rename to namespaces/std_term.go
index 2b8201a7..324336af 100644
--- a/nsinit/std_term.go
+++ b/namespaces/std_term.go
@@ -1,4 +1,4 @@
-package nsinit
+package namespaces
 
 import (
 	"io"
diff --git a/nsinit/sync_pipe.go b/namespaces/sync_pipe.go
similarity index 98%
rename from nsinit/sync_pipe.go
rename to namespaces/sync_pipe.go
index d0bfdda8..e12ed447 100644
--- a/nsinit/sync_pipe.go
+++ b/namespaces/sync_pipe.go
@@ -1,4 +1,4 @@
-package nsinit
+package namespaces
 
 import (
 	"encoding/json"
diff --git a/nsinit/term.go b/namespaces/term.go
similarity index 95%
rename from nsinit/term.go
rename to namespaces/term.go
index 5fc801ab..2a50bf85 100644
--- a/nsinit/term.go
+++ b/namespaces/term.go
@@ -1,4 +1,4 @@
-package nsinit
+package namespaces
 
 import (
 	"io"
diff --git a/nsinit/tty_term.go b/namespaces/tty_term.go
similarity index 98%
rename from nsinit/tty_term.go
rename to namespaces/tty_term.go
index fc6e1ab4..272cf2cd 100644
--- a/nsinit/tty_term.go
+++ b/namespaces/tty_term.go
@@ -1,4 +1,4 @@
-package nsinit
+package namespaces
 
 import (
 	"io"
diff --git a/nsinit/unsupported.go b/namespaces/unsupported.go
similarity index 97%
rename from nsinit/unsupported.go
rename to namespaces/unsupported.go
index 51509f79..b459b4d2 100644
--- a/nsinit/unsupported.go
+++ b/namespaces/unsupported.go
@@ -1,6 +1,6 @@
 // +build !linux
 
-package nsinit
+package namespaces
 
 import (
 	"github.com/dotcloud/docker/pkg/libcontainer"
diff --git a/nsinit/nsinit/main.go b/nsinit/main.go
similarity index 83%
rename from nsinit/nsinit/main.go
rename to nsinit/main.go
index 5d968375..6659a131 100644
--- a/nsinit/nsinit/main.go
+++ b/nsinit/main.go
@@ -13,7 +13,7 @@ import (
 
 	"github.com/dotcloud/docker/pkg/libcontainer"
 	"github.com/dotcloud/docker/pkg/libcontainer/cgroups/fs"
-	"github.com/dotcloud/docker/pkg/libcontainer/nsinit"
+	"github.com/dotcloud/docker/pkg/libcontainer/namespaces"
 )
 
 var (
@@ -40,9 +40,9 @@ func main() {
 		}
 
 		if nspid > 0 {
-			exitCode, err = nsinit.ExecIn(container, nspid, os.Args[2:])
+			exitCode, err = namespaces.ExecIn(container, nspid, os.Args[2:])
 		} else {
-			term := nsinit.NewTerminal(os.Stdin, os.Stdout, os.Stderr, container.Tty)
+			term := namespaces.NewTerminal(os.Stdin, os.Stdout, os.Stderr, container.Tty)
 			exitCode, err = startContainer(container, term, dataPath, os.Args[2:])
 		}
 
@@ -61,12 +61,12 @@ func main() {
 		if err != nil {
 			log.Fatal(err)
 		}
-		syncPipe, err := nsinit.NewSyncPipeFromFd(0, uintptr(pipeFd))
+		syncPipe, err := namespaces.NewSyncPipeFromFd(0, uintptr(pipeFd))
 		if err != nil {
 			log.Fatalf("unable to create sync pipe: %s", err)
 		}
 
-		if err := nsinit.Init(container, rootfs, console, syncPipe, os.Args[2:]); err != nil {
+		if err := namespaces.Init(container, rootfs, console, syncPipe, os.Args[2:]); err != nil {
 			log.Fatalf("unable to initialize for container: %s", err)
 		}
 	case "stats":
@@ -124,7 +124,7 @@ func readPid() (int, error) {
 // error.
 //
 // Signals sent to the current process will be forwarded to container.
-func startContainer(container *libcontainer.Container, term nsinit.Terminal, dataPath string, args []string) (int, error) {
+func startContainer(container *libcontainer.Container, term namespaces.Terminal, dataPath string, args []string) (int, error) {
 	var (
 		cmd  *exec.Cmd
 		sigc = make(chan os.Signal, 10)
@@ -133,7 +133,7 @@ func startContainer(container *libcontainer.Container, term nsinit.Terminal, dat
 	signal.Notify(sigc)
 
 	createCommand := func(container *libcontainer.Container, console, rootfs, dataPath, init string, pipe *os.File, args []string) *exec.Cmd {
-		cmd = nsinit.DefaultCreateCommand(container, console, rootfs, dataPath, init, pipe, args)
+		cmd = namespaces.DefaultCreateCommand(container, console, rootfs, dataPath, init, pipe, args)
 		return cmd
 	}
 
@@ -145,7 +145,7 @@ func startContainer(container *libcontainer.Container, term nsinit.Terminal, dat
 		}()
 	}
 
-	return nsinit.Exec(container, term, "", dataPath, args, createCommand, startCallback)
+	return namespaces.Exec(container, term, "", dataPath, args, createCommand, startCallback)
 }
 
 // returns the container stats in json format.