diff --git a/README.md b/README.md
index cc54c51..7db1885 100644
--- a/README.md
+++ b/README.md
@@ -211,12 +211,6 @@ to something similar to "http://domain/#channel/2011-03-09 14:25:09", or
     When using Pushover, this option allows you to specify a single device name to send
     notifications to; if blank or unset, notifications will be sent to all devices.
 
-    When using URL, this options allows you to specify the URL to send a GET request
-    to, and has keyword expansion performed on portions of it, including the path and
-    any query parameter values.
-
-    This option must be set when using URL.
-
 
 ### Conditions
 
@@ -314,6 +308,10 @@ to something similar to "http://domain/#channel/2011-03-09 14:25:09", or
     local scheme to access a mobile application.  Keyword expansion is performed on this
     value.
 
+    When using the custom URL service, this options allows you to specify the URL to send
+    a GET request to, and has keyword expansion performed on portions of it, including the
+    path and any query parameter values.
+
 *   `message_title = "{title}"`
 
     Title that will be provided for the push notification.  Keyword expansion is performed
diff --git a/push.cpp b/push.cpp
index 39b604b..7c9c3bc 100644
--- a/push.cpp
+++ b/push.cpp
@@ -352,15 +352,15 @@ class CPushMod : public CModule
 			}
 			else if (service == "url")
 			{
-				if (options["target"] == "")
+				if (options["message_uri"] == "")
 				{
-					PutModule("Error: target (url) not set");
+					PutModule("Error: message_uri not set");
 					return;
 				}
 
 				int count;
 				VCString parts;
-				CString url = options["target"];
+				CString url = options["message_uri"];
 
 				// Verify that the URL begins with either http:// or https://
 				count = url.Split("://", parts, false);
@@ -1044,7 +1044,7 @@ class CPushMod : public CModule
 						}
 						else if (value == "url")
 						{
-							PutModule("Note: URL requires setting the 'target' option with the full URL");
+							PutModule("Note: URL requires setting the 'message_uri' option with the full URL");
 						}
 						else
 						{