diff --git a/ui/src/controller/heap_profile_controller.ts b/ui/src/controller/heap_profile_controller.ts
index 4a5d262..f3f23b5 100644
--- a/ui/src/controller/heap_profile_controller.ts
+++ b/ui/src/controller/heap_profile_controller.ts
@@ -82,8 +82,6 @@
 
         const key = `${selectedUpid};${selectedTs}`;
 
-        // TODO(tneda): Prevent lots of flamegraph queries being queued if a
-        // user clicks lots of the markers quickly.
         this.getFlamegraphData(
                 key, lastSelectedViewingOption, selection.ts, selectedUpid)
             .then(flamegraphData => {
@@ -123,7 +121,7 @@
     if (this.flamegraphDatasets.has(key)) {
       currentData = this.flamegraphDatasets.get(key)!;
     } else {
-      // TODO(tneda): Show loading state.
+      // TODO(taylori): Show loading state.
 
       // Collecting data for drawing flamegraph for selected heap profile.
       // Data needs to be in following format:
@@ -203,7 +201,7 @@
         this.tableName(`grouped_callsites_for_flamegraph`);
     // Joining the callsite table with frame table then with alloc table to get
     // the size and name for each callsite.
-    // TODO(tneda): Make frame name nullable in the trace processor for
+    // TODO(taylori): Make frame name nullable in the trace processor for
     // consistency with the other columns.
     await this.args.engine.query(
         `create view if not exists ${tableNameCallsiteNameSize} as
diff --git a/ui/src/controller/record_controller.ts b/ui/src/controller/record_controller.ts
index acfe936..0b1063f 100644
--- a/ui/src/controller/record_controller.ts
+++ b/ui/src/controller/record_controller.ts
@@ -226,7 +226,7 @@
 
   let heapprofd: HeapprofdConfig|undefined = undefined;
   if (uiCfg.heapProfiling) {
-    // TODO(tneda): Check or inform user if buffer size are too small.
+    // TODO(taylori): Check or inform user if buffer size are too small.
     if (heapprofd === undefined) heapprofd = new HeapprofdConfig();
     heapprofd.samplingIntervalBytes = uiCfg.hpSamplingIntervalBytes;
     if (uiCfg.hpSharedMemoryBuffer >= 8192 &&
