diff --git a/lib/rapi/client.py b/lib/rapi/client.py
index 813904917bef13f7a5c3e663ae1478b5ac6dda2e..aedf0b8c93b8f30c4c6a2662a8037ebe1a2a078b 100644
--- a/lib/rapi/client.py
+++ b/lib/rapi/client.py
@@ -760,8 +760,8 @@ class GanetiRapiClient(object):
     """
     return self._SendRequest(HTTP_GET, "/2/jobs/%d" % job_id, None, None)
 
-  def DeleteJob(self, job_id, dry_run=False):
-    """Deletes a job.
+  def CancelJob(self, job_id, dry_run=False):
+    """Cancels a job.
 
     @type job_id: int
     @param job_id: id of the job to delete
diff --git a/test/ganeti.rapi.client_unittest.py b/test/ganeti.rapi.client_unittest.py
index 727dcbf5ae5bf3d187d732d4c063a9285cfbe38c..f7ceea6aebc55afcb7c9f7fb9eb70f38b33564d6 100755
--- a/test/ganeti.rapi.client_unittest.py
+++ b/test/ganeti.rapi.client_unittest.py
@@ -324,10 +324,10 @@ class GanetiRapiClientTests(unittest.TestCase):
     self.assertHandler(rlib2.R_2_jobs_id)
     self.assertItems(["1234"])
 
-  def testDeleteJob(self):
+  def testCancelJob(self):
     self.rapi.AddResponse("[true, \"Job 123 will be canceled\"]")
     self.assertEqual([True, "Job 123 will be canceled"],
-                     self.client.DeleteJob(999, dry_run=True))
+                     self.client.CancelJob(999, dry_run=True))
     self.assertHandler(rlib2.R_2_jobs_id)
     self.assertItems(["999"])
     self.assertDryRun()