diff --git a/cmd/kubeadm/app/cmd/phases/addons.go b/cmd/kubeadm/app/cmd/phases/addons.go
index 4951b23382..26ce873ab9 100644
--- a/cmd/kubeadm/app/cmd/phases/addons.go
+++ b/cmd/kubeadm/app/cmd/phases/addons.go
@@ -39,24 +39,24 @@ import (
 
 var (
 	allAddonsLongDesc = normalizer.LongDesc(`
-		Installs the kube-dns and the kube-proxys addons components via the API server.  
+		Installs the CoreDNS and the kube-proxys addons components via the API server.
 		Please note that although the DNS server is deployed, it will not be scheduled until CNI is installed.
 		` + cmdutil.AlphaDisclaimer)
 
 	allAddonsExample = normalizer.Examples(`
-		# Installs the kube-dns and the kube-proxys addons components via the API server, 
+		# Installs the CoreDNS and the kube-proxys addons components via the API server,
 		# functionally equivalent to what installed by kubeadm init. 
 
 		kubeadm alpha phase selfhosting from-staticpods
 		`)
 
-	kubednsAddonsLongDesc = normalizer.LongDesc(`
-		Installs the kube-dns addon components via the API server.  
+	corednsAddonsLongDesc = normalizer.LongDesc(`
+		Installs the CoreDNS addon components via the API server.
 		Please note that although the DNS server is deployed, it will not be scheduled until CNI is installed.
 		` + cmdutil.AlphaDisclaimer)
 
 	kubeproxyAddonsLongDesc = normalizer.LongDesc(`
-		Installs the kube-proxy addon components via the API server.  
+		Installs the kube-proxy addon components via the API server.
 		` + cmdutil.AlphaDisclaimer)
 )
 
@@ -116,9 +116,9 @@ func getAddonsSubCommands() []*cobra.Command {
 			cmdFunc:  EnsureAllAddons,
 		},
 		{
-			use:     "kube-dns",
-			short:   "Installs the kube-dns addon to a Kubernetes cluster",
-			long:    kubednsAddonsLongDesc,
+			use:     "coredns",
+			short:   "Installs the CoreDNS addon to a Kubernetes cluster",
+			long:    corednsAddonsLongDesc,
 			cmdFunc: dnsaddon.EnsureDNSAddon,
 		},
 		{
@@ -151,7 +151,7 @@ func getAddonsSubCommands() []*cobra.Command {
 			cmd.Flags().StringVar(&cfg.Networking.PodSubnet, "pod-network-cidr", cfg.Networking.PodSubnet, `The range of IP addresses used for the Pod network`)
 		}
 
-		if properties.use == "all" || properties.use == "kube-dns" {
+		if properties.use == "all" || properties.use == "coredns" {
 			cmd.Flags().StringVar(&cfg.Networking.DNSDomain, "service-dns-domain", cfg.Networking.DNSDomain, `Alternative domain for services`)
 			cmd.Flags().StringVar(&cfg.Networking.ServiceSubnet, "service-cidr", cfg.Networking.ServiceSubnet, `The range of IP address used for service VIPs`)
 			cmd.Flags().StringVar(&featureGatesString, "feature-gates", featureGatesString, "A set of key=value pairs that describe feature gates for various features."+
diff --git a/cmd/kubeadm/app/cmd/phases/addons_test.go b/cmd/kubeadm/app/cmd/phases/addons_test.go
index e2333ec305..713e7f8dbd 100644
--- a/cmd/kubeadm/app/cmd/phases/addons_test.go
+++ b/cmd/kubeadm/app/cmd/phases/addons_test.go
@@ -56,7 +56,7 @@ func TestAddonsSubCommandsHasFlags(t *testing.T) {
 			},
 		},
 		{
-			command: "kube-dns",
+			command: "coredns",
 			additionalFlags: []string{
 				"service-dns-domain",
 				"service-cidr",
diff --git a/docs/.generated_docs b/docs/.generated_docs
index 4cbec27e77..9192643674 100644
--- a/docs/.generated_docs
+++ b/docs/.generated_docs
@@ -9,7 +9,7 @@ docs/admin/kubeadm_alpha.md
 docs/admin/kubeadm_alpha_phase.md
 docs/admin/kubeadm_alpha_phase_addon.md
 docs/admin/kubeadm_alpha_phase_addon_all.md
-docs/admin/kubeadm_alpha_phase_addon_kube-dns.md
+docs/admin/kubeadm_alpha_phase_addon_coredns.md
 docs/admin/kubeadm_alpha_phase_addon_kube-proxy.md
 docs/admin/kubeadm_alpha_phase_bootstrap-token.md
 docs/admin/kubeadm_alpha_phase_bootstrap-token_all.md
@@ -86,7 +86,7 @@ docs/man/man1/kube-controller-manager.1
 docs/man/man1/kube-proxy.1
 docs/man/man1/kube-scheduler.1
 docs/man/man1/kubeadm-alpha-phase-addon-all.1
-docs/man/man1/kubeadm-alpha-phase-addon-kube-dns.1
+docs/man/man1/kubeadm-alpha-phase-addon-coredns.1
 docs/man/man1/kubeadm-alpha-phase-addon-kube-proxy.1
 docs/man/man1/kubeadm-alpha-phase-addon.1
 docs/man/man1/kubeadm-alpha-phase-bootstrap-token-all.1
diff --git a/docs/admin/kubeadm_alpha_phase_addon_kube-dns.md b/docs/admin/kubeadm_alpha_phase_addon_coredns.md
similarity index 100%
rename from docs/admin/kubeadm_alpha_phase_addon_kube-dns.md
rename to docs/admin/kubeadm_alpha_phase_addon_coredns.md
diff --git a/docs/man/man1/kubeadm-alpha-phase-addon-kube-dns.1 b/docs/man/man1/kubeadm-alpha-phase-addon-coredns.1
similarity index 100%
rename from docs/man/man1/kubeadm-alpha-phase-addon-kube-dns.1
rename to docs/man/man1/kubeadm-alpha-phase-addon-coredns.1