diff --git a/services/server/env/fuchsia/km_apphint.cc b/services/server/env/fuchsia/km_apphint.cc
index 7d09a96..766d582 100644
--- a/services/server/env/fuchsia/km_apphint.cc
+++ b/services/server/env/fuchsia/km_apphint.cc
@@ -174,7 +174,7 @@
 {
 	// AppHints can't be queryed (from outside the driver) or changed, so the callbacks aren't
 	// used.
-	// TODO(MA-589): Implement.
+	// TODO(fxbug.dev/13196): Implement.
 }
 
 void
@@ -187,7 +187,7 @@
 {
 	// AppHints can't be queryed (from outside the driver) or changed, so the callbacks aren't
 	// used.
-	// TODO(MA-589): Implement.
+	// TODO(fxbug.dev/13196): Implement.
 }
 
 void
@@ -200,7 +200,7 @@
 {
 	// AppHints can't be queryed (from outside the driver) or changed, so the callbacks aren't
 	// used.
-	// TODO(MA-589): Implement.
+	// TODO(fxbug.dev/13196): Implement.
 }
 
 void
@@ -213,7 +213,7 @@
 {
 	// AppHints can't be queryed (from outside the driver) or changed, so the callbacks aren't
 	// used.
-	// TODO(MA-589): Implement.
+	// TODO(fxbug.dev/13196): Implement.
 }
 
 /* EOF */
diff --git a/services/server/env/fuchsia/osfunc.cc b/services/server/env/fuchsia/osfunc.cc
index e262b23..00c2a3d 100644
--- a/services/server/env/fuchsia/osfunc.cc
+++ b/services/server/env/fuchsia/osfunc.cc
@@ -981,7 +981,7 @@
 		       OS_DEC_STATS_MEM_REFCOUNT_FUNC *pfnDecMemRefCt,
 		       void *pvData)
 {
-	// TODO(MA-578): Implement.
+	// TODO(fxbug.dev/13185): Implement.
 	NOT_IMPLEMENTED();
 	return new StatisticEntry;
 }