diff --git a/contrib/onefuzz-job-github-actions/github-pipeline.yml b/contrib/onefuzz-job-github-actions/github-pipeline.yml
index d0eee29ea..f8c708f38 100644
--- a/contrib/onefuzz-job-github-actions/github-pipeline.yml
+++ b/contrib/onefuzz-job-github-actions/github-pipeline.yml
@@ -47,7 +47,7 @@ jobs:
           # On Windows, this text replacement could instead be implemented via PowerShell.
           sed -i s/INSERT_YOUR_PERSONAL_ACCESS_TOKEN_HERE/${ONEFUZZ_PAT}/ github-issues.json
 
-          onefuzz config --endpoint $ONEFUZZ_ENDPOINT --override_client_id $ONEFUZZ_CLIENT_ID 
+          onefuzz config --endpoint $ONEFUZZ_ENDPOINT --client_id $ONEFUZZ_CLIENT_ID 
           onefuzz --client_secret $ONEFUZZ_CLIENT_SECRET template libfuzzer basic $ONEFUZZ_PROJECT $ONEFUZZ_NAME $GITHUB_SHA $ONEFUZZ_POOL --target_exe fuzz.exe --colocate_all_tasks --duration 1 --vm_count 1 --notification_config @./github-issues.json
         # Default for Linux. Would only need to be specified if `runs-on` == `windows-latest`.
         shell: bash
\ No newline at end of file
diff --git a/src/cli/examples/azure-functions-example/info/__init__.py b/src/cli/examples/azure-functions-example/info/__init__.py
index c134914f6..4de729cda 100644
--- a/src/cli/examples/azure-functions-example/info/__init__.py
+++ b/src/cli/examples/azure-functions-example/info/__init__.py
@@ -13,7 +13,7 @@ def main(req: func.HttpRequest) -> func.HttpResponse:
     o.config(
         endpoint=os.environ.get("ONEFUZZ_ENDPOINT"),
         override_authority=os.environ.get("ONEFUZZ_AUTHORITY"),
-        override_client_id=os.environ.get("ONEFUZZ_CLIENT_ID"),
+        client_id=os.environ.get("ONEFUZZ_CLIENT_ID"),
     )
     info = o.info.get()
     return func.HttpResponse(info.json())
diff --git a/src/cli/onefuzz/api.py b/src/cli/onefuzz/api.py
index 944186b45..cad2f15cb 100644
--- a/src/cli/onefuzz/api.py
+++ b/src/cli/onefuzz/api.py
@@ -1895,7 +1895,7 @@ class Onefuzz:
         self,
         endpoint: Optional[str] = None,
         override_authority: Optional[str] = None,
-        override_client_id: Optional[str] = None,
+        client_id: Optional[str] = None,
         override_tenant_domain: Optional[str] = None,
         enable_feature: Optional[PreviewFeature] = None,
         reset: Optional[bool] = None,
@@ -1922,10 +1922,10 @@ class Onefuzz:
                     "Missing HTTP Authentication"
                 )
             self._backend.config.endpoint = endpoint
+        if client_id is not None:
+            self._backend.config.client_id = client_id
         if override_authority is not None:
             self._backend.config.authority = override_authority
-        if override_client_id is not None:
-            self._backend.config.client_id = override_client_id
         if enable_feature:
             self._backend.enable_feature(enable_feature.name)
         if override_tenant_domain is not None: