diff --git a/tensorflow_graphics/geometry/representation/ray.py b/tensorflow_graphics/geometry/representation/ray.py
index dc51f0d95..a81636009 100644
--- a/tensorflow_graphics/geometry/representation/ray.py
+++ b/tensorflow_graphics/geometry/representation/ray.py
@@ -83,7 +83,7 @@ def triangulate(startpoints, endpoints, weights, name=None):
 
     left_hand_side_list = []
     right_hand_side_list = []
-    # TODO: Replace the inefficient for loop and add comments here.
+    # TODO(b/130892100): Replace the inefficient for loop and add comments here.
     for ray_id in range(weights.shape[-1]):
       weights_single_ray = weights[..., ray_id]
       startpoints_single_ray = startpoints[..., ray_id, :]
@@ -116,7 +116,7 @@ def triangulate(startpoints, endpoints, weights, name=None):
     return points
 
 
-# TODO: Add batch support for radii and return [A1, ... , 3, 2].
+# TODO(b/130893491): Add batch support for radii and return [A1, ... , 3, 2].
 def intersection_ray_sphere(sphere_center,
                             sphere_radius,
                             ray,
diff --git a/tensorflow_graphics/math/interpolation/bspline.py b/tensorflow_graphics/math/interpolation/bspline.py
index 8962a929b..3a5c54a25 100644
--- a/tensorflow_graphics/math/interpolation/bspline.py
+++ b/tensorflow_graphics/math/interpolation/bspline.py
@@ -30,7 +30,7 @@
 from tensorflow_graphics.util import shape
 
 
-# TODO: remove when TF API is
+# TODO(b/131510643): remove when TF API is
 def _mod(x, y):
   return x - tf.cast((x // y) * y, dtype=x.dtype)
 
diff --git a/tensorflow_graphics/notebooks/spherical_harmonics_approximation.ipynb b/tensorflow_graphics/notebooks/spherical_harmonics_approximation.ipynb
index cd0542505..3c4a74369 100644
--- a/tensorflow_graphics/notebooks/spherical_harmonics_approximation.ipynb
+++ b/tensorflow_graphics/notebooks/spherical_harmonics_approximation.ipynb
@@ -568,7 +568,7 @@
         "gt = tf.where(tf.greater(intersection_3d[:, :, 2], 0.0), gt, tf.zeros_like(gt))\n",
         "gt *= factor\n",
         "\n",
-        "# TODO: gt and sh_integration differ by a factor of pi.\n",
+        "# TODO(b/124463095): gt and sh_integration differ by a factor of pi.\n",
         "sh_integration = np.transpose(sh_integration, (1, 0))\n",
         "gt = np.transpose(gt, (1, 0))\n",
         "\n",
diff --git a/tensorflow_graphics/tensorboard/mesh_visualizer/tf_mesh_dashboard/array-buffer-data-provider.js b/tensorflow_graphics/tensorboard/mesh_visualizer/tf_mesh_dashboard/array-buffer-data-provider.js
index 96f1c8e84..b8ce8de0d 100644
--- a/tensorflow_graphics/tensorboard/mesh_visualizer/tf_mesh_dashboard/array-buffer-data-provider.js
+++ b/tensorflow_graphics/tensorboard/mesh_visualizer/tf_mesh_dashboard/array-buffer-data-provider.js
@@ -18,7 +18,7 @@ limitations under the License.
  * receive and parse response.
  */
 
-// TODO: this class must be refactored into base DataProvider and
+// TODO(b/135959734): this class must be refactored into base DataProvider and
 // subclass ArrayBufferDataProvider later.
 var vz_mesh;
 (function(vz_mesh) {
diff --git a/tensorflow_graphics/tensorboard/mesh_visualizer/tf_mesh_dashboard/mesh-viewer.js b/tensorflow_graphics/tensorboard/mesh_visualizer/tf_mesh_dashboard/mesh-viewer.js
index 5776eea5d..f9e616fde 100644
--- a/tensorflow_graphics/tensorboard/mesh_visualizer/tf_mesh_dashboard/mesh-viewer.js
+++ b/tensorflow_graphics/tensorboard/mesh_visualizer/tf_mesh_dashboard/mesh-viewer.js
@@ -34,7 +34,7 @@ class MeshViewer extends THREE.EventDispatcher {
     this._runColor = runColor;
   }
 
-  // TODO replace with some thirdparty library call.
+  // TODO(b/130030314) replace with some thirdparty library call.
   /**
    * Returns true if the specified value is an object.
    * @param {?} val Variable to test.
diff --git a/tensorflow_graphics/util/tests/test_case_test.py b/tensorflow_graphics/util/tests/test_case_test.py
index b1a551b2c..3bca59d8a 100644
--- a/tensorflow_graphics/util/tests/test_case_test.py
+++ b/tensorflow_graphics/util/tests/test_case_test.py
@@ -53,7 +53,7 @@ def test_assert_tf_lite_convertible_exception_not_raised(self, test_inputs):
   @parameterized.parameters(None, (((1.0,),),))
   def test_assert_tf_lite_convertible_exception_raised(self, test_inputs):
     """Tests that assert_tf_lite_convertible succeeds with a simple function."""
-    # TODO: TFLite conversion throws SIGABRT instead of Exception.
+    # TODO(b/131912561): TFLite conversion throws SIGABRT instead of Exception.
     return
     # pylint: disable=unreachable
     # This code should be able to catch exceptions correctly once TFLite bug