diff --git a/cmd/hyperkube/kube-scheduler.go b/cmd/hyperkube/kube-scheduler.go
index 6c5faffff95..f27a3f863d2 100644
--- a/cmd/hyperkube/kube-scheduler.go
+++ b/cmd/hyperkube/kube-scheduler.go
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 // CAUTION: If you update code in this file, you may need to also update code
-//          in contrib/mesos/cmd/km/k8sm-mesos_scheduler.go
+//          in contrib/mesos/cmd/km/k8sm-scheduler.go
 package main
 
 import (
diff --git a/contrib/mesos/cmd/km/k8sm-scheduler.go b/contrib/mesos/cmd/km/k8sm-scheduler.go
index 79b9b3fda37..3904668f4d8 100644
--- a/contrib/mesos/cmd/km/k8sm-scheduler.go
+++ b/contrib/mesos/cmd/km/k8sm-scheduler.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// clone of the upstream cmd/hypercube/k8sm-mesos_scheduler.go
+// clone of the upstream cmd/hypercube/k8sm-scheduler.go
 package main
 
 import (
diff --git a/contrib/mesos/pkg/executor/executor.go b/contrib/mesos/pkg/executor/executor.go
index 0f4d365af62..7d1a078a442 100644
--- a/contrib/mesos/pkg/executor/executor.go
+++ b/contrib/mesos/pkg/executor/executor.go
@@ -475,7 +475,7 @@ func (k *KubernetesMesosExecutor) launchTask(driver bindings.ExecutorDriver, tas
 	// TODO(k8s): use Pods interface for binding once clusters are upgraded
 	// return b.Pods(binding.Namespace).Bind(binding)
 	if pod.Spec.NodeName == "" {
-		//HACK(jdef): cloned binding construction from k8s plugin/pkg/scheduler/mesos_scheduler.go
+		//HACK(jdef): cloned binding construction from k8s plugin/pkg/scheduler/scheduler.go
 		binding := &api.Binding{
 			ObjectMeta: api.ObjectMeta{
 				Namespace:   pod.Namespace,
@@ -780,7 +780,7 @@ func (k *KubernetesMesosExecutor) FrameworkMessage(driver bindings.ExecutorDrive
 	}
 
 	log.Infof("Receives message from framework %v\n", message)
-	//TODO(jdef) master reported a lost task, reconcile this! @see mesos_scheduler.go:handleTaskLost
+	//TODO(jdef) master reported a lost task, reconcile this! @see scheduler.go:handleTaskLost
 	if strings.HasPrefix(message, messages.TaskLost+":") {
 		taskId := message[len(messages.TaskLost)+1:]
 		if taskId != "" {
diff --git a/contrib/mesos/pkg/scheduler/mesosframework.go b/contrib/mesos/pkg/scheduler/framework.go
similarity index 100%
rename from contrib/mesos/pkg/scheduler/mesosframework.go
rename to contrib/mesos/pkg/scheduler/framework.go
diff --git a/contrib/mesos/pkg/scheduler/plugin.go b/contrib/mesos/pkg/scheduler/plugin.go
index 6cb89ee5f0e..a906e90ce4d 100644
--- a/contrib/mesos/pkg/scheduler/plugin.go
+++ b/contrib/mesos/pkg/scheduler/plugin.go
@@ -196,7 +196,7 @@ func (s *schedulerPlugin) Run(done <-chan struct{}) {
 	go runtime.Until(s.scheduleOne, pluginRecoveryDelay, done)
 }
 
-// hacked from GoogleCloudPlatform/kubernetes/plugin/pkg/scheduler/mesos_scheduler.go,
+// hacked from GoogleCloudPlatform/kubernetes/plugin/pkg/scheduler/scheduler.go,
 // with the Modeler stuff removed since we don't use it because we have mesos.
 func (s *schedulerPlugin) scheduleOne() {
 	pod := s.config.NextPod()
diff --git a/contrib/mesos/pkg/scheduler/mesos_scheduler.go b/contrib/mesos/pkg/scheduler/scheduler.go
similarity index 100%
rename from contrib/mesos/pkg/scheduler/mesos_scheduler.go
rename to contrib/mesos/pkg/scheduler/scheduler.go
diff --git a/contrib/mesos/pkg/scheduler/mesos_scheduler_mock.go b/contrib/mesos/pkg/scheduler/scheduler_mock.go
similarity index 100%
rename from contrib/mesos/pkg/scheduler/mesos_scheduler_mock.go
rename to contrib/mesos/pkg/scheduler/scheduler_mock.go
diff --git a/contrib/mesos/pkg/scheduler/mesos_scheduler_test.go b/contrib/mesos/pkg/scheduler/scheduler_test.go
similarity index 100%
rename from contrib/mesos/pkg/scheduler/mesos_scheduler_test.go
rename to contrib/mesos/pkg/scheduler/scheduler_test.go