Professional Services for Piwik, neutral branding within Piwik app (#10339)

Professional Services for Piwik - neutral branding within Piwik app

37 files changed, 207 insertions, 238 deletions

diff --git a/plugins/CoreConsole/Commands/ManagePlugin.php b/plugins/CoreConsole/Commands/ManagePlugin.php
index 3f07918f7c..0f2294c7e0 100644
--- a/plugins/CoreConsole/Commands/ManagePlugin.php
+++ b/plugins/CoreConsole/Commands/ManagePlugin.php
@@ -41,7 +41,7 @@ class ManagePlugin extends ConsoleCommand
     }
 
     /**
-     * Execute command like: ./console core:plugin activate CustomAlerts --piwik-domain=testcustomer.piwik.pro
+     * Execute command like: ./console core:plugin activate CustomAlerts --piwik-domain=testcustomer.example.com
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
diff --git a/plugins/CoreHome/templates/getDefaultIndexView.twig b/plugins/CoreHome/templates/getDefaultIndexView.twig
index 62e8d8ffe7..62553e1ffe 100644
--- a/plugins/CoreHome/templates/getDefaultIndexView.twig
+++ b/plugins/CoreHome/templates/getDefaultIndexView.twig
@@ -10,7 +10,7 @@
 {% endblock %}
 
 {% block content %}
-    {{ ajax.requestErrorDiv(emailSuperUser|default(''), arePiwikProAdsEnabled) }}
+    {{ ajax.requestErrorDiv(emailSuperUser|default(''), areAdsForProfessionalServicesEnabled, currentModule) }}
     {{ ajax.loadingDiv() }}
 
     <div id="content" class="home">
diff --git a/plugins/CoreUpdater/lang/en.json b/plugins/CoreUpdater/lang/en.json
index 5186315310..8086f16b36 100644
--- a/plugins/CoreUpdater/lang/en.json
+++ b/plugins/CoreUpdater/lang/en.json
@@ -57,7 +57,7 @@
         "ThankYouUpdatePiwik": "Thank you for using Piwik and keeping it up to date!",
         "PostUpdateMessage": "Piwik will always be free to download and use, but it needs your continued support to grow and improve.",
         "PostUpdateSupport": "If you need help using Piwik, you can get support from its creators:",
-        "EnterpriseSolutions": "Enterprise solutions",
+        "ProfessionalServices": "Professional Services",
         "CloudHosting": "Cloud hosting",
         "Updating": "Updating",
         "UpdateUsingHttpsFailed": "Downloading the latest Piwik version over secure HTTPS connection did not succeed, because of the following error:",
diff --git a/plugins/CoreUpdater/templates/updateSuccess.twig b/plugins/CoreUpdater/templates/updateSuccess.twig
index 3ce45af298..661c8ded4d 100644
--- a/plugins/CoreUpdater/templates/updateSuccess.twig
+++ b/plugins/CoreUpdater/templates/updateSuccess.twig
@@ -22,12 +22,13 @@
             {{ 'CoreUpdater_PostUpdateSupport'|translate }}
         </h2>
 
-        <div class="row">
+        <div class="row" style="margin-top:7%">
             <div class="col-sm-5 col-sm-offset-1">
-                <a href="https://piwik.pro/enterprise?pk_medium=App_Enterprise_button&pk_source=Piwik_App&pk_campaign=App_Updated" class="btn btn-lg btn-block">{{ 'CoreUpdater_EnterpriseSolutions'|translate }}</a>
+                <a href="https://piwik.org/support/?pk_medium=Update_Success_button&pk_source=Piwik_App&pk_campaign=App_Updated" class="btn btn-lg btn-block">{{ 'CoreUpdater_ProfessionalServices'|translate }}</a>
             </div>
+
             <div class="col-sm-5">
-                <a href="https://piwik.pro/cloud?pk_medium=App_Cloud_button&pk_source=Piwik_App&pk_campaign=App_Updated" class="btn btn-lg btn-block">{{ 'CoreUpdater_CloudHosting'|translate }}</a>
+                <a href="https://piwik.org/hosting/?pk_medium=App_Cloud_button&pk_source=Piwik_App&pk_campaign=App_Updated" class="btn btn-lg btn-block">{{ 'CoreUpdater_CloudHosting'|translate }}</a>
             </div>
         </div>
 
diff --git a/plugins/Dashboard/Dashboard.php b/plugins/Dashboard/Dashboard.php
index 729f845c70..c25122bcea 100644
--- a/plugins/Dashboard/Dashboard.php
+++ b/plugins/Dashboard/Dashboard.php
@@ -64,10 +64,10 @@ class Dashboard extends \Piwik\Plugin
         if (empty($defaultLayout)) {
             $topWidget = '';
 
-            $advertising = StaticContainer::get('Piwik\PiwikPro\Advertising');
-            if ($advertising->arePiwikProAdsEnabled() && Plugin\Manager::getInstance()->isPluginActivated('PiwikPro')) {
-                $topWidget .= '{"uniqueId":"widgetPiwikPropromoPiwikPro",'
-                    . '"parameters":{"module":"PiwikPro","action":"promoPiwikPro"}},';
+            $advertising = StaticContainer::get('Piwik\ProfessionalServices\Advertising');
+            if ($advertising->areAdsForProfessionalServicesEnabled() && Plugin\Manager::getInstance()->isPluginActivated('ProfessionalServices')) {
+                $topWidget .= '{"uniqueId":"widgetProfessionalServicespromoServices",'
+                    . '"parameters":{"module":"ProfessionalServices","action":"promoServices"}},';
             }
 
             if (Piwik::hasUserSuperUserAccess()) {
diff --git a/plugins/DevicesDetection/plugin.json b/plugins/DevicesDetection/plugin.json
deleted file mode 100644
index 5a522126b8..0000000000
--- a/plugins/DevicesDetection/plugin.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "authors": [
-    {
-      "name": "Piwik PRO",
-      "homepage": "http://piwik.pro"
-    }
-  ]
-}
diff --git a/plugins/Feedback/lang/en.json b/plugins/Feedback/lang/en.json
index 4d55bcfe7a..d16f70a86b 100644
--- a/plugins/Feedback/lang/en.json
+++ b/plugins/Feedback/lang/en.json
@@ -19,15 +19,15 @@
         "ViewUserGuides": "Learn how to configure Piwik and how to effectively analyze your data with our %1$suser guides%2$s",
         "CommunityHelp": "Community Help",
         "ProfessionalHelp": "Professional Help",
-        "PiwikProIntro": "Piwik PRO provides expert support and consulting to clients who host Piwik on their own infrastructure.",
-        "PiwikProOfferIntro": "Our offer includes",
-        "PiwikProReviewPiwikSetup": "A review of your Piwik setup",
-        "PiwikProOptimizationMaintenance": "Piwik optimization & maintenance services",
-        "PiwikProPhoneEmailSupport": "Phone and Email support",
-        "PiwikProTraining": "User, Technical and Developer training",
-        "PiwikProPremiumFeatures": "Premium features",
-        "PiwikProCustomDevelopment": "Custom Development services",
-        "PiwikProAnalystConsulting": "Analyst consulting services",
+        "ProfessionalServicesIntro": "Our worldwide network of professional consultants for Piwik support clients who host Piwik on their own infrastructure.",
+        "ProfessionalServicesOfferIntro": "What services can you benefit from?",
+        "ProfessionalServicesReviewPiwikSetup": "A review of your Piwik setup",
+        "ProfessionalServicesOptimizationMaintenance": "Piwik optimization & maintenance services",
+        "ProfessionalServicesPhoneEmailSupport": "Phone and Email support",
+        "ProfessionalServicesTraining": "User, Technical and Developer training",
+        "ProfessionalServicesPremiumFeatures": "Premium features",
+        "ProfessionalServicesCustomDevelopment": "Custom Development services",
+        "ProfessionalServicesAnalystConsulting": "Analyst consulting services",
         "ContactUs": "Contact us",
         "VisitTheForums": "Visit the %1$s Forums%2$s and get help from the community of Piwik users"
     }
diff --git a/plugins/Feedback/templates/index.twig b/plugins/Feedback/templates/index.twig
index 31e1ec83fc..74818d9213 100644
--- a/plugins/Feedback/templates/index.twig
+++ b/plugins/Feedback/templates/index.twig
@@ -41,19 +41,19 @@
         <h2>{{ 'Feedback_ProfessionalHelp'|translate }}</h2>
 
         <div class="header_full">
-            <p>{{ 'Feedback_PiwikProIntro'|translate }}</p>
+            <p>{{ 'Feedback_ProfessionalServicesIntro'|translate }}</p>
 
-            <p>{{ 'Feedback_PiwikProOfferIntro'|translate }}:</p>
-            <p> &bull; {{ 'Feedback_PiwikProReviewPiwikSetup'|translate }}</p>
-            <p> &bull; {{ 'Feedback_PiwikProOptimizationMaintenance'|translate }}</p>
-            <p> &bull; {{ 'Feedback_PiwikProPhoneEmailSupport'|translate }}</p>
-            <p> &bull; {{ 'Feedback_PiwikProTraining'|translate }}</p>
-            <p> &bull; {{ 'Feedback_PiwikProPremiumFeatures'|translate }}</p>
-            <p> &bull; {{ 'Feedback_PiwikProCustomDevelopment'|translate }}</p>
-            <p> &bull; {{ 'Feedback_PiwikProAnalystConsulting'|translate }}</p>
+            <p>{{ 'Feedback_ProfessionalServicesOfferIntro'|translate }}</p>
+            <p> &bull; {{ 'Feedback_ProfessionalServicesReviewPiwikSetup'|translate }}</p>
+            <p> &bull; {{ 'Feedback_ProfessionalServicesOptimizationMaintenance'|translate }}</p>
+            <p> &bull; {{ 'Feedback_ProfessionalServicesPhoneEmailSupport'|translate }}</p>
+            <p> &bull; {{ 'Feedback_ProfessionalServicesTraining'|translate }}</p>
+            <p> &bull; {{ 'Feedback_ProfessionalServicesPremiumFeatures'|translate }}</p>
+            <p> &bull; {{ 'Feedback_ProfessionalServicesCustomDevelopment'|translate }}</p>
+            <p> &bull; {{ 'Feedback_ProfessionalServicesAnalystConsulting'|translate }}</p>
         </div>
 
-        <form target="_blank" action="https://piwik.pro/contact#contact-form">
+        <form target="_blank" action="https://piwik.org/support/">
             <input type="hidden" name="pk_campaign" value="App_Help">
             <input type="hidden" name="pk_source" value="Piwik_App">
             <input type="hidden" name="pk_medium" value="App_ContactUs_button">
diff --git a/plugins/Installation/Controller.php b/plugins/Installation/Controller.php
index e91ab0355c..f75477f659 100644
--- a/plugins/Installation/Controller.php
+++ b/plugins/Installation/Controller.php
@@ -279,8 +279,8 @@ class Controller extends \Piwik\Plugin\ControllerAdmin
 
                 $email = $form->getSubmitValue('email');
                 $newsletterPiwikORG = $form->getSubmitValue('subscribe_newsletter_piwikorg');
-                $newsletterPiwikPRO = $form->getSubmitValue('subscribe_newsletter_piwikpro');
-                $this->registerNewsletter($email, $newsletterPiwikORG, $newsletterPiwikPRO);
+                $newsletterProfessionalServices = $form->getSubmitValue('subscribe_newsletter_professionalservices');
+                $this->registerNewsletter($email, $newsletterPiwikORG, $newsletterProfessionalServices);
                 $this->redirectToNextStep(__FUNCTION__);
 
             } catch (Exception $e) {
@@ -425,6 +425,7 @@ class Controller extends \Piwik\Plugin\ControllerAdmin
         $view->addForm($form);
 
         $view->showNextStep = false;
+        $view->linkToProfessionalServices = StaticContainer::get('Piwik\ProfessionalServices\Advertising')->getPromoUrlForProfessionalServices($medium = 'App_InstallationFinished');
         $output = $view->render();
 
         return $output;
@@ -670,16 +671,16 @@ class Controller extends \Piwik\Plugin\ControllerAdmin
     /**
      * @param $email
      * @param $newsletterPiwikORG
-     * @param $newsletterPiwikPRO
+     * @param $newsletterProfessionalServices
      */
-    protected function registerNewsletter($email, $newsletterPiwikORG, $newsletterPiwikPRO)
+    protected function registerNewsletter($email, $newsletterPiwikORG, $newsletterProfessionalServices)
     {
         $url = Config::getInstance()->General['api_service_url'];
         $url .= '/1.0/subscribeNewsletter/';
         $params = array(
             'email'     => $email,
             'piwikorg'  => $newsletterPiwikORG,
-            'piwikpro'  => $newsletterPiwikPRO,
+            'piwikpro'  => $newsletterProfessionalServices,
             'url'       => Url::getCurrentUrlWithoutQueryString(),
             'language'  => StaticContainer::get('Piwik\Translation\Translator')->getCurrentLanguage(),
         );
diff --git a/plugins/Installation/FormSuperUser.php b/plugins/Installation/FormSuperUser.php
index c4b1d0944d..87abc026fd 100644
--- a/plugins/Installation/FormSuperUser.php
+++ b/plugins/Installation/FormSuperUser.php
@@ -59,22 +59,15 @@ class FormSuperUser extends QuickForm2
                 'content' => '&nbsp;&nbsp;' . Piwik::translate('Installation_PiwikOrgNewsletter'),
             ));
 
-        $piwikProNewsletter = Piwik::translate('Installation_PiwikProNewsletter',
-            array("<a href='http://piwik.pro?pk_medium=App_Newsletter_link&pk_source=Piwik_App&pk_campaign=App_Installation' style='color:#444;' rel='noreferrer' target='_blank'>", "</a>")
+        $professionalServicesNewsletter = Piwik::translate('Installation_ProfessionalServicesNewsletter',
+            array("<a href='http://piwik.org/consulting/?pk_medium=App_Newsletter_link&pk_source=Piwik_App&pk_campaign=App_Installation' style='color:#444;' rel='noreferrer' target='_blank'>", "</a>")
         );
 
         $currentLanguage = StaticContainer::get('Piwik\Translation\Translator')->getCurrentLanguage();
 
-        if ($currentLanguage == 'de') {
-            $piwikProNewsletter = Piwik::translate('Installation_PiwikProNewsletter',
-                array("<a href='http://piwikpro.de?pk_medium=App_Newsletter_link&pk_source=Piwik_App&pk_campaign=App_Installation' style='color:#444;' rel='noreferrer' target='_blank'>", "</a>")
-            );
-            $piwikProNewsletter = preg_replace('(Piwik PRO(?! GmbH))', 'Piwik PRO GmbH', $piwikProNewsletter);
-        }
-
-        $this->addElement('checkbox', 'subscribe_newsletter_piwikpro', null,
+        $this->addElement('checkbox', 'subscribe_newsletter_professionalservices', null,
             array(
-                'content' => '&nbsp;&nbsp;' . $piwikProNewsletter,
+                'content' => '&nbsp;&nbsp;' . $professionalServicesNewsletter,
             ));
 
         $this->addElement('submit', 'submit', array('value' => Piwik::translate('General_Next') . ' »', 'class' => 'btn btn-lg'));
@@ -82,7 +75,7 @@ class FormSuperUser extends QuickForm2
         // default values
         $this->addDataSource(new HTML_QuickForm2_DataSource_Array(array(
             'subscribe_newsletter_piwikorg' => 1,
-            'subscribe_newsletter_piwikpro' => $currentLanguage == 'de' ? 0 : 1,
+            'subscribe_newsletter_professionalservices' => $currentLanguage == 'de' ? 0 : 1,
         )));
     }
 }
diff --git a/plugins/Installation/lang/en.json b/plugins/Installation/lang/en.json
index c67066b201..725c3bfde2 100644
--- a/plugins/Installation/lang/en.json
+++ b/plugins/Installation/lang/en.json
@@ -44,8 +44,9 @@
         "PasswordDoNotMatch": "password do not match",
         "PasswordRepeat": "Password (repeat)",
         "PercentDone": "%s %% Done",
-        "PiwikProAdTitle": "Advanced Analytics & Services",
-        "PiwikProAdText": "Add premium functionality and unlock the full power with %1$sPiwik PRO On-Premises%2$s, or get your own hassle-free Piwik hosted in the %3$sPiwik PRO Cloud%4$s.",
+        "ProfessionalServicesAdTitle": "Advanced Analytics & Services",
+        "ProfessionalServicesfessionalServicesAdText": "Our network of experts can help your organization unlock the full power of Piwik analytics. ",
+        "ProfessionalServicesfessionalDiscoverHow": "Learn about %1$sadditional products and services%2$s for Piwik and how to increase your conversions and revenue.",
         "PleaseFixTheFollowingErrors": "Please fix the following errors",
         "DefaultSettings": "Default Piwik settings",
         "DefaultSettingsHelp": "Piwik comes with default settings. You can customize them now or do so later in the admin screen.",
@@ -53,7 +54,7 @@
         "RestartWebServer": "After making this change, restart your web server.",
         "ReusingTables": "Reusing the Tables",
         "PiwikOrgNewsletter": "email me with major Piwik community updates",
-        "PiwikProNewsletter": "send me information on %1$sPiwik PRO%2$s services and offers",
+        "ProfessionalServicesNewsletter": "send me information on %1$sProfessional services and products%2$s for Piwik",
         "SeeBelowForMoreInfo": "See below for more information.",
         "SetupWebsite": "Setup a Website",
         "SetupWebsiteError": "There was an error when adding the website",
diff --git a/plugins/Installation/templates/finished.twig b/plugins/Installation/templates/finished.twig
index b64bb79812..133bdc6ab4 100644
--- a/plugins/Installation/templates/finished.twig
+++ b/plugins/Installation/templates/finished.twig
@@ -17,13 +17,13 @@
     <p>{{ 'Installation_WeHopeYouWillEnjoyPiwik'|translate }}</p>
     <p><i>{{ 'Installation_HappyAnalysing'|translate }}</i></p>
 
-    {% if arePiwikProAdsEnabled %}
-        <h3>{{ 'Installation_PiwikProAdTitle'|translate }}</h3>
+    {% if areAdsForProfessionalServicesEnabled %}
+        <h3>{{ 'Installation_ProfessionalServicesAdTitle'|translate }}</h3>
         <p>
-            {% set linkOnPremises = 'Installation_End'|piwikProOnPremisesPromoUrl %}
-            {% set linkOnCloud = 'Installation_End'|piwikProCloudPromoUrl %}
-
-            {{ 'Installation_PiwikProAdText'|translate('<a rel="noreferrer" target="_blank" href="' ~ linkOnPremises ~ '">','</a>', '<a  rel="noreferrer"  target="_blank" href="' ~ linkOnCloud ~ '">','</a>')|raw }}
+            {{ 'Installation_ProfessionalServicesfessionalServicesAdText'|translate }}
+        </p>
+        <p>
+            {{ 'Installation_ProfessionalServicesfessionalDiscoverHow'|translate('<a rel="noreferrer" target="_blank" href="' ~ linkToProfessionalServices ~ '">','</a>')|raw }}
         </p>
     {% endif %}
 
diff --git a/plugins/Morpheus/templates/admin.twig b/plugins/Morpheus/templates/admin.twig
index 143d5a9f07..2ddf3e6929 100644
--- a/plugins/Morpheus/templates/admin.twig
+++ b/plugins/Morpheus/templates/admin.twig
@@ -19,7 +19,7 @@
     {% include "@CoreHome/_topScreen.twig" %}
 
     {% import 'ajaxMacros.twig' as ajax %}
-    {{ ajax.requestErrorDiv(emailSuperUser|default(''), arePiwikProAdsEnabled) }}
+    {{ ajax.requestErrorDiv(emailSuperUser|default(''), areAdsForProfessionalServicesEnabled, currentModule) }}
     {{ postEvent("Template.beforeContent", "admin", currentModule) }}
 
     <div class="page">
diff --git a/plugins/Morpheus/templates/ajaxMacros.twig b/plugins/Morpheus/templates/ajaxMacros.twig
index 267ff8e83d..2a4584c425 100644
--- a/plugins/Morpheus/templates/ajaxMacros.twig
+++ b/plugins/Morpheus/templates/ajaxMacros.twig
@@ -13,7 +13,7 @@
 </div>
 {% endmacro %}
 
-{% macro requestErrorDiv(emailSuperUser, arePiwikProAdsEnabled = false) %}
+{% macro requestErrorDiv(emailSuperUser, areAdsForProfessionalServicesEnabled = false, currentModule = '') %}
     <div id="loadingError">
         <div class="alert alert-danger">
 
@@ -29,9 +29,10 @@
             <a rel="noreferrer" target="_blank" href="https://piwik.org/faq/troubleshooting/faq_19489/">{{ 'General_Faq'|translate }}</a> –
             <a rel="noreferrer" target="_blank" href="http://forum.piwik.org/">{{ 'Feedback_CommunityHelp'|translate }}</a>
 
-            {%- if arePiwikProAdsEnabled %}
+            {%- if areAdsForProfessionalServicesEnabled %}
                 –
-                <a rel="noreferrer" target="_blank" href="{{ 'https://piwik.pro/'|piwikProCampaignParameters('Help', 'AjaxError')|e('html_attr') }}">{{ 'Feedback_ProfessionalHelp'|translate }}</a>
+                {% set supportUrl = 'https://piwik.org/support/?pk_campaign=Help&pk_medium=AjaxError&pk_content=' ~ currentModule ~ '&pk_source=Piwik_App' %}
+                <a rel="noreferrer" target="_blank" href="{{ supportUrl|e('html_attr') }}">{{ 'Feedback_ProfessionalHelp'|translate }}</a>
             {%- endif %}.
         </div>
     </div>
diff --git a/plugins/Morpheus/templates/user.twig b/plugins/Morpheus/templates/user.twig
index b343961eae..f13dc1ebd4 100644
--- a/plugins/Morpheus/templates/user.twig
+++ b/plugins/Morpheus/templates/user.twig
@@ -21,7 +21,7 @@
     {% include "@CoreHome/_topScreen.twig" %}
 
     {% import 'ajaxMacros.twig' as ajax %}
-    {{ ajax.requestErrorDiv(emailSuperUser|default(''), arePiwikProAdsEnabled) }}
+    {{ ajax.requestErrorDiv(emailSuperUser|default(''), areAdsForProfessionalServicesEnabled, currentModule) }}
     {{ postEvent("Template.beforeContent", "user", currentModule) }}
 
     <div class="page">
diff --git a/plugins/MultiSites/angularjs/dashboard/dashboard.controller.js b/plugins/MultiSites/angularjs/dashboard/dashboard.controller.js
index 35cf26a5de..41fcb81d9f 100644
--- a/plugins/MultiSites/angularjs/dashboard/dashboard.controller.js
+++ b/plugins/MultiSites/angularjs/dashboard/dashboard.controller.js
@@ -19,7 +19,7 @@
         $scope.idSite = piwik.broadcast.getValueFromUrl('idSite');
         $scope.url  = piwik.piwik_url;
         $scope.period = piwik.period;
-        $scope.arePiwikProAdsEnabled = piwik.config && piwik.config.are_ads_enabled;
+        $scope.areAdsForProfessionalServicesEnabled = piwik.config && piwik.config.are_ads_enabled;
 
         this.refresh = function (interval) {
             multisitesDashboardModel.refreshInterval = interval;
diff --git a/plugins/MultiSites/angularjs/dashboard/dashboard.directive.html b/plugins/MultiSites/angularjs/dashboard/dashboard.directive.html
index 06a7fb6613..9c7f0f5f21 100644
--- a/plugins/MultiSites/angularjs/dashboard/dashboard.directive.html
+++ b/plugins/MultiSites/angularjs/dashboard/dashboard.directive.html
@@ -66,8 +66,8 @@
                         <a rel="noreferrer" target="_blank" href="https://piwik.org/faq/troubleshooting/faq_19489/">{{ 'General_Faq'|translate }}</a>
                         –
                         <a rel="noreferrer" target="_blank" href="http://forum.piwik.org/">{{ 'Feedback_CommunityHelp'|translate }}</a>
-                        <span ng-show="arePiwikProAdsEnabled"> – </span>
-                        <a ng-show="arePiwikProAdsEnabled" rel="noreferrer" target="_blank" href="https://piwik.pro/?pk_campaign=Help&pk_medium=AjaxError&pk_content=MultiSites&pk_source=Piwik_App">{{ 'Feedback_ProfessionalHelp'|translate }}</a>.
+                        <span ng-show="areAdsForProfessionalServicesEnabled"> – </span>
+                        <a ng-show="areAdsForProfessionalServicesEnabled" rel="noreferrer" target="_blank" href="https://piwik.org/support/?pk_campaign=Help&pk_medium=AjaxError&pk_content=MultiSites&pk_source=Piwik_App">{{ 'Feedback_ProfessionalHelp'|translate }}</a>.
                     </div>
                 </td>
             </tr>
diff --git a/plugins/MultiSites/plugin.json b/plugins/MultiSites/plugin.json
deleted file mode 100644
index 1bf22b2dbd..0000000000
--- a/plugins/MultiSites/plugin.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "authors": [
-    {
-      "name": "Piwik PRO",
-      "homepage": "http://piwik.pro"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/plugins/PiwikPro/PiwikPro.php b/plugins/PiwikPro/PiwikPro.php
deleted file mode 100644
index 590b2a94b5..0000000000
--- a/plugins/PiwikPro/PiwikPro.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-namespace Piwik\Plugins\PiwikPro;
-
-class PiwikPro extends \Piwik\Plugin
-{
-    /**
-     * @see Piwik\Plugin::registerEvents
-     */
-    public function registerEvents()
-    {
-        return array(
-            'AssetManager.getStylesheetFiles' => 'getStylesheetFiles',
-        );
-    }
-
-    public function getStylesheetFiles(&$stylesheets)
-    {
-        $stylesheets[] = 'plugins/PiwikPro/stylesheets/widget.less';
-    }
-}
diff --git a/plugins/PiwikPro/Widgets.php b/plugins/PiwikPro/Widgets.php
deleted file mode 100644
index f8e007aa07..0000000000
--- a/plugins/PiwikPro/Widgets.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-namespace Piwik\Plugins\PiwikPro;
-
-use Piwik\Piwik;
-use Piwik\PiwikPro\Advertising;
-use Piwik\Plugins\ExampleRssWidget\RssRenderer;
-use Piwik\View;
-
-class Widgets extends \Piwik\Plugin\Widgets
-{
-    protected $category = 'About Piwik';
-
-    /**
-     * @var Advertising
-     */
-    private $advertising;
-
-    /**
-     * @var Promo
-     */
-    private $promo;
-
-    public function __construct(Advertising $advertising, Promo $promo)
-    {
-        $this->advertising = $advertising;
-        $this->promo = $promo;
-    }
-
-    protected function init()
-    {
-        if ($this->advertising->arePiwikProAdsEnabled()) {
-            $this->addWidget('PiwikPro_WidgetBlogTitle', 'rssPiwikPro');
-            $this->addWidget('PiwikPro_WidgetPiwikProAd', 'promoPiwikPro');
-        }
-    }
-
-    public function rssPiwikPro()
-    {
-        try {
-            $rss = new RssRenderer('https://piwik.pro/feed/');
-            $rss->showDescription(true);
-
-            return $rss->get();
-
-        } catch (\Exception $e) {
-
-            return $this->error($e);
-        }
-    }
-
-    public function promoPiwikPro()
-    {
-        $view = new View('@PiwikPro/promoPiwikProWidget');
-
-        $promo = $this->promo->getContent();
-
-        $view->ctaLinkUrl = $this->advertising->getPromoUrlForOnPremises('PromoWidget', $promo['campaignContent']);
-        $view->ctaText = $promo['text'];
-        $view->ctaLinkTitle = $this->promo->getLinkTitle();
-
-        return $view->render();
-    }
-
-    /**
-     * @param \Exception $e
-     * @return string
-     */
-    private function error($e)
-    {
-        return '<div class="pk-emptyDataTable">'
-             . Piwik::translate('General_ErrorRequest', array('', ''))
-             . ' - ' . $e->getMessage() . '</div>';
-    }
-
-}
diff --git a/plugins/PiwikPro/config/test.php b/plugins/PiwikPro/config/test.php
deleted file mode 100644
index 327acd5205..0000000000
--- a/plugins/PiwikPro/config/test.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-use Piwik\Tests\Framework\Mock\PiwikPro\Advertising;
-use Piwik\Plugins\PiwikPro\tests\Framework\Mock\Promo;
-
-return array(
-    'Piwik\PiwikPro\Advertising' => function () {
-        return new Advertising();
-    },
-    'Piwik\Plugins\PiwikPro\Promo' => function () {
-        return new Promo();
-    }
-);
diff --git a/plugins/PiwikPro/lang/en.json b/plugins/PiwikPro/lang/en.json
deleted file mode 100644
index 34e405f8f0..0000000000
--- a/plugins/PiwikPro/lang/en.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "PiwikPro": {
-        "WidgetBlogTitle": "Piwik PRO Blog",
-        "WidgetPiwikProAd": "Piwik PRO: Advanced Analytics & Services"
-    }
-}
\ No newline at end of file
diff --git a/plugins/PiwikPro/plugin.json b/plugins/PiwikPro/plugin.json
deleted file mode 100644
index 089dd4abf2..0000000000
--- a/plugins/PiwikPro/plugin.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "name": "PiwikPro",
-  "description": "Provides widgets to follow Piwik PRO blog and to see info about Piwik PRO services and products.",
-  "theme": false
-}
\ No newline at end of file
diff --git a/plugins/ProfessionalServices/ProfessionalServices.php b/plugins/ProfessionalServices/ProfessionalServices.php
new file mode 100644
index 0000000000..203c3bb6f6
--- /dev/null
+++ b/plugins/ProfessionalServices/ProfessionalServices.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Plugins\ProfessionalServices;
+
+class ProfessionalServices extends \Piwik\Plugin
+{
+    /**
+     * @see Piwik\Plugin::registerEvents
+     */
+    public function registerEvents()
+    {
+        return array(
+            'AssetManager.getStylesheetFiles' => 'getStylesheetFiles',
+            'Request.getRenamedModuleAndAction' => 'renameProfessionalServicesModule',
+        );
+    }
+
+    public function getStylesheetFiles(&$stylesheets)
+    {
+        $stylesheets[] = 'plugins/ProfessionalServices/stylesheets/widget.less';
+    }
+
+    /**
+     * @deprecated Can be removed in Piwik 3.0
+     * @param $module
+     * @param $action
+     */
+    public function renameProfessionalServicesModule(&$module, &$action)
+    {
+        if ($module == 'ProfessionalServices') {
+            $module = 'ProfessionalServices';
+
+            if($action == 'promoPiwikPro') {
+                $action = 'promoServices';
+            }
+
+            if($action == 'rssPiwikPro') {
+                $action = 'rss';
+            }
+        }
+    }
+}
diff --git a/plugins/PiwikPro/Promo.php b/plugins/ProfessionalServices/Promo.php
index c253df0f43..36f8ae155d 100644
--- a/plugins/PiwikPro/Promo.php
+++ b/plugins/ProfessionalServices/Promo.php
@@ -6,7 +6,7 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
-namespace Piwik\Plugins\PiwikPro;
+namespace Piwik\Plugins\ProfessionalServices;
 
 class Promo
 {
@@ -19,27 +19,27 @@ class Promo
         ),
         array(
             'campaignContent' => 'bringEnterpriseLevel',
-            'text' => 'Bring your analytics to enterprise level. Upgrade your Piwik platform and receive access to numerous premium features and assistance from our experts.'
+            'text' => 'Bring your analytics to enterprise level. Upgrade your Piwik platform and receive access to numerous premium features and assistance from experts.'
         ),
         array(
             'campaignContent' => 'funnelAnalytics',
-            'text' => 'Want Funnel Analytics? Get Premium features and enterprise-grade support from the makers of Piwik.'
+            'text' => 'Want Funnel Analytics? Get Premium features and enterprise-grade support.'
         ),
         array(
             'campaignContent' => 'monitoringAndIncident',
-            'text' => 'Do you need 24/7 Monitoring and Incident Handling for your Piwik? Get Premium features and enterprise-grade support from the makers of Piwik.'
+            'text' => 'Do you need 24/7 Monitoring and Incident Handling for your Piwik? Get Premium features and enterprise-grade support.'
         ),
         array(
             'campaignContent' => 'slowingDown',
-            'text' => 'Is your Piwik slowing down? The Piwik makers can help with your server setup!'
+            'text' => 'Is your Piwik slowing down? Piwik experts can help with your server setup!'
         ),
         array(
             'campaignContent' => 'excitingFeatures',
-            'text' => 'Want to know how to use all the exciting features in Piwik? Try our User training to be up to speed with working with Piwik.'
+            'text' => 'Want to know how to use all the exciting features in Piwik? Try a User training to be up to speed with working with Piwik.'
         ),
         array(
             'campaignContent' => 'slowingDown',
-            'text' => 'Did you know you can adjust the look and feel of Piwik to your brand, and even replace "Piwik" with your product name? Try our White Label product!',
+            'text' => 'Did you know you can adjust the look and feel of Piwik to your brand, and even replace "Piwik" with your product name? Try the White Label product!',
         ),
         array(
             'campaignContent' => 'metaSites',
diff --git a/plugins/ProfessionalServices/Widgets.php b/plugins/ProfessionalServices/Widgets.php
new file mode 100644
index 0000000000..b1abc5e7da
--- /dev/null
+++ b/plugins/ProfessionalServices/Widgets.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\ProfessionalServices;
+
+use Piwik\Piwik;
+use Piwik\ProfessionalServices\Advertising;
+use Piwik\Plugins\ExampleRssWidget\RssRenderer;
+use Piwik\View;
+
+class Widgets extends \Piwik\Plugin\Widgets
+{
+    protected $category = 'About Piwik';
+
+    /**
+     * @var Advertising
+     */
+    private $advertising;
+
+    /**
+     * @var Promo
+     */
+    private $promo;
+
+    public function __construct(Advertising $advertising, Promo $promo)
+    {
+        $this->advertising = $advertising;
+        $this->promo = $promo;
+    }
+
+    protected function init()
+    {
+        if ($this->advertising->areAdsForProfessionalServicesEnabled()) {
+            $this->addWidget('ProfessionalServices_WidgetProfessionalServicesForPiwik', 'promoServices');
+        }
+    }
+
+    public function rss()
+    {
+        return '';
+    }
+
+    public function promoServices()
+    {
+        $view = new View('@ProfessionalServices/promoServicesWidget');
+
+        $promo = $this->promo->getContent();
+
+        $view->ctaLinkUrl = $this->advertising->getPromoUrlForPiwikProUpgrade();
+        $view->ctaText = $promo['text'];
+        $view->ctaLinkTitle = $this->promo->getLinkTitle();
+
+        return $view->render();
+    }
+}
diff --git a/plugins/ProfessionalServices/config/test.php b/plugins/ProfessionalServices/config/test.php
new file mode 100644
index 0000000000..03ad8662fd
--- /dev/null
+++ b/plugins/ProfessionalServices/config/test.php
@@ -0,0 +1,13 @@
+<?php
+
+use Piwik\Tests\Framework\Mock\ProfessionalServices\Advertising;
+use Piwik\Plugins\ProfessionalServices\tests\Framework\Mock\Promo;
+
+return array(
+    'Piwik\ProfessionalServices\Advertising' => function () {
+        return new Advertising();
+    },
+    'Piwik\Plugins\ProfessionalServices\Promo' => function () {
+        return new Promo();
+    }
+);
diff --git a/plugins/PiwikPro/images/promo.png b/plugins/ProfessionalServices/images/promo.png
index ac15b596df..ac15b596df 100644
--- a/plugins/PiwikPro/images/promo.png
+++ b/plugins/ProfessionalServices/images/promo.png
diff --git a/plugins/ProfessionalServices/lang/en.json b/plugins/ProfessionalServices/lang/en.json
new file mode 100644
index 0000000000..1f275d103f
--- /dev/null
+++ b/plugins/ProfessionalServices/lang/en.json
@@ -0,0 +1,5 @@
+{
+    "ProfessionalServices": {
+        "WidgetProfessionalServicesForPiwik": "Professional Services for Piwik"
+    }
+}
\ No newline at end of file
diff --git a/plugins/ProfessionalServices/plugin.json b/plugins/ProfessionalServices/plugin.json
new file mode 100644
index 0000000000..852b094b37
--- /dev/null
+++ b/plugins/ProfessionalServices/plugin.json
@@ -0,0 +1,4 @@
+{
+  "name": "ProfessionalServices",
+  "description": "Provides widgets to learn about Professional services and products for Piwik."
+}
\ No newline at end of file
diff --git a/plugins/PiwikPro/stylesheets/widget.less b/plugins/ProfessionalServices/stylesheets/widget.less
index fdb9cb1eae..fdb9cb1eae 100644
--- a/plugins/PiwikPro/stylesheets/widget.less
+++ b/plugins/ProfessionalServices/stylesheets/widget.less
diff --git a/plugins/PiwikPro/templates/promoPiwikProWidget.twig b/plugins/ProfessionalServices/templates/promoServicesWidget.twig
index 2864fa340f..67f87df40a 100644
--- a/plugins/PiwikPro/templates/promoPiwikProWidget.twig
+++ b/plugins/ProfessionalServices/templates/promoServicesWidget.twig
@@ -1,6 +1,6 @@
 <div class="promoWidget">
     <div class="promo">
-        <img class="icon" src="plugins/PiwikPro/images/promo.png">
+        <img class="icon" src="plugins/ProfessionalServices/images/promo.png">
         <p class="text">
             {{ ctaText }}
             <br /><br />
diff --git a/plugins/PiwikPro/tests/Framework/Mock/Promo.php b/plugins/ProfessionalServices/tests/Framework/Mock/Promo.php
index 47dd6f6497..a854b9da8a 100644
--- a/plugins/PiwikPro/tests/Framework/Mock/Promo.php
+++ b/plugins/ProfessionalServices/tests/Framework/Mock/Promo.php
@@ -6,9 +6,9 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
-namespace Piwik\Plugins\PiwikPro\tests\Framework\Mock;
+namespace Piwik\Plugins\ProfessionalServices\tests\Framework\Mock;
 
-class Promo extends \Piwik\Plugins\PiwikPro\Promo
+class Promo extends \Piwik\Plugins\ProfessionalServices\Promo
 {
     public function getLinkTitle()
     {
diff --git a/plugins/Referrers/tests/Integration/Columns/ReferrerKeywordTest.php b/plugins/Referrers/tests/Integration/Columns/ReferrerKeywordTest.php
index f5ff10e11c..1e7e4af8cb 100644
--- a/plugins/Referrers/tests/Integration/Columns/ReferrerKeywordTest.php
+++ b/plugins/Referrers/tests/Integration/Columns/ReferrerKeywordTest.php
@@ -38,7 +38,7 @@ class ReferrerKeywordTest extends IntegrationTestCase
         $ecommerce = false;
 
         Fixture::createWebsite($date, $ecommerce, $name = 'test1', $url = 'http://piwik.org/');
-        Fixture::createWebsite($date, $ecommerce, $name = 'test3', $url = 'http://piwik.pro/');
+        Fixture::createWebsite($date, $ecommerce, $name = 'test3', $url = 'http://piwik.xyz/');
 
         $this->keyword = new Keyword();
     }
diff --git a/plugins/Referrers/tests/Integration/Columns/ReferrerNameTest.php b/plugins/Referrers/tests/Integration/Columns/ReferrerNameTest.php
index f118e14ba6..cd1610a178 100644
--- a/plugins/Referrers/tests/Integration/Columns/ReferrerNameTest.php
+++ b/plugins/Referrers/tests/Integration/Columns/ReferrerNameTest.php
@@ -44,7 +44,7 @@ class ReferrerNameTest extends IntegrationTestCase
 
         Fixture::createWebsite($date, $ecommerce, $name = 'test1', $url = 'http://piwik.org/foo/bar');
         Fixture::createWebsite($date, $ecommerce, $name = 'test2', $url = 'http://piwik.org/');
-        Fixture::createWebsite($date, $ecommerce, $name = 'test3', $url = 'http://piwik.pro/');
+        Fixture::createWebsite($date, $ecommerce, $name = 'test3', $url = 'http://piwik.xyz/');
 
         $this->referrerName = new ReferrerName();
     }
diff --git a/plugins/Referrers/tests/Integration/Columns/ReferrerTypeTest.php b/plugins/Referrers/tests/Integration/Columns/ReferrerTypeTest.php
index 7b4b304262..63da107af5 100644
--- a/plugins/Referrers/tests/Integration/Columns/ReferrerTypeTest.php
+++ b/plugins/Referrers/tests/Integration/Columns/ReferrerTypeTest.php
@@ -45,7 +45,7 @@ class ReferrerTypeTest extends IntegrationTestCase
 
         Fixture::createWebsite($date, $ecommerce, $name = 'test1', $url = 'http://piwik.org/foo/bar');
         Fixture::createWebsite($date, $ecommerce, $name = 'test2', $url = 'http://piwik.org/');
-        Fixture::createWebsite($date, $ecommerce, $name = 'test3', $url = 'http://piwik.pro/');
+        Fixture::createWebsite($date, $ecommerce, $name = 'test3', $url = 'http://piwik.xyz/');
         Fixture::createWebsite($date, $ecommerce, $name = 'test4', $url = 'http://google.com/subdir/', 1, null, null, null, null, $excludeUnknownUrls = 1);
 
         $this->referrerType = new ReferrerType();
diff --git a/plugins/Widgetize/tests/System/WidgetTest.php b/plugins/Widgetize/tests/System/WidgetTest.php
index fe126b0b08..c73ebf25e6 100644
--- a/plugins/Widgetize/tests/System/WidgetTest.php
+++ b/plugins/Widgetize/tests/System/WidgetTest.php
@@ -836,21 +836,12 @@ class WidgetTest extends SystemTestCase
                         ),
                 ),
                 array (
-                    'name' => 'Piwik PRO Blog',
-                    'uniqueId' => 'widgetPiwikProrssPiwikPro',
+                    'name' => 'Professional Services for Piwik',
+                    'uniqueId' => 'widgetProfessionalServicespromoServices',
                     'parameters' =>
                         array (
-                            'module' => 'PiwikPro',
-                            'action' => 'rssPiwikPro',
-                        ),
-                ),
-                array (
-                    'name' => 'Piwik PRO: Advanced Analytics & Services',
-                    'uniqueId' => 'widgetPiwikPropromoPiwikProPiwikPro',
-                    'parameters' =>
-                        array (
-                            'module' => 'PiwikPro',
-                            'action' => 'promoPiwikPro',
+                            'module' => 'ProfessionalServices',
+                            'action' => 'promoServices',
                         ),
                 )
         );