diff --git a/pkg/api/types.go b/pkg/api/types.go
index 2a5c550f937..61ac813efe1 100644
--- a/pkg/api/types.go
+++ b/pkg/api/types.go
@@ -156,7 +156,7 @@ type Percentile struct {
 
 // ContainerStats represents statistical information of a container
 type ContainerStats struct {
-	CpuUsagePercentiles    []Percentile `json:"cpu_usage_percentiles,omitempty"`
+	CPUUsagePercentiles    []Percentile `json:"cpu_usage_percentiles,omitempty"`
 	MemoryUsagePercentiles []Percentile `json:"memory_usage_percentiles,omitempty"`
 	MaxMemoryUsage         uint64       `json:"max_memory_usage,omitempty"`
 }
diff --git a/pkg/api/validation.go b/pkg/api/validation.go
index a73373efa97..a29dec05c0d 100644
--- a/pkg/api/validation.go
+++ b/pkg/api/validation.go
@@ -247,6 +247,7 @@ func ValidateManifest(manifest *ContainerManifest) []error {
 	return []error(allErrs)
 }
 
+// ValidateService tests if required fields in the service are set.
 func ValidateService(service *Service) []error {
 	allErrs := errorList{}
 	if service.ID == "" {
diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go
index 5bf45fcd0c8..ac4ab99ef47 100644
--- a/pkg/kubelet/kubelet.go
+++ b/pkg/kubelet/kubelet.go
@@ -963,7 +963,7 @@ func (kl *Kubelet) statsFromContainerPath(containerPath string) (*api.ContainerS
 			percentiles[i].Percentage = p.Percentage
 			percentiles[i].Value = p.Value
 		}
-		ret.CpuUsagePercentiles = percentiles
+		ret.CPUUsagePercentiles = percentiles
 	}
 	if len(info.StatsPercentiles.MemoryUsagePercentiles) > 0 {
 		percentiles := make([]api.Percentile, len(info.StatsPercentiles.MemoryUsagePercentiles))
diff --git a/pkg/kubelet/kubelet_server_test.go b/pkg/kubelet/kubelet_server_test.go
index bb00612ba95..38ad6261392 100644
--- a/pkg/kubelet/kubelet_server_test.go
+++ b/pkg/kubelet/kubelet_server_test.go
@@ -150,7 +150,7 @@ func TestContainerStats(t *testing.T) {
 	fw := makeServerTest()
 	expectedStats := &api.ContainerStats{
 		MaxMemoryUsage: 1024001,
-		CpuUsagePercentiles: []api.Percentile{
+		CPUUsagePercentiles: []api.Percentile{
 			{50, 150},
 			{80, 180},
 			{90, 190},
@@ -190,7 +190,7 @@ func TestMachineStats(t *testing.T) {
 	fw := makeServerTest()
 	expectedStats := &api.ContainerStats{
 		MaxMemoryUsage: 1024001,
-		CpuUsagePercentiles: []api.Percentile{
+		CPUUsagePercentiles: []api.Percentile{
 			{50, 150},
 			{80, 180},
 			{90, 190},
diff --git a/pkg/kubelet/kubelet_test.go b/pkg/kubelet/kubelet_test.go
index a3a74381e19..9f9e9a902b7 100644
--- a/pkg/kubelet/kubelet_test.go
+++ b/pkg/kubelet/kubelet_test.go
@@ -966,7 +966,7 @@ func TestGetContainerStats(t *testing.T) {
 				{80, 180},
 				{90, 190},
 			},
-			CpuUsagePercentiles: []info.Percentile{
+			CPUUsagePercentiles: []info.Percentile{
 				{51, 101},
 				{81, 181},
 				{91, 191},
@@ -995,7 +995,7 @@ func TestGetContainerStats(t *testing.T) {
 	if stats.MaxMemoryUsage != containerInfo.StatsPercentiles.MaxMemoryUsage {
 		t.Errorf("wrong max memory usage")
 	}
-	areSamePercentiles(containerInfo.StatsPercentiles.CpuUsagePercentiles, stats.CpuUsagePercentiles, t)
+	areSamePercentiles(containerInfo.StatsPercentiles.CpuUsagePercentiles, stats.CPUUsagePercentiles, t)
 	areSamePercentiles(containerInfo.StatsPercentiles.MemoryUsagePercentiles, stats.MemoryUsagePercentiles, t)
 	mockCadvisor.AssertExpectations(t)
 }
@@ -1036,7 +1036,7 @@ func TestGetMachineStats(t *testing.T) {
 	if stats.MaxMemoryUsage != containerInfo.StatsPercentiles.MaxMemoryUsage {
 		t.Errorf("wrong max memory usage")
 	}
-	areSamePercentiles(containerInfo.StatsPercentiles.CpuUsagePercentiles, stats.CpuUsagePercentiles, t)
+	areSamePercentiles(containerInfo.StatsPercentiles.CpuUsagePercentiles, stats.CPUUsagePercentiles, t)
 	areSamePercentiles(containerInfo.StatsPercentiles.MemoryUsagePercentiles, stats.MemoryUsagePercentiles, t)
 	mockCadvisor.AssertExpectations(t)
 }
@@ -1060,8 +1060,8 @@ func TestGetContainerStatsWithoutCadvisor(t *testing.T) {
 	if stats.MaxMemoryUsage != 0 {
 		t.Errorf("MaxMemoryUsage is %v even if there's no cadvisor", stats.MaxMemoryUsage)
 	}
-	if len(stats.CpuUsagePercentiles) > 0 {
-		t.Errorf("Cpu usage percentiles is not empty (%+v) even if there's no cadvisor", stats.CpuUsagePercentiles)
+	if len(stats.CPUUsagePercentiles) > 0 {
+		t.Errorf("Cpu usage percentiles is not empty (%+v) even if there's no cadvisor", stats.CPUUsagePercentiles)
 	}
 	if len(stats.MemoryUsagePercentiles) > 0 {
 		t.Errorf("Memory usage percentiles is not empty (%+v) even if there's no cadvisor", stats.MemoryUsagePercentiles)