Changed table and column names for migrating from Drupal 6