diff --git a/pkg/kubelet/dockertools/docker.go b/pkg/kubelet/dockertools/docker.go
index b907b6388eb..801b785323f 100644
--- a/pkg/kubelet/dockertools/docker.go
+++ b/pkg/kubelet/dockertools/docker.go
@@ -182,7 +182,7 @@ func (d *dockerContainerCommandRunner) RunInContainer(containerID string, cmd []
 	}
 	errChan := make(chan error, 1)
 	go func() {
-		errChan <- d.client.StartExec(execObj.Id, startOpts)
+		errChan <- d.client.StartExec(execObj.ID, startOpts)
 	}()
 	wrBuf.Flush()
 	return buf.Bytes(), <-errChan
diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go
index f075647de2d..a81cc1a79e5 100644
--- a/pkg/kubelet/kubelet.go
+++ b/pkg/kubelet/kubelet.go
@@ -358,7 +358,7 @@ func makePortsAndBindings(container *api.Container) (map[docker.Port]struct{}, m
 		portBindings[dockerPort] = []docker.PortBinding{
 			{
 				HostPort: strconv.Itoa(exteriorPort),
-				HostIp:   port.HostIP,
+				HostIP:   port.HostIP,
 			},
 		}
 	}
@@ -501,7 +501,7 @@ func (kl *Kubelet) runContainer(pod *api.BoundPod, container *api.Container, pod
 			Hostname:     pod.Name,
 			Image:        container.Image,
 			Memory:       int64(container.Memory),
-			CpuShares:    int64(milliCPUToShares(container.CPU)),
+			CPUShares:    int64(milliCPUToShares(container.CPU)),
 			WorkingDir:   container.WorkingDir,
 		},
 	}
diff --git a/pkg/kubelet/kubelet_test.go b/pkg/kubelet/kubelet_test.go
index 105e256be3f..3fa6e37671a 100644
--- a/pkg/kubelet/kubelet_test.go
+++ b/pkg/kubelet/kubelet_test.go
@@ -895,29 +895,29 @@ func TestMakePortsAndBindings(t *testing.T) {
 			if !reflect.DeepEqual(docker.Port("80/tcp"), key) {
 				t.Errorf("Unexpected docker port: %#v", key)
 			}
-			if value[0].HostIp != "127.0.0.1" {
-				t.Errorf("Unexpected host IP: %s", value[0].HostIp)
+			if value[0].HostIP != "127.0.0.1" {
+				t.Errorf("Unexpected host IP: %s", value[0].HostIP)
 			}
 		case "443":
 			if !reflect.DeepEqual(docker.Port("443/tcp"), key) {
 				t.Errorf("Unexpected docker port: %#v", key)
 			}
-			if value[0].HostIp != "" {
-				t.Errorf("Unexpected host IP: %s", value[0].HostIp)
+			if value[0].HostIP != "" {
+				t.Errorf("Unexpected host IP: %s", value[0].HostIP)
 			}
 		case "444":
 			if !reflect.DeepEqual(docker.Port("444/udp"), key) {
 				t.Errorf("Unexpected docker port: %#v", key)
 			}
-			if value[0].HostIp != "" {
-				t.Errorf("Unexpected host IP: %s", value[0].HostIp)
+			if value[0].HostIP != "" {
+				t.Errorf("Unexpected host IP: %s", value[0].HostIP)
 			}
 		case "445":
 			if !reflect.DeepEqual(docker.Port("445/tcp"), key) {
 				t.Errorf("Unexpected docker port: %#v", key)
 			}
-			if value[0].HostIp != "" {
-				t.Errorf("Unexpected host IP: %s", value[0].HostIp)
+			if value[0].HostIP != "" {
+				t.Errorf("Unexpected host IP: %s", value[0].HostIP)
 			}
 		}
 	}