diff --git a/cluster/gce/coreos/helper.sh b/cluster/gce/coreos/helper.sh
index dbf9a46a068..5ef057acf4a 100755
--- a/cluster/gce/coreos/helper.sh
+++ b/cluster/gce/coreos/helper.sh
@@ -139,8 +139,8 @@ function create-master-instance {
 
 # TODO(dawnchen): Check $CONTAINER_RUNTIME to decide which
 # cloud_config yaml file should be passed
-# TODO(mbforbes): Make $1 required.
-# TODO(mbforbes): Document required vars (for this and call chain).
+# TODO(zmerlynn): Make $1 required.
+# TODO(zmerlynn): Document required vars (for this and call chain).
 # $1 version
 function create-node-instance-template {
   local suffix=""
diff --git a/cluster/gce/debian/helper.sh b/cluster/gce/debian/helper.sh
index f58876ec62c..6b929c2d9ee 100755
--- a/cluster/gce/debian/helper.sh
+++ b/cluster/gce/debian/helper.sh
@@ -152,8 +152,8 @@ function create-master-instance {
     --disk "name=${MASTER_NAME}-pd,device-name=master-pd,mode=rw,boot=no,auto-delete=no"
 }
 
-# TODO(mbforbes): Make $1 required.
-# TODO(mbforbes): Document required vars (for this and call chain).
+# TODO(zmerlynn): Make $1 required.
+# TODO(zmerlynn): Document required vars (for this and call chain).
 # $1 version
 function create-node-instance-template {
   local suffix=""
diff --git a/cluster/gce/upgrade.sh b/cluster/gce/upgrade.sh
index 58719511826..549971e4699 100755
--- a/cluster/gce/upgrade.sh
+++ b/cluster/gce/upgrade.sh
@@ -119,7 +119,7 @@ function prepare-upgrade() {
 #   PROJECT
 #   ZONE
 function get-node-env() {
-  # TODO(mbforbes): Make this more reliable with retries.
+  # TODO(zmerlynn): Make this more reliable with retries.
   gcloud compute --project ${PROJECT} ssh --zone ${ZONE} ${MINION_NAMES[0]} --command \
     "curl --fail --silent -H 'Metadata-Flavor: Google' \
       'http://metadata/computeMetadata/v1/instance/attributes/kube-env'" 2>/dev/null
@@ -177,7 +177,7 @@ function prepare-node-upgrade() {
 
   detect-minion-names
 
-  # TODO(mbforbes): Refactor setting scope flags.
+  # TODO(zmerlynn): Refactor setting scope flags.
   local scope_flags=
   if [ -n "${MINION_SCOPES}" ]; then
     scope_flags="--scopes ${MINION_SCOPES}"
@@ -194,11 +194,11 @@ function prepare-node-upgrade() {
   KUBELET_CERT_BASE64=$(get-env-val "${node_env}" "KUBELET_CERT")
   KUBELET_KEY_BASE64=$(get-env-val "${node_env}" "KUBELET_KEY")
 
-  # TODO(mbforbes): How do we ensure kube-env is written in a ${version}-
+  # TODO(zmerlynn): How do we ensure kube-env is written in a ${version}-
   #                 compatible way?
   write-node-env
 
-  # TODO(mbforbes): Get configure-vm script from ${version}. (Must plumb this
+  # TODO(zmerlynn): Get configure-vm script from ${version}. (Must plumb this
   #                 through all create-node-instance-template implementations).
   create-node-instance-template ${SANITIZED_VERSION}
   # The following is echo'd so that callers can get the template name.
@@ -211,9 +211,9 @@ function prepare-node-upgrade() {
 function do-node-upgrade() {
   echo "== Upgrading nodes to ${KUBE_VERSION}. ==" >&2
   # Do the actual upgrade.
-  # NOTE(mbforbes): If you are changing this gcloud command, update
+  # NOTE(zmerlynn): If you are changing this gcloud command, update
   #                 test/e2e/cluster_upgrade.go to match this EXACTLY.
-  # TODO(mbforbes): Remove this hack on July 29, 2015, when the migration to
+  # TODO(zmerlynn): Remove this hack on July 29, 2015, when the migration to
   #                 `gcloud alpha compute rolling-updates` is complete.
   local subgroup="preview"
   local exists=$(gcloud ${subgroup} rolling-updates -h &>/dev/null; echo $?) || true
@@ -231,7 +231,7 @@ function do-node-upgrade() {
       --max-num-failed-instances=0 \
       --min-instance-update-time=0s
 
-  # TODO(mbforbes): Wait for the rolling-update to finish.
+  # TODO(zmerlynn): Wait for the rolling-update to finish.
 
   echo "== Finished upgrading nodes to ${KUBE_VERSION}. ==" >&2
 }
diff --git a/cluster/gce/util.sh b/cluster/gce/util.sh
index de4983d62f3..4f81d24a317 100755
--- a/cluster/gce/util.sh
+++ b/cluster/gce/util.sh
@@ -354,7 +354,7 @@ function create-node-template {
   detect-project
 
   # First, ensure the template doesn't exist.
-  # TODO(mbforbes): To make this really robust, we need to parse the output and
+  # TODO(zmerlynn): To make this really robust, we need to parse the output and
   #                 add retries. Just relying on a non-zero exit code doesn't
   #                 distinguish an ephemeral failed call from a "not-exists".
   if gcloud compute instance-templates describe "$1" --project "${PROJECT}" &>/dev/null; then
@@ -653,7 +653,7 @@ function kube-up {
 
   echo "Creating minions."
 
-  # TODO(mbforbes): Refactor setting scope flags.
+  # TODO(zmerlynn): Refactor setting scope flags.
   local scope_flags=
   if [ -n "${MINION_SCOPES}" ]; then
     scope_flags="--scopes ${MINION_SCOPES}"
@@ -1015,7 +1015,7 @@ function prepare-push() {
   if [[ "${1-}" == "true" ]]; then
     write-node-env
 
-    # TODO(mbforbes): Refactor setting scope flags.
+    # TODO(zmerlynn): Refactor setting scope flags.
     local scope_flags=
     if [ -n "${MINION_SCOPES}" ]; then
       scope_flags="--scopes ${MINION_SCOPES}"
diff --git a/test/e2e/cluster_upgrade.go b/test/e2e/cluster_upgrade.go
index 364401f9a8f..108f93b4579 100644
--- a/test/e2e/cluster_upgrade.go
+++ b/test/e2e/cluster_upgrade.go
@@ -133,7 +133,7 @@ func masterUpgradeGKE(v string) error {
 }
 
 var masterPush = func(_ string) error {
-	// TODO(mbforbes): Make master push use the provided version.
+	// TODO(mikedanese): Make master push use the provided version.
 	_, _, err := runCmd(path.Join(testContext.RepoRoot, "hack/e2e-internal/e2e-push.sh"), "-m")
 	return err
 }
@@ -233,7 +233,7 @@ var _ = Describe("Skipped", func() {
 			}
 			testLoadBalancerReachable(ingress, 80)
 
-			// TODO(mbforbes): Add setup, validate, and teardown for:
+			// TODO(mikedanese): Add setup, validate, and teardown for:
 			//  - secrets
 			//  - volumes
 			//  - persistent volumes
@@ -485,7 +485,7 @@ func validate(f Framework, svcNameWant, rcNameWant string, ingress api.LoadBalan
 	if svcNameWant != svc.Name {
 		return fmt.Errorf("wanted service name %q, got %q", svcNameWant, svc.Name)
 	}
-	// TODO(mbforbes): Make testLoadBalancerReachable return an error.
+	// TODO(mikedanese): Make testLoadBalancerReachable return an error.
 	testLoadBalancerReachable(ingress, 80)
 
 	Logf("Cluster validation succeeded")
@@ -517,7 +517,7 @@ func migTemplate() (string, error) {
 	var templ string
 	key := "instanceTemplate"
 	if wait.Poll(poll, singleCallTimeout, func() (bool, error) {
-		// TODO(mbforbes): make this hit the compute API directly instead of
+		// TODO(mikedanese): make this hit the compute API directly instead of
 		// shelling out to gcloud.
 		// An `instance-groups managed describe` call outputs what we want to stdout.
 		output, _, err := retryCmd("gcloud", "compute", "instance-groups", "managed",
@@ -555,9 +555,9 @@ func migRollingUpdateStart(templ string, nt time.Duration) (string, error) {
 	var id string
 	prefix, suffix := "Started [", "]."
 	if err := wait.Poll(poll, singleCallTimeout, func() (bool, error) {
-		// TODO(mbforbes): make this hit the compute API directly instead of
+		// TODO(mikedanese): make this hit the compute API directly instead of
 		//                 shelling out to gcloud.
-		// NOTE(mbforbes): If you are changing this gcloud command, update
+		// NOTE(mikedanese): If you are changing this gcloud command, update
 		//                 cluster/gce/upgrade.sh to match this EXACTLY.
 		// A `rolling-updates start` call outputs what we want to stderr.
 		_, output, err := retryCmd("gcloud", append(migUdpateCmdBase(),
@@ -610,7 +610,7 @@ func migRollingUpdateStart(templ string, nt time.Duration) (string, error) {
 //
 //   {"alpha", "compute"}
 //
-// TODO(mbforbes): Remove this hack on July 29, 2015 when the migration to
+// TODO(mikedanese): Remove this hack on July 29, 2015 when the migration to
 //                 `gcloud alpha compute rolling-updates` is complete.
 func migUdpateCmdBase() []string {
 	b := []string{"preview"}
diff --git a/test/e2e/reboot.go b/test/e2e/reboot.go
index d9b55ba9f55..13cd85ff09d 100644
--- a/test/e2e/reboot.go
+++ b/test/e2e/reboot.go
@@ -112,7 +112,7 @@ func testReboot(c *client.Client, rebootCmd string) {
 
 	// Wait for all to finish and check the final result.
 	failed := false
-	// TODO(mbforbes): Change to `for range` syntax and remove logging once
+	// TODO(a-robinson): Change to `for range` syntax and remove logging once
 	// we support only Go >= 1.4.
 	for _, n := range nodelist.Items {
 		if !<-result {
diff --git a/test/e2e/restart.go b/test/e2e/restart.go
index 2708ee9479a..3ee924231df 100644
--- a/test/e2e/restart.go
+++ b/test/e2e/restart.go
@@ -221,7 +221,7 @@ func restartNodes(provider string, nt time.Duration) error {
 	}
 }
 
-// TODO(mbforbes): Switch this to MIG recreate-instances. This can be done
+// TODO(marekbiskup): Switch this to MIG recreate-instances. This can be done
 // with the following bash, but needs to be written in Go:
 //
 //   # Step 1: Get instance names.
diff --git a/test/e2e/service.go b/test/e2e/service.go
index c0bd456c612..f6b054b645a 100644
--- a/test/e2e/service.go
+++ b/test/e2e/service.go
@@ -1533,7 +1533,7 @@ func (t *WebserverTest) Cleanup() []error {
 		if _, err := t.Client.ReplicationControllers(t.Namespace).Update(old); err != nil {
 			errs = append(errs, err)
 		}
-		// TODO(mbforbes): Wait.
+		// TODO(mikedanese): Wait.
 
 		// Then, delete the RC altogether.
 		if err := t.Client.ReplicationControllers(t.Namespace).Delete(rcName); err != nil {
diff --git a/test/e2e/util.go b/test/e2e/util.go
index 1cf2d08ce20..1f6e96f0677 100644
--- a/test/e2e/util.go
+++ b/test/e2e/util.go
@@ -1585,7 +1585,7 @@ func NodeSSHHosts(c *client.Client) ([]string, error) {
 		for _, addr := range n.Status.Addresses {
 			// Use the first external IP address we find on the node, and
 			// use at most one per node.
-			// TODO(mbforbes): Use the "preferred" address for the node, once
+			// TODO(roberthbailey): Use the "preferred" address for the node, once
 			// such a thing is defined (#2462).
 			if addr.Type == api.NodeExternalIP {
 				hosts = append(hosts, addr.Address+":22")
@@ -1680,7 +1680,7 @@ func checkPodsRunningReady(c *client.Client, ns string, podNames []string, timeo
 	}
 	// Wait for them all to finish.
 	success := true
-	// TODO(mbforbes): Change to `for range` syntax and remove logging once we
+	// TODO(a-robinson): Change to `for range` syntax and remove logging once we
 	// support only Go >= 1.4.
 	for _, podName := range podNames {
 		if !<-result {