diff --git a/cern_integration.module b/cern_integration.module
index 9929ee62d43e713b78a0c7d3e72f91c77903489c..4fb782dfa092199c996f83c717100f3fe1bc6e98 100644
--- a/cern_integration.module
+++ b/cern_integration.module
@@ -163,18 +163,18 @@ function cern_integration_form_simplesamlphp_auth_syncing_settings_form_alter(&$
     $form['user_info']['autoenablesaml']['#disabled'] = TRUE;
 }
 
-###############################
-# Piwik                       #
-# /admin/config/system/piwik  #
-###############################
+################################
+# Matomo                        #
+# /admin/config/system/matomo  #
+################################
 /**
-*  Implements hook_form_FORM_ID_alter() for piwik_admin_settings().
-* @see /admin/config/system/piwik
+*  Implements hook_form_FORM_ID_alter() for matomo_admin_settings().
+* @see /admin/config/system/matomo
 */
-function cern_integration_form_piwik_admin_settings_alter(&$form, &$form_state, $form_id){
-    $form['general']['piwik_site_id']['#disabled'] = TRUE;
-    $form['general']['piwik_url_http']['#disabled'] = TRUE;
-    $form['general']['piwik_url_https']['#disabled'] = TRUE;
+function cern_integration_form_matomo_admin_settings_alter(&$form, &$form_state, $form_id){
+    $form['general']['matomo_site_id']['#disabled'] = TRUE;
+    $form['general']['matomo_url_http']['#disabled'] = TRUE;
+    $form['general']['matomo_url_https']['#disabled'] = TRUE;
 
     global $base_url;
     $_finalurl = $base_url;
@@ -188,8 +188,8 @@ function cern_integration_form_piwik_admin_settings_alter(&$form, &$form_state,
     );
 
     $_markup = \Drupal\Core\Link::fromTextAndUrl('WebServices website', \Drupal\Core\Url::fromUri("https://webservices.web.cern.ch/webservices/Tools/Piwik/?SiteName=$_finalurl"))->toString();
-    $form['cern_view_statistics']['piwik_link'] = array(
-        '#markup' => "Please go to " . $_markup . " to view statistics gathered by Piwik for your site."
+    $form['cern_view_statistics']['matomo_link'] = array(
+        '#markup' => "Please go to " . $_markup . " to view statistics gathered by Matomo/Piwik for your site."
     );
 }
 
@@ -221,4 +221,4 @@ function cern_integration_help($route_name, \Drupal\Core\Routing\RouteMatchInter
             $output .= '<p>' . t('Custom functionality and constraints for CERN Drupal 8 infrastructure.') . '</p>';
       return $output;
     }
-}
\ No newline at end of file
+}