diff --git a/federation/cmd/federated-apiserver/OWNERS b/federation/cmd/federation-apiserver/OWNERS
similarity index 100%
rename from federation/cmd/federated-apiserver/OWNERS
rename to federation/cmd/federation-apiserver/OWNERS
diff --git a/federation/cmd/federated-apiserver/apiserver.go b/federation/cmd/federation-apiserver/apiserver.go
similarity index 95%
rename from federation/cmd/federated-apiserver/apiserver.go
rename to federation/cmd/federation-apiserver/apiserver.go
index 18e37a7ff85..ff4ef919d40 100644
--- a/federation/cmd/federated-apiserver/apiserver.go
+++ b/federation/cmd/federation-apiserver/apiserver.go
@@ -25,7 +25,7 @@ import (
 	"runtime"
 	"time"
 
-	"k8s.io/kubernetes/federation/cmd/federated-apiserver/app"
+	"k8s.io/kubernetes/federation/cmd/federation-apiserver/app"
 	genericoptions "k8s.io/kubernetes/pkg/genericapiserver/options"
 	"k8s.io/kubernetes/pkg/util"
 	"k8s.io/kubernetes/pkg/util/flag"
diff --git a/federation/cmd/federated-apiserver/app/core.go b/federation/cmd/federation-apiserver/app/core.go
similarity index 100%
rename from federation/cmd/federated-apiserver/app/core.go
rename to federation/cmd/federation-apiserver/app/core.go
diff --git a/federation/cmd/federated-apiserver/app/federation.go b/federation/cmd/federation-apiserver/app/federation.go
similarity index 100%
rename from federation/cmd/federated-apiserver/app/federation.go
rename to federation/cmd/federation-apiserver/app/federation.go
diff --git a/federation/cmd/federated-apiserver/app/plugins.go b/federation/cmd/federation-apiserver/app/plugins.go
similarity index 100%
rename from federation/cmd/federated-apiserver/app/plugins.go
rename to federation/cmd/federation-apiserver/app/plugins.go
diff --git a/federation/cmd/federated-apiserver/app/server.go b/federation/cmd/federation-apiserver/app/server.go
similarity index 99%
rename from federation/cmd/federated-apiserver/app/server.go
rename to federation/cmd/federation-apiserver/app/server.go
index cc04abeeca3..15299a8e167 100644
--- a/federation/cmd/federated-apiserver/app/server.go
+++ b/federation/cmd/federation-apiserver/app/server.go
@@ -42,7 +42,7 @@ func NewAPIServerCommand() *cobra.Command {
 	s := genericoptions.NewServerRunOptions()
 	s.AddFlags(pflag.CommandLine)
 	cmd := &cobra.Command{
-		Use: "federated-apiserver",
+		Use: "federation-apiserver",
 		Long: `The Kubernetes federation API server validates and configures data
 for the api objects which include pods, services, replicationcontrollers, and
 others. The API Server services REST operations and provides the frontend to the
diff --git a/federation/cmd/federated-apiserver/app/server_test.go b/federation/cmd/federation-apiserver/app/server_test.go
similarity index 100%
rename from federation/cmd/federated-apiserver/app/server_test.go
rename to federation/cmd/federation-apiserver/app/server_test.go
diff --git a/hack/lib/golang.sh b/hack/lib/golang.sh
index a7af15c38ff..0ff6e972b20 100755
--- a/hack/lib/golang.sh
+++ b/hack/lib/golang.sh
@@ -37,7 +37,7 @@ kube::golang::server_targets() {
     cmd/kubelet
     cmd/kubemark
     cmd/hyperkube
-    federation/cmd/federated-apiserver
+    federation/cmd/federation-apiserver
     federation/cmd/federation-controller-manager
     plugin/cmd/kube-scheduler
   )