diff --git a/feeds_ui/feeds_ui.admin.inc b/feeds_ui/feeds_ui.admin.inc
index 3b36ed105b4545156da3c311d755e631e6033342..b59595a43775fcd2318bd364e2f97ef974ea5397 100644
--- a/feeds_ui/feeds_ui.admin.inc
+++ b/feeds_ui/feeds_ui.admin.inc
@@ -268,10 +268,10 @@ function theme_feeds_ui_build_mapping_form($form) {
   foreach (element_children($form['processors']) as $processor) {
     $rows = array();
     if (is_array($form['processors'][$processor]['#mappings'])) {
-      foreach ($form['processors'][$processor]['#mappings'] as $source => $mapping) {
+      foreach ($form['processors'][$processor]['#mappings'] as $target => $mapping) {
         $rows[] = array(
           $source,
-          $mapping['target'],
+          $mapping['source'],
           $mapping['unique'] ? t('Yes') : t('No'),
           t('Remove'),
         ); 
diff --git a/includes/feed.inc b/includes/feed.inc
index 2fa712ca7269f736dbb3b0706e0c51e2205584cb..63909d88c6206bc449e4823727e1ec4b12965a2e 100644
--- a/includes/feed.inc
+++ b/includes/feed.inc
@@ -409,8 +409,8 @@ class FeedsProcessor extends FeedsConfigurable {
   public function addMapping($source, $target, $unique = NULL) {
     if (!empty($source) && !empty($target)) {
       $config = $this->getConfig();
-      $config['mappings'][$source] = array(
-        'target' => $target,
+      $config['mappings'][$target] = array(
+        'source' => $source,
         'unique' => $unique,
       );
     }