diff --git a/core/modules/contact/lib/Drupal/contact/Access/ContactPageAccess.php b/core/modules/contact/lib/Drupal/contact/Access/ContactPageAccess.php
index 8f6afbc..9e4d2ca 100644
--- a/core/modules/contact/lib/Drupal/contact/Access/ContactPageAccess.php
+++ b/core/modules/contact/lib/Drupal/contact/Access/ContactPageAccess.php
@@ -10,7 +10,7 @@
 use Drupal\Core\Access\AccessCheckInterface;
 use Symfony\Component\Routing\Route;
 use Symfony\Component\HttpFoundation\Request;
-use Drupal\Core\Config\Config;
+use Drupal\Core\Config\ConfigFactory;
 
 /**
  * Access check for test routes.
@@ -22,7 +22,7 @@ class ContactPageAccess implements AccessCheckInterface {
    *
    * @var \Drupal\Core\Config\Config
    */
-  protected $config;
+  protected $configFactory;
 
   /**
    * User Data Service.
@@ -34,8 +34,8 @@ class ContactPageAccess implements AccessCheckInterface {
   /**
    * Constructor for ContactPageAccess.
    */
-  public function __construct(Config $config, UserData $userData) {
-    $this->config = $config;
+  public function __construct(ConfigFactory $configFactory, UserData $userData) {
+    $this->configFactory = $configFactory;
     $this->userData = $userData;
   }
   /**
@@ -80,7 +80,7 @@ public function access(Route $route, Request $request) {
     }
     // If the requested user did not save a preference yet, deny access if the
     // configured default is disabled.
-    elseif (!$this->config('contact.settings')->get('user_default_enabled')) {
+    elseif (!$this->configFactory('contact.settings')->get('user_default_enabled')) {
       return FALSE;
     }
 
diff --git a/core/modules/contact/lib/Drupal/contact/ContactBundle.php b/core/modules/contact/lib/Drupal/contact/ContactBundle.php
index b07bc3c..06bf4a2 100644
--- a/core/modules/contact/lib/Drupal/contact/ContactBundle.php
+++ b/core/modules/contact/lib/Drupal/contact/ContactBundle.php
@@ -21,7 +21,7 @@ class ContactBundle extends Bundle {
    */
   public function build(ContainerBuilder $container) {
     $container->register('access_check.contact', 'Drupal\contact\Access\ContactPageAccess')
-      ->addArgument(new Reference('config.storage'))
+      ->addArgument(new Reference('config.factory'))
       ->addArgument(new Reference('user.data'))
       ->addTag('access_check');
   }
diff --git a/core/modules/contact/lib/Drupal/contact/Controller/ContactPageController.php b/core/modules/contact/lib/Drupal/contact/Controller/ContactPageController.php
index f7aa3c9..5479fb6 100644
--- a/core/modules/contact/lib/Drupal/contact/Controller/ContactPageController.php
+++ b/core/modules/contact/lib/Drupal/contact/Controller/ContactPageController.php
@@ -4,7 +4,7 @@
 use Drupal\Core\ControllerInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Drupal\Core\Flood\FloodInterface;
-use \Drupal\Core\Config\Config;
+use Drupal\Core\Config\ConfigFactory;
 
 use Drupal\contact\Plugin\Core\Entity\Category;
 use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
@@ -25,9 +25,9 @@ class ContactPageController implements ControllerInterface {
   /**
    * Config Manager Object.
    *
-   * @var \Drupal\Core\Config\Config
+   * @var \Drupal\Core\Config\ConfigFactory
    */
-  protected $config;
+  protected $configFactory;
 
   /**
    * Injects database service.
@@ -36,18 +36,21 @@ class ContactPageController implements ControllerInterface {
    *   Symfony Container Interface.
    */
   public static function create(ContainerInterface $container) {
-    return new static($container->get('flood'), $container->get('config'));
+    return new static($container->get('flood'), $container->get('config.factory'));
   }
 
   /**
    * Constructs a ContactController object.
    *
-   * @param \Drupal\Core\Flood\FloodInterface $database
-   *   Database connection.
+   * @param \Drupal\Core\Flood\FloodInterface $flood
+   *   Flood Control Interface.
+   *
+   * @param \Drupal\Core\Config\ConfigFactory $configFactory
+   *   Configuration Factory.
    */
-  public function __construct(FloodInterface $flood, Config $config) {
+  public function __construct(FloodInterface $flood, ConfigFactory $configFactory) {
     $this->flood = $flood;
-    $this->config = $config;
+    $this->configFactory = $configFactory;
   }
   /**
    * Presents the site-wide contact form.
@@ -130,7 +133,7 @@ public function contactPersonalPage($user) {
  * @see \Drupal\contact\Controlelr\ContactPersonalPage()
  */
 protected function contactFloodControl() {
-  $config = $this->config('contact.settings');
+  $config = $this->configFactory('contact.settings');
   $limit = $config->get('flood.limit');
   $interval = $config->get('flood.interval');
   if (!$this->flood->isAllowed('contact', $limit, $interval)) {