diff --git a/cloud/api/BUILD.bazel b/cloud/api/BUILD.bazel
index 6d67db5..7d471af 100644
--- a/cloud/api/BUILD.bazel
+++ b/cloud/api/BUILD.bazel
@@ -7,7 +7,7 @@
     name = "api_proto_lint_test",
     except_rules = [
         "PACKAGE_VERSION_SUFFIX",
-        "SERVICE_SUFFIX",  # TODO: evaluate correctness
+        "SERVICE_SUFFIX",
     ],
     protos = [":api_proto"],
     use_rules = [
diff --git a/cloud/bmaas/server/api/BUILD.bazel b/cloud/bmaas/server/api/BUILD.bazel
index 911dbb9..15d649f 100644
--- a/cloud/bmaas/server/api/BUILD.bazel
+++ b/cloud/bmaas/server/api/BUILD.bazel
@@ -9,7 +9,7 @@
         "PACKAGE_VERSION_SUFFIX",
         "RPC_REQUEST_STANDARD_NAME",  # TODO: evaluate correctness
         "RPC_RESPONSE_STANDARD_NAME",  # TODO: evaluate correctness
-        "SERVICE_SUFFIX",  # TODO: evaluate correctness
+        "SERVICE_SUFFIX",
     ],
     protos = [":api_proto"],
     use_rules = [