diff --git a/src/google/adk/tools/application_integration_tool/application_integration_toolset.py b/src/google/adk/tools/application_integration_tool/application_integration_toolset.py
index cf5815de..eccaae75 100644
--- a/src/google/adk/tools/application_integration_tool/application_integration_toolset.py
+++ b/src/google/adk/tools/application_integration_tool/application_integration_toolset.py
@@ -134,7 +134,6 @@ class ApplicationIntegrationToolset(BaseToolset):
     self._connection = connection
     self._entity_operations = entity_operations
     self._actions = actions
-    self._tool_name_prefix = tool_name_prefix
     self._tool_instructions = tool_instructions
     self._service_account_json = service_account_json
     self._auth_scheme = auth_scheme
diff --git a/src/google/adk/tools/bigquery/bigquery_toolset.py b/src/google/adk/tools/bigquery/bigquery_toolset.py
index 4b84a270..8ca9223e 100644
--- a/src/google/adk/tools/bigquery/bigquery_toolset.py
+++ b/src/google/adk/tools/bigquery/bigquery_toolset.py
@@ -43,7 +43,7 @@ class BigQueryToolset(BaseToolset):
       credentials_config: Optional[BigQueryCredentialsConfig] = None,
       bigquery_tool_config: Optional[BigQueryToolConfig] = None,
   ):
-    self.tool_filter = tool_filter
+    super().__init__(tool_filter=tool_filter)
     self._credentials_config = credentials_config
     self._tool_settings = (
         bigquery_tool_config if bigquery_tool_config else BigQueryToolConfig()
diff --git a/src/google/adk/tools/google_api_tool/google_api_toolset.py b/src/google/adk/tools/google_api_tool/google_api_toolset.py
index c2c6a130..f7c68909 100644
--- a/src/google/adk/tools/google_api_tool/google_api_toolset.py
+++ b/src/google/adk/tools/google_api_tool/google_api_toolset.py
@@ -47,13 +47,13 @@ class GoogleApiToolset(BaseToolset):
       tool_filter: Optional[Union[ToolPredicate, List[str]]] = None,
       service_account: Optional[ServiceAccount] = None,
   ):
+    super().__init__(tool_filter=tool_filter)
     self.api_name = api_name
     self.api_version = api_version
     self._client_id = client_id
     self._client_secret = client_secret
     self._service_account = service_account
     self._openapi_toolset = self._load_toolset_with_oidc_auth()
-    self.tool_filter = tool_filter
 
   @override
   async def get_tools(
diff --git a/src/google/adk/tools/spanner/spanner_toolset.py b/src/google/adk/tools/spanner/spanner_toolset.py
index 97dfa9a8..859921d1 100644
--- a/src/google/adk/tools/spanner/spanner_toolset.py
+++ b/src/google/adk/tools/spanner/spanner_toolset.py
@@ -44,7 +44,7 @@ class SpannerToolset(BaseToolset):
       credentials_config: Optional[SpannerCredentialsConfig] = None,
       spanner_tool_settings: Optional[SpannerToolSettings] = None,
   ):
-    self.tool_filter = tool_filter
+    super().__init__(tool_filter=tool_filter)
     self._credentials_config = credentials_config
     self._tool_settings = (
         spanner_tool_settings