diff --git a/node_title_help_text.module b/node_title_help_text.module
index 36428ac..8e99078 100644
--- a/node_title_help_text.module
+++ b/node_title_help_text.module
@@ -17,10 +17,9 @@ use Symfony\Component\HttpFoundation\Request;
  */
 
 function node_title_help_text_form_node_form_alter(&$form, FormStateInterface $form_state) {
-  $node_type = $form_state->getFormObject()->getEntity()->getType();
   // Retrieve and add description to node title field on node add/edit page.
-  $name = 'node_title_help_text_' . $node_type . '_title_help';
-  $description = \Drupal::state()->get($name) ?: NULL;
+  $name = 'node.type.' . $form_state->getFormObject()->getEntity()->get('type');
+  $description = \Drupal::config($name)->get('title_help') ?: NULL;
   if ($description) {
     $widget =& $form['title']['widget'];
     if (empty($widget[0]['value']['#description'])) {
@@ -39,8 +38,8 @@ function node_title_help_text_form_node_form_alter(&$form, FormStateInterface $f
  */
 function node_title_help_text_form_node_type_form_alter(&$form, \Drupal\Core\Form\FormStateInterface $form_state, $form_id) {
   // Set default value of the help text form element on node type form.
-  $name = 'node_title_help_text_' . $form['type']['#default_value'] . '_title_help';
-  $value = \Drupal::state()->get($name) ?: NULL;
+  $name = 'node.type.' . $form['type']['#default_value'];
+  $value = \Drupal::config($name)->get('title_help') ?: NULL;
 
   $form['submission']['title_help'] = array(
     '#title' => t('Title field helptext'),
@@ -49,11 +48,6 @@ function node_title_help_text_form_node_type_form_alter(&$form, \Drupal\Core\For
     '#description' => 'This text will be displayed at the bottom of title field when creating or editing content of this type.',
   );
 
-  $form['node_type_help_text'] = array(
-    '#type' => 'hidden',
-    '#value' => $name,
-  );
-
   foreach (array_keys($form['actions']) as $action) {
     if (isset($form['actions'][$action]) && isset($form['actions'][$action]['#type']) && $form['actions'][$action]['#type'] === 'submit') {
       $form['actions'][$action]['#submit'][] = 'node_title_help_text_node_type_form_submit';
@@ -66,11 +60,11 @@ function node_title_help_text_form_node_type_form_alter(&$form, \Drupal\Core\For
  *
  * @see node_title_help_text_form_node_type_form_alter()
  */
-function node_title_help_text_node_type_form_submit($form_id, &$form_state) {
+function node_title_help_text_node_type_form_submit($form_id, FormStateInterface $form_state) {
   // In case of change of machine name, remove the old variable.
+  $name = 'node.type.' . $form_state->getFormObject()->getEntity()->get('type');
   $value = $form_state->getFormObject()->getEntity()->title_help;
-  $key = $form_state->getFormObject()->getEntity()->node_type_help_text;
-  \Drupal::state()->set($key, $value);
+  \Drupal::configFactory()->getEditable($name)->set('title_help', $value)->save();
 }
 
 /**
@@ -78,6 +72,6 @@ function node_title_help_text_node_type_form_submit($form_id, &$form_state) {
  */
 function node_title_help_text_node_type_delete($info) {
   // Delete the variable along with content type.
-  $name = 'node_title_help_text_' . $info->type . '_title_help';
-  \Drupal::config()->delete($name);
+  $name = 'node.type.' . $info->type;
+  \Drupal::config($name)->delete('title_help');
 }