diff --git a/README.txt b/README.txt
index e889378..d512f23 100644
--- a/README.txt
+++ b/README.txt
@@ -41,7 +41,7 @@ Note: Do not forget to rename the functions.
   function mymodule_adobeanalytics_variables() {
   // Initialize a variables array to be returned by this hook.
   $variables = array();
-  $config_var = \Drupal::config('adobeanalytics.settings')->get('adobeanalytics_track_search_engine', 0);
+  $config_var = \Drupal::config('adobeanalytics.settings')->get('track_search_engine', 0);
   if ($config_var) {
     $variables['referring_search_engine'] = 'none';
 
@@ -76,7 +76,7 @@ Note: Do not forget to rename the functions.
     $form['general']['adobeanalytics_track_search_engine'] = array(
       '#type' => 'checkbox',
       '#title' => t('Track the referring search engine for every request'),
-      '#default_value' => \Drupal::config(adobeanalytics . settings)->get('adobeanalytics_track_search_engine', 0),
+      '#default_value' => \Drupal::config(adobeanalytics . settings)->get('track_search_engine', 0),
     );
   }
 
diff --git a/adobeanalytics.module b/adobeanalytics.module
index c29fea8..3ccbc5c 100644
--- a/adobeanalytics.module
+++ b/adobeanalytics.module
@@ -14,7 +14,7 @@ function adobeanalytics_help($route_name, RouteMatchInterface $route_match) {
 
   switch ($route_name) {
     case 'help.page.adobeanalytics':
-      return ['#markup' => "<p>" . t("Settings for AdobeAnalytics.") . "</p>"];
+      return ['#markup' => '<p>' . t('Settings for AdobeAnalytics.') . '</p>'];
   }
 }
 
@@ -30,8 +30,8 @@ function adobeanalytics_page_bottom(&$variables) {
   // Check if we should track the currently active user's role.
   $track_user = TRUE;
   $get_roles = array();
-  $tracking_type = $config->get('adobeanalytics_role_tracking_type');
-  $stored_roles = $config->get('adobeanalytics_track_roles');
+  $tracking_type = $config->get('role_tracking_type');
+  $stored_roles = $config->get('track_roles');
   if ($stored_roles) {
     $get_roles = array();
     foreach ($stored_roles as $key => $value) {
@@ -63,15 +63,13 @@ function adobeanalytics_page_bottom(&$variables) {
     return;
   }
 
-  $adobeanalytics_js_file_location = $config->get(
-        "adobeanalytics_js_file_location"
-    );
+  $adobeanalytics_js_file_location = $config->get('js_file_location');
   $js_file_location = $adobeanalytics_js_file_location;
 
   // Add any custom code snippets if specified and replace any tokens.
   $context = $adobeanalytics_helper->adobeAnalyticsGetTokenContext();
   $codesnippet = $adobeanalytics_helper->adobeAnalyticsTokenReplace(
-        $config->get('adobeanalytics_codesnippet'), $context, array(
+        $config->get('codesnippet'), $context, array(
           'clear' => TRUE,
           'sanitize' => TRUE,
         )
@@ -81,7 +79,7 @@ function adobeanalytics_page_bottom(&$variables) {
   // Right order is the code file (list likely to be maintained)
   // Then admin settings with codesnippet first and finally taxonomy->vars.
   $extra_variables_formatted = $codesnippet;
-  $adobeanalytics_version = $config->get("adobeanalytics_version");
+  $adobeanalytics_version = $config->get("version");
 
   $header = "<!-- AdobeAnalytics code version: ";
   $header .= $adobeanalytics_version;
@@ -97,7 +95,7 @@ function adobeanalytics_page_bottom(&$variables) {
   $footer .= '<script type="text/javascript"><!--' . "\n";
   $footer .= "if(navigator.appVersion.indexOf('MSIE')>=0)document.write(unescape('%3C')+'\!-'+'-')" . "\n";
   $footer .= '//--></script>' . "\n";
-  $nojs = $config->get("adobeanalytics_image_file_location");
+  $nojs = $config->get("image_file_location");
   if (!empty($nojs)) {
     $footer .= '<noscript><img src="' . check_url(
           $nojs . '/' . rand(0, 10000000)
@@ -159,7 +157,7 @@ function adobeanalytics_adobeanalytics_variables() {
    */
 
   // Include variables from the "custom variables" section of the settings form.
-  $settings_variables = $config->get('adobeanalytics_extra_variables');
+  $settings_variables = $config->get('extra_variables');
   foreach ($settings_variables as $key => $value) {
     $variables[$key] = $adobeanalytics_helper->adobeAnalyticsTokenReplace(
           $value
diff --git a/adobeanalytics.permissions.yml b/adobeanalytics.permissions.yml
index f0c89ac..c212065 100644
--- a/adobeanalytics.permissions.yml
+++ b/adobeanalytics.permissions.yml
@@ -1,5 +1,4 @@
 administer AdobeAnalytics configuration:
   title: 'Configure Adobe Analytics settings'
   description: 'Configure Adobe Analytics settings.'
-  #access to Configure the Adobeanalytics form is restricted to admin only.
-  restrict access: true   
+  restrict access: true
diff --git a/composer.json b/composer.json
deleted file mode 100644
index 6bd6816..0000000
--- a/composer.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "name": "drupal/adobeanalytics",
-    "description": "Adds Adobe Analytics javascript tracking code to your site's pages.",
-    "type": "drupal-module",
-    "license": "GPL-2.0+"
-}
diff --git a/config/install/adobeanalytics.settings.yml b/config/install/adobeanalytics.settings.yml
index 00868f5..a7e1aa9 100644
--- a/config/install/adobeanalytics.settings.yml
+++ b/config/install/adobeanalytics.settings.yml
@@ -1,8 +1,8 @@
-adobeanalytics_role_tracking_type: inclusive
-adobeanalytics_js_file_location: ''
-adobeanalytics_codesnippet: ''
-adobeanalytics_version: H.20.3.
-adobeanalytics_image_file_location: ''
-adobeanalytics_token_cache_lifetime: 0
-adobeanalytics_extra_variables: { }
-adobeanalytics_track_roles: { }
+role_tracking_type: inclusive
+js_file_location: ''
+codesnippet: ''
+version: H.20.3.
+image_file_location: ''
+token_cache_lifetime: 0
+extra_variables: { }
+track_roles: { }
diff --git a/config/schema/adobeanalytics.schema.yml b/config/schema/adobeanalytics.schema.yml
index 853d5e3..233cbd4 100644
--- a/config/schema/adobeanalytics.schema.yml
+++ b/config/schema/adobeanalytics.schema.yml
@@ -2,24 +2,24 @@ adoboanalystics.settings:
   type: config_object
   label: 'Adobe Analytics settings'
   mapping:
-    adobeanalytics_role_tracking_type:
+    role_tracking_type:
       type: string
       label: 'Role Tracking Type'
-    adobeanalytics_js_file_location:
+    js_file_location:
       type: string
       label: 'Javascript file location'
-    adobeanalytics_codesnippet:
+    codesnippet:
       type: string
       label: 'Codesnippet'
-    adobeanalytics_version:
+    version:
       type: string
       label: 'Version'
-    adobeanalytics_image_file_location:
+    image_file_location:
       type: string
       label: 'Image file location'
-    adobeanalytics_token_cache_lifetime:
-    adobeanalytics_extra_variables: { }
-    adobeanalytics_track_roles: { }
+    token_cache_lifetime:
+    extra_variables: { }
+    track_roles: { }
     admin_only:
       type: boolean
       label: 'Only apply to admin pages'
diff --git a/src/AdobeAnalyticsHelper.php b/src/AdobeAnalyticsHelper.php
index e160efe..e475067 100644
--- a/src/AdobeAnalyticsHelper.php
+++ b/src/AdobeAnalyticsHelper.php
@@ -11,6 +11,10 @@ use Drupal\system\Entity\Menu;
  * Class to provide helpful function.
  */
 class AdobeAnalyticsHelper {
+
+  // To allow tracking by the AdobeAnalytics package.
+  const ADOBEANALYTICS_TOKEN_CACHE = 'adobeanalytics:tag_token_results';
+
   /**
    * The CurrentRouteMatch service.
    *
@@ -55,9 +59,6 @@ class AdobeAnalyticsHelper {
     $this->token = $token;
   }
 
-  // To allow tracking by the AdobeAnalytics package.
-  const ADOBEANALYTICS_TOKEN_CACHE = 'adobeanalytics:tag_token_results';
-
   /**
    * Get the context.
    */
diff --git a/src/Form/AdobeanalyticsAdminSettings.php b/src/Form/AdobeanalyticsAdminSettings.php
index e85b771..38aa565 100644
--- a/src/Form/AdobeanalyticsAdminSettings.php
+++ b/src/Form/AdobeanalyticsAdminSettings.php
@@ -43,28 +43,28 @@ class AdobeanalyticsAdminSettings extends ConfigFormBase {
       '#weight' => '-10',
     ];
 
-    $form['general']['adobeanalytics_js_file_location'] = [
+    $form['general']['js_file_location'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Complete path to AdobeAnalytics Javascript file'),
-      '#default_value' => $config->get('adobeanalytics_js_file_location'),
+      '#default_value' => $config->get('js_file_location'),
     ];
 
-    $form['general']['adobeanalytics_image_file_location'] = [
+    $form['general']['image_file_location'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Complete path to AdobeAnalytics Image file'),
-      '#default_value' => $config->get('adobeanalytics_image_file_location'),
+      '#default_value' => $config->get('image_file_location'),
     ];
 
-    $form['general']['adobeanalytics_version'] = [
+    $form['general']['version'] = [
       '#type' => 'textfield',
       '#title' => $this->t('AdobeAnalytics version (used by adobeanalytics for debugging)'),
-      '#default_value' => $config->get('adobeanalytics_version'),
+      '#default_value' => $config->get('version'),
     ];
 
-    $form['general']['adobeanalytics_token_cache_lifetime'] = [
+    $form['general']['token_cache_lifetime'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Token cache lifetime'),
-      '#default_value' => $config->get('adobeanalytics_token_cache_lifetime'),
+      '#default_value' => $config->get('token_cache_lifetime'),
       '#description' => $this->t(
         'The time, in seconds, that the AdobeAnalytics token
          cache will be valid for. The token cache will always be cleared at the
@@ -80,8 +80,8 @@ class AdobeanalyticsAdminSettings extends ConfigFormBase {
       '#weight' => '-6',
     ];
 
-    $default_value = ($config->get("adobeanalytics_role_tracking_type")) ? $config->get("adobeanalytics_role_tracking_type") : 'inclusive';
-    $form['roles']['adobeanalytics_role_tracking_type'] = [
+    $default_value = ($config->get("role_tracking_type")) ? $config->get("role_tracking_type") : 'inclusive';
+    $form['roles']['role_tracking_type'] = [
       '#type' => 'select',
       '#title' => $this->t('Add tracking for specific roles'),
       '#options' => [
@@ -91,17 +91,17 @@ class AdobeanalyticsAdminSettings extends ConfigFormBase {
       '#default_value' => $default_value,
     ];
 
-    $roles = array();
+    $roles = [];
     foreach (user_roles() as $role) {
       $roles[$role->id()] = $role->label();
     }
-    $adobeanalytics_config_track_roles = $config->get('adobeanalytics_track_roles');
+    $config_track_roles = $config->get('track_roles');
 
-    $form['roles']["adobeanalytics_track_roles"] = [
+    $form['roles']['track_roles'] = [
       '#type' => 'checkboxes',
       '#options' => $roles,
-      '#default_value' => empty($adobeanalytics_config_track_roles) ?
-      array_keys($roles) : $config->get('adobeanalytics_track_roles'),
+      '#default_value' => empty($config_track_roles) ?
+        array_keys($roles) : $config->get('track_roles'),
     ];
 
     $form['variables'] = [
@@ -125,10 +125,10 @@ class AdobeanalyticsAdminSettings extends ConfigFormBase {
          = "weekend"; }<br/>';
     $description .= '- if ("[current-page:url:path]" == "node") {s.prop9 = "homep
         age";} else {s.prop9 = "[current-page:title]";}';
-    $form['advanced']['adobeanalytics_codesnippet'] = [
+    $form['advanced']['codesnippet'] = [
       '#type' => 'textarea',
       '#title' => $this->t('JavaScript Code'),
-      '#default_value' => $config->get('adobeanalytics_codesnippet'),
+      '#default_value' => $config->get('codesnippet'),
       '#rows' => 15,
       '#description' => $description,
     ];
@@ -149,9 +149,9 @@ class AdobeanalyticsAdminSettings extends ConfigFormBase {
   public function adobeAnalyticsExtraVariablesForm(&$form) {
 
     $config = $this->config('adobeanalytics.settings');
-    $existing_variables = $config->get('adobeanalytics_extra_variables');
-    $headers = array($this->t('Name'), $this->t('Value'));
-    $form['variables']['adobeanalytics_variables'] = [
+    $existing_variables = $config->get('extra_variables');
+    $headers = [$this->t('Name'), $this->t('Value')];
+    $form['variables']['variables'] = [
       '#type' => 'table',
       '#header' => $headers,
     ];
@@ -160,9 +160,9 @@ class AdobeanalyticsAdminSettings extends ConfigFormBase {
     if (!empty($existing_variables)) {
       foreach ($existing_variables as $key_name => $key_value) {
         $form = $this->adobeAnalyticsExtraVariableInputs(
-              $form, $number,
-              $key_name, $key_value
-          );
+          $form, $number,
+          $key_name, $key_value
+        );
         $number++;
       }
     }
@@ -171,18 +171,18 @@ class AdobeanalyticsAdminSettings extends ConfigFormBase {
     }
 
     // Check if the last row empty.
-    $total_extra = count($form['variables']['adobeanalytics_variables']);
-    if (!isset($form['variables']['adobeanalytics_variables'][$total_extra]['name'])
-      ) {
+    $total_extra = count($form['variables']['variables']);
+    if (!isset($form['variables']['variables'][$total_extra]['name'])
+    ) {
       $form = $this->adobeAnalyticsExtraVariableInputs(
-            $form, $total_extra + 1,
-            '', ''
-        );
+        $form, $total_extra + 1,
+        '', ''
+      );
     }
 
     $form['variables']['tokens'] = [
       '#theme' => 'token_tree_link',
-      '#token_types' => array('node', 'menu', 'term', 'user'),
+      '#token_types' => ['node', 'menu', 'term', 'user'],
       '#global_types' => TRUE,
       '#click_insert' => TRUE,
       '#dialog' => TRUE,
@@ -228,33 +228,33 @@ class AdobeanalyticsAdminSettings extends ConfigFormBase {
     $config = $this->config('adobeanalytics.settings');
 
     // Save extra variables.
-    $extra_vars = array();
+    $extra_vars = [];
     foreach ($form_state->getValue('adobeanalytics_variables') as $vars) {
       if (!empty($vars['name']) && !empty($vars['value'])) {
         $extra_vars[$vars['name']] = $vars['value'];
       }
     }
     // Save all the config variables.
-    $config->set('adobeanalytics_extra_variables', $extra_vars)
-      ->set('adobeanalytics_js_file_location', $form_state->getValue('adobeanalytics_js_file_location'))
-      ->set('adobeanalytics_image_file_location', $form_state->getValue('adobeanalytics_image_file_location'))
+    $config->set('extra_variables', $extra_vars)
+      ->set('js_file_location', $form_state->getValue('js_file_location'))
+      ->set('image_file_location', $form_state->getValue('image_file_location'))
       ->set(
-              'adobeanalytics_version', $form_state->getValue(
-                  'adobeanalytics_version'
-              )
-            )
-      ->set('adobeanalytics_token_cache_lifetime', $form_state->getValue('adobeanalytics_token_cache_lifetime'))
+        'version', $form_state->getValue(
+        'version'
+      )
+      )
+      ->set('token_cache_lifetime', $form_state->getValue('token_cache_lifetime'))
       ->set(
-              'adobeanalytics_codesnippet', $form_state->getValue(
-                  'adobeanalytics_codesnippet'
-              )
-            )
-      ->set('adobeanalytics_role_tracking_type', $form_state->getValue('adobeanalytics_role_tracking_type'))
+        'codesnippet', $form_state->getValue(
+        'codesnippet'
+      )
+      )
+      ->set('role_tracking_type', $form_state->getValue('role_tracking_type'))
       ->set(
-              'adobeanalytics_track_roles', $form_state->getValue(
-                  'adobeanalytics_track_roles'
-              )
-            )->save();
+        'track_roles', $form_state->getValue(
+        'track_roles'
+      )
+      )->save();
     parent::submitForm($form, $form_state);
   }