diff --git a/cmd/kubeadm/app/cmd/phases/kubeconfig.go b/cmd/kubeadm/app/cmd/phases/kubeconfig.go
index af38df0c449..47583e3fbed 100644
--- a/cmd/kubeadm/app/cmd/phases/kubeconfig.go
+++ b/cmd/kubeadm/app/cmd/phases/kubeconfig.go
@@ -40,7 +40,7 @@ func NewCmdKubeConfig(out io.Writer) *cobra.Command {
 }
 
 func NewCmdToken(out io.Writer) *cobra.Command {
-	config := &kubeconfigphase.KubeConfigProperties{
+	config := &kubeconfigphase.BuildConfigProperties{
 		MakeClientCerts: false,
 	}
 	cmd := &cobra.Command{
@@ -57,7 +57,7 @@ func NewCmdToken(out io.Writer) *cobra.Command {
 }
 
 func NewCmdClientCerts(out io.Writer) *cobra.Command {
-	config := &kubeconfigphase.KubeConfigProperties{
+	config := &kubeconfigphase.BuildConfigProperties{
 		MakeClientCerts: true,
 	}
 	cmd := &cobra.Command{
@@ -73,13 +73,13 @@ func NewCmdClientCerts(out io.Writer) *cobra.Command {
 	return cmd
 }
 
-func addCommonFlags(cmd *cobra.Command, config *kubeconfigphase.KubeConfigProperties) {
+func addCommonFlags(cmd *cobra.Command, config *kubeconfigphase.BuildConfigProperties) {
 	cmd.Flags().StringVar(&config.CertDir, "cert-dir", kubeadmconstants.DefaultCertDir, "The path to the directory where the certificates are.")
 	cmd.Flags().StringVar(&config.ClientName, "client-name", "", "The name of the client for which the KubeConfig file will be generated.")
 	cmd.Flags().StringVar(&config.APIServer, "server", "", "The location of the api server.")
 }
 
-func validateCommonFlags(config *kubeconfigphase.KubeConfigProperties) error {
+func validateCommonFlags(config *kubeconfigphase.BuildConfigProperties) error {
 	if len(config.ClientName) == 0 {
 		return fmt.Errorf("The --client-name flag is required")
 	}
@@ -90,7 +90,7 @@ func validateCommonFlags(config *kubeconfigphase.KubeConfigProperties) error {
 }
 
 // RunCreateWithToken generates a kubeconfig file from with a token as the authentication mechanism
-func RunCreateWithToken(out io.Writer, config *kubeconfigphase.KubeConfigProperties) error {
+func RunCreateWithToken(out io.Writer, config *kubeconfigphase.BuildConfigProperties) error {
 	if len(config.Token) == 0 {
 		return fmt.Errorf("The --token flag is required")
 	}
@@ -106,7 +106,7 @@ func RunCreateWithToken(out io.Writer, config *kubeconfigphase.KubeConfigPropert
 }
 
 // RunCreateWithClientCerts generates a kubeconfig file from with client certs as the authentication mechanism
-func RunCreateWithClientCerts(out io.Writer, config *kubeconfigphase.KubeConfigProperties) error {
+func RunCreateWithClientCerts(out io.Writer, config *kubeconfigphase.BuildConfigProperties) error {
 	if err := validateCommonFlags(config); err != nil {
 		return err
 	}
diff --git a/cmd/kubeadm/app/phases/kubeconfig/kubeconfig.go b/cmd/kubeadm/app/phases/kubeconfig/kubeconfig.go
index d04879e2a75..652b79e125f 100644
--- a/cmd/kubeadm/app/phases/kubeconfig/kubeconfig.go
+++ b/cmd/kubeadm/app/phases/kubeconfig/kubeconfig.go
@@ -31,7 +31,8 @@ import (
 	kubeconfigutil "k8s.io/kubernetes/cmd/kubeadm/app/util/kubeconfig"
 )
 
-type KubeConfigProperties struct {
+// BuildConfigProperties holds some simple information about how this phase should build the KubeConfig object
+type BuildConfigProperties struct {
 	CertDir         string
 	ClientName      string
 	Organization    []string
@@ -59,7 +60,7 @@ func CreateInitKubeConfigFiles(masterEndpoint, pkiDir, outDir string) error {
 	}
 
 	// Create a lightweight specification for what the files should look like
-	filesToCreateFromSpec := map[string]KubeConfigProperties{
+	filesToCreateFromSpec := map[string]BuildConfigProperties{
 		kubeadmconstants.AdminKubeConfigFileName: {
 			ClientName:      "kubernetes-admin",
 			APIServer:       masterEndpoint,
@@ -105,7 +106,8 @@ func CreateInitKubeConfigFiles(masterEndpoint, pkiDir, outDir string) error {
 	return nil
 }
 
-func GetKubeConfigBytesFromSpec(config KubeConfigProperties) ([]byte, error) {
+// GetKubeConfigBytesFromSpec takes properties how to build a KubeConfig file and then returns the bytes of that file
+func GetKubeConfigBytesFromSpec(config BuildConfigProperties) ([]byte, error) {
 	kubeconfig, err := buildKubeConfig(config)
 	if err != nil {
 		return []byte{}, err
@@ -119,7 +121,7 @@ func GetKubeConfigBytesFromSpec(config KubeConfigProperties) ([]byte, error) {
 }
 
 // buildKubeConfig creates a kubeconfig object from some commonly specified properties in the struct above
-func buildKubeConfig(config KubeConfigProperties) (*clientcmdapi.Config, error) {
+func buildKubeConfig(config BuildConfigProperties) (*clientcmdapi.Config, error) {
 
 	// Try to load ca.crt and ca.key from the PKI directory
 	caCert, caKey, err := pkiutil.TryLoadCertAndKeyFromDisk(config.CertDir, kubeadmconstants.CACertAndKeyBaseName)