diff --git a/v3etcdctl/command/delete_range_command.go b/etcdctlv3/command/delete_range_command.go
similarity index 100%
rename from v3etcdctl/command/delete_range_command.go
rename to etcdctlv3/command/delete_range_command.go
diff --git a/v3etcdctl/command/put_command.go b/etcdctlv3/command/put_command.go
similarity index 100%
rename from v3etcdctl/command/put_command.go
rename to etcdctlv3/command/put_command.go
diff --git a/v3etcdctl/command/range_command.go b/etcdctlv3/command/range_command.go
similarity index 100%
rename from v3etcdctl/command/range_command.go
rename to etcdctlv3/command/range_command.go
diff --git a/v3etcdctl/main.go b/etcdctlv3/main.go
similarity index 93%
rename from v3etcdctl/main.go
rename to etcdctlv3/main.go
index acbcd8c2d..bf7a5d07b 100644
--- a/v3etcdctl/main.go
+++ b/etcdctlv3/main.go
@@ -18,13 +18,13 @@ import (
 	"os"
 
 	"github.com/coreos/etcd/Godeps/_workspace/src/github.com/codegangsta/cli"
-	"github.com/coreos/etcd/v3etcdctl/command"
+	"github.com/coreos/etcd/etcdctlv3/command"
 	"github.com/coreos/etcd/version"
 )
 
 func main() {
 	app := cli.NewApp()
-	app.Name = "v3etcdctl"
+	app.Name = "etcdctlv3"
 	app.Version = version.Version
 	app.Usage = "A simple command line client for etcd3."
 	app.Commands = []cli.Command{