diff --git a/cern_integration.info b/cern_integration.info
index 277e15e8f433cc5b8bcd0c2f4efec551ee890fb8..923b82c708cfe189ce9f61219878e0e5e47dcd72 100644
--- a/cern_integration.info
+++ b/cern_integration.info
@@ -1,7 +1,7 @@
 name = CERN Integration
 package = CERN
 description = Provides CERN site integration for Drupal.
-version = "7.X-1.11"
+version = "7.X-1.12"
 core = 7.x
 
 dependencies[] = shib_auth
diff --git a/cern_integration.module b/cern_integration.module
index df592f4662db996f4d0db875480758b2e30346ac..7d9746180f91fddbdd22b0827d08acb8fc1a863a 100644
--- a/cern_integration.module
+++ b/cern_integration.module
@@ -474,7 +474,7 @@ function cern_integration_form_boost_admin_settings_alter(&$form, &$form_state)
 }
 
 // Disable functionality from Piwik module, eduardo 30/01/2014. Also add View statistics link
-function cern_integration_form_piwik_admin_settings_form_alter(&$form, &$form_state)
+function cern_integration_form_matomo_admin_settings_form_alter(&$form, &$form_state)
 {
     // drupal_set_message(print_r($form,TRUE));
     global $base_url;
@@ -483,16 +483,16 @@ function cern_integration_form_piwik_admin_settings_form_alter(&$form, &$form_st
     $_finalurl = str_replace("https://", "", $_finalurl);
     $_finalurl = str_replace(".web.cern.ch", "", $_finalurl);
     
-    $form['account']['piwik_site_id']['#disabled'] = TRUE;
-    $form['account']['piwik_url_http']['#disabled'] = TRUE;
-    $form['account']['piwik_url_https']['#disabled'] = TRUE;
+    $form['account']['matomo_site_id']['#disabled'] = TRUE;
+    $form['account']['matomo_url_http']['#disabled'] = TRUE;
+    $form['account']['matomo_url_https']['#disabled'] = TRUE;
     
     $form['cern_view_statistics'] = array(
         '#type' => 'fieldset',
         '#title' => t('View statistics'),
         '#weight' => - 30
     );
-    $form['cern_view_statistics']['piwik_link'] = array(
+    $form['cern_view_statistics']['matomo_link'] = array(
         '#markup' => "Please go to " . l('WebServices website', "https://webservices.web.cern.ch/webservices/Tools/Piwik/?SiteName=$_finalurl") . " to view statistics gathered by Piwik for your site"
     );
 }
@@ -530,6 +530,7 @@ function cern_integration_help($path, $arg)
         // return '<p>' . t('Note:') . '<p><ul><li>' . t('CERN user: this role is granted to CERN accounts only.') . '</li></ul><p>' . t('see <a href="http://cern.ch/account">CERN Accounts</a> for more information.') . '<p>';
         
         case 'admin/config/system/piwik':
+        case 'admin/config/system/matomo':
             return '<p><b>' . t('Note:') . '</b>' . t(' Piwik configuration is partially centrally managed. Piwik site Id and URLs are set automatically from your data registered in Piwik and disabled on this form. In case of problems or specific request please contact service desk.') . '</p>';
         case 'admin/reports/updates/update':
         case 'admin/modules/update':