diff --git a/fc2m.module b/fc2m.module
index 25c8652..2cf8c35 100644
--- a/fc2m.module
+++ b/fc2m.module
@@ -284,14 +284,14 @@ function fc2m($instance, $multifield_name, $multifield_label, $delete_source_ins
   $data_query->addField($table_alias, 'language', 'language');
   $data_query->addField($table_alias, 'delta', 'delta');
 
-  $revision_query = db_select('field_collection_item', 'fci');
-  $revision_query->addField('fci', 'item_id', _field_sql_storage_columnname($multifield_name, 'id'));
+  $revision_query = db_select('field_collection_item_revision', 'fci');
+  $revision_query->addField('fci', 'revision_id', _field_sql_storage_columnname($multifield_name, 'id'));
   $revision_query->addExpression("'" . $entity_type . "'", 'entity_type');
   $revision_query->addExpression("'" . $bundle . "'", 'bundle');
   $table_alias = $revision_query->join(
-    _field_sql_storage_tablename(field_info_field($field_name)),
+    _field_sql_storage_revision_tablename(field_info_field($field_name)),
     $field_name,
-    '%alias.' . _field_sql_storage_columnname($field_name, 'value') . ' = fci.item_id '
+    '%alias.' . _field_sql_storage_columnname($field_name, 'revision_id') . ' = fci.revision_id '
     . 'AND %alias.entity_type = \'' . $entity_type . '\' '
     . 'AND %alias.bundle = \'' . $bundle . '\' '
     . 'AND %alias.deleted = 0'
@@ -310,9 +310,9 @@ function fc2m($instance, $multifield_name, $multifield_label, $delete_source_ins
       '%alias.entity_id = fci.item_id AND %alias.deleted = 0 AND %alias.entity_type = \'field_collection_item\''
     );
     $revision_table_alias = $revision_query->leftJoin(
-      _field_sql_storage_tablename(field_info_field($subfield_instance['field_name'])),
+      _field_sql_storage_revision_tablename(field_info_field($subfield_instance['field_name'])),
       $subfield_instance['field_name'],
-      '%alias.entity_id = fci.item_id AND %alias.deleted = 0 AND %alias.entity_type = \'field_collection_item\''
+      '%alias.revision_id = fci.revision_id AND %alias.deleted = 0 AND %alias.entity_type = \'field_collection_item\''
     );
     foreach (array_keys($subfield['columns']) as $column_name) {
       $data_query->addField(