diff --git a/libtransmission/transmission.c b/libtransmission/transmission.c
index 837e0969d..5ecf20111 100644
--- a/libtransmission/transmission.c
+++ b/libtransmission/transmission.c
@@ -190,32 +190,17 @@ int tr_natTraversalStatus( tr_handle_t * h )
     return TR_NAT_TRAVERSAL_ERROR;
 }
 
-/***********************************************************************
- * tr_setUploadLimit
- ***********************************************************************
- * 
- **********************************************************************/
-void tr_setUploadLimit( tr_handle_t * h, int limit )
+void tr_setGlobalUploadLimit( tr_handle_t * h, int limit )
 {
     tr_rcSetLimit( h->upload, limit );
     tr_chokingSetLimit( h->choking, limit );
 }
 
-/***********************************************************************
- * tr_setDownloadLimit
- ***********************************************************************
- * 
- **********************************************************************/
-void tr_setDownloadLimit( tr_handle_t * h, int limit )
+void tr_setGlobalDownloadLimit( tr_handle_t * h, int limit )
 {
     tr_rcSetLimit( h->download, limit );
 }
 
-/***********************************************************************
- * tr_torrentRates
- ***********************************************************************
- *
- **********************************************************************/
 void tr_torrentRates( tr_handle_t * h, float * dl, float * ul )
 {
     tr_torrent_t * tor;
diff --git a/libtransmission/transmission.h b/libtransmission/transmission.h
index 6c4174e55..8e27e4a92 100644
--- a/libtransmission/transmission.h
+++ b/libtransmission/transmission.h
@@ -131,18 +131,18 @@ void tr_natTraversalDisable( tr_handle_t * );
 int tr_natTraversalStatus( tr_handle_t * );
 
 /***********************************************************************
- * tr_setUploadLimit
+ * tr_setGlobalUploadLimit
  ***********************************************************************
  * Sets the total upload rate limit in KB/s
  **********************************************************************/
-void tr_setUploadLimit( tr_handle_t *, int );
+void tr_setGlobalUploadLimit( tr_handle_t *, int );
 
 /***********************************************************************
- * tr_setDownloadLimit
+ * tr_setGlobalDownloadLimit
  ***********************************************************************
  * Sets the total download rate limit in KB/s
  **********************************************************************/
-void tr_setDownloadLimit( tr_handle_t *, int );
+void tr_setGlobalDownloadLimit( tr_handle_t *, int );
 
 /***********************************************************************
  * tr_torrentCount
diff --git a/macosx/PrefsController.m b/macosx/PrefsController.m
index 2a341424b..a3d6ccd0e 100644
--- a/macosx/PrefsController.m
+++ b/macosx/PrefsController.m
@@ -301,14 +301,14 @@
 {
     if ([fDefaults boolForKey: @"SpeedLimit"])
     {
-        tr_setUploadLimit(fHandle, [fDefaults integerForKey: @"SpeedLimitUploadLimit"]);
-        tr_setDownloadLimit(fHandle, [fDefaults integerForKey: @"SpeedLimitDownloadLimit"]);
+        tr_setGlobalUploadLimit(fHandle, [fDefaults integerForKey: @"SpeedLimitUploadLimit"]);
+        tr_setGlobalDownloadLimit(fHandle, [fDefaults integerForKey: @"SpeedLimitDownloadLimit"]);
     }
     else
     {
-        tr_setUploadLimit(fHandle, [fDefaults boolForKey: @"CheckUpload"]
+        tr_setGlobalUploadLimit(fHandle, [fDefaults boolForKey: @"CheckUpload"]
                                         ? [fDefaults integerForKey: @"UploadLimit"] : -1);
-        tr_setDownloadLimit(fHandle, [fDefaults boolForKey: @"CheckDownload"]
+        tr_setGlobalDownloadLimit(fHandle, [fDefaults boolForKey: @"CheckDownload"]
                                         ? [fDefaults integerForKey: @"DownloadLimit"] : -1);
     }
 }