Index: feedapi_mapper.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/feedapi_mapper/Attic/feedapi_mapper.admin.inc,v
retrieving revision 1.1.2.8
diff -u -p -r1.1.2.8 feedapi_mapper.admin.inc
--- feedapi_mapper.admin.inc	18 Aug 2009 19:11:44 -0000	1.1.2.8
+++ feedapi_mapper.admin.inc	24 Aug 2009 08:29:43 -0000
@@ -111,7 +111,7 @@ function feedapi_mapper_delete_form($for
  * Submission callback for feedapi_mapper_delete_form.
  */
 function feedapi_mapper_delete_form_submit($form, &$form_state) {
-  $param = isset($form['#node']->nid) && _feedapi_mapper_is_overridden($form['#node']->nid) ? $form['#node']->nid : $form['#node']->type;
+  $param = isset($form['#node']->nid) && _feedapi_mapper_scope($form['#node']->nid) ? $form['#node']->nid : $form['#node']->type;
   $node = new stdClass();
   $field = is_numeric($param) ? 'nid' : 'type';
   $node->{$field} = $param;
@@ -161,7 +161,7 @@ function feedapi_mapper_toggle_unique($p
     $node->type = str_replace('-', '_', $param);
     $path = 'admin/content/node-type/'. $param .'/map';
   }
-  elseif (!_feedapi_mapper_is_overridden($param)) {
+  elseif (!_feedapi_mapper_scope($param)) {
     $node = node_load($param);
     $path = "node/{$param}/map";
     $param = $node->type;
@@ -202,26 +202,26 @@ function feedapi_mapper_default_form_sub
 }
 
 /**
- * Form callback confirmation form for override mapping.
+ * Form callback confirmation form for restrict mapping to the given node.
  */
-function feedapi_mapper_override_form($form_state, $feed_node) {
+function feedapi_mapper_restrict_form($form_state, $feed_node) {
   $form = array();
   $form['#node'] = $feed_node;
   $form['#redirect'] = "node/{$feed_node->nid}/map";
 
   return confirm_form($form,
-    t('Override?'),
+    t('Restrict?'),
     "node/{$feed_node->nid}/map",
-    t('Would you like to override the content-type defaults?'),
-    t('Override'),
+    t('Would you like to restrict the scope of the mapping to the given node only?'),
+    t('Restrict'),
     t('Cancel')
   );
 }
 
 /**
- * Submission callback for feedapi_mapper_override_form.
+ * Submission callback for feedapi_mapper_restrict_form.
  */
-function feedapi_mapper_override_form_submit($form, &$form_state) {
+function feedapi_mapper_restrict_form_submit($form, &$form_state) {
   $mapping = feedapi_mapper_load_mapping($form['#node']);
   feedapi_mapper_save_mapping($form['#node']->nid, $mapping);
 }
@@ -274,15 +274,15 @@ function feedapi_mapper_form($form_state
   }
   $form['#mapping'] = $mapping;
 
-  // Override settings: if theis is a node we are on and there is no mapping at all,
-  // we are operating on the content-type defaults. If not we are overriding.
-  if ($feed_node->nid && _feedapi_mapper_is_overridden($feed_node->nid)) {
-    $override = t('This mapping is specific to this feed node.') .' '. l(t('Use content-type default.'), 'node/'. $feed_node->nid .'/map/default');
-    $form['#override'] = TRUE;
+  // Scope settings: if there is is a node we are on and there is no mapping at all,
+  // we are operating on the content-type defaults. If not it's per-node.
+  if ($feed_node->nid && _feedapi_mapper_scope($feed_node->nid)) {
+    $scope = t('This mapping is specific to this feed node.') .' '. l(t('Use content-type default.'), 'node/'. $feed_node->nid .'/map/default');
+    $form['#scope'] = TRUE;
   }
   elseif (isset($feed_node->nid)) {
-    $override = t('This mapping is the standard content-type mapping. Any changes will affect all feeds with the same content-type.') .' '. l(t('Override.'), 'node/'. $feed_node->nid .'/map/override');
-    $form['#override'] = FALSE;
+    $scope = t('This mapping is the standard content-type mapping. Any changes will affect all feeds with the same content-type.') .' '. l(t('Restrict to per-node.'), 'node/'. $feed_node->nid .'/map/restrict');
+    $form['#scope'] = FALSE;
   }
 
   if ($mapping['export_type'] === EXPORT_IN_DATABASE) {
@@ -296,8 +296,8 @@ function feedapi_mapper_form($form_state
     $status = t('Status: overridden - ') . l(t('revert.'), 'admin/content/node-type/'. str_replace('_', '-', $feed_node->type) .'/map/revert', array('query' => array('destination' => $destination)));
   }
 
-  $form['override'] = array(
-    '#value' => $override,
+  $form['scope'] = array(
+    '#value' => $scope,
   );
   $form['revert'] = array(
     '#value' => '<div class="export-status"><strong>'. $status .'</strong></div>',
@@ -398,7 +398,7 @@ function feedapi_mapper_form_validate($f
  * Submit hook.
  */
 function feedapi_mapper_form_submit($form, &$form_state) {
-  $param = ($form['#node']->nid && $form['#override']) ? $form['#node']->nid : $form['#node']->type;
+  $param = ($form['#node']->nid && $form['#scope']) ? $form['#node']->nid : $form['#node']->type;
   feedapi_mapper_add_mapping($param, $form_state['values']['source'], $form_state['values']['target'], FALSE);
 }
 
@@ -407,7 +407,7 @@ function feedapi_mapper_form_submit($for
  */
 function feedapi_mapper_export_page($form_state, $param) {
   if (is_object($param)) {
-    if (_feedapi_mapper_is_overridden($param->nid)) {
+    if (_feedapi_mapper_scope($param->nid)) {
       drupal_set_message(t('Only per content-type mappings can be exported.'), 'warning');
       drupal_goto("node/{$param->nid}/map");
     }
Index: feedapi_mapper.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/feedapi_mapper/feedapi_mapper.module,v
retrieving revision 1.2.2.23
diff -u -p -r1.2.2.23 feedapi_mapper.module
--- feedapi_mapper.module	24 Aug 2009 01:52:15 -0000	1.2.2.23
+++ feedapi_mapper.module	24 Aug 2009 08:29:43 -0000
@@ -71,10 +71,10 @@ function feedapi_mapper_menu() {
     'access arguments' => array(1),
     'file' => 'feedapi_mapper.admin.inc',
   );
-  $items['node/%node/map/override'] = array(
-    'title' => 'Override',
+  $items['node/%node/map/restrict'] = array(
+    'title' => 'Restrict',
     'page callback' => 'drupal_get_form',
-    'page arguments' => array('feedapi_mapper_override_form', 1),
+    'page arguments' => array('feedapi_mapper_restrict_form', 1),
     'type' => MENU_CALLBACK,
     'access callback' => 'feedapi_mapper_access_mapper',
     'access arguments' => array(1),
@@ -455,16 +455,16 @@ function _feedapi_mapper_load_mapping($p
 }
 
 /**
- * Determine whether a node specified by given node id uses
- * overridden or per content type mapping.
+ * Determines the scope of the mapping for the given node id.
  *
  * @param $nid
  *   Node id.
  * 
  * @return 
- *   TRUE if the node uses overridden mapping, FALSE otherwise.
+ *   TRUE if the mapping is valid for the node only
+ *   FALSE if it's valid for the entire content-type
  */
-function _feedapi_mapper_is_overridden($nid) {
+function _feedapi_mapper_scope($nid) {
   if (_feedapi_mapper_load_mapping($nid)) {
     return TRUE;
   }
Index: tests/feedapi_mapper.test
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/feedapi_mapper/tests/feedapi_mapper.test,v
retrieving revision 1.2.2.4
diff -u -p -r1.2.2.4 feedapi_mapper.test
--- tests/feedapi_mapper.test	24 Aug 2009 01:42:28 -0000	1.2.2.4
+++ tests/feedapi_mapper.test	24 Aug 2009 08:29:43 -0000
@@ -98,11 +98,11 @@ class FeedApiMapperBasicTestCase extends
     $mapper_entries = unserialize(db_result(db_query("SELECT mapping FROM {feedapi_mapper}")));
     $this->assertTrue(count($mapper_entries == 4), 'Three mapping entries are defined after one is deleted.');
 
-    // Test per content-type and per node mapping. Test overriding.
+    // Test per content-type and per node mapping. Test scope handling.
     $old_param = db_result(db_query("SELECT param FROM {feedapi_mapper}"));
     $this->drupalGet($feed_url . '/map');
     $this->assertText('This mapping is the standard content-type mapping.', 'The mapping is per-content-type by default');
-    $this->drupalPost($feed_url. '/map/override', array(), 'Override');
+    $this->drupalPost($feed_url. '/map/restrict', array(), 'Restrict');
     $this->drupalGet($feed_url . '/map');
     $this->assertText('This mapping is specific to this feed node', 'The mapping is now per-node');
     $mapper_rows = db_result(db_query("SELECT COUNT(*) FROM {feedapi_mapper}"));