diff --git a/fillpdf.admin.inc b/fillpdf.admin.inc
index 91a5028a8ff37a7b066483650a303d24bc02d539..d3db6026814a6732574656ed0cab4f288207e225 100644
--- a/fillpdf.admin.inc
+++ b/fillpdf.admin.inc
@@ -67,7 +67,7 @@ function fillpdf_settings($form, &$form_state) {
   $form['remote']['remote_endpoint'] = array(
     '#type' => 'textfield',
     '#title' => t('Server endpoint'),
-    '#default_value' => variable_get('remote_endpoint', DEFAULT_SERVLET_URL),
+    '#default_value' => variable_get('remote_endpoint', FILLPDF_DEFAULT_SERVLET_URL),
     '#description' => t('The endpoint for the FillPDF Service instance. This does not usually need to be changed, but you may want to if you have, for example, a <a href="https://fillpdf.io/hosting">private server</a>. Do not include the protocol, as this is determined by the <em>Use HTTPS?</em> setting below.'),
   );
   $form['remote']['fillpdf_api_key'] = array(
diff --git a/fillpdf.module b/fillpdf.module
index 2679ac7fcd7d736bbddf0778636cf6a74a3855e7..fe85ae3c1249e21107743705fe4d3996c8a936fa 100644
--- a/fillpdf.module
+++ b/fillpdf.module
@@ -7,7 +7,7 @@
 
 require_once dirname(__FILE__) . '/fillpdf.deprecated.inc';
 
-define("DEFAULT_SERVLET_URL", variable_get('fillpdf_remote_protocol', 'https') . "://" . variable_get('fillpdf_remote_endpoint', "fillpdf.io/xmlrpc.php"));
+define("FILLPDF_DEFAULT_SERVLET_URL", variable_get('fillpdf_remote_protocol', 'https') . "://" . variable_get('fillpdf_remote_endpoint', "fillpdf.io/xmlrpc.php"));
 module_load_include('inc', 'fillpdf', 'fillpdf.admin');
 
 /**
@@ -1166,7 +1166,7 @@ function fillpdf_execute_merge($method, $fields, $fillpdf, $mode = 'url', $flatt
     // FillPDF Service.
     case 'remote':
       $api_key = variable_get('fillpdf_api_key', '0');
-      $result = _fillpdf_xmlrpc_request(DEFAULT_SERVLET_URL, 'merge_pdf_v3', base64_encode($contents), $fields, $api_key, $flatten, $image_data);
+      $result = _fillpdf_xmlrpc_request(FILLPDF_DEFAULT_SERVLET_URL, 'merge_pdf_v3', base64_encode($contents), $fields, $api_key, $flatten, $image_data);
       if ($result->error == TRUE) {
         drupal_goto();
       } // after setting error message
@@ -1344,7 +1344,7 @@ function fillpdf_execute_parse($method, $fillpdf, $mode = 'url') {
 
   switch ($method) {
     case 'remote':
-      $result = _fillpdf_xmlrpc_request(DEFAULT_SERVLET_URL, 'parse_pdf_fields', base64_encode($content));
+      $result = _fillpdf_xmlrpc_request(FILLPDF_DEFAULT_SERVLET_URL, 'parse_pdf_fields', base64_encode($content));
       if ($result->error == TRUE) {
         drupal_goto('admin/structure/fillpdf');
       } // after setting error message