diff --git a/core/modules/migrate/src/Plugin/migrate/destination/Config.php b/core/modules/migrate/src/Plugin/migrate/destination/Config.php
index f842259..a7b5de2 100644
--- a/core/modules/migrate/src/Plugin/migrate/destination/Config.php
+++ b/core/modules/migrate/src/Plugin/migrate/destination/Config.php
@@ -70,7 +70,7 @@ public static function create(ContainerInterface $container, array $configuratio
   public function import(Row $row, array $old_destination_id_values = array()) {
     foreach ($row->getRawDestination() as $key => $value) {
       if (isset($value) || !empty($this->configuration['store null'])) {
-        $this->config->set($key, $value);
+        $this->config->set(str_replace(Row::PROPERTY_SEPARATOR, '.', $key), $value);
       }
     }
     $this->config->save();
diff --git a/core/modules/migrate/src/Plugin/migrate/destination/EntityConfigBase.php b/core/modules/migrate/src/Plugin/migrate/destination/EntityConfigBase.php
index e788939..3205898 100644
--- a/core/modules/migrate/src/Plugin/migrate/destination/EntityConfigBase.php
+++ b/core/modules/migrate/src/Plugin/migrate/destination/EntityConfigBase.php
@@ -75,7 +75,7 @@ public function getIds() {
    */
   protected function updateEntity(EntityInterface $entity, Row $row) {
     foreach ($row->getRawDestination() as $property => $value) {
-      $this->updateEntityProperty($entity, explode('.', $property), $value);
+      $this->updateEntityProperty($entity, explode(Row::PROPERTY_SEPARATOR, $property), $value);
     }
   }
 
diff --git a/core/modules/migrate/src/Row.php b/core/modules/migrate/src/Row.php
index 60cb02f..b96f1ac 100644
--- a/core/modules/migrate/src/Row.php
+++ b/core/modules/migrate/src/Row.php
@@ -37,6 +37,11 @@ class Row {
   protected $destination = array();
 
   /**
+   * Level separator of destination and source properties.
+   */
+  const PROPERTY_SEPARATOR = '/';
+
+  /**
    * The mapping between source and destination identifiers.
    *
    * @var array
@@ -119,7 +124,7 @@ public function getSourceIdValues() {
    *   TRUE if the source has property; FALSE otherwise.
    */
   public function hasSourceProperty($property) {
-    return NestedArray::keyExists($this->source, explode('.', $property));
+    return NestedArray::keyExists($this->source, explode(static::PROPERTY_SEPARATOR, $property));
   }
 
   /**
@@ -132,7 +137,7 @@ public function hasSourceProperty($property) {
    *   The found returned property or NULL if not found.
    */
   public function getSourceProperty($property) {
-    $return = NestedArray::getValue($this->source, explode('.', $property), $key_exists);
+    $return = NestedArray::getValue($this->source, explode(static::PROPERTY_SEPARATOR, $property), $key_exists);
     if ($key_exists) {
       return $return;
     }
@@ -165,7 +170,7 @@ public function setSourceProperty($property, $data) {
       throw new \Exception("The source is frozen and can't be changed any more");
     }
     else {
-      NestedArray::setValue($this->source, explode('.', $property), $data, TRUE);
+      NestedArray::setValue($this->source, explode(static::PROPERTY_SEPARATOR, $property), $data, TRUE);
     }
   }
 
@@ -186,7 +191,7 @@ public function freezeSource() {
    *   TRUE if the destination property exists.
    */
   public function hasDestinationProperty($property) {
-    return NestedArray::keyExists($this->destination, explode('.', $property));
+    return NestedArray::keyExists($this->destination, explode($this::PROPERTY_SEPARATOR, $property));
   }
 
   /**
@@ -199,7 +204,7 @@ public function hasDestinationProperty($property) {
    */
   public function setDestinationProperty($property, $value) {
     $this->rawDestination[$property] = $value;
-    NestedArray::setValue($this->destination, explode('.', $property), $value, TRUE);
+    NestedArray::setValue($this->destination, explode($this::PROPERTY_SEPARATOR, $property), $value, TRUE);
   }
 
   /**
@@ -215,10 +220,10 @@ public function getDestination() {
   /**
    * Returns the raw destination. Rarely necessary.
    *
-   * For example calling setDestination('foo:bar', 'baz') results in
+   * For example calling setDestination('foo/bar', 'baz') results in
    * @code
    * $this->destination['foo']['bar'] = 'baz';
-   * $this->rawDestination['foo.bar'] = 'baz';
+   * $this->rawDestination['foo/bar'] = 'baz';
    * @encode
    *
    * @return array
@@ -238,7 +243,7 @@ public function getRawDestination() {
    *   The destination value.
    */
   public function getDestinationProperty($property) {
-    return NestedArray::getValue($this->destination, explode('.', $property));
+    return NestedArray::getValue($this->destination, explode($this::PROPERTY_SEPARATOR, $property));
   }
 
   /**
diff --git a/core/modules/migrate/tests/src/RowTest.php b/core/modules/migrate/tests/src/RowTest.php
index c30375c..6ccfd6e 100644
--- a/core/modules/migrate/tests/src/RowTest.php
+++ b/core/modules/migrate/tests/src/RowTest.php
@@ -248,8 +248,8 @@ public function testDestination() {
   public function testMultipleDestination() {
     $row = new Row($this->testValues, $this->testSourceIds);
     // Set some deep nested values.
-    $row->setDestinationProperty('image.alt', 'alt text');
-    $row->setDestinationProperty('image.fid', 3);
+    $row->setDestinationProperty('image/alt', 'alt text');
+    $row->setDestinationProperty('image/fid', 3);
 
     $this->assertTrue($row->hasDestinationProperty('image'));
     $this->assertFalse($row->hasDestinationProperty('alt'));
@@ -258,8 +258,8 @@ public function testMultipleDestination() {
     $destination = $row->getDestination();
     $this->assertEquals('alt text', $destination['image']['alt']);
     $this->assertEquals(3, $destination['image']['fid']);
-    $this->assertEquals('alt text', $row->getDestinationProperty('image.alt'));
-    $this->assertEquals(3, $row->getDestinationProperty('image.fid'));
+    $this->assertEquals('alt text', $row->getDestinationProperty('image/alt'));
+    $this->assertEquals(3, $row->getDestinationProperty('image/fid'));
   }
 
 }
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_aggregator_settings.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_aggregator_settings.yml
index 25dd674..1f9c015 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_aggregator_settings.yml
+++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_aggregator_settings.yml
@@ -14,10 +14,10 @@ process:
   fetcher: aggregator_fetcher
   parser: aggregator_parser
   processors: aggregator_processors
-  'items.allowed_html': aggregator_allowed_html_tags
-  'items.teaser_length': aggregator_teaser_length
-  'items.expire': aggregator_clear
-  'source.list_max': aggregator_summary_items
+  'items/allowed_html': aggregator_allowed_html_tags
+  'items/teaser_length': aggregator_teaser_length
+  'items/expire': aggregator_clear
+  'source/list_max': aggregator_summary_items
 destination:
   plugin: config
   config_name: aggregator.settings
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_block.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_block.yml
index 4fa9ea7..55448b8 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_block.yml
+++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_block.yml
@@ -54,8 +54,8 @@ process:
       - delta
       - settings
       - visibility
-  'settings.visibility.request_path.pages': pages
-  'settings.visibility.user_role.roles': roles
+  'settings/visibility/request_path/pages': pages
+  'settings/visibility/user_role/roles': roles
 destination:
   plugin: entity:block
 migration_dependencies:
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_book.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_book.yml
index 03758d5..c67f957 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_book.yml
+++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_book.yml
@@ -4,9 +4,9 @@ source:
   plugin: d6_book
 process:
   nid: nid
-  book.bid: bid
-  book.weight: weight
-  book.pid:
+  'book/bid': bid
+  'book/weight': weight
+  'book/pid':
     -
       plugin: skip_process_on_empty
       source: plid
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_book_settings.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_book_settings.yml
index 0da3a45..82405a1 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_book_settings.yml
+++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_book_settings.yml
@@ -8,7 +8,7 @@ source:
     - book_allowed_types
 process:
   child_type: book_child_type
-  'block.navigation.mode': book_block_mode
+  'block/navigation/mode': book_block_mode
   allowed_types: book_allowed_types
 destination:
   plugin: config
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_comment.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_comment.yml
index 34e681e..0ccec0f 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_comment.yml
+++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_comment.yml
@@ -19,9 +19,9 @@ process:
     plugin: migration
     migration: d6_node
     source: nid
-  entity_type: constants.entity_type
-  field_name: constants.field_name
-  comment_type: constants.comment_type
+  entity_type: 'constants/entity_type'
+  field_name: 'constants/field_name'
+  comment_type: 'constants/comment_type'
   subject: subject
   uid:
     -
@@ -38,8 +38,8 @@ process:
   changed: timestamp
   status: status #In D6, published=0. We reverse the value in prepareRow.
   thread: thread
-  'comment_body.value': comment
-  'comment_body.format':
+  'comment_body/value': comment
+  'comment_body/format':
     plugin: migration
     migration: d6_filter_format
     source: format
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_comment_entity_display.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_comment_entity_display.yml
index a99f84e..f9c4743 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_comment_entity_display.yml
+++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_comment_entity_display.yml
@@ -11,10 +11,10 @@ source:
       type: comment_default
       weight: 20
 process:
-  entity_type: constants.entity_type
-  field_name: constants.field_name
-  view_mode: constants.view_mode
-  options: constants.options
+  entity_type: 'constants/entity_type'
+  field_name: 'constants/field_name'
+  view_mode: 'constants/view_mode'
+  options: 'constants/options'
 
   bundle: node_type
 destination:
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_comment_entity_form_display.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_comment_entity_form_display.yml
index d82c812..a845b84 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_comment_entity_form_display.yml
+++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_comment_entity_form_display.yml
@@ -10,10 +10,10 @@ source:
       type: comment_default
       weight: 20
 process:
-  entity_type: constants.entity_type
-  field_name: constants.field_name
-  form_mode: constants.form_mode
-  options: constants.options
+  entity_type: 'constants/entity_type'
+  field_name: 'constants/field_name'
+  form_mode: 'constants/form_mode'
+  options: 'constants/options'
 
   bundle: node_type
 destination:
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_comment_field.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_comment_field.yml
index 2a5ccc4..175ac8c 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_comment_field.yml
+++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_comment_field.yml
@@ -10,10 +10,10 @@ source:
     settings:
       content_type: comment
 process:
-  entity_type: constants.entity_type
-  id: constants.id
-  name: constants.name
-  type: constants.type
-  settings: constants.settings
+  entity_type: 'constants/entity_type'
+  id: 'constants/id'
+  name: 'constants/name'
+  type: 'constants/type'
+  settings: 'constants/settings'
 destination:
   plugin: entity:field_config
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_comment_field_instance.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_comment_field_instance.yml
index c7631c2..6d9b14c 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_comment_field_instance.yml
+++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_comment_field_instance.yml
@@ -8,19 +8,19 @@ source:
     label: Comment settings
     required: true
 process:
-  entity_type: constants.entity_type
-  field_name: constants.field_name
-  label: constants.label
-  required: constants.required
+  entity_type: 'constants/entity_type'
+  field_name: 'constants/field_name'
+  label: 'constants/label'
+  required: 'constants/required'
 
   bundle: node_type
-  'default_value.0.status': comment
-  'settings.default_mode': comment_default_mode
-  'settings.per_page': comment_default_per_page
-  'settings.anonymous': comment_anonymous
-  'settings.subject': comment_subject_field
-  'settings.form_location': comment_form_location
-  'settings.preview': comment_preview
+  'default_value/0/status': comment
+  'settings/default_mode': comment_default_mode
+  'settings/per_page': comment_default_per_page
+  'settings/anonymous': comment_anonymous
+  'settings/subject': comment_subject_field
+  'settings/form_location': comment_form_location
+  'settings/preview': comment_preview
 destination:
   plugin: entity:field_instance_config
 migration_dependencies:
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_comment_type.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_comment_type.yml
index 6bd490b..26cef49 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_comment_type.yml
+++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_comment_type.yml
@@ -17,9 +17,9 @@ source:
     label: comment
     description: comment
 process:
-  target_entity_type_id: constants.entity_type
-  id: constants.id
-  label: constants.label
-  description: constants.description
+  target_entity_type_id: 'constants/entity_type'
+  id: 'constants/id'
+  label: 'constants/label'
+  description: 'constants/description'
 destination:
   plugin: entity:comment_type
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_contact_settings.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_contact_settings.yml
index e45dde1..e77d096 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_contact_settings.yml
+++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_contact_settings.yml
@@ -7,7 +7,7 @@ source:
     - contact_hourly_threshold
 process:
   user_default_enabled: contact_default_status
-  'flood.limit': contact_hourly_threshold
+  'flood/limit': contact_hourly_threshold
   default_category:
     plugin: migration
     migration: d6_contact_category
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_custom_block.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_custom_block.yml
index c7dd4ab..bbaa2fb 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_custom_block.yml
+++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_custom_block.yml
@@ -6,13 +6,13 @@ source:
     type: basic
 process:
   id: bid
-  type: constants.type
+  type: 'constants/type'
   info: info
-  'body.format':
+  'body/format':
     plugin: migration
     migration: d6_filter_format
     source: format
-  'body.value': body
+  'body/value': body
 destination:
   plugin: entity:block_content
 migration_dependencies:
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_date_formats.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_date_formats.yml
index 734149b..f5564ef 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_date_formats.yml
+++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_date_formats.yml
@@ -14,6 +14,6 @@ process:
       date_format_long: long
       date_format_short: short
       date_format_medium: medium
-  'pattern.php': value
+  pattern: value
 destination:
   plugin: entity:date_format
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_field.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_field.yml
index 3e6edbf..b4aea5b 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_field.yml
+++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_field.yml
@@ -6,9 +6,9 @@ source:
     entity_type: node
     langcode: und
 process:
-  entity_type: constants.entity_type
+  entity_type: 'constants/entity_type'
   status: active
-  langcode: constants.langcode
+  langcode: 'constants/langcode'
   name: field_name
   type:
     -
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_field_formatter_settings.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_field_formatter_settings.yml
index 2d76591..a849f67 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_field_formatter_settings.yml
+++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_field_formatter_settings.yml
@@ -21,7 +21,7 @@ process:
         - 1
     -
       plugin: skip_row_on_empty
-  entity_type: constants.entity_type
+  entity_type: 'constants/entity_type'
   bundle: type_name
   view_mode:
     -
@@ -34,15 +34,15 @@ process:
       index:
         - 1
   field_name: field_name
-  "options.label": label
-  "options.weight": weight
-  "options.type":
+  "options/label": label
+  "options/weight": weight
+  "options/type":
       -
         plugin: static_map
         bypass: true
         source:
           - type
-          - "display_settings.format"
+          - 'display_settings/format'
         map:
           text:
             default: text_default
@@ -164,13 +164,13 @@ process:
             default: string
       -
         plugin: field_type_defaults
-  "options.settings":
+  "options/settings":
     -
       plugin: static_map
       bypass: true
       source:
         - module
-        - "display_settings.format"
+        - 'display_settings/format'
       map:
         number:
           us_0:
@@ -291,7 +291,7 @@ process:
             trim_length: 600
     -
       plugin: field_formatter_settings_defaults
-  "options.third_party_settings": constants.third_party_settings
+  "options/third_party_settings": 'constants/third_party_settings'
 
 destination:
   plugin: component_entity_display
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_field_instance.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_field_instance.yml
index 74e3536..9c34a72 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_field_instance.yml
+++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_field_instance.yml
@@ -20,7 +20,7 @@ process:
         - 1
     -
       plugin: skip_row_on_empty
-  entity_type: constants.entity_type
+  entity_type: 'constants/entity_type'
   field_name: field_name
   bundle: type_name
   label: label
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_field_instance_widget_settings.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_field_instance_widget_settings.yml
index 9f169e1..eebe967 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_field_instance_widget_settings.yml
+++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_field_instance_widget_settings.yml
@@ -23,11 +23,11 @@ process:
     -
       plugin: skip_row_on_empty
   bundle: type_name
-  form_mode: constants.form_mode
+  form_mode: 'constants/form_mode'
   field_name: field_name
-  entity_type: constants.entity_type
-  "options.weight": weight
-  "options.type":
+  entity_type: 'constants/entity_type'
+  'options/weight': weight
+  'options/type':
     type:
       plugin: static_map
       bypass: true
@@ -45,13 +45,13 @@ process:
         optionwidgets_onoff: options_onoff
         optionwidgets_buttons: options_buttons
         optionwidgets_select: options_select
-  "options.settings":
+  'options/settings':
     -
       plugin: field_instance_widget_settings
       source:
         - widget_type
         - widget_settings
-  "options.third_party_settings": constants.third_party_settings
+  'options/third_party_settings': 'constants/third_party_settings'
 
 destination:
   plugin: component_entity_form_display
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_file_settings.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_file_settings.yml
index 0b7522e..9c2fc14 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_file_settings.yml
+++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_file_settings.yml
@@ -7,9 +7,9 @@ source:
     - file_description_length
     - file_icon_directory
 process:
-  'description.type': file_description_type
-  'description.length': file_description_length
-  'icon.directory': file_icon_directory
+  'description/type': file_description_type
+  'description/length': file_description_length
+  'icon/directory': file_icon_directory
 destination:
   plugin: config
   config_name: file.settings
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_forum_settings.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_forum_settings.yml
index b46cca5..66697f3 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_forum_settings.yml
+++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_forum_settings.yml
@@ -9,11 +9,11 @@ source:
     - forum_block_num_0
     - forum_block_num_1
 process:
-  'block.active.limit': forum_block_num_0
-  'block.new.limit': forum_block_num_1
-  'topics.hot_threshold': forum_hot_topic
-  'topics.page_limit': forum_per_page
-  'topics.order': forum_order
+  'block/active/limit': forum_block_num_0
+  'block/new/limit': forum_block_num_1
+  'topics/hot_threshold': forum_hot_topic
+  'topics/page_limit': forum_per_page
+  'topics/order': forum_order
 destination:
   plugin: config
   config_name: forum.settings
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_locale_settings.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_locale_settings.yml
index de9063b..82d3e00 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_locale_settings.yml
+++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_locale_settings.yml
@@ -7,7 +7,7 @@ source:
     - locale_js_directory
 process:
   cache_strings: locale_cache_strings
-  'javascript.directory': locale_js_directory
+  'javascript/directory': locale_js_directory
 destination:
   plugin: config
   config_name: locale.settings
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_node.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_node.yml
index b74df84..ac9cd36 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_node.yml
+++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_node.yml
@@ -14,11 +14,11 @@ process:
   changed: changed
   promote: promote
   sticky: sticky
-  body.format:
+  'body/format':
     plugin: migration
     migration: d6_filter_format
     source: format
-  body.value: body
+  'body/value': body
 
 #  unmapped d6 fields.
 #  tnid
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_node_revision.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_node_revision.yml
index 537b255..5010ce9 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_node_revision.yml
+++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_node_revision.yml
@@ -14,11 +14,11 @@ process:
   changed: changed
   promote: promote
   sticky: sticky
-  body.format:
+  'body/format':
     plugin: migration
     migration: d6_filter_format
     source: format
-  body.value: body
+  'body/value': body
 
 #  unmapped d6 fields.
 #  tnid
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_node_type.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_node_type.yml
index 83f7558..ba4ba67 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_node_type.yml
+++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_node_type.yml
@@ -12,7 +12,7 @@ process:
   description: description
   help: help
   title_label: title_label
-  preview: constants.preview
+  preview: 'constants/preview'
   submitted: submitted
   options: options
   create_body: has_body
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_search_page.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_search_page.yml
index 87e1805..38977e8 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_search_page.yml
+++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_search_page.yml
@@ -14,10 +14,10 @@ source:
     path: node
     plugin: node_search
 process:
-  id: constants.id
-  path: constants.path
-  plugin: constants.plugin
-  configuration.rankings:
+  id: 'constants/id'
+  path: 'constants/path'
+  plugin: 'constants/plugin'
+  'configuration/rankings':
     plugin: d6_search_configuration_rankings
 destination:
   plugin: entity:search_page
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_search_settings.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_search_settings.yml
index 00a886e..be1d9ea 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_search_settings.yml
+++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_search_settings.yml
@@ -9,9 +9,9 @@ source:
     - search_tag_weights
     - search_and_or_limit
 process:
-  'index.minimum_word_size': minimum_word_size
-  'index.overlap_cjk': overlap_cjk
-  'index.cron_limit': search_cron_limit
+  'index/minimum_word_size': minimum_word_size
+  'index/overlap_cjk': overlap_cjk
+  'index/cron_limit': search_cron_limit
 destination:
   plugin: config
   config_name: search.settings
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_simpletest_settings.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_simpletest_settings.yml
index 30b85d9..c6320ea 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_simpletest_settings.yml
+++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_simpletest_settings.yml
@@ -10,9 +10,9 @@ source:
     - simpletest_verbose
 process:
   clear_results: simpletest_clear_results
-  'httpauth.method': simpletest_httpauth_method
-  'httpauth.password': simpletest_httpauth_password
-  'httpauth.username': simpletest_httpauth_username
+  'httpauth/method': simpletest_httpauth_method
+  'httpauth/password': simpletest_httpauth_password
+  'httpauth/username': simpletest_httpauth_username
   verbose: simpletest_verbose
 destination:
   plugin: config
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_statistics_settings.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_statistics_settings.yml
index 63dc976..73d1f0b 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_statistics_settings.yml
+++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_statistics_settings.yml
@@ -10,12 +10,12 @@ source:
     - statistics_block_top_all_num
     - statistics_block_top_last_num
 process:
-  'access_log.enabled': statistics_enable_access_log
-  'access_log.max_lifetime': statistics_flush_accesslog_timer
+  'access_log/enabled': statistics_enable_access_log
+  'access_log/max_lifetime': statistics_flush_accesslog_timer
   'count_content_views': statistics_count_content_views
-  'block.popular.top_day_limit': statistics_block_top_day_num
-  'block.popular.top_all_limit': statistics_block_top_all_num
-  'block.popular.top_recent_limit': statistics_block_top_last_num
+  'block/popular/top_day_limit': statistics_block_top_day_num
+  'block/popular/top_all_limit': statistics_block_top_all_num
+  'block/popular/top_recent_limit': statistics_block_top_last_num
 destination:
   plugin: config
   config_name: statistics.settings
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_system_cron.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_system_cron.yml
index 1807732..96d9d16 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_system_cron.yml
+++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_system_cron.yml
@@ -7,8 +7,8 @@ source:
     - cron_threshold_error
     - cron_last
 process:
-  'threshold.warning': cron_threshold_warning
-  'threshold.error': cron_threshold_error
+  'threshold/warning': cron_threshold_warning
+  'threshold/error': cron_threshold_error
 destination:
   plugin: config
   config_name: system.cron
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_system_file.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_system_file.yml
index 3fdb86f..61777f9 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_system_file.yml
+++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_system_file.yml
@@ -6,8 +6,8 @@ source:
     - file_directory_path
     - file_directory_temp
 process:
-  'path.private': file_directory_path
-  'path.temporary': file_directory_temp
+  'path/private': file_directory_path
+  'path/temporary': file_directory_temp
 destination:
   plugin: config
   config_name: system.file
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_system_performance.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_system_performance.yml
index 25bf122..a7f94d0 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_system_performance.yml
+++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_system_performance.yml
@@ -7,9 +7,9 @@ source:
     - preprocess_js
     - cache_lifetime
 process:
-  'css.preprocess': preprocess_css
-  'js.preprocess': preprocess_js
-  'cache.page.max_age': cache_lifetime
+  'css/preprocess': preprocess_css
+  'js/preprocess': preprocess_js
+  'cache/page/max_age': cache_lifetime
 destination:
   plugin: config
   config_name: system.performance
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_system_rss.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_system_rss.yml
index 0325553..1209531 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_system_rss.yml
+++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_system_rss.yml
@@ -5,7 +5,7 @@ source:
   variables:
     - feed_default_items
 process:
-  'items.limit': feed_default_items
+  'items/limit': feed_default_items
 destination:
   plugin: config
   config_name: system.rss
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_system_site.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_system_site.yml
index f3b5b08..59f6598 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_system_site.yml
+++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_system_site.yml
@@ -15,9 +15,9 @@ process:
   name: site_name
   mail: site_mail
   slogan: site_slogan
-  'page.front': site_frontpage
-  'page.403': site_403
-  'page.404': site_404
+  'page/front': site_frontpage
+  'page/403': site_403
+  'page/404': site_404
   weight_select_max: drupal_weight_select_max
   admin_compact_mode: admin_compact_mode
 destination:
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_update_settings.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_update_settings.yml
index 924c166..e707aed 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_update_settings.yml
+++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_update_settings.yml
@@ -8,10 +8,10 @@ source:
     - update_notification_threshold
     - update_notify_emails
 process:
-  'fetch.max_attempts': update_max_fetch_attempts
-  'fetch.url': update_fetch_url
-  'notification.threshold': update_notification_threshold
-  'notification.emails': update_notify_emails
+  'fetch/max_attempts': update_max_fetch_attempts
+  'fetch/url': update_fetch_url
+  'notification/threshold': update_notification_threshold
+  'notification/emails': update_notify_emails
 destination:
   plugin: config
   config_name: update.settings
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_upload_entity_display.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_upload_entity_display.yml
index f915411..b29a1ca 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_upload_entity_display.yml
+++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_upload_entity_display.yml
@@ -11,13 +11,13 @@ source:
       label: hidden
       settings: {}
 process:
-  entity_type: constants.entity_type
+  entity_type: 'constants/entity_type'
   bundle: node_type
-  view_mode: constants.view_mode
-  field_name: constants.name
-  type: constants.type
-  options: constants.options
-  'options.type': @type
+  view_mode: 'constants/view_mode'
+  field_name: 'constants/name'
+  type: 'constants/type'
+  options: 'constants/options'
+  'options/type': @type
 destination:
   plugin: component_entity_display
 migration_dependencies:
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_upload_entity_form_display.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_upload_entity_form_display.yml
index f6d8ef9..1a098ae 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_upload_entity_form_display.yml
+++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_upload_entity_form_display.yml
@@ -13,13 +13,13 @@ source:
       settings:
         progress_indicator: throbber
 process:
-  entity_type: constants.entity_type
+  entity_type: 'constants/entity_type'
   bundle: node_type
-  field_name: constants.name
-  form_mode: constants.form_mode
-  type: constants.type
-  options: constants.options
-  'options.type': @type
+  field_name: 'constants/name'
+  form_mode: 'constants/form_mode'
+  type: 'constants/type'
+  options: 'constants/options'
+  'options/type': @type
 destination:
   plugin: component_entity_form_display
 migration_dependencies:
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_upload_field.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_upload_field.yml
index 05cd8e2..f055f95 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_upload_field.yml
+++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_upload_field.yml
@@ -12,10 +12,10 @@ source:
     cardinality: -1
     display_field: true
 process:
-  entity_type: constants.entity_type
-  name: constants.name
-  type: constants.type
-  cardinality: constants.cardinality
-  settings.display_field: constants.display_field
+  entity_type: 'constants/entity_type'
+  name: 'constants/name'
+  type: 'constants/type'
+  cardinality: 'constants/cardinality'
+  'settings/display_field': 'constants/display_field'
 destination:
   plugin: entity:field_config
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_upload_field_instance.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_upload_field_instance.yml
index 8a85b40..5aa5179 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_upload_field_instance.yml
+++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_upload_field_instance.yml
@@ -8,12 +8,12 @@ source:
     settings:
       description_field: 1
 process:
-  entity_type: constants.entity_type
+  entity_type: 'constants/entity_type'
   bundle: node_type
-  field_name: constants.name
-  settings: constants.settings
-  'settings.file_extensions': file_extensions
-  'settings.max_filesize': max_filesize
+  field_name: 'constants/name'
+  settings: 'constants/settings'
+  'settings/file_extensions': file_extensions
+  'settings/max_filesize': max_filesize
 destination:
   plugin: entity:field_instance_config
 migration_dependencies:
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_mail.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_mail.yml
index 9716bef..5f20f17 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_mail.yml
+++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_mail.yml
@@ -18,20 +18,20 @@ source:
     - user_mail_status_blocked_subject
     - user_mail_status_blocked_body
 process:
-  'status_activated.subject': user_mail_status_activated_subject
-  'status_activated.body': user_mail_status_activated_body
-  'password_reset.subject': user_mail_password_reset_subject
-  'password_reset.body': user_mail_password_reset_body
-  'cancel_confirm.subject': user_mail_status_deleted_subject
-  'cancel_confirm.body': user_mail_status_deleted_body
-  'register_admin_created.subject': user_mail_register_admin_created_subject
-  'register_admin_created.body': user_mail_register_admin_created_body
-  'register_no_approval_required.subject': user_mail_register_no_approval_required_subject
-  'register_no_approval_required.body': user_mail_register_no_approval_required_body
-  'register_pending_approval.subject': user_mail_user_mail_register_pending_approval_subject
-  'register_pending_approval.body': user_mail_user_mail_register_pending_approval_body
-  'status_blocked.subject': user_mail_status_blocked_subject
-  'status_blocked.body': user_mail_status_blocked_body
+  'status_activated/subject': user_mail_status_activated_subject
+  'status_activated/body': user_mail_status_activated_body
+  'password_reset/subject': user_mail_password_reset_subject
+  'password_reset/body': user_mail_password_reset_body
+  'cancel_confirm/subject': user_mail_status_deleted_subject
+  'cancel_confirm/body': user_mail_status_deleted_body
+  'register_admin_created/subject': user_mail_register_admin_created_subject
+  'register_admin_created/body': user_mail_register_admin_created_body
+  'register_no_approval_required/subject': user_mail_register_no_approval_required_subject
+  'register_no_approval_required/body': user_mail_register_no_approval_required_body
+  'register_pending_approval/subject': user_mail_user_mail_register_pending_approval_subject
+  'register_pending_approval/body': user_mail_user_mail_register_pending_approval_body
+  'status_blocked/subject': user_mail_status_blocked_subject
+  'status_blocked/body': user_mail_status_blocked_body
 destination:
   plugin: config
   config_name: user.mail
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_picture_entity_display.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_picture_entity_display.yml
index ae74352..adfdd83 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_picture_entity_display.yml
+++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_picture_entity_display.yml
@@ -14,13 +14,13 @@ source:
         image_style: ''
         image_link: content
 process:
-  entity_type: constants.entity_type
-  bundle: constants.bundle
-  view_mode: constants.view_mode
-  field_name: constants.name
-  type: constants.type
-  options: constants.options
-  options.type: @type
+  entity_type: 'constants/entity_type'
+  bundle: 'constants/bundle'
+  view_mode: 'constants/view_mode'
+  field_name: 'constants/name'
+  type: 'constants/type'
+  options: 'constants/options'
+  'options/type': @type
 destination:
   plugin: component_entity_display
 migration_dependencies:
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_picture_entity_form_display.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_picture_entity_form_display.yml
index a91e2b4..39c2a81 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_picture_entity_form_display.yml
+++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_picture_entity_form_display.yml
@@ -14,13 +14,13 @@ source:
         progress_indicator: throbber
         preview_image_style: thumbnail
 process:
-  entity_type: constants.entity_type
-  bundle: constants.bundle
-  field_name: constants.name
-  form_mode: constants.form_mode
-  type: constants.type
-  options: constants.options
-  options.type: @type
+  entity_type: 'constants/entity_type'
+  bundle: 'constants/bundle'
+  field_name: 'constants/name'
+  form_mode: 'constants/form_mode'
+  type: 'constants/type'
+  options: 'constants/options'
+  'options/type': @type
 destination:
   plugin: component_entity_form_display
 migration_dependencies:
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_picture_field.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_picture_field.yml
index ed53dd1..5a4a992 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_picture_field.yml
+++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_picture_field.yml
@@ -10,9 +10,9 @@ source:
     name: user_picture
     cardinality: 1
 process:
-  entity_type: constants.entity_type
-  name: constants.name
-  type: constants.type
-  cardinality: constants.cardinality
+  entity_type: 'constants/entity_type'
+  name: 'constants/name'
+  type: 'constants/type'
+  cardinality: 'constants/cardinality'
 destination:
   plugin: entity:field_config
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_picture_field_instance.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_picture_field_instance.yml
index 22962bf..74b4838 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_picture_field_instance.yml
+++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_picture_field_instance.yml
@@ -14,13 +14,13 @@ source:
       alt_field_required: false
       title_field_required: false
 process:
-  entity_type: constants.entity_type
-  bundle: constants.bundle
-  field_name: constants.name
-  settings: constants.settings
-  'settings.file_directory': file_directory
-  'settings.max_filesize': max_filesize
-  'settings.max_resolution': max_resolution
+  entity_type: 'constants/entity_type'
+  bundle: 'constants/bundle'
+  field_name: 'constants/name'
+  settings: 'constants/settings'
+  'settings/file_directory': file_directory
+  'settings/max_filesize': max_filesize
+  'settings/max_resolution': max_resolution
 destination:
   plugin: entity:field_instance_config
 migration_dependencies:
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_picture_file.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_picture_file.yml
index b97950b..21c53e1 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_picture_file.yml
+++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_picture_file.yml
@@ -11,7 +11,7 @@ process:
     source:
       - picture
       - file_directory_path
-      - constants.is_public
+      - 'constants/is_public'
 destination:
   plugin: entity:file
   source_path_property: picture
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_profile_entity_display.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_profile_entity_display.yml
index 0e026dc..57146a5 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_profile_entity_display.yml
+++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_profile_entity_display.yml
@@ -10,9 +10,9 @@ source:
       label: hidden
       settings: {}
 process:
-  entity_type: constants.entity_type
-  bundle: constants.bundle
-  view_mode: constants.view_mode
+  entity_type: 'constants/entity_type'
+  bundle: 'constants/bundle'
+  view_mode: 'constants/view_mode'
   field_name: name
   type:
     plugin: static_map
@@ -25,8 +25,8 @@ process:
       textfield: text_default
       textarea: text_default
       url: link_default
-  options: constants.options
-  'options.type': @type
+  options: 'constants/options'
+  'options/type': @type
   hidden:
     plugin: static_map
     source: visibility
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_profile_entity_form_display.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_profile_entity_form_display.yml
index 6dc6148..0ace57a 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_profile_entity_form_display.yml
+++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_profile_entity_form_display.yml
@@ -10,10 +10,10 @@ source:
     options:
       label: hidden
 process:
-  entity_type: constants.entity_type
-  bundle: constants.bundle
+  entity_type: 'constants/entity_type'
+  bundle: 'constants/bundle'
   field_name: name
-  form_mode: constants.form_mode
+  form_mode: 'constants/form_mode'
   type:
     plugin: static_map
     source: type
@@ -25,14 +25,14 @@ process:
       textfield: text_textfield
       textarea: text_textarea
       url: link_default
-  options: constants.options
-  'options.type': @type
-  'options.settings':
+  options: 'constants/options'
+  'options/type': @type
+  'options/settings':
     plugin: field_instance_widget_settings
     source:
       - @type
-      - constants.empty # we don't have any settings.
-  'options.settings.display_label':  # Single on/off checkboxes need to have display_label = true otherwise their label doesn't show.
+      - 'constants/empty' # we don't have any settings.
+  'options/settings/display_label':  # Single on/off checkboxes need to have display_label = true otherwise their label doesn't show.
     plugin: static_map
     default_value: false
     source: type
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_profile_field.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_profile_field.yml
index 183a265..a075708 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_profile_field.yml
+++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_profile_field.yml
@@ -5,7 +5,7 @@ source:
   constants:
     entity_type: user
 process:
-  entity_type: constants.entity_type
+  entity_type: 'constants/entity_type'
   name: name
   type:
     plugin: static_map
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_profile_field_instance.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_profile_field_instance.yml
index 34a77ac..443d0ec 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_profile_field_instance.yml
+++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_profile_field_instance.yml
@@ -6,8 +6,8 @@ source:
     entity_type: user
     bundle: user
 process:
-  entity_type: constants.entity_type
-  bundle: constants.bundle
+  entity_type: 'constants/entity_type'
+  bundle: 'constants/bundle'
   label: title
   description: explanation
   field_name: name
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_view_modes.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_view_modes.yml
index 3bc9131..a2474c2 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_view_modes.yml
+++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_view_modes.yml
@@ -31,8 +31,8 @@ process:
       5: "Print"
       teaser: "Teaser"
       full: "Full"
-  targetEntityType: constants.targetEntityType
-  status: constants.status
+  targetEntityType: 'constants/targetEntityType'
+  status: 'constants/status'
 
 destination:
   plugin: entity:view_mode
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_vocabulary_entity_display.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_vocabulary_entity_display.yml
index a81af39..65d1fa0 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_vocabulary_entity_display.yml
+++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_vocabulary_entity_display.yml
@@ -11,9 +11,9 @@ source:
       weight: 20
 
 process:
-  entity_type: constants.entity_type
-  view_mode: constants.view_mode
-  options: constants.options
+  entity_type: 'constants/entity_type'
+  view_mode: 'constants/view_mode'
+  options: 'constants/options'
   bundle: type
   field_name:
     plugin: migration
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_vocabulary_entity_form_display.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_vocabulary_entity_form_display.yml
index 249b3b3..945f89d 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_vocabulary_entity_form_display.yml
+++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_vocabulary_entity_form_display.yml
@@ -9,9 +9,9 @@ source:
       type: options_select
       weight: 20
 process:
-  entity_type: constants.entity_type
-  form_mode: constants.form_mode
-  options: constants.options
+  entity_type: 'constants/entity_type'
+  form_mode: 'constants/form_mode'
+  options: 'constants/options'
   bundle: type
   field_name:
     plugin: migration
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_vocabulary_field.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_vocabulary_field.yml
index 13d3bf6..93cacd9 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_vocabulary_field.yml
+++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_vocabulary_field.yml
@@ -8,15 +8,15 @@ source:
     parent: 0
     cardinality: -1
 process:
-  entity_type: constants.entity_type
-  type: constants.type
+  entity_type: 'constants/entity_type'
+  type: 'constants/type'
   name:
     plugin: migration
     migration: d6_taxonomy_vocabulary
     source: vid
-  'settings.allowed_values.0.vocabulary': @name
-  'settings.allowed_values.0.parent': constants.parent
-  cardinality: constants.cardinality
+  'settings/allowed_values/0/vocabulary': @name
+  'settings/allowed_values/0/parent': 'constants/parent'
+  cardinality: 'constants/cardinality'
 destination:
   plugin: entity:field_config
 migration_dependencies:
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_vocabulary_field_instance.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_vocabulary_field_instance.yml
index c7fc497..6427f84 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_vocabulary_field_instance.yml
+++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_vocabulary_field_instance.yml
@@ -6,7 +6,7 @@ source:
     entity_type: node
     parent: 0
 process:
-  entity_type: constants.entity_type
+  entity_type: 'constants/entity_type'
   bundle: type
   field_name:
     plugin: migration
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/CckFieldValues.php b/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/CckFieldValues.php
index be8788a..4e3e2d0 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/CckFieldValues.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/CckFieldValues.php
@@ -148,15 +148,15 @@ public function prepareRow(Row $row) {
           foreach ($field_query->execute() as $field_row) {
             foreach ($field_info['columns'] as $display_name => $column_name) {
               list ( , $column) = explode(':', $display_name);
-              $propery_path = $field_name . '.' . $field_row['delta'] . '.' . $column;
-              $row->setSourceProperty($propery_path, $field_row[$column_name]);
+              $property_path = $field_name . Row::PROPERTY_SEPARATOR . $field_row['delta'] . Row::PROPERTY_SEPARATOR . $column;
+              $row->setSourceProperty($property_path, $field_row[$column_name]);
             }
           }
         }
         else {
           if ($field_row = $field_query->execute()->fetchAssoc()) {
             foreach ($field_info['columns'] as $display_name => $column_name) {
-              $row->setSourceProperty(str_replace(':', '.', $display_name), $field_row[$column_name]);
+              $row->setSourceProperty(str_replace(':', Row::PROPERTY_SEPARATOR, $display_name), $field_row[$column_name]);
             }
           }
         }