diff --git a/core/lib/Drupal/Core/Config/Config.php b/core/lib/Drupal/Core/Config/Config.php
index 93e7898..eed4f89 100644
--- a/core/lib/Drupal/Core/Config/Config.php
+++ b/core/lib/Drupal/Core/Config/Config.php
@@ -70,13 +70,6 @@ class Config {
   protected $data;
 
   /**
-   * The original data of the configuration object.
-   *
-   * @var array
-   */
-  protected $originalData;
-
-  /**
    * The current runtime data.
    *
    * The configuration data from storage merged with language, module and
@@ -167,7 +160,6 @@ public function initWithData(array $data) {
     $this->moduleOverrides = array();
     $this->isNew = FALSE;
     $this->replaceData($data);
-    $this->originalData = $this->data;
     return $this;
   }
 
@@ -475,7 +467,6 @@ public function load() {
       $this->isNew = FALSE;
       $this->replaceData($data);
     }
-    $this->originalData = $this->data;
     $this->isLoaded = TRUE;
     return $this;
   }
@@ -505,8 +496,7 @@ public function save() {
     }
     $this->storage->write($this->name, $this->data);
     $this->isNew = FALSE;
-    $this->notify(ConfigEvents::SAVE);
-    $this->originalData = $this->data;
+    $this->notify('save');
     return $this;
   }
 
@@ -522,8 +512,7 @@ public function delete() {
     $this->storage->delete($this->name);
     $this->isNew = TRUE;
     $this->resetOverriddenData();
-    $this->notify(ConfigEvents::DELETE);
-    $this->originalData = $this->data;
+    $this->notify('delete');
     return $this;
   }
 
@@ -544,7 +533,7 @@ public function getStorage() {
    *   The configuration event name.
    */
   protected function notify($config_event_name) {
-    $this->eventDispatcher->dispatch($config_event_name, new ConfigEvent($this));
+    $this->eventDispatcher->dispatch('config.' . $config_event_name, new ConfigEvent($this));
   }
 
   /**
@@ -661,44 +650,5 @@ public function getRawData() {
     return $this->data;
   }
 
-  /**
-   * Gets original data from this configuration object.
-   *
-   * @see \Drupal\Core\Config\Config::get()
-   *
-   * @return mixed
-   *   The data that was requested.
-   */
-  public function getOriginal($key = '') {
-    if (!$this->isLoaded) {
-      $this->load();
-    }
-
-    // Apply overrides.
-    $original_data = $this->originalData;
-    if (isset($this->languageOverrides) && is_array($this->languageOverrides)) {
-      $original_data = NestedArray::mergeDeepArray(array($original_data, $this->languageOverrides), TRUE);
-    }
-    if (isset($this->moduleOverrides) && is_array($this->moduleOverrides)) {
-      $original_data = NestedArray::mergeDeepArray(array($original_data, $this->moduleOverrides), TRUE);
-    }
-    if (isset($this->settingsOverrides) && is_array($this->settingsOverrides)) {
-      $original_data = NestedArray::mergeDeepArray(array($original_data, $this->settingsOverrides), TRUE);
-    }
-
-    if (empty($key)) {
-      return $original_data;
-    }
-    else {
-      $parts = explode('.', $key);
-      if (count($parts) == 1) {
-        return isset($original_data[$key]) ? $original_data[$key] : NULL;
-      }
-      else {
-        $value = NestedArray::getValue($original_data, $parts, $key_exists);
-        return $key_exists ? $value : NULL;
-      }
-    }
-  }
 }
 
diff --git a/core/lib/Drupal/Core/Config/ConfigEvent.php b/core/lib/Drupal/Core/Config/ConfigEvent.php
index 07ef9ec..5b07098 100644
--- a/core/lib/Drupal/Core/Config/ConfigEvent.php
+++ b/core/lib/Drupal/Core/Config/ConfigEvent.php
@@ -1,15 +1,10 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Config\ConfigEvent.
- */
-
 namespace Drupal\Core\Config;
 
 use Symfony\Component\EventDispatcher\Event;
 
-class ConfigEvent extends Event implements ConfigEventInterface {
+class ConfigEvent extends Event {
 
   /**
    * Configuration object.
@@ -29,17 +24,10 @@ public function __construct(Config $config) {
   }
 
   /**
-   * {@inheritdoc}
+   * Get configuration object.
    */
   public function getConfig() {
     return $this->config;
   }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function changed($key) {
-    return $this->config->get($key) === $this->config->getOriginal($key);
-  }
 }
 
diff --git a/core/lib/Drupal/Core/Config/ConfigEventInterface.php b/core/lib/Drupal/Core/Config/ConfigEventInterface.php
deleted file mode 100644
index e047fa0..0000000
--- a/core/lib/Drupal/Core/Config/ConfigEventInterface.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\Core\Config\ConfigEventInterface.
- */
-
-namespace Drupal\Core\Config;
-
-interface ConfigEventInterface {
-
-  /**
-   * Gets configuration object.
-   *
-   * @return \Drupal\Core\Config\Config
-   *   The configuration object that caused the event to fire.
-   */
-  public function getConfig();
-
-  /**
-   * Checks to see if the provided configuration key's value has changed.
-   *
-   * @param string $key
-   *   The configuration key to check if it has changed.
-   *
-   * @return bool
-   */
-  public function changed($key);
-}
diff --git a/core/lib/Drupal/Core/Config/ConfigEvents.php b/core/lib/Drupal/Core/Config/ConfigEvents.php
deleted file mode 100644
index 81f2638..0000000
--- a/core/lib/Drupal/Core/Config/ConfigEvents.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-
-/**
- * @file
- * Definition of Drupal\Core\Config\ConfigEvents.
- */
-
-namespace Drupal\Core\Config;
-
-
-class ConfigEvents {
-
-  /**
-   * Saves the configuration object(@see \Drupal\Core\Config\Config::save()).
-   *
-   * @return \Drupal\Core\Config\Config
-   *   The configuration object.
-   */
-  const SAVE = 'config.save';
-
-  /**
-   * Deletes the configuration object(@see \Drupal\Core\Config\Config::delete()).
-   *
-   * @return \Drupal\Core\Config\Config
-   *   The configuration object.
-   */
-  const DELETE = 'config.delete';
-
-  /**
-   * Get arbitrary overrides for the named configuration objects from modules(@see \Drupal\Core\Config\ConfigFactory::loadModuleOverrides()).
-   *
-   * @param array $names
-   *   The names of the configuration objects to get overrides for.
-   *
-   * @return array
-   *   An array of overrides keyed by the configuration object name.
-   */
-  const MODULE_OVERRIDES = 'config.module.overrides';
-
-  /**
-   * Renames a configuration object using the storage controller(@see \Drupal\Core\Config\ConfigFactory::rename()).
-   *
-   * @param string $old_name
-   *   The old name of the configuration object.
-   * @param string $new_name
-   *   The new name of the configuration object.
-   *
-   * @return \Drupal\Core\Config\Config
-   *   The renamed config object.
-   */
-  const RENAME = 'config.rename';
-
-  /**
-   * Dispatches validate event for a ConfigImporter object(@see  \Drupal\Core\Config\ConfigImporter::validate()).
-   *
-   * Events should throw a \Drupal\Core\Config\ConfigImporterException to
-   * prevent an import from occurring.
-   */
-  const VALIDATE = 'config.importer.validate';
-
-  /**
-   * Imports the changelist to the target storage(@see  Drupal\Core\Config\ConfigImporter::import()).
-   *
-   * @throws \Drupal\Core\Config\ConfigException
-   *
-   * @return \Drupal\Core\Config\ConfigImporte
-   *   The ConfigImporter instance.
-   */
-  const IMPORT = 'config.importer.import';
-
-}
diff --git a/core/lib/Drupal/Core/Config/ConfigFactory.php b/core/lib/Drupal/Core/Config/ConfigFactory.php
index 622a063..8aeb301 100644
--- a/core/lib/Drupal/Core/Config/ConfigFactory.php
+++ b/core/lib/Drupal/Core/Config/ConfigFactory.php
@@ -257,7 +257,7 @@ public function loadMultiple(array $names) {
    */
   protected function loadModuleOverrides(array $names) {
     $configOverridesEvent = new ConfigModuleOverridesEvent($names, $this->language);
-    $this->eventDispatcher->dispatch(ConfigEvents::MODULE_OVERRIDES, $configOverridesEvent);
+    $this->eventDispatcher->dispatch('config.module.overrides', $configOverridesEvent);
     return $configOverridesEvent->getOverrides();
   }
 
@@ -307,11 +307,10 @@ public function rename($old_name, $new_name) {
       unset($this->cache[$old_cache_key]);
     }
 
-    // Prime the cache and load the configuration with the correct overrides.
-    $config = $this->get($new_name);
-    $this->eventDispatcher->dispatch(ConfigEvents::RENAME, new ConfigRenameEvent($config, $old_name));
-
-    return $config;
+    $new_cache_key = $this->getCacheKey($new_name);
+    $this->cache[$new_cache_key] = new Config($new_name, $this->storage, $this->eventDispatcher, $this->typedConfigManager, $this->language);
+    $this->cache[$new_cache_key]->load();
+    return $this->cache[$new_cache_key];
   }
 
   /**
@@ -468,7 +467,7 @@ public function onConfigSave(ConfigEvent $event) {
    * {@inheritdoc}
    */
   static function getSubscribedEvents() {
-    $events[ConfigEvents::SAVE][] = array('onConfigSave', 255);
+    $events['config.save'][] = array('onConfigSave', 255);
     return $events;
   }
 
diff --git a/core/lib/Drupal/Core/Config/ConfigImporter.php b/core/lib/Drupal/Core/Config/ConfigImporter.php
index 8d9de29..0feabdf 100644
--- a/core/lib/Drupal/Core/Config/ConfigImporter.php
+++ b/core/lib/Drupal/Core/Config/ConfigImporter.php
@@ -215,7 +215,7 @@ public function getUnprocessed($op) {
    *
    * @throws \Drupal\Core\Config\ConfigException
    *
-   * @return \Drupal\Core\Config\ConfigImporte
+   * @return \Drupal\Core\Config\ConfigImporter
    *   The ConfigImporter instance.
    */
   public function import() {
@@ -315,6 +315,16 @@ protected function importInvokeOwner() {
   }
 
   /**
+   * Dispatches a config importer event.
+   *
+   * @param string $event_name
+   *   The name of the config importer event to dispatch.
+   */
+  protected function notify($event_name) {
+    $this->eventDispatcher->dispatch(static::ID . '.' . $event_name, new ConfigImporterEvent($this));
+  }
+
+  /**
    * Determines if a import is already running.
    *
    * @return bool
diff --git a/core/lib/Drupal/Core/Config/ConfigRenameEvent.php b/core/lib/Drupal/Core/Config/ConfigRenameEvent.php
deleted file mode 100644
index e4e4ffc..0000000
--- a/core/lib/Drupal/Core/Config/ConfigRenameEvent.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\Core\Config\ConfigRenameEvent.
- */
-
-namespace Drupal\Core\Config;
-
-class ConfigRenameEvent extends ConfigEvent {
-
-  /**
-   * The old configuration object name.
-   *
-   * @var string
-   */
-  protected $oldName;
-
-  /**
-   * Constructs the config rename event.
-   *
-   * @param \Drupal\Core\Config\Config $confg
-   *   The configuration that has been renamed.
-   * @param $old_name
-   *   The old configuration object name.
-   */
-  public function __construct(Config $confg, $old_name) {
-    $this->config = $confg;
-    $this->oldName = $old_name;
-  }
-
-  /**
-   * Gets the old configuration object name.
-   *
-   * @return string
-   *   The old configuration object name.
-   */
-  public function getOldName() {
-    return $this->oldName;
-  }
-
-}
diff --git a/core/modules/config/lib/Drupal/config/Tests/ConfigEventsTest.php b/core/modules/config/lib/Drupal/config/Tests/ConfigEventsTest.php
deleted file mode 100644
index 38d2d31..0000000
--- a/core/modules/config/lib/Drupal/config/Tests/ConfigEventsTest.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\config\Tests\ConfigEventsTest.
- */
-
-namespace Drupal\config\Tests;
-
-use Drupal\Core\Config\Config;
-use Drupal\Core\Config\ConfigEvents;
-use Drupal\simpletest\DrupalUnitTestBase;
-
-
-/**
- * Tests CRUD operations on configuration objects.
- */
-class ConfigEventsTest extends DrupalUnitTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('config_events_test');
-
-  public static function getInfo() {
-    return array(
-      'name' => 'Config events',
-      'description' => 'Tests events fired on configuration objects.',
-      'group' => 'Configuration',
-    );
-  }
-
-  /**
-   * Tests configuration events.
-   */
-  function testConfigEvents() {
-
-    $name = 'config_events_test.test';
-
-    $config = new Config($name, \Drupal::service('config.storage'), \Drupal::service('event_dispatcher'), \Drupal::service('config.typed'));
-    $config->set('key', 'initial');
-    \Drupal::state()->get('config_events_test.event', FALSE);
-    $this->assertIdentical(\Drupal::state()->get('config_events_test.event', array()), array(), 'No events fired by creating a new configuration object');
-    $config->save();
-
-    $event = \Drupal::state()->get('config_events_test.event', array());
-    $this->assertIdentical($event['event_name'], ConfigEvents::SAVE);
-    $this->assertIdentical($event['current_config_data'], array('key' => 'initial'));
-    $this->assertIdentical($event['raw_config_data'], array('key' => 'initial'));
-    $this->assertIdentical($event['original_config_data'], array());
-
-    $config->set('key', 'updated')->save();
-    $event = \Drupal::state()->get('config_events_test.event', array());
-    $this->assertIdentical($event['event_name'], ConfigEvents::SAVE);
-    $this->assertIdentical($event['current_config_data'], array('key' => 'updated'));
-    $this->assertIdentical($event['raw_config_data'], array('key' => 'updated'));
-    $this->assertIdentical($event['original_config_data'], array('key' => 'initial'));
-
-    $config->delete();
-    $event = \Drupal::state()->get('config_events_test.event', array());
-    $this->assertIdentical($event['event_name'], ConfigEvents::DELETE);
-    $this->assertIdentical($event['current_config_data'], array());
-    $this->assertIdentical($event['raw_config_data'], array());
-    $this->assertIdentical($event['original_config_data'], array('key' => 'updated'));
-  }
-
-  /**
-   * Tests configuration rename event that is fired from the ConfigFactory.
-   */
-  function testConfigRenameEvent() {
-    $name = 'config_events_test.test';
-    $new_name = 'config_events_test.test_rename';
-
-    $config = \Drupal::config($name);
-    $config->set('key', 'initial')->save();
-    $event = \Drupal::state()->get('config_events_test.event', array());
-    $this->assertIdentical($event['event_name'], ConfigEvents::SAVE);
-
-    \Drupal::configFactory()->rename($name, $new_name);
-    $event = \Drupal::state()->get('config_events_test.event', array());
-    $this->assertIdentical($event['event_name'], ConfigEvents::RENAME);
-    $this->assertIdentical($event['current_config_data'], array('key' => 'initial'));
-    $this->assertIdentical($event['raw_config_data'], array('key' => 'initial'));
-    $this->assertIdentical($event['original_config_data'], array('key' => 'initial'));
-  }
-
-
-}
diff --git a/core/modules/config/tests/config_events_test/config_events_test.info.yml b/core/modules/config/tests/config_events_test/config_events_test.info.yml
deleted file mode 100644
index 6cb7504..0000000
--- a/core/modules/config/tests/config_events_test/config_events_test.info.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Configuration events test'
-type: module
-package: Testing
-version: VERSION
-core: 8.x
-hidden: true
diff --git a/core/modules/config/tests/config_events_test/config_events_test.module b/core/modules/config/tests/config_events_test/config_events_test.module
deleted file mode 100644
index aa52475..0000000
--- a/core/modules/config/tests/config_events_test/config_events_test.module
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-/**
- * @file
- * Provides Config event listeners for testing purposes.
- */
diff --git a/core/modules/config/tests/config_events_test/config_events_test.services.yml b/core/modules/config/tests/config_events_test/config_events_test.services.yml
deleted file mode 100644
index 12d6fb1..0000000
--- a/core/modules/config/tests/config_events_test/config_events_test.services.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-services:
-  config_events_test.event_subscriber:
-    class: Drupal\config_events_test\EventSubscriber
-    arguments: ['@state']
-    tags:
-      - { name: event_subscriber }
diff --git a/core/modules/config/tests/config_events_test/lib/Drupal/config_events_test/EventSubscriber.php b/core/modules/config/tests/config_events_test/lib/Drupal/config_events_test/EventSubscriber.php
deleted file mode 100644
index de919ce..0000000
--- a/core/modules/config/tests/config_events_test/lib/Drupal/config_events_test/EventSubscriber.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\config_events_test\EventSubscriber.
- */
-
-namespace Drupal\config_events_test;
-
-
-use Drupal\Core\Config\ConfigEvent;
-use Drupal\Core\Config\ConfigEvents;
-use Drupal\Core\KeyValueStore\StateInterface;
-use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-
-class EventSubscriber implements EventSubscriberInterface {
-
-
-  /**
-   * The state key value store.
-   *
-   * @var \Drupal\Core\KeyValueStore\StateInterface
-   */
-  protected $state;
-
-  /**
-   * Constructs the Event Subscriber object.
-   *
-   * @param \Drupal\Core\KeyValueStore\StateInterface $state
-   *   The state key value store.
-   */
-  public function __construct(StateInterface $state) {
-    $this->state = $state;
-  }
-
-  /**
-   * Reacts to config event.
-   *
-   * @param \Drupal\Core\Config\ConfigEvent $event
-   *   The configuration event.
-   */
-  public function configEventRecorder(ConfigEvent $event) {
-    $config = $event->getConfig();
-    $this->state->set('config_events_test.event', array(
-      'event_name' => $event->getName(),
-      'current_config_data' => $config->get(),
-      'original_config_data' => $config->getOriginal(),
-      'raw_config_data' => $config->getRawData()
-    ));
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  static function getSubscribedEvents() {
-    $events[ConfigEvents::SAVE][] = array('configEventRecorder');
-    $events[ConfigEvents::DELETE][] = array('configEventRecorder');
-    $events[ConfigEvents::RENAME][] = array('configEventRecorder');
-    return $events;
-  }
-} 
\ No newline at end of file
diff --git a/core/modules/config/tests/config_override/lib/Drupal/config_override/EventSubscriber/ConfigModuleLowPriorityOverrideSubscriber.php b/core/modules/config/tests/config_override/lib/Drupal/config_override/EventSubscriber/ConfigModuleLowPriorityOverrideSubscriber.php
index fd7e26c..1e1b5ef 100644
--- a/core/modules/config/tests/config_override/lib/Drupal/config_override/EventSubscriber/ConfigModuleLowPriorityOverrideSubscriber.php
+++ b/core/modules/config/tests/config_override/lib/Drupal/config_override/EventSubscriber/ConfigModuleLowPriorityOverrideSubscriber.php
@@ -7,7 +7,6 @@
 
 namespace Drupal\config_override\EventSubscriber;
 
-use Drupal\Core\Config\ConfigEvents;
 use Drupal\Core\Config\ConfigModuleOverridesEvent;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
@@ -37,7 +36,7 @@ public function onConfigModuleOverride(ConfigModuleOverridesEvent $event) {
    *   An array of event listener definitions.
    */
   static function getSubscribedEvents() {
-    $events[ConfigEvents::MODULE_OVERRIDES][] = array('onConfigModuleOverride', 35);
+    $events['config.module.overrides'][] = array('onConfigModuleOverride', 35);
     return $events;
   }
 }
diff --git a/core/modules/config/tests/config_override/lib/Drupal/config_override/EventSubscriber/ConfigModuleOverrideSubscriber.php b/core/modules/config/tests/config_override/lib/Drupal/config_override/EventSubscriber/ConfigModuleOverrideSubscriber.php
index e168111..54f0f64 100644
--- a/core/modules/config/tests/config_override/lib/Drupal/config_override/EventSubscriber/ConfigModuleOverrideSubscriber.php
+++ b/core/modules/config/tests/config_override/lib/Drupal/config_override/EventSubscriber/ConfigModuleOverrideSubscriber.php
@@ -7,7 +7,6 @@
 
 namespace Drupal\config_override\EventSubscriber;
 
-use Drupal\Core\Config\ConfigEvents;
 use Drupal\Core\Config\ConfigModuleOverridesEvent;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
@@ -35,7 +34,7 @@ public function onConfigModuleOverride(ConfigModuleOverridesEvent $event) {
    *   An array of event listener definitions.
    */
   static function getSubscribedEvents() {
-    $events[ConfigEvents::MODULE_OVERRIDES][] = array('onConfigModuleOverride', 40);
+    $events['config.module.overrides'][] = array('onConfigModuleOverride', 40);
     return $events;
   }
 }