diff --git a/arguments/nid.inc b/arguments/nid.inc
index 4930c05c34c142f552a5924ec8c2fd9d90dda96e..f48ff0391bf1785c4c468c8d1e9398c2c3d46459 100644
--- a/arguments/nid.inc
+++ b/arguments/nid.inc
@@ -32,11 +32,11 @@ function panels_nid_context($node = NULL, $conf = NULL, $empty = FALSE) {
   }
 
   if (!is_object($node)) {
-    return PANELS_BAD_ARG;
+    return PANELS_ARG_IS_BAD;
   }
 
   if (array_filter($conf['types']) && empty($conf['types'][$node->type])) {
-    return PANELS_USE_FALLBACK_ROUTER;
+    return PANELS_ARG_USE_FALLBACK;
   }
 
   return panels_context_create('node', $node);
diff --git a/arguments/node_add.inc b/arguments/node_add.inc
index 5be50a418b528ae3bfc1ed0288a182ee878ed178..ea6535ec28d55a96bbc03acbbcf3bd075a78879c 100644
--- a/arguments/node_add.inc
+++ b/arguments/node_add.inc
@@ -32,7 +32,7 @@ function panels_node_add_context($arg = NULL, $conf = NULL, $empty = FALSE) {
   }
 
   if (array_filter($conf['types']) && empty($conf['types'][$arg])) {
-    return PANELS_USE_FALLBACK_ROUTER;
+    return PANELS_ARG_USE_FALLBACK;
   }
 
   return panels_context_create('node_add_form', $arg);
diff --git a/arguments/node_edit.inc b/arguments/node_edit.inc
index 77c8e3f2f43f076c8c3796a8d7bc4b5bf139c186..64040dc049bc8b5a207b114c65e99bf5a5697973 100644
--- a/arguments/node_edit.inc
+++ b/arguments/node_edit.inc
@@ -32,16 +32,16 @@ function panels_node_edit_context($arg = NULL, $conf = NULL, $empty = FALSE) {
   }
 
   if (!is_numeric($arg)) {
-    return PANELS_BAD_ARG;
+    return PANELS_ARG_IS_BAD;
   }
 
   $node = node_load($arg);
   if (!$node) {
-    return PANELS_BAD_ARG;
+    return PANELS_ARG_IS_BAD;
   }
 
   if (array_filter($conf['types']) && empty($conf['types'][$node->type])) {
-    return PANELS_USE_FALLBACK_ROUTER;
+    return PANELS_ARG_USE_FALLBACK;
   }
 
   // This will perform a node_access check, so we don't have to.
diff --git a/arguments/term.inc b/arguments/term.inc
index 7e4bde51fe70cfebb17e0a7366ce35342ee70988..2afc3583970ba2987ff2402e0ca340cf6f7613dc 100644
--- a/arguments/term.inc
+++ b/arguments/term.inc
@@ -59,11 +59,11 @@ function panels_term_context($arg = NULL, $conf = NULL, $empty = FALSE) {
   }
 
   if (empty($term)) {
-    return PANELS_BAD_ARG;
+    return PANELS_ARG_IS_BAD;
   }
 
   if (!empty($conf['vids']) && array_filter($conf['vids']) && empty($conf['vids'][$term->vid])) {
-    return PANELS_USE_FALLBACK_ROUTER;
+    return PANELS_ARG_USE_FALLBACK;
   }
 
   return panels_context_create('term', $term);
diff --git a/arguments/uid.inc b/arguments/uid.inc
index 22de9ba9e7953550af82471adee76ab3738d421c..9e47a5e998658a9c7ab3436443946ec916e13412 100644
--- a/arguments/uid.inc
+++ b/arguments/uid.inc
@@ -32,12 +32,12 @@ function panels_uid_context($arg = NULL, $conf = NULL, $empty = FALSE) {
   }
 
   if (!is_numeric($arg)) {
-    return PANELS_BAD_ARG;
+    return PANELS_ARG_IS_BAD;
   }
 
   $user = user_load(array('uid' => $arg));
   if (!$user) {
-    return PANELS_BAD_ARG;
+    return PANELS_ARG_IS_BAD;
   }
 
   return panels_context_create('user', $user);
diff --git a/arguments/vid.inc b/arguments/vid.inc
index f284a3509cef77df18ee8c6aaccfa0929d611718..a227eff8bd54275fcdcc335d7b18a945005f42aa 100644
--- a/arguments/vid.inc
+++ b/arguments/vid.inc
@@ -32,12 +32,12 @@ function panels_vid_context($arg = NULL, $conf = NULL, $empty = FALSE) {
   }
 
   if (!is_numeric($arg)) {
-    return PANELS_BAD_ARG;
+    return PANELS_ARG_IS_BAD;
   }
 
   $vocabulary = taxonomy_get_vocabulary($arg);
   if (!$vocabulary) {
-    return PANELS_BAD_ARG;
+    return PANELS_ARG_IS_BAD;
   }
 
   return panels_context_create('vocabulary', $vocabulary);