diff --git a/sdk/python/feast/errors.py b/sdk/python/feast/errors.py
index 295c464d77..5eb0ea8422 100644
--- a/sdk/python/feast/errors.py
+++ b/sdk/python/feast/errors.py
@@ -128,7 +128,7 @@ def __init__(self, repo_obj_type: str, specific_issue: str):
 
 class BigQueryJobCancelled(Exception):
     def __init__(self, job_id):
-        super().__init__(f"The following job '{job_id}' got cancelled")
+        super().__init__(f"The BigQuery job with ID '{job_id}' was cancelled")
 
 
 class RedshiftCredentialsError(Exception):
diff --git a/sdk/python/feast/infra/offline_stores/bigquery.py b/sdk/python/feast/infra/offline_stores/bigquery.py
index 148eb3830f..f7f6fc161a 100644
--- a/sdk/python/feast/infra/offline_stores/bigquery.py
+++ b/sdk/python/feast/infra/offline_stores/bigquery.py
@@ -280,11 +280,11 @@ def _is_done(job_id):
         return client.get_job(job_id).state in ["PENDING", "RUNNING"]
 
     @retry(wait=wait_fixed(10), stop=stop_after_delay(1800), reraise=True)
-    def _wait_till_done(job_id):
+    def _wait_until_done(job_id):
         return _is_done(job_id)
 
     job_id = bq_job.job_id
-    _wait_till_done(job_id=job_id)
+    _wait_until_done(job_id=job_id)
 
     if not _is_done(job_id):
         client.cancel_job(job_id)