Refs #4125 Renaming plugin from Referers to Referrers

 * updating all variables/methods containing Referers
 * RENAMING custom segments definition, and custom scheduled reports definition, so that when they load "Referers" segment/report it still works as expected
 * RENAMING old archived data so that archived blobs are called Referrers
  * Reverting part of 0deb2bbb8d5598200f7adfbc77b190516f919e48
  * Update integration tests generating PDF+HTML with images on my dev box (GD 2.1 and PHP 5.5)

311 files changed, 223 insertions, 299 deletions

diff --git a/plugins/API/API.php b/plugins/API/API.php
index 10dc43fb18..4fb8ee1ec0 100644
--- a/plugins/API/API.php
+++ b/plugins/API/API.php
@@ -496,7 +496,7 @@ class API
     }
 
     /**
-     * Given an API report to query (eg. "Referers.getKeywords", and a Label (eg. "free%20software"),
+     * Given an API report to query (eg. "Referrers.getKeywords", and a Label (eg. "free%20software"),
      * this function will query the API for the previous days/weeks/etc. and will return
      * a ready to use data structure containing the metrics for the requested Label, along with enriched information (min/max values, etc.)
      *
diff --git a/plugins/API/RowEvolution.php b/plugins/API/RowEvolution.php
index cc1e6461c1..db1ec57fb1 100644
--- a/plugins/API/RowEvolution.php
+++ b/plugins/API/RowEvolution.php
@@ -197,7 +197,7 @@ class RowEvolution
         $url = $row->getMetadata('url');
         if ($url
             && ($apiModule == 'Actions'
-                || ($apiModule == 'Referers'
+                || ($apiModule == 'Referrers'
                     && $apiAction == 'getWebsites'))
             && $labelUseAbsoluteUrl
         ) {
diff --git a/plugins/CoreHome/javascripts/broadcast.js b/plugins/CoreHome/javascripts/broadcast.js
index 7a38a63df6..ecd9fb470f 100644
--- a/plugins/CoreHome/javascripts/broadcast.js
+++ b/plugins/CoreHome/javascripts/broadcast.js
@@ -163,7 +163,7 @@ var broadcast = {
     /**
      * propagateAjax -- update hash values then make ajax calls.
      *    example :
-     *       1) <a href="javascript:broadcast.propagateAjax('module=Referers&action=getKeywords')">View keywords report</a>
+     *       1) <a href="javascript:broadcast.propagateAjax('module=Referrers&action=getKeywords')">View keywords report</a>
      *       2) Main menu li also goes through this function.
      *
      * Will propagate your new value into the current hash string and make ajax calls.
diff --git a/plugins/CoreHome/templates/getPromoVideo.twig b/plugins/CoreHome/templates/getPromoVideo.twig
index b0aafb005e..ea70ffaa00 100755
--- a/plugins/CoreHome/templates/getPromoVideo.twig
+++ b/plugins/CoreHome/templates/getPromoVideo.twig
@@ -17,12 +17,12 @@
 
         {# facebook #}
         <a href="http://www.facebook.com/sharer.php?u={{ promoVideoUrl|url_encode }}" target="_blank">
-            <img src="plugins/Referers/images/socials/facebook.com.png" />
+            <img src="plugins/Referrers/images/socials/facebook.com.png" />
         </a>
 
         {# twitter #}
         <a href="http://twitter.com/share?text={{ shareText|url_encode }}&url={{ promoVideoUrl|url_encode }}" target="_blank">
-            <img src="plugins/Referers/images/socials/twitter.com.png" />
+            <img src="plugins/Referrers/images/socials/twitter.com.png" />
         </a>
 
         {# email #}
diff --git a/plugins/CorePluginsAdmin/Controller.php b/plugins/CorePluginsAdmin/Controller.php
index 2d01691a08..680d0462af 100644
--- a/plugins/CorePluginsAdmin/Controller.php
+++ b/plugins/CorePluginsAdmin/Controller.php
@@ -280,7 +280,7 @@ class Controller extends \Piwik\Controller\Admin
     protected function redirectAfterModification($redirectAfter)
     {
         if ($redirectAfter) {
-            Url::redirectToReferer();
+            Url::redirectToReferrer();
         }
     }
 
diff --git a/plugins/Dashboard/Dashboard.php b/plugins/Dashboard/Dashboard.php
index 20ac92a9dc..23fe896491 100644
--- a/plugins/Dashboard/Dashboard.php
+++ b/plugins/Dashboard/Dashboard.php
@@ -81,13 +81,13 @@ class Dashboard extends \Piwik\Plugin
                 ],
                 [
                     ' . $topWidget . '
-                    {"uniqueId":"widgetReferersgetKeywords","parameters":{"module":"Referers","action":"getKeywords"}},
-                    {"uniqueId":"widgetReferersgetWebsites","parameters":{"module":"Referers","action":"getWebsites"}}
+                    {"uniqueId":"widgetReferrersgetKeywords","parameters":{"module":"Referrers","action":"getKeywords"}},
+                    {"uniqueId":"widgetReferrersgetWebsites","parameters":{"module":"Referrers","action":"getWebsites"}}
                 ],
                 [
                     {"uniqueId":"widgetUserCountryMapvisitorMap","parameters":{"module":"UserCountryMap","action":"visitorMap"}},
                     {"uniqueId":"widgetUserSettingsgetBrowser","parameters":{"module":"UserSettings","action":"getBrowser"}},
-                    {"uniqueId":"widgetReferersgetSearchEngines","parameters":{"module":"Referers","action":"getSearchEngines"}},
+                    {"uniqueId":"widgetReferrersgetSearchEngines","parameters":{"module":"Referrers","action":"getSearchEngines"}},
                     {"uniqueId":"widgetVisitTimegetVisitInformationPerServerTime","parameters":{"module":"VisitTime","action":"getVisitInformationPerServerTime"}},
                     {"uniqueId":"widgetExampleRssWidgetrssPiwik","parameters":{"module":"ExampleRssWidget","action":"rssPiwik"}}
                 ]
diff --git a/plugins/ExamplePlugin/ExamplePlugin.php b/plugins/ExamplePlugin/ExamplePlugin.php
index ccc6897465..6bf92427a2 100644
--- a/plugins/ExamplePlugin/ExamplePlugin.php
+++ b/plugins/ExamplePlugin/ExamplePlugin.php
@@ -42,7 +42,7 @@ class ExamplePlugin extends \Piwik\Plugin
     public function addUniqueVisitorsColumnToGivenReport($view)
     {
         $view = $view['view'];
-        if ($view->getCurrentControllerName() == 'Referers'
+        if ($view->getCurrentControllerName() == 'Referrers'
             && $view->getCurrentControllerAction() == 'getWebsites'
         ) {
             $view->columns_to_display[] = 'nb_uniq_visitors';
diff --git a/plugins/Feedback/Controller.php b/plugins/Feedback/Controller.php
index 2b80b18ad2..c905a5d683 100644
--- a/plugins/Feedback/Controller.php
+++ b/plugins/Feedback/Controller.php
@@ -74,7 +74,7 @@ class Controller extends \Piwik\Controller
             $mail->setBodyText(Common::unsanitizeInputValue($body) . "\n"
                 . 'Piwik ' . Version::VERSION . "\n"
                 . 'IP: ' . IP::getIpFromHeader() . "\n"
-                . 'URL: ' . Url::getReferer() . "\n");
+                . 'URL: ' . Url::getReferrer() . "\n");
             @$mail->send();
         } catch (Exception $e) {
             $view->errorString = $e->getMessage();
diff --git a/plugins/Goals/Controller.php b/plugins/Goals/Controller.php
index 22e253511a..239ccf2b36 100644
--- a/plugins/Goals/Controller.php
+++ b/plugins/Goals/Controller.php
@@ -21,7 +21,7 @@ use Piwik\View\ReportsByDimension;
 use Piwik\ViewDataTable;
 use Piwik\View;
 use Piwik\Plugins\Goals\Goals;
-use Piwik\Plugins\Referers\API as APIReferers;
+use Piwik\Plugins\Referrers\API as APIReferrers;
 
 /**
  *
@@ -312,11 +312,11 @@ class Controller extends \Piwik\Controller
         }
 
         $keywordNotDefinedString = '';
-        if (\Piwik\PluginsManager::getInstance()->isPluginActivated('Referers')) {
-            $keywordNotDefinedString = APIReferers::getKeywordNotDefinedString();
+        if (\Piwik\PluginsManager::getInstance()->isPluginActivated('Referrers')) {
+            $keywordNotDefinedString = APIReferrers::getKeywordNotDefinedString();
             $topDimensionsToLoad += array(
-                'keyword' => 'Referers.getKeywords',
-                'website' => 'Referers.getWebsites',
+                'keyword' => 'Referrers.getKeywords',
+                'website' => 'Referrers.getWebsites',
             );
         }
         $topDimensions = array();
diff --git a/plugins/ImageGraph/API.php b/plugins/ImageGraph/API.php
index ec90bd9305..e9a85905a4 100644
--- a/plugins/ImageGraph/API.php
+++ b/plugins/ImageGraph/API.php
@@ -80,7 +80,7 @@ class API
             false // override if !$isMultiplePeriod
             => StaticGraph::GRAPH_TYPE_HORIZONTAL_BAR,
         ),
-        'Referers_getRefererType' => array(
+        'Referrers_getReferrerType' => array(
             false // override if !$isMultiplePeriod
             => StaticGraph::GRAPH_TYPE_HORIZONTAL_BAR,
         ),
diff --git a/plugins/ImageGraph/ImageGraph.php b/plugins/ImageGraph/ImageGraph.php
index fc992a3425..7b3d68d745 100644
--- a/plugins/ImageGraph/ImageGraph.php
+++ b/plugins/ImageGraph/ImageGraph.php
@@ -19,12 +19,12 @@ use Piwik\Config;
 class ImageGraph extends \Piwik\Plugin
 {
     static private $CONSTANT_ROW_COUNT_REPORT_EXCEPTIONS = array(
-        'Referers_getRefererType',
+        'Referrers_getReferrerType',
     );
 
     // row evolution support not yet implemented for these APIs
     static private $REPORTS_DISABLED_EVOLUTION_GRAPH = array(
-        'Referers_getAll',
+        'Referrers_getAll',
     );
 
     public function getInformation()
diff --git a/plugins/Installation/Controller.php b/plugins/Installation/Controller.php
index 81f48a66d1..a7977a5349 100644
--- a/plugins/Installation/Controller.php
+++ b/plugins/Installation/Controller.php
@@ -585,7 +585,7 @@ class Controller extends \Piwik\Controller\Admin
     {
         $language = Common::getRequestVar('language');
         LanguagesManager::setLanguageForSession($language);
-        Url::redirectToReferer();
+        Url::redirectToReferrer();
     }
 
     /**
diff --git a/plugins/LanguagesManager/Controller.php b/plugins/LanguagesManager/Controller.php
index 7d716013df..3177a3dabe 100644
--- a/plugins/LanguagesManager/Controller.php
+++ b/plugins/LanguagesManager/Controller.php
@@ -40,6 +40,6 @@ class Controller extends \Piwik\Controller
                 API::getInstance()->setLanguageForUser($currentUser, $language);
             }
         }
-        Url::redirectToReferer();
+        Url::redirectToReferrer();
     }
 }
diff --git a/plugins/Live/API.php b/plugins/Live/API.php
index 4fb04ca616..3acd154dd2 100644
--- a/plugins/Live/API.php
+++ b/plugins/Live/API.php
@@ -23,7 +23,7 @@ use Piwik\Period;
 use Piwik\Period\Range;
 use Piwik\Piwik;
 use Piwik\Plugins\SitesManager\API as APISitesManager;
-use Piwik\Plugins\Referers\API as APIReferers;
+use Piwik\Plugins\Referrers\API as APIReferrers;
 use Piwik\Segment;
 use Piwik\Site;
 use Piwik\Tracker\Action;
@@ -472,7 +472,7 @@ class API
 
             $keyword = $visit->getColumn('referrerKeyword');
             if ($keyword !== false
-                && $keyword != APIReferers::getKeywordNotDefinedString()
+                && $keyword != APIReferrers::getKeywordNotDefinedString()
             ) {
                 $result .= ' (' . $keyword . ')';
             }
diff --git a/plugins/Live/Visitor.php b/plugins/Live/Visitor.php
index 3f81dbfcb4..39581e7f83 100644
--- a/plugins/Live/Visitor.php
+++ b/plugins/Live/Visitor.php
@@ -13,20 +13,20 @@ namespace Piwik\Plugins\Live;
 use Piwik\Common;
 use Piwik\IP;
 use Piwik\Plugins\API\API as APIMetadata;
-use Piwik\Plugins\Referers\API as APIReferers;
+use Piwik\Plugins\Referrers\API as APIReferrers;
 use Piwik\Plugins\UserCountry\LocationProvider\GeoIp;
 use Piwik\Tracker;
 use Piwik\Tracker\Visit;
 use Piwik\UrlHelper;
 
 /**
- * @see plugins/Referers/functions.php
+ * @see plugins/Referrers/functions.php
  * @see plugins/UserCountry/functions.php
  * @see plugins/UserSettings/functions.php
  * @see plugins/Provider/functions.php
  */
 
-require_once PIWIK_INCLUDE_PATH . '/plugins/Referers/functions.php';
+require_once PIWIK_INCLUDE_PATH . '/plugins/Referrers/functions.php';
 require_once PIWIK_INCLUDE_PATH . '/plugins/UserCountry/functions.php';
 require_once PIWIK_INCLUDE_PATH . '/plugins/UserSettings/functions.php';
 require_once PIWIK_INCLUDE_PATH . '/plugins/Provider/functions.php';
@@ -97,12 +97,12 @@ class Visitor
             'providerName'                => $this->getProviderName(),
             'providerUrl'                 => $this->getProviderUrl(),
 
-            'referrerType'                => $this->getRefererType(),
-            'referrerTypeName'            => $this->getRefererTypeName(),
-            'referrerName'                => $this->getRefererName(),
+            'referrerType'                => $this->getReferrerType(),
+            'referrerTypeName'            => $this->getReferrerTypeName(),
+            'referrerName'                => $this->getReferrerName(),
             'referrerKeyword'             => $this->getKeyword(),
             'referrerKeywordPosition'     => $this->getKeywordPosition(),
-            'referrerUrl'                 => $this->getRefererUrl(),
+            'referrerUrl'                 => $this->getReferrerUrl(),
             'referrerSearchEngineUrl'     => $this->getSearchEngineUrl(),
             'referrerSearchEngineIcon'    => $this->getSearchEngineIcon(),
             'operatingSystem'             => $this->getOperatingSystem(),
@@ -337,41 +337,41 @@ class Visitor
         return $customVariables;
     }
 
-    function getRefererType()
+    function getReferrerType()
     {
-        return \Piwik\Plugins\Referers\getRefererTypeFromShortName($this->details['referer_type']);
+        return \Piwik\Plugins\Referrers\getReferrerTypeFromShortName($this->details['referer_type']);
     }
 
-    function getRefererTypeName()
+    function getReferrerTypeName()
     {
-        return \Piwik\Plugins\Referers\getRefererTypeLabel($this->details['referer_type']);
+        return \Piwik\Plugins\Referrers\getReferrerTypeLabel($this->details['referer_type']);
     }
 
     function getKeyword()
     {
         $keyword = $this->details['referer_keyword'];
-        if (\Piwik\PluginsManager::getInstance()->isPluginActivated('Referers')
-            && $this->getRefererType() == 'search'
+        if (\Piwik\PluginsManager::getInstance()->isPluginActivated('Referrers')
+            && $this->getReferrerType() == 'search'
         ) {
-            $keyword = \Piwik\Plugins\Referers\API::getCleanKeyword($keyword);
+            $keyword = \Piwik\Plugins\Referrers\API::getCleanKeyword($keyword);
         }
         return urldecode($keyword);
     }
 
-    function getRefererUrl()
+    function getReferrerUrl()
     {
-        if ($this->getRefererType() == 'search') {
-            if (\Piwik\PluginsManager::getInstance()->isPluginActivated('Referers')
-                && $this->details['referer_keyword'] == APIReferers::LABEL_KEYWORD_NOT_DEFINED
+        if ($this->getReferrerType() == 'search') {
+            if (\Piwik\PluginsManager::getInstance()->isPluginActivated('Referrers')
+                && $this->details['referer_keyword'] == APIReferrers::LABEL_KEYWORD_NOT_DEFINED
             ) {
                 return 'http://piwik.org/faq/general/#faq_144';
             } // Case URL is google.XX/url.... then we rewrite to the search result page url
-            elseif ($this->getRefererName() == 'Google'
+            elseif ($this->getReferrerName() == 'Google'
                 && strpos($this->details['referer_url'], '/url')
             ) {
                 $refUrl = @parse_url($this->details['referer_url']);
                 if (isset($refUrl['host'])) {
-                    $url = \Piwik\Plugins\Referers\getSearchEngineUrlFromUrlAndKeyword('http://google.com', $this->getKeyword());
+                    $url = \Piwik\Plugins\Referrers\getSearchEngineUrlFromUrlAndKeyword('http://google.com', $this->getKeyword());
                     $url = str_replace('google.com', $refUrl['host'], $url);
                     return $url;
                 }
@@ -385,8 +385,8 @@ class Visitor
 
     function getKeywordPosition()
     {
-        if ($this->getRefererType() == 'search'
-            && strpos($this->getRefererName(), 'Google') !== false
+        if ($this->getReferrerType() == 'search'
+            && strpos($this->getReferrerName(), 'Google') !== false
         ) {
             $url = @parse_url($this->details['referer_url']);
             if (empty($url['query'])) {
@@ -400,17 +400,17 @@ class Visitor
         return null;
     }
 
-    function getRefererName()
+    function getReferrerName()
     {
         return urldecode($this->details['referer_name']);
     }
 
     function getSearchEngineUrl()
     {
-        if ($this->getRefererType() == 'search'
+        if ($this->getReferrerType() == 'search'
             && !empty($this->details['referer_name'])
         ) {
-            return \Piwik\Plugins\Referers\getSearchEngineUrlFromName($this->details['referer_name']);
+            return \Piwik\Plugins\Referrers\getSearchEngineUrlFromName($this->details['referer_name']);
         }
         return null;
     }
@@ -419,7 +419,7 @@ class Visitor
     {
         $searchEngineUrl = $this->getSearchEngineUrl();
         if (!is_null($searchEngineUrl)) {
-            return \Piwik\Plugins\Referers\getSearchEngineLogoFromUrl($searchEngineUrl);
+            return \Piwik\Plugins\Referrers\getSearchEngineLogoFromUrl($searchEngineUrl);
         }
         return null;
     }
diff --git a/plugins/Live/stylesheets/live.less b/plugins/Live/stylesheets/live.less
index 7c1bc5ded8..950481169e 100644
--- a/plugins/Live/stylesheets/live.less
+++ b/plugins/Live/stylesheets/live.less
@@ -4,7 +4,7 @@
     color: #444;
 }
 
-#visitsLive .datetime, #visitsLive .country, #visitsLive .referer, #visitsLive .settings, #visitsLive .returning {
+#visitsLive .datetime, #visitsLive .country, #visitsLive .referrer, #visitsLive .settings, #visitsLive .returning {
     border-bottom: 1px solid #d3d1c5;
     border-right: 1px solid #d3d1c5;
     padding: 5px 5px 5px 12px;
@@ -21,11 +21,11 @@
     background: #FFF url(plugins/CoreHome/images/bullet1.gif) no-repeat scroll 0 0;
 }
 
-#visitsLive .referer {
+#visitsLive .referrer {
     background: #F9FAFA none repeat scroll 0 0;
 }
 
-#visitsLive .referer:hover {
+#visitsLive .referrer:hover {
     background: #FFFFF7;
 }
 
diff --git a/plugins/Live/templates/_dataTableViz_visitorLog.twig b/plugins/Live/templates/_dataTableViz_visitorLog.twig
index 3d090748df..f74a32a1e3 100644
--- a/plugins/Live/templates/_dataTableViz_visitorLog.twig
+++ b/plugins/Live/templates/_dataTableViz_visitorLog.twig
@@ -114,7 +114,7 @@ GPS (lat/long): {{ visitor.getColumn('latitude') }},{{ visitor.getColumn('longit
             {% endif %}
 
             <td class="column">
-                <div class="referer">
+                <div class="referrer">
                     {% if visitor.getColumn('referrerType') == 'website' %}
                         {{ 'Referrers_ColumnWebsite'|translate }}:
                         <a href="{{ visitor.getColumn('referrerUrl') }}" target="_blank" title="{{ visitor.getColumn('referrerUrl') }}"
diff --git a/plugins/Live/templates/getLastVisitsStart.twig b/plugins/Live/templates/getLastVisitsStart.twig
index eacc3b73d4..a30d5b331c 100644
--- a/plugins/Live/templates/getLastVisitsStart.twig
+++ b/plugins/Live/templates/getLastVisitsStart.twig
@@ -36,7 +36,7 @@
                 {% endif %}
             </div>
             <!--<div class="settings"></div>-->
-            <div class="referer">
+            <div class="referrer">
                 {% if visitor.referrerType != 'direct' %}
                     {{ 'General_FromReferrer'|translate }}
                     {% if visitor.referrerUrl is not empty %}
diff --git a/plugins/PleineLune/stylesheets/plugins/_live.less b/plugins/PleineLune/stylesheets/plugins/_live.less
index bdcd2da1c9..6d134a661f 100644
--- a/plugins/PleineLune/stylesheets/plugins/_live.less
+++ b/plugins/PleineLune/stylesheets/plugins/_live.less
@@ -15,7 +15,7 @@
 
 #visitsLive .datetime,
 #visitsLive .country,
-#visitsLive .referer,
+#visitsLive .referrer,
 #visitsLive .settings,
 #visitsLive .returning {
   border: 1px solid @theme-color-background-smallContrast;
@@ -28,8 +28,8 @@
 }
 
 #visitsLive .country,
-#visitsLive .referer,
-#visitsLive .referer:hover,
+#visitsLive .referrer,
+#visitsLive .referrer:hover,
 #visitsLive .settings {
   background: @theme-color-background-base;
 }
\ No newline at end of file
diff --git a/plugins/PleineLune/stylesheets/plugins/_referers.less b/plugins/PleineLune/stylesheets/plugins/_referrers.less
index c7cb884617..c7cb884617 100644
--- a/plugins/PleineLune/stylesheets/plugins/_referers.less
+++ b/plugins/PleineLune/stylesheets/plugins/_referrers.less
diff --git a/plugins/PleineLune/stylesheets/theme.less b/plugins/PleineLune/stylesheets/theme.less
index aa63d9210a..da885c83b1 100644
--- a/plugins/PleineLune/stylesheets/theme.less
+++ b/plugins/PleineLune/stylesheets/theme.less
@@ -35,7 +35,7 @@
 @import "../../PleineLune/stylesheets/_transitionColors.less";
 @import "../../PleineLune/stylesheets/_map.less";
 @import "../../PleineLune/stylesheets/plugins/_multiSites.less";
-@import "../../PleineLune/stylesheets/plugins/_referers.less";
+@import "../../PleineLune/stylesheets/plugins/_referrers.less";
 @import "../../PleineLune/stylesheets/plugins/_userManager.less";
 @import "../../PleineLune/stylesheets/plugins/_userCountry.less";
 @import "../../PleineLune/stylesheets/plugins/_dbStats.less";
diff --git a/plugins/Proxy/Controller.php b/plugins/Proxy/Controller.php
index 9d2927f2ad..3531d781a4 100644
--- a/plugins/Proxy/Controller.php
+++ b/plugins/Proxy/Controller.php
@@ -62,11 +62,11 @@ class Controller extends \Piwik\Controller
         $url = Common::getRequestVar('url', '', 'string', $_GET);
 
         // validate referrer
-        $referrer = Url::getReferer();
+        $referrer = Url::getReferrer();
         if (empty($referrer) || !Url::isLocalUrl($referrer)) {
             die('Invalid Referrer detected - This means that your web browser is not sending the "Referrer URL" which is
 				required to proceed with the redirect. Verify your browser settings and add-ons, to check why your browser
-				 is not sending this referer.
+				 is not sending this referrer.
 
 				<br/><br/>You can access the page at: ' . $url);
         }
diff --git a/plugins/Referers/API.php b/plugins/Referrers/API.php
index 40542ef26f..055205ffbe 100644
--- a/plugins/Referers/API.php
+++ b/plugins/Referrers/API.php
@@ -6,9 +6,9 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  *
  * @category Piwik_Plugins
- * @package Referers
+ * @package Referrers
  */
-namespace Piwik\Plugins\Referers;
+namespace Piwik\Plugins\Referrers;
 
 use Exception;
 use Piwik\API\ResponseBuilder;
@@ -19,18 +19,16 @@ use Piwik\Piwik;
 use Piwik\Common;
 use Piwik\Date;
 use Piwik\DataTable;
-use Piwik\DataTable\Map;
-use Piwik\Plugins\Referers\Archiver;
 
 /**
  * The Referrers API lets you access reports about Websites, Search engines, Keywords, Campaigns used to access your website.
  *
  * For example, "getKeywords" returns all search engine keywords (with <a href='http://piwik.org/docs/analytics-api/reference/#toc-metric-definitions' target='_blank'>general analytics metrics</a> for each keyword), "getWebsites" returns referrer websites (along with the full Referrer URL if the parameter &expanded=1 is set).
- * "getRefererType" returns the Referrer overview report. "getCampaigns" returns the list of all campaigns (and all campaign keywords if the parameter &expanded=1 is set).
+ * "getReferrerType" returns the Referrer overview report. "getCampaigns" returns the list of all campaigns (and all campaign keywords if the parameter &expanded=1 is set).
  *
  * The methods "getKeywordsForPageUrl" and "getKeywordsForPageTitle" are used to output the top keywords used to find a page.
- * Check out the widget <a href='http://demo.piwik.org/index.php?module=Widgetize&action=iframe&moduleToWidgetize=Referers&actionToWidgetize=getKeywordsForPage&idSite=7&period=day&date=2011-02-15&disableLink=1' target='_blank'>"Top keywords used to find this page"</a> that you can easily re-use on your website.
- * @package Referers
+ * Check out the widget <a href='http://demo.piwik.org/index.php?module=Widgetize&action=iframe&moduleToWidgetize=Referrers&actionToWidgetize=getKeywordsForPage&idSite=7&period=day&date=2011-02-15&disableLink=1' target='_blank'>"Top keywords used to find this page"</a> that you can easily re-use on your website.
+ * @package Referrers
  */
 class API
 {
@@ -57,65 +55,11 @@ class API
     protected function getDataTable($name, $idSite, $period, $date, $segment, $expanded = false, $idSubtable = null)
     {
         $dataTable = Archive::getDataTableFromArchive($name, $idSite, $period, $date, $segment, $expanded, $idSubtable);
-
-        // backwards compatibility: before v2.0, Referrers_... blobs were named Referers_... . here we
-        // check if we're missing blobs w/ the correct name, and if so, try to use the old name.
-        $dataMissing = true;
-        $dataTable->filter(function ($table) use (&$dataMissing) {
-            if ($table->getRowsCount() > 0) {
-                $dataMissing = false;
-            }
-        });
-
-        if ($dataMissing) {
-            $oldName = $this->getOldReferrersRecordName($name);
-            $oldData = Archive::getDataTableFromArchive($oldName, $idSite, $period, $date, $segment, $expanded, $idSubtable);
-
-            if ($dataTable instanceof DataTable) {
-                $dataTable = $oldData;
-            } else {
-                $this->replaceEmptyDataTablesWith($dataTable, $oldData);
-            }
-        }
-
         $dataTable->filter('Sort', array(Metrics::INDEX_NB_VISITS, 'desc', $naturalSort = false, $expanded));
         $dataTable->queueFilter('ReplaceColumnNames');
         return $dataTable;
     }
 
-    private function getNumeric($name, $idSite, $period, $date, $segment)
-    {
-        Piwik::checkUserHasViewAccess($idSite);
-        $archive = Archive::build($idSite, $period, $date, $segment);
-        $dataTable = $archive->getDataTableFromNumeric($name);
-
-        // backwards compatibility: before v2.0, Referrers_... metrics were named Referers_... . here we
-        // check if we're missing metrics w/ the correct name, and if so, try to use the old name.
-        // NOTE: getDataTableFromNumeric will return a DataTable w/ data even if no metrics are found.
-        //       In this case, there will be one row w/ column values of 0.
-        $dataMissing = true;
-        $dataTable->filter(function ($table) use (&$dataMissing, $name) {
-            if ($table->getRowsCount() > 0
-                && $table->getFirstRow()->getColumn($name) != 0
-            ) {
-                $dataMissing = false;
-            }
-        });
-
-        if ($dataMissing) {
-            $oldName = $this->getOldReferrersRecordName($name);
-            $oldData = $archive->getDataTableFromNumeric($oldName);
-
-            if ($dataTable instanceof DataTable) {
-                $dataTable = $oldData;
-            } else {
-                $this->replaceEmptyDataTablesWith($dataTable, $oldData);
-            }
-        }
-
-        return $dataTable;
-    }
-
     /**
      * Returns a report describing visit information for each possible referrer type. The
      * result is a datatable whose subtables are the reports for each parent row's referrer type.
@@ -128,7 +72,7 @@ class API
      *                       or 'range'.
      * @param string $date The date of the period.
      * @param bool|string $segment The segment to use.
-     * @param bool|int $typeReferer (deprecated) If you want to get data only for a specific referrer
+     * @param bool|int $typeReferrer (deprecated) If you want to get data only for a specific referrer
      *                         type, supply a type for this parameter.
      * @param bool|int $idSubtable For this report this value is a referrer type ID and not an actual
      *                        subtable ID. The result when using this parameter will be the
@@ -136,7 +80,7 @@ class API
      * @param bool $expanded Whether to get report w/ subtables loaded or not.
      * @return DataTable
      */
-    public function  getRefererType($idSite, $period, $date, $segment = false, $typeReferer = false,
+    public function  getReferrerType($idSite, $period, $date, $segment = false, $typeReferrer = false,
                                     $idSubtable = false, $expanded = false)
     {
         // if idSubtable is supplied, interpret idSubtable as referrer type and return correct report
@@ -164,9 +108,9 @@ class API
         // get visits by referrer type
         $dataTable = $this->getDataTable(Archiver::REFERRER_TYPE_RECORD_NAME, $idSite, $period, $date, $segment);
 
-        if ($typeReferer !== false) // filter for a specific referrer type
+        if ($typeReferrer !== false) // filter for a specific referrer type
         {
-            $dataTable->filter('Pattern', array('label', $typeReferer));
+            $dataTable->filter('Pattern', array('label', $typeReferrer));
         }
 
         // set subtable IDs for each row to the label (which holds the int referrer type)
@@ -176,7 +120,7 @@ class API
         }
 
         // set referrer type column to readable value
-        $dataTable->queueFilter('ColumnCallbackReplace', array('label', __NAMESPACE__ . '\getRefererTypeLabel'));
+        $dataTable->queueFilter('ColumnCallbackReplace', array('label', __NAMESPACE__ . '\getReferrerTypeLabel'));
 
         return $dataTable;
     }
@@ -186,13 +130,13 @@ class API
      */
     public function getAll($idSite, $period, $date, $segment = false)
     {
-        $dataTable = $this->getRefererType($idSite, $period, $date, $segment, $typeReferer = false, $idSubtable = false, $expanded = true);
+        $dataTable = $this->getReferrerType($idSite, $period, $date, $segment, $typeReferrer = false, $idSubtable = false, $expanded = true);
 
         if ($dataTable instanceof DataTable\Map) {
             throw new Exception("Referrers.getAll with multiple sites or dates is not supported (yet).");
         }
 
-        $dataTable = $dataTable->mergeSubtables($labelColumn = 'referrer_type', $useMetadataColumn = true);
+        $dataTable = $dataTable->mergeSubtables($labelColumn = 'referer_type', $useMetadataColumn = true);
 
         $dataTable->filter('Sort', array(Metrics::INDEX_NB_VISITS, 'desc'));
         $dataTable->queueFilter('ReplaceColumnNames');
@@ -471,6 +415,13 @@ class API
         return $this->getNumeric(Archiver::METRIC_DISTINCT_URLS_RECORD_NAME, $idSite, $period, $date, $segment);
     }
 
+    private function getNumeric($name, $idSite, $period, $date, $segment)
+    {
+        Piwik::checkUserHasViewAccess($idSite);
+        $archive = Archive::build($idSite, $period, $date, $segment);
+        return $archive->getDataTableFromNumeric($name);
+    }
+
     /**
      * Removes idsubdatatable_in_db metadata from a DataTable. Used by Social tables since
      * they use fake subtable IDs.
@@ -522,7 +473,7 @@ class API
 
     /**
      * Utility function that removes the subtable IDs for the subtables of the
-     * getRefererType report. This avoids infinite recursion in said report (ie,
+     * getReferrerType report. This avoids infinite recursion in said report (ie,
      * the grandchildren of the report will be the original report, and it will
      * recurse when trying to get a flat report).
      *
@@ -545,13 +496,13 @@ class API
     }
 
     /**
-     * Utility function that sets the subtables for the getRefererType report.
+     * Utility function that sets the subtables for the getReferrerType report.
      *
      * If we're not getting an expanded datatable, the subtable ID is set to each parent
-     * row's referrer type (stored in the label for the getRefererType report).
+     * row's referrer type (stored in the label for the getReferrerType report).
      *
      * If we are getting an expanded datatable, the datatable for the row's referrer
-     * type is loaded and attached to the appropriate row in the getRefererType report.
+     * type is loaded and attached to the appropriate row in the getReferrerType report.
      *
      * @param DataTable $dataTable
      * @param string $idSite
@@ -570,7 +521,7 @@ class API
                     $row->c[Row::DATATABLE_ASSOCIATED] = $typeReferrer;
                 } else // otherwise, we have to get the othe datatables
                 {
-                    $subtable = $this->getRefererType($idSite, $period, $date, $segment, $type = false,
+                    $subtable = $this->getReferrerType($idSite, $period, $date, $segment, $type = false,
                         $idSubtable = $typeReferrer);
 
                     if ($expanded) {
@@ -583,37 +534,4 @@ class API
         }
     }
 
-    /**
-     * Replaces empty DataTables in a DataTable Map with DataTables in another DataTable Map.
-     * Only replaces DataTables if DataTables in $replaceIn are empty.
-     * 
-     * @param Map $replaceIn
-     * @param Map $replaceWith
-     */
-    private function replaceEmptyDataTablesWith(Map $replaceIn, Map $replaceWith)
-    {
-        foreach ($replaceWith->getDataTables() as $label => $replaceWithChildTable) {
-            if ($replaceWithChildTable instanceof Map) { // recurse
-                $this->replaceEmptyDataTablesWith($replaceIn->getTable($label), $replaceWithChildTable);
-            } else {
-                $replaceInChildTable = $replaceIn->getTable($label);
-
-                if (!$this->isDataTableEmpty($replaceWithChildTable)
-                    && $this->isDataTableEmpty($replaceInChildTable)
-                ) {
-                    $replaceIn->addTable($replaceWithChildTable, $label);
-                }
-            }
-        }
-    }
-
-    private function getOldReferrersRecordName($name)
-    {
-        return str_replace('Referrers', 'Referers', $name);
-    }
-
-    private function isDataTableEmpty($table)
-    {
-        return empty($table) || $table->getRowsCount() == 0;
-    }
 }
\ No newline at end of file
diff --git a/plugins/Referers/Archiver.php b/plugins/Referrers/Archiver.php
index 357612796d..9316b92ae8 100644
--- a/plugins/Referers/Archiver.php
+++ b/plugins/Referrers/Archiver.php
@@ -6,16 +6,16 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  *
  * @category Piwik_Plugins
- * @package Referers
+ * @package Referrers
  */
-namespace Piwik\Plugins\Referers;
+namespace Piwik\Plugins\Referrers;
 
 use Exception;
 use Piwik\Common;
 use Piwik\Config;
 use Piwik\Metrics;
 use Piwik\DataArray;
-use Piwik\Plugins\Referers\API;
+use Piwik\Plugins\Referrers\API;
 use Piwik\PluginsArchiver;
 
 
@@ -43,8 +43,14 @@ class Archiver extends PluginsArchiver
     {
         parent::__construct($processor);
         $this->columnToSortByBeforeTruncation = Metrics::INDEX_NB_VISITS;
-        $this->maximumRowsInDataTableLevelZero = Config::getInstance()->General['datatable_archiving_maximum_rows_referers'];
-        $this->maximumRowsInSubDataTable = Config::getInstance()->General['datatable_archiving_maximum_rows_subtable_referers'];
+
+        // Reading pre 2.0 config file settings
+        $this->maximumRowsInDataTableLevelZero = @Config::getInstance()->General['datatable_archiving_maximum_rows_referers'];
+        $this->maximumRowsInSubDataTable = @Config::getInstance()->General['datatable_archiving_maximum_rows_subtable_referers'];
+        if(empty($this->maximumRowsInDataTableLevelZero)) {
+            $this->maximumRowsInDataTableLevelZero = Config::getInstance()->General['datatable_archiving_maximum_rows_referrers'];
+            $this->maximumRowsInSubDataTable = Config::getInstance()->General['datatable_archiving_maximum_rows_subtable_referrers'];
+        }
     }
 
     public function archiveDay()
@@ -75,12 +81,12 @@ class Archiver extends PluginsArchiver
     protected function aggregateFromVisits($query)
     {
         while ($row = $query->fetch()) {
-            $this->makeRefererTypeNonEmpty($row);
+            $this->makeReferrerTypeNonEmpty($row);
             $this->aggregateVisit($row);
         }
     }
 
-    protected function makeRefererTypeNonEmpty(&$row)
+    protected function makeReferrerTypeNonEmpty(&$row)
     {
         if (empty($row['referer_type'])) {
             $row['referer_type'] = Common::REFERRER_TYPE_DIRECT_ENTRY;
@@ -145,7 +151,7 @@ class Archiver extends PluginsArchiver
             return;
         }
         while ($row = $query->fetch()) {
-            $this->makeRefererTypeNonEmpty($row);
+            $this->makeReferrerTypeNonEmpty($row);
 
             $skipAggregateByType = $this->aggregateConversion($row);
             if (!$skipAggregateByType) {
diff --git a/plugins/Referers/Controller.php b/plugins/Referrers/Controller.php
index bf42b0c949..714d0e835c 100644
--- a/plugins/Referers/Controller.php
+++ b/plugins/Referrers/Controller.php
@@ -6,9 +6,9 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  *
  * @category Piwik_Plugins
- * @package Referers
+ * @package Referrers
  */
-namespace Piwik\Plugins\Referers;
+namespace Piwik\Plugins\Referrers;
 
 use Piwik\API\Request;
 use Piwik\DataTable\Map;
@@ -22,21 +22,21 @@ use Piwik\Url;
 
 /**
  *
- * @package Referers
+ * @package Referrers
  */
 class Controller extends \Piwik\Controller
 {
     public function index()
     {
-        $view = new View('@Referers/index');
+        $view = new View('@Referrers/index');
 
-        $view->graphEvolutionReferers = $this->getEvolutionGraph(true, Common::REFERRER_TYPE_DIRECT_ENTRY, array('nb_visits'));
-        $view->nameGraphEvolutionReferers = 'Referers.getEvolutionGraph';
+        $view->graphEvolutionReferrers = $this->getEvolutionGraph(true, Common::REFERRER_TYPE_DIRECT_ENTRY, array('nb_visits'));
+        $view->nameGraphEvolutionReferrers = 'Referrers.getEvolutionGraph';
 
-        // building the referers summary report
-        $view->dataTableRefererType = $this->getRefererType(true);
+        // building the referrers summary report
+        $view->dataTableReferrerType = $this->getReferrerType(true);
 
-        $nameValues = $this->getReferersVisitorsByType();
+        $nameValues = $this->getReferrersVisitorsByType();
 
         $totalVisits = array_sum($nameValues);
         foreach ($nameValues as $name => $value) {
@@ -67,7 +67,7 @@ class Controller extends \Piwik\Controller
             $prettyLastPeriodDate = self::getPrettyDate($lastPeriodDate, $period);
 
             // visit metrics
-            $previousValues = $this->getReferersVisitorsByType($lastPeriodDate);
+            $previousValues = $this->getReferrersVisitorsByType($lastPeriodDate);
             $this->addEvolutionPropertiesToView($view, $prettyDate, $nameValues, $prettyLastPeriodDate, $previousValues);
 
             // distinct metrics
@@ -110,18 +110,18 @@ class Controller extends \Piwik\Controller
             $referrersReportsByDimension = new View\ReportsByDimension();
 
             $referrersReportsByDimension->addReport(
-                'Referrers_ViewAllReferrers', 'Referrers_WidgetGetAll', 'Referers.getAll');
+                'Referrers_ViewAllReferrers', 'Referrers_WidgetGetAll', 'Referrers.getAll');
 
             $byTypeCategory = Piwik_Translate('Referrers_ViewReferrersBy', Piwik_Translate('Live_GoalType'));
             $referrersReportsByDimension->addReport(
-                $byTypeCategory, 'Referrers_WidgetKeywords', 'Referers.getKeywords');
-            $referrersReportsByDimension->addReport($byTypeCategory, 'SitesManager_Sites', 'Referers.getWebsites');
-            $referrersReportsByDimension->addReport($byTypeCategory, 'Referrers_Campaigns', 'Referers.getCampaigns');
+                $byTypeCategory, 'Referrers_WidgetKeywords', 'Referrers.getKeywords');
+            $referrersReportsByDimension->addReport($byTypeCategory, 'SitesManager_Sites', 'Referrers.getWebsites');
+            $referrersReportsByDimension->addReport($byTypeCategory, 'Referrers_Campaigns', 'Referrers.getCampaigns');
 
             $bySourceCategory = Piwik_Translate('Referrers_ViewReferrersBy', Piwik_Translate('General_Source'));
-            $referrersReportsByDimension->addReport($bySourceCategory, 'Referrers_Socials', 'Referers.getSocials');
+            $referrersReportsByDimension->addReport($bySourceCategory, 'Referrers_Socials', 'Referrers.getSocials');
             $referrersReportsByDimension->addReport(
-                $bySourceCategory, 'Referrers_SearchEngines', 'Referers.getSearchEngines');
+                $bySourceCategory, 'Referrers_SearchEngines', 'Referrers.getSearchEngines');
 
             $result = $referrersReportsByDimension->render();
         }
@@ -131,13 +131,13 @@ class Controller extends \Piwik\Controller
 
     public function getSearchEnginesAndKeywords()
     {
-        $view = new View('@Referers/getSearchEnginesAndKeywords');
+        $view = new View('@Referrers/getSearchEnginesAndKeywords');
         $view->searchEngines = $this->getSearchEngines(true);
         $view->keywords = $this->getKeywords(true);
         echo $view->render();
     }
 
-    public function getRefererType($fetch = false)
+    public function getReferrerType($fetch = false)
     {
         return ViewDataTable::renderReport($this->pluginName, __FUNCTION__, $fetch);
     }
@@ -177,7 +177,7 @@ class Controller extends \Piwik\Controller
 
     public function indexWebsites($fetch = false)
     {
-        $view = new View('@Referers/indexWebsites');
+        $view = new View('@Referrers/indexWebsites');
         $view->websites = $this->getWebsites(true);
         $view->socials = $this->getSocials(true);
         if ($fetch) {
@@ -224,7 +224,7 @@ class Controller extends \Piwik\Controller
         return ViewDataTable::renderReport($this->pluginName, __FUNCTION__, $fetch);
     }
 
-    protected function getReferersVisitorsByType($date = false)
+    protected function getReferrersVisitorsByType($date = false)
     {
         if ($date === false) {
             $date = Common::getRequestVar('date', false);
@@ -233,8 +233,8 @@ class Controller extends \Piwik\Controller
         // we disable the queued filters because here we want to get the visits coming from search engines
         // if the filters were applied we would have to look up for a label looking like "Search Engines"
         // which is not good when we have translations
-        $dataTableReferersType = Request::processRequest(
-            "Referers.getRefererType", array('disable_queued_filters' => '1', 'date' => $date));
+        $dataTableReferrersType = Request::processRequest(
+            "Referrers.getReferrerType", array('disable_queued_filters' => '1', 'date' => $date));
 
         $nameToColumnId = array(
             'visitorsFromSearchEngines' => Common::REFERRER_TYPE_SEARCH_ENGINE,
@@ -245,7 +245,7 @@ class Controller extends \Piwik\Controller
         $return = array();
         foreach ($nameToColumnId as $nameVar => $columnId) {
             $value = 0;
-            $row = $dataTableReferersType->getRowFromLabel($columnId);
+            $row = $dataTableReferrersType->getRowFromLabel($columnId);
             if ($row !== false) {
                 $value = $row->getColumn(Metrics::INDEX_NB_VISITS);
             }
@@ -261,9 +261,9 @@ class Controller extends \Piwik\Controller
         Common::REFERRER_TYPE_CAMPAIGN      => 'Referrers_Campaigns',
     );
 
-    public function getEvolutionGraph($fetch = false, $typeReferer = false, array $columns = array())
+    public function getEvolutionGraph($fetch = false, $typeReferrer = false, array $columns = array())
     {
-        $view = $this->getLastUnitGraph($this->pluginName, __FUNCTION__, 'Referers.getRefererType');
+        $view = $this->getLastUnitGraph($this->pluginName, __FUNCTION__, 'Referrers.getReferrerType');
 
         $view->visualization_properties->add_total_row = true;
 
@@ -289,14 +289,14 @@ class Controller extends \Piwik\Controller
             // this happens when the row picker has been used
             $visibleRows = Piwik::getArrayFromApiParameter($visibleRows);
 
-            // typeReferer is redundant if rows are defined, so make sure it's not used
-            $view->custom_parameters['typeReferer'] = false;
+            // typeReferrer is redundant if rows are defined, so make sure it's not used
+            $view->custom_parameters['typeReferrer'] = false;
         } else {
-            // use $typeReferer as default
-            if ($typeReferer === false) {
-                $typeReferer = Common::getRequestVar('typeReferer', false);
+            // use $typeReferrer as default
+            if ($typeReferrer === false) {
+                $typeReferrer = Common::getRequestVar('typeReferrer', false);
             }
-            $label = self::getTranslatedReferrerTypeLabel($typeReferer);
+            $label = self::getTranslatedReferrerTypeLabel($typeReferrer);
             $total = Piwik_Translate('General_Total');
             $visibleRows = array($label, $total);
             $view->request_parameters_to_modify['rows'] = $label . ',' . $total;
@@ -314,33 +314,33 @@ class Controller extends \Piwik\Controller
 
     public function getLastDistinctSearchEnginesGraph($fetch = false)
     {
-        $view = $this->getLastUnitGraph($this->pluginName, __FUNCTION__, "Referers.getNumberOfDistinctSearchEngines");
-        $view->translations['Referers_distinctSearchEngines'] = ucfirst(Piwik_Translate('Referrers_DistinctSearchEngines'));
-        $view->columns_to_display = array('Referers_distinctSearchEngines');
+        $view = $this->getLastUnitGraph($this->pluginName, __FUNCTION__, "Referrers.getNumberOfDistinctSearchEngines");
+        $view->translations['Referrers_distinctSearchEngines'] = ucfirst(Piwik_Translate('Referrers_DistinctSearchEngines'));
+        $view->columns_to_display = array('Referrers_distinctSearchEngines');
         return $this->renderView($view, $fetch);
     }
 
     public function getLastDistinctKeywordsGraph($fetch = false)
     {
-        $view = $this->getLastUnitGraph($this->pluginName, __FUNCTION__, "Referers.getNumberOfDistinctKeywords");
-        $view->translations['Referers_distinctKeywords'] = ucfirst(Piwik_Translate('Referrers_DistinctKeywords'));
-        $view->columns_to_display = array('Referers_distinctKeywords');
+        $view = $this->getLastUnitGraph($this->pluginName, __FUNCTION__, "Referrers.getNumberOfDistinctKeywords");
+        $view->translations['Referrers_distinctKeywords'] = ucfirst(Piwik_Translate('Referrers_DistinctKeywords'));
+        $view->columns_to_display = array('Referrers_distinctKeywords');
         return $this->renderView($view, $fetch);
     }
 
     public function getLastDistinctWebsitesGraph($fetch = false)
     {
-        $view = $this->getLastUnitGraph($this->pluginName, __FUNCTION__, "Referers.getNumberOfDistinctWebsites");
-        $view->translations['Referers_distinctWebsites'] = ucfirst(Piwik_Translate('Referrers_DistinctWebsites'));
-        $view->columns_to_display = array('Referers_distinctWebsites');
+        $view = $this->getLastUnitGraph($this->pluginName, __FUNCTION__, "Referrers.getNumberOfDistinctWebsites");
+        $view->translations['Referrers_distinctWebsites'] = ucfirst(Piwik_Translate('Referrers_DistinctWebsites'));
+        $view->columns_to_display = array('Referrers_distinctWebsites');
         return $this->renderView($view, $fetch);
     }
 
     public function getLastDistinctCampaignsGraph($fetch = false)
     {
-        $view = $this->getLastUnitGraph($this->pluginName, __FUNCTION__, "Referers.getNumberOfDistinctCampaigns");
-        $view->translations['Referers_distinctCampaigns'] = ucfirst(Piwik_Translate('Referrers_DistinctCampaigns'));
-        $view->columns_to_display = array('Referers_distinctCampaigns');
+        $view = $this->getLastUnitGraph($this->pluginName, __FUNCTION__, "Referrers.getNumberOfDistinctCampaigns");
+        $view->translations['Referrers_distinctCampaigns'] = ucfirst(Piwik_Translate('Referrers_DistinctCampaigns'));
+        $view->columns_to_display = array('Referrers_distinctCampaigns');
         return $this->renderView($view, $fetch);
     }
 
@@ -376,7 +376,7 @@ class Controller extends \Piwik\Controller
 
         // HTML
         $api = Url::getCurrentUrlWithoutFileName()
-            . '?module=API&method=Referers.getKeywordsForPageUrl'
+            . '?module=API&method=Referrers.getKeywordsForPageUrl'
             . '&format=php'
             . '&filter_limit=10'
             . '&token_auth=' . Piwik::getCurrentUserTokenAuth();
@@ -471,7 +471,7 @@ function DisplayTopKeywords($url = "")
      */
     public static function getTranslatedReferrerTypeLabel($typeReferrer)
     {
-        $label = getRefererTypeLabel($typeReferrer);
+        $label = getReferrerTypeLabel($typeReferrer);
         return Piwik_Translate($label);
     }
 
@@ -488,7 +488,7 @@ function DisplayTopKeywords($url = "")
             'getEvolutionGraph',
             array('columns'     => array('nb_visits'),
                   'rows'        => array(self::getTranslatedReferrerTypeLabel($referrerType), $totalRow),
-                  'typeReferer' => $referrerType)
+                  'typeReferrer' => $referrerType)
         );
     }
 
@@ -512,7 +512,7 @@ function DisplayTopKeywords($url = "")
 
         $result = array();
         foreach ($propertyToAccessorMapping as $property => $method) {
-            $result[$property] = $this->getNumericValue('Referers.' . $method, $date);
+            $result[$property] = $this->getNumericValue('Referrers.' . $method, $date);
         }
         return $result;
     }
diff --git a/plugins/Referers/Referers.php b/plugins/Referrers/Referrers.php
index 5ee8ebf364..79b06e326e 100644
--- a/plugins/Referers/Referers.php
+++ b/plugins/Referrers/Referrers.php
@@ -6,9 +6,9 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  *
  * @category Piwik_Plugins
- * @package Referers
+ * @package Referrers
  */
-namespace Piwik\Plugins\Referers;
+namespace Piwik\Plugins\Referrers;
 
 use Piwik\ArchiveProcessor;
 use Piwik\Common;
@@ -16,14 +16,14 @@ use Piwik\SettingsPiwik;
 use Piwik\WidgetsList;
 
 /**
- * @see plugins/Referers/functions.php
+ * @see plugins/Referrers/functions.php
  */
-require_once PIWIK_INCLUDE_PATH . '/plugins/Referers/functions.php';
+require_once PIWIK_INCLUDE_PATH . '/plugins/Referrers/functions.php';
 
 /**
- * @package Referers
+ * @package Referrers
  */
-class Referers extends \Piwik\Plugin
+class Referrers extends \Piwik\Plugin
 {
     /**
      * @see Piwik_Plugin::getListHooksRegistered
@@ -49,8 +49,8 @@ class Referers extends \Piwik\Plugin
                                               array(
                                                   'category'          => Piwik_Translate('Referrers_Referrers'),
                                                   'name'              => Piwik_Translate('Referrers_Type'),
-                                                  'module'            => 'Referers',
-                                                  'action'            => 'getRefererType',
+                                                  'module'            => 'Referrers',
+                                                  'action'            => 'getReferrerType',
                                                   'dimension'         => Piwik_Translate('Referrers_Type'),
                                                   'constantRowsCount' => true,
                                                   'documentation'     => Piwik_Translate('Referrers_TypeReportDocumentation') . '<br />'
@@ -66,7 +66,7 @@ class Referers extends \Piwik\Plugin
                                               array(
                                                   'category'      => Piwik_Translate('Referrers_Referrers'),
                                                   'name'          => Piwik_Translate('Referrers_WidgetGetAll'),
-                                                  'module'        => 'Referers',
+                                                  'module'        => 'Referrers',
                                                   'action'        => 'getAll',
                                                   'dimension'     => Piwik_Translate('Referrers_Referrer'),
                                                   'documentation' => Piwik_Translate('Referrers_AllReferrersReportDocumentation', '<br />'),
@@ -75,7 +75,7 @@ class Referers extends \Piwik\Plugin
                                               array(
                                                   'category'              => Piwik_Translate('Referrers_Referrers'),
                                                   'name'                  => Piwik_Translate('Referrers_Keywords'),
-                                                  'module'                => 'Referers',
+                                                  'module'                => 'Referrers',
                                                   'action'                => 'getKeywords',
                                                   'actionToLoadSubTables' => 'getSearchEnginesFromKeywordId',
                                                   'dimension'             => Piwik_Translate('General_ColumnKeyword'),
@@ -85,7 +85,7 @@ class Referers extends \Piwik\Plugin
                                               array( // subtable report
                                                   'category'         => Piwik_Translate('Referrers_Referrers'),
                                                   'name'             => Piwik_Translate('Referrers_Keywords'),
-                                                  'module'           => 'Referers',
+                                                  'module'           => 'Referrers',
                                                   'action'           => 'getSearchEnginesFromKeywordId',
                                                   'dimension'        => Piwik_Translate('Referrers_ColumnSearchEngine'),
                                                   'documentation'    => Piwik_Translate('Referrers_KeywordsReportDocumentation', '<br />'),
@@ -96,7 +96,7 @@ class Referers extends \Piwik\Plugin
                                               array(
                                                   'category'              => Piwik_Translate('Referrers_Referrers'),
                                                   'name'                  => Piwik_Translate('Referrers_Websites'),
-                                                  'module'                => 'Referers',
+                                                  'module'                => 'Referrers',
                                                   'action'                => 'getWebsites',
                                                   'dimension'             => Piwik_Translate('Referrers_ColumnWebsite'),
                                                   'documentation'         => Piwik_Translate('Referrers_WebsitesReportDocumentation', '<br />'),
@@ -106,7 +106,7 @@ class Referers extends \Piwik\Plugin
                                               array( // subtable report
                                                   'category'         => Piwik_Translate('Referrers_Referrers'),
                                                   'name'             => Piwik_Translate('Referrers_Websites'),
-                                                  'module'           => 'Referers',
+                                                  'module'           => 'Referrers',
                                                   'action'           => 'getUrlsFromWebsiteId',
                                                   'dimension'        => Piwik_Translate('Referrers_ColumnWebsitePage'),
                                                   'documentation'    => Piwik_Translate('Referrers_WebsitesReportDocumentation', '<br />'),
@@ -117,7 +117,7 @@ class Referers extends \Piwik\Plugin
                                               array(
                                                   'category'              => Piwik_Translate('Referrers_Referrers'),
                                                   'name'                  => Piwik_Translate('Referrers_SearchEngines'),
-                                                  'module'                => 'Referers',
+                                                  'module'                => 'Referrers',
                                                   'action'                => 'getSearchEngines',
                                                   'dimension'             => Piwik_Translate('Referrers_ColumnSearchEngine'),
                                                   'documentation'         => Piwik_Translate('Referrers_SearchEnginesReportDocumentation', '<br />'),
@@ -127,7 +127,7 @@ class Referers extends \Piwik\Plugin
                                               array( // subtable report
                                                   'category'         => Piwik_Translate('Referrers_Referrers'),
                                                   'name'             => Piwik_Translate('Referrers_SearchEngines'),
-                                                  'module'           => 'Referers',
+                                                  'module'           => 'Referrers',
                                                   'action'           => 'getKeywordsFromSearchEngineId',
                                                   'dimension'        => Piwik_Translate('General_ColumnKeyword'),
                                                   'documentation'    => Piwik_Translate('Referrers_SearchEnginesReportDocumentation', '<br />'),
@@ -138,7 +138,7 @@ class Referers extends \Piwik\Plugin
                                               array(
                                                   'category'              => Piwik_Translate('Referrers_Referrers'),
                                                   'name'                  => Piwik_Translate('Referrers_Campaigns'),
-                                                  'module'                => 'Referers',
+                                                  'module'                => 'Referrers',
                                                   'action'                => 'getCampaigns',
                                                   'dimension'             => Piwik_Translate('Referrers_ColumnCampaign'),
                                                   'documentation'         => Piwik_Translate('Referrers_CampaignsReportDocumentation',
@@ -149,7 +149,7 @@ class Referers extends \Piwik\Plugin
                                               array( // subtable report
                                                   'category'         => Piwik_Translate('Referrers_Referrers'),
                                                   'name'             => Piwik_Translate('Referrers_Campaigns'),
-                                                  'module'           => 'Referers',
+                                                  'module'           => 'Referrers',
                                                   'action'           => 'getKeywordsFromCampaignId',
                                                   'dimension'        => Piwik_Translate('General_ColumnKeyword'),
                                                   'documentation'    => Piwik_Translate('Referrers_CampaignsReportDocumentation',
@@ -160,7 +160,7 @@ class Referers extends \Piwik\Plugin
                                               array(
                                                   'category'              => Piwik_Translate('Referrers_Referrers'),
                                                   'name'                  => Piwik_Translate('Referrers_Socials'),
-                                                  'module'                => 'Referers',
+                                                  'module'                => 'Referrers',
                                                   'action'                => 'getSocials',
                                                   'actionToLoadSubTables' => 'getUrlsForSocial',
                                                   'dimension'             => Piwik_Translate('Referrers_ColumnSocial'),
@@ -179,7 +179,7 @@ class Referers extends \Piwik\Plugin
             'segment'        => 'referrerType',
             'acceptedValues' => 'direct, search, website, campaign',
             'sqlSegment'     => 'log_visit.referer_type',
-            'sqlFilter'      => __NAMESPACE__ . '\getRefererTypeFromShortName',
+            'sqlFilter'      => __NAMESPACE__ . '\getReferrerTypeFromShortName',
         );
         $segments[] = array(
             'type'           => 'dimension',
@@ -212,15 +212,15 @@ class Referers extends \Piwik\Plugin
      */
     function addWidgets()
     {
-        WidgetsList::add('Referrers_Referrers', 'Referrers_WidgetKeywords', 'Referers', 'getKeywords');
-        WidgetsList::add('Referrers_Referrers', 'Referrers_WidgetExternalWebsites', 'Referers', 'getWebsites');
-        WidgetsList::add('Referrers_Referrers', 'Referrers_WidgetSocials', 'Referers', 'getSocials');
-        WidgetsList::add('Referrers_Referrers', 'Referrers_SearchEngines', 'Referers', 'getSearchEngines');
-        WidgetsList::add('Referrers_Referrers', 'Referrers_Campaigns', 'Referers', 'getCampaigns');
-        WidgetsList::add('Referrers_Referrers', 'General_Overview', 'Referers', 'getRefererType');
-        WidgetsList::add('Referrers_Referrers', 'Referrers_WidgetGetAll', 'Referers', 'getAll');
+        WidgetsList::add('Referrers_Referrers', 'Referrers_WidgetKeywords', 'Referrers', 'getKeywords');
+        WidgetsList::add('Referrers_Referrers', 'Referrers_WidgetExternalWebsites', 'Referrers', 'getWebsites');
+        WidgetsList::add('Referrers_Referrers', 'Referrers_WidgetSocials', 'Referrers', 'getSocials');
+        WidgetsList::add('Referrers_Referrers', 'Referrers_SearchEngines', 'Referrers', 'getSearchEngines');
+        WidgetsList::add('Referrers_Referrers', 'Referrers_Campaigns', 'Referrers', 'getCampaigns');
+        WidgetsList::add('Referrers_Referrers', 'General_Overview', 'Referrers', 'getReferrerType');
+        WidgetsList::add('Referrers_Referrers', 'Referrers_WidgetGetAll', 'Referrers', 'getAll');
         if (SettingsPiwik::isSegmentationEnabled()) {
-            WidgetsList::add('SEO', 'Referrers_WidgetTopKeywordsForPages', 'Referers', 'getKeywordsForPage');
+            WidgetsList::add('SEO', 'Referrers_WidgetTopKeywordsForPages', 'Referrers', 'getKeywordsForPage');
         }
     }
 
@@ -229,11 +229,11 @@ class Referers extends \Piwik\Plugin
      */
     function addMenus()
     {
-        Piwik_AddMenu('Referrers_Referrers', '', array('module' => 'Referers', 'action' => 'index'), true, 20);
-        Piwik_AddMenu('Referrers_Referrers', 'General_Overview', array('module' => 'Referers', 'action' => 'index'), true, 1);
-        Piwik_AddMenu('Referrers_Referrers', 'Referrers_SubmenuSearchEngines', array('module' => 'Referers', 'action' => 'getSearchEnginesAndKeywords'), true, 2);
-        Piwik_AddMenu('Referrers_Referrers', 'Referrers_SubmenuWebsites', array('module' => 'Referers', 'action' => 'indexWebsites'), true, 3);
-        Piwik_AddMenu('Referrers_Referrers', 'Referrers_Campaigns', array('module' => 'Referers', 'action' => 'indexCampaigns'), true, 4);
+        Piwik_AddMenu('Referrers_Referrers', '', array('module' => 'Referrers', 'action' => 'index'), true, 20);
+        Piwik_AddMenu('Referrers_Referrers', 'General_Overview', array('module' => 'Referrers', 'action' => 'index'), true, 1);
+        Piwik_AddMenu('Referrers_Referrers', 'Referrers_SubmenuSearchEngines', array('module' => 'Referrers', 'action' => 'getSearchEnginesAndKeywords'), true, 2);
+        Piwik_AddMenu('Referrers_Referrers', 'Referrers_SubmenuWebsites', array('module' => 'Referrers', 'action' => 'indexWebsites'), true, 3);
+        Piwik_AddMenu('Referrers_Referrers', 'Referrers_Campaigns', array('module' => 'Referrers', 'action' => 'indexCampaigns'), true, 4);
     }
 
     /**
@@ -244,28 +244,28 @@ class Referers extends \Piwik\Plugin
         $dimensions = array_merge($dimensions, array(
                                                     array('category' => Piwik_Translate('Referrers_Referrers'),
                                                           'name'     => Piwik_Translate('Referrers_Keywords'),
-                                                          'module'   => 'Referers',
+                                                          'module'   => 'Referrers',
                                                           'action'   => 'getKeywords',
                                                     ),
                                                     array('category' => Piwik_Translate('Referrers_Referrers'),
                                                           'name'     => Piwik_Translate('Referrers_SearchEngines'),
-                                                          'module'   => 'Referers',
+                                                          'module'   => 'Referrers',
                                                           'action'   => 'getSearchEngines',
                                                     ),
                                                     array('category' => Piwik_Translate('Referrers_Referrers'),
                                                           'name'     => Piwik_Translate('Referrers_Websites'),
-                                                          'module'   => 'Referers',
+                                                          'module'   => 'Referrers',
                                                           'action'   => 'getWebsites',
                                                     ),
                                                     array('category' => Piwik_Translate('Referrers_Referrers'),
                                                           'name'     => Piwik_Translate('Referrers_Campaigns'),
-                                                          'module'   => 'Referers',
+                                                          'module'   => 'Referrers',
                                                           'action'   => 'getCampaigns',
                                                     ),
                                                     array('category' => Piwik_Translate('Referrers_Referrers'),
                                                           'name'     => Piwik_Translate('Referrers_Type'),
-                                                          'module'   => 'Referers',
-                                                          'action'   => 'getRefererType',
+                                                          'module'   => 'Referrers',
+                                                          'action'   => 'getReferrerType',
                                                     ),
                                                ));
     }
@@ -295,21 +295,21 @@ class Referers extends \Piwik\Plugin
 
     public function getReportDisplayProperties(&$properties)
     {
-        $properties['Referers.getRefererType'] = $this->getDisplayPropertiesForGetRefererType();
-        $properties['Referers.getAll'] = $this->getDisplayPropertiesForGetAll();
-        $properties['Referers.getKeywords'] = $this->getDisplayPropertiesForGetKeywords();
-        $properties['Referers.getSearchEnginesFromKeywordId'] = $this->getDisplayPropertiesForGetSearchEnginesFromKeywordId();
-        $properties['Referers.getSearchEngines'] = $this->getDisplayPropertiesForGetSearchEngines();
-        $properties['Referers.getKeywordsFromSearchEngineId'] = $this->getDisplayPropertiesForGetKeywordsFromSearchEngineId();
-        $properties['Referers.getWebsites'] = $this->getDisplayPropertiesForGetWebsites();
-        $properties['Referers.getSocials'] = $this->getDisplayPropertiesForGetSocials();
-        $properties['Referers.getUrlsForSocial'] = $this->getDisplayPropertiesForGetUrlsForSocial();
-        $properties['Referers.getCampaigns'] = $this->getDisplayPropertiesForGetCampaigns();
-        $properties['Referers.getKeywordsFromCampaignId'] = $this->getDisplayPropertiesForGetKeywordsFromCampaignId();
-        $properties['Referers.getUrlsFromWebsiteId'] = $this->getDisplayPropertiesForGetUrlsFromWebsiteId();
+        $properties['Referrers.getReferrerType'] = $this->getDisplayPropertiesForGetReferrerType();
+        $properties['Referrers.getAll'] = $this->getDisplayPropertiesForGetAll();
+        $properties['Referrers.getKeywords'] = $this->getDisplayPropertiesForGetKeywords();
+        $properties['Referrers.getSearchEnginesFromKeywordId'] = $this->getDisplayPropertiesForGetSearchEnginesFromKeywordId();
+        $properties['Referrers.getSearchEngines'] = $this->getDisplayPropertiesForGetSearchEngines();
+        $properties['Referrers.getKeywordsFromSearchEngineId'] = $this->getDisplayPropertiesForGetKeywordsFromSearchEngineId();
+        $properties['Referrers.getWebsites'] = $this->getDisplayPropertiesForGetWebsites();
+        $properties['Referrers.getSocials'] = $this->getDisplayPropertiesForGetSocials();
+        $properties['Referrers.getUrlsForSocial'] = $this->getDisplayPropertiesForGetUrlsForSocial();
+        $properties['Referrers.getCampaigns'] = $this->getDisplayPropertiesForGetCampaigns();
+        $properties['Referrers.getKeywordsFromCampaignId'] = $this->getDisplayPropertiesForGetKeywordsFromCampaignId();
+        $properties['Referrers.getUrlsFromWebsiteId'] = $this->getDisplayPropertiesForGetUrlsFromWebsiteId();
     }
 
-    private function getDisplayPropertiesForGetRefererType()
+    private function getDisplayPropertiesForGetReferrerType()
     {
         $idSubtable = Common::getRequestVar('idSubtable', false);
         $labelColumnTitle = Piwik_Translate('Referrers_Type');
@@ -359,7 +359,7 @@ class Referers extends \Piwik\Plugin
                 )
             ),
             'filters' => array(
-                array('MetadataCallbackAddMetadata', array('referrer_type', 'html_label_prefix', $setGetAllHtmlPrefix))
+                array('MetadataCallbackAddMetadata', array('referer_type', 'html_label_prefix', $setGetAllHtmlPrefix))
             )
         );
     }
diff --git a/plugins/Referers/functions.php b/plugins/Referrers/functions.php
index 750e08204e..f162f65668 100644
--- a/plugins/Referers/functions.php
+++ b/plugins/Referrers/functions.php
@@ -6,9 +6,9 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  *
  * @category Piwik_Plugins
- * @package Referers
+ * @package Referrers
  */
-namespace Piwik\Plugins\Referers;
+namespace Piwik\Plugins\Referrers;
 
 use Piwik\Common;
 use Piwik\UrlHelper;
@@ -84,7 +84,7 @@ function isSocialUrl($url, $socialName = false)
  *
  * @param string $url
  * @return string path
- * @see plugins/Referers/images/socials/
+ * @see plugins/Referrers/images/socials/
  */
 function getSocialsLogoFromUrl($domain)
 {
@@ -100,10 +100,10 @@ function getSocialsLogoFromUrl($domain)
             }
         }
 
-        $pathWithCode = 'plugins/Referers/images/socials/' . $firstDomain . '.png';
+        $pathWithCode = 'plugins/Referrers/images/socials/' . $firstDomain . '.png';
         return $pathWithCode;
     } else {
-        return 'plugins/Referers/images/socials/xx.png';
+        return 'plugins/Referrers/images/socials/xx.png';
     }
 }
 
@@ -146,11 +146,11 @@ function getSearchEngineHostFromUrl($url)
  *
  * @param string $url
  * @return string path
- * @see plugins/Referers/images/searchEnginges/
+ * @see plugins/Referrers/images/searchEnginges/
  */
 function getSearchEngineLogoFromUrl($url)
 {
-    $pathInPiwik = 'plugins/Referers/images/searchEngines/%s.png';
+    $pathInPiwik = 'plugins/Referrers/images/searchEngines/%s.png';
     $pathWithCode = sprintf($pathInPiwik, getSearchEngineHostFromUrl($url));
     $absolutePath = PIWIK_INCLUDE_PATH . '/' . $pathWithCode;
     if (file_exists($absolutePath)) {
@@ -216,7 +216,7 @@ function getSearchEngineUrlFromKeywordAndUrl($keyword, $url)
  * @param string $label
  * @return string Referrer type
  */
-function getRefererTypeLabel($label)
+function getReferrerTypeLabel($label)
 {
     $indexTranslation = '';
     switch ($label) {
@@ -246,7 +246,7 @@ function getRefererTypeLabel($label)
  * @throws \Exception
  * @return string
  */
-function getRefererTypeFromShortName($name)
+function getReferrerTypeFromShortName($name)
 {
     $map = array(
         Common::REFERRER_TYPE_SEARCH_ENGINE => 'search',
diff --git a/plugins/Referers/images/searchEngines/1.cz.png b/plugins/Referrers/images/searchEngines/1.cz.png
index 0740cef1a7..0740cef1a7 100644
--- a/plugins/Referers/images/searchEngines/1.cz.png
+++ b/plugins/Referrers/images/searchEngines/1.cz.png
diff --git a/plugins/Referers/images/searchEngines/abcsok.no.png b/plugins/Referrers/images/searchEngines/abcsok.no.png
index 8f07635798..8f07635798 100644
--- a/plugins/Referers/images/searchEngines/abcsok.no.png
+++ b/plugins/Referrers/images/searchEngines/abcsok.no.png
diff --git a/plugins/Referers/images/searchEngines/alexa.com.png b/plugins/Referrers/images/searchEngines/alexa.com.png
index 115a89f2ae..115a89f2ae 100644
--- a/plugins/Referers/images/searchEngines/alexa.com.png
+++ b/plugins/Referrers/images/searchEngines/alexa.com.png
diff --git a/plugins/Referers/images/searchEngines/all.by.png b/plugins/Referrers/images/searchEngines/all.by.png
index 0740cef1a7..0740cef1a7 100644
--- a/plugins/Referers/images/searchEngines/all.by.png
+++ b/plugins/Referrers/images/searchEngines/all.by.png
diff --git a/plugins/Referers/images/searchEngines/apollo.lv.png b/plugins/Referrers/images/searchEngines/apollo.lv.png
index 1f69668a00..1f69668a00 100644
--- a/plugins/Referers/images/searchEngines/apollo.lv.png
+++ b/plugins/Referrers/images/searchEngines/apollo.lv.png
diff --git a/plugins/Referers/images/searchEngines/apollo7.de.png b/plugins/Referrers/images/searchEngines/apollo7.de.png
index 4f16ca9b8b..4f16ca9b8b 100644
--- a/plugins/Referers/images/searchEngines/apollo7.de.png
+++ b/plugins/Referrers/images/searchEngines/apollo7.de.png
diff --git a/plugins/Referers/images/searchEngines/arama.com.png b/plugins/Referrers/images/searchEngines/arama.com.png
index 7735bc7ffe..7735bc7ffe 100644
--- a/plugins/Referers/images/searchEngines/arama.com.png
+++ b/plugins/Referrers/images/searchEngines/arama.com.png
diff --git a/plugins/Referers/images/searchEngines/ariadna.elmundo.es.png b/plugins/Referrers/images/searchEngines/ariadna.elmundo.es.png
index 9f752b02ca..9f752b02ca 100644
--- a/plugins/Referers/images/searchEngines/ariadna.elmundo.es.png
+++ b/plugins/Referrers/images/searchEngines/ariadna.elmundo.es.png
diff --git a/plugins/Referers/images/searchEngines/arianna.libero.it.png b/plugins/Referrers/images/searchEngines/arianna.libero.it.png
index 686672acf0..686672acf0 100644
--- a/plugins/Referers/images/searchEngines/arianna.libero.it.png
+++ b/plugins/Referrers/images/searchEngines/arianna.libero.it.png
diff --git a/plugins/Referers/images/searchEngines/ask.com.png b/plugins/Referrers/images/searchEngines/ask.com.png
index 0a8883f84b..0a8883f84b 100644
--- a/plugins/Referers/images/searchEngines/ask.com.png
+++ b/plugins/Referrers/images/searchEngines/ask.com.png
diff --git a/plugins/Referers/images/searchEngines/bg.setooz.com.png b/plugins/Referrers/images/searchEngines/bg.setooz.com.png
index c1528359f6..c1528359f6 100644
--- a/plugins/Referers/images/searchEngines/bg.setooz.com.png
+++ b/plugins/Referrers/images/searchEngines/bg.setooz.com.png
diff --git a/plugins/Referers/images/searchEngines/bing.com.png b/plugins/Referrers/images/searchEngines/bing.com.png
index b25db7d9b7..b25db7d9b7 100644
--- a/plugins/Referers/images/searchEngines/bing.com.png
+++ b/plugins/Referrers/images/searchEngines/bing.com.png
diff --git a/plugins/Referers/images/searchEngines/blekko.com.png b/plugins/Referrers/images/searchEngines/blekko.com.png
index e97d841eac..e97d841eac 100644
--- a/plugins/Referers/images/searchEngines/blekko.com.png
+++ b/plugins/Referrers/images/searchEngines/blekko.com.png
diff --git a/plugins/Referers/images/searchEngines/blogs.icerocket.com.png b/plugins/Referrers/images/searchEngines/blogs.icerocket.com.png
index 5836b4d331..5836b4d331 100644
--- a/plugins/Referers/images/searchEngines/blogs.icerocket.com.png
+++ b/plugins/Referrers/images/searchEngines/blogs.icerocket.com.png
diff --git a/plugins/Referers/images/searchEngines/blogsearch.google.com.png b/plugins/Referrers/images/searchEngines/blogsearch.google.com.png
index 6745d4b002..6745d4b002 100644
--- a/plugins/Referers/images/searchEngines/blogsearch.google.com.png
+++ b/plugins/Referrers/images/searchEngines/blogsearch.google.com.png
diff --git a/plugins/Referers/images/searchEngines/busca.orange.es.png b/plugins/Referrers/images/searchEngines/busca.orange.es.png
index 78fd0e2ba2..78fd0e2ba2 100644
--- a/plugins/Referers/images/searchEngines/busca.orange.es.png
+++ b/plugins/Referrers/images/searchEngines/busca.orange.es.png
diff --git a/plugins/Referers/images/searchEngines/busca.uol.com.br.png b/plugins/Referrers/images/searchEngines/busca.uol.com.br.png
index d69e3ffec0..d69e3ffec0 100644
--- a/plugins/Referers/images/searchEngines/busca.uol.com.br.png
+++ b/plugins/Referrers/images/searchEngines/busca.uol.com.br.png
diff --git a/plugins/Referers/images/searchEngines/buscador.terra.es.png b/plugins/Referrers/images/searchEngines/buscador.terra.es.png
index 4a39349642..4a39349642 100644
--- a/plugins/Referers/images/searchEngines/buscador.terra.es.png
+++ b/plugins/Referrers/images/searchEngines/buscador.terra.es.png
diff --git a/plugins/Referers/images/searchEngines/cgi.search.biglobe.ne.jp.png b/plugins/Referrers/images/searchEngines/cgi.search.biglobe.ne.jp.png
index c9c258a2f0..c9c258a2f0 100644
--- a/plugins/Referers/images/searchEngines/cgi.search.biglobe.ne.jp.png
+++ b/plugins/Referrers/images/searchEngines/cgi.search.biglobe.ne.jp.png
diff --git a/plugins/Referers/images/searchEngines/daemon-search.com.png b/plugins/Referrers/images/searchEngines/daemon-search.com.png
index 950b01320d..950b01320d 100644
--- a/plugins/Referers/images/searchEngines/daemon-search.com.png
+++ b/plugins/Referrers/images/searchEngines/daemon-search.com.png
diff --git a/plugins/Referers/images/searchEngines/digg.com.png b/plugins/Referrers/images/searchEngines/digg.com.png
index 9a68450df6..9a68450df6 100644
--- a/plugins/Referers/images/searchEngines/digg.com.png
+++ b/plugins/Referrers/images/searchEngines/digg.com.png
diff --git a/plugins/Referers/images/searchEngines/dir.gigablast.com.png b/plugins/Referrers/images/searchEngines/dir.gigablast.com.png
index 56a15084a0..56a15084a0 100644
--- a/plugins/Referers/images/searchEngines/dir.gigablast.com.png
+++ b/plugins/Referrers/images/searchEngines/dir.gigablast.com.png
diff --git a/plugins/Referers/images/searchEngines/dmoz.org.png b/plugins/Referrers/images/searchEngines/dmoz.org.png
index 92366084c4..92366084c4 100644
--- a/plugins/Referers/images/searchEngines/dmoz.org.png
+++ b/plugins/Referrers/images/searchEngines/dmoz.org.png
diff --git a/plugins/Referers/images/searchEngines/duckduckgo.com.png b/plugins/Referrers/images/searchEngines/duckduckgo.com.png
index 50af3029f0..50af3029f0 100644
--- a/plugins/Referers/images/searchEngines/duckduckgo.com.png
+++ b/plugins/Referrers/images/searchEngines/duckduckgo.com.png
diff --git a/plugins/Referers/images/searchEngines/ecosia.org.png b/plugins/Referrers/images/searchEngines/ecosia.org.png
index 29674eecf9..29674eecf9 100644
--- a/plugins/Referers/images/searchEngines/ecosia.org.png
+++ b/plugins/Referrers/images/searchEngines/ecosia.org.png
diff --git a/plugins/Referers/images/searchEngines/encrypted.google.com.png b/plugins/Referrers/images/searchEngines/encrypted.google.com.png
index 6745d4b002..6745d4b002 100644
--- a/plugins/Referers/images/searchEngines/encrypted.google.com.png
+++ b/plugins/Referrers/images/searchEngines/encrypted.google.com.png
diff --git a/plugins/Referers/images/searchEngines/eo.st.png b/plugins/Referrers/images/searchEngines/eo.st.png
index d236620190..d236620190 100644
--- a/plugins/Referers/images/searchEngines/eo.st.png
+++ b/plugins/Referrers/images/searchEngines/eo.st.png
diff --git a/plugins/Referers/images/searchEngines/forestle.org.png b/plugins/Referrers/images/searchEngines/forestle.org.png
index 6233749873..6233749873 100644
--- a/plugins/Referers/images/searchEngines/forestle.org.png
+++ b/plugins/Referrers/images/searchEngines/forestle.org.png
diff --git a/plugins/Referers/images/searchEngines/fr.dir.com.png b/plugins/Referrers/images/searchEngines/fr.dir.com.png
index da8ba3703d..da8ba3703d 100644
--- a/plugins/Referers/images/searchEngines/fr.dir.com.png
+++ b/plugins/Referrers/images/searchEngines/fr.dir.com.png
diff --git a/plugins/Referers/images/searchEngines/fr.wedoo.com.png b/plugins/Referrers/images/searchEngines/fr.wedoo.com.png
index b44da23e05..b44da23e05 100644
--- a/plugins/Referers/images/searchEngines/fr.wedoo.com.png
+++ b/plugins/Referrers/images/searchEngines/fr.wedoo.com.png
diff --git a/plugins/Referers/images/searchEngines/friendfeed.com.png b/plugins/Referrers/images/searchEngines/friendfeed.com.png
index dac26c1d4f..dac26c1d4f 100644
--- a/plugins/Referers/images/searchEngines/friendfeed.com.png
+++ b/plugins/Referrers/images/searchEngines/friendfeed.com.png
diff --git a/plugins/Referers/images/searchEngines/gais.cs.ccu.edu.tw.png b/plugins/Referrers/images/searchEngines/gais.cs.ccu.edu.tw.png
index 0740cef1a7..0740cef1a7 100644
--- a/plugins/Referers/images/searchEngines/gais.cs.ccu.edu.tw.png
+++ b/plugins/Referrers/images/searchEngines/gais.cs.ccu.edu.tw.png
diff --git a/plugins/Referers/images/searchEngines/geona.net.png b/plugins/Referrers/images/searchEngines/geona.net.png
index c3cf014946..c3cf014946 100644
--- a/plugins/Referers/images/searchEngines/geona.net.png
+++ b/plugins/Referrers/images/searchEngines/geona.net.png
diff --git a/plugins/Referers/images/searchEngines/go.mail.ru.png b/plugins/Referrers/images/searchEngines/go.mail.ru.png
index 42b90d0669..42b90d0669 100644
--- a/plugins/Referers/images/searchEngines/go.mail.ru.png
+++ b/plugins/Referrers/images/searchEngines/go.mail.ru.png
diff --git a/plugins/Referers/images/searchEngines/google.com.png b/plugins/Referrers/images/searchEngines/google.com.png
index 6745d4b002..6745d4b002 100644
--- a/plugins/Referers/images/searchEngines/google.com.png
+++ b/plugins/Referrers/images/searchEngines/google.com.png
diff --git a/plugins/Referers/images/searchEngines/googlesyndicatedsearch.com.png b/plugins/Referrers/images/searchEngines/googlesyndicatedsearch.com.png
index 6745d4b002..6745d4b002 100644
--- a/plugins/Referers/images/searchEngines/googlesyndicatedsearch.com.png
+++ b/plugins/Referrers/images/searchEngines/googlesyndicatedsearch.com.png
diff --git a/plugins/Referers/images/searchEngines/holmes.ge.png b/plugins/Referrers/images/searchEngines/holmes.ge.png
index 6185d23372..6185d23372 100644
--- a/plugins/Referers/images/searchEngines/holmes.ge.png
+++ b/plugins/Referrers/images/searchEngines/holmes.ge.png
diff --git a/plugins/Referers/images/searchEngines/images.google.com.png b/plugins/Referrers/images/searchEngines/images.google.com.png
index 6745d4b002..6745d4b002 100644
--- a/plugins/Referers/images/searchEngines/images.google.com.png
+++ b/plugins/Referrers/images/searchEngines/images.google.com.png
diff --git a/plugins/Referers/images/searchEngines/images.search.yahoo.com.png b/plugins/Referrers/images/searchEngines/images.search.yahoo.com.png
index 7908ccaecd..7908ccaecd 100644
--- a/plugins/Referers/images/searchEngines/images.search.yahoo.com.png
+++ b/plugins/Referrers/images/searchEngines/images.search.yahoo.com.png
diff --git a/plugins/Referers/images/searchEngines/images.yandex.ru.png b/plugins/Referrers/images/searchEngines/images.yandex.ru.png
index b6cf192fb9..b6cf192fb9 100644
--- a/plugins/Referers/images/searchEngines/images.yandex.ru.png
+++ b/plugins/Referrers/images/searchEngines/images.yandex.ru.png
diff --git a/plugins/Referers/images/searchEngines/infospace.com.png b/plugins/Referrers/images/searchEngines/infospace.com.png
index 0518db9760..0518db9760 100644
--- a/plugins/Referers/images/searchEngines/infospace.com.png
+++ b/plugins/Referrers/images/searchEngines/infospace.com.png
diff --git a/plugins/Referers/images/searchEngines/iwon.ask.com.png b/plugins/Referrers/images/searchEngines/iwon.ask.com.png
index 0a8883f84b..0a8883f84b 100644
--- a/plugins/Referers/images/searchEngines/iwon.ask.com.png
+++ b/plugins/Referrers/images/searchEngines/iwon.ask.com.png
diff --git a/plugins/Referers/images/searchEngines/ixquick.com.png b/plugins/Referrers/images/searchEngines/ixquick.com.png
index 93a69e1b60..93a69e1b60 100644
--- a/plugins/Referers/images/searchEngines/ixquick.com.png
+++ b/plugins/Referrers/images/searchEngines/ixquick.com.png
diff --git a/plugins/Referers/images/searchEngines/junglekey.com.png b/plugins/Referrers/images/searchEngines/junglekey.com.png
index 46ea986847..46ea986847 100644
--- a/plugins/Referers/images/searchEngines/junglekey.com.png
+++ b/plugins/Referrers/images/searchEngines/junglekey.com.png
diff --git a/plugins/Referers/images/searchEngines/jyxo.1188.cz.png b/plugins/Referrers/images/searchEngines/jyxo.1188.cz.png
index c329eda940..c329eda940 100644
--- a/plugins/Referers/images/searchEngines/jyxo.1188.cz.png
+++ b/plugins/Referrers/images/searchEngines/jyxo.1188.cz.png
diff --git a/plugins/Referers/images/searchEngines/ko.search.need2find.com.png b/plugins/Referrers/images/searchEngines/ko.search.need2find.com.png
index 0740cef1a7..0740cef1a7 100644
--- a/plugins/Referers/images/searchEngines/ko.search.need2find.com.png
+++ b/plugins/Referrers/images/searchEngines/ko.search.need2find.com.png
diff --git a/plugins/Referers/images/searchEngines/lo.st.png b/plugins/Referrers/images/searchEngines/lo.st.png
index e28d1b2a9c..e28d1b2a9c 100644
--- a/plugins/Referers/images/searchEngines/lo.st.png
+++ b/plugins/Referrers/images/searchEngines/lo.st.png
diff --git a/plugins/Referers/images/searchEngines/maps.google.com.png b/plugins/Referrers/images/searchEngines/maps.google.com.png
index 562aeffd54..562aeffd54 100644
--- a/plugins/Referers/images/searchEngines/maps.google.com.png
+++ b/plugins/Referrers/images/searchEngines/maps.google.com.png
diff --git a/plugins/Referers/images/searchEngines/meta.rrzn.uni-hannover.de.png b/plugins/Referrers/images/searchEngines/meta.rrzn.uni-hannover.de.png
index be0939904b..be0939904b 100644
--- a/plugins/Referers/images/searchEngines/meta.rrzn.uni-hannover.de.png
+++ b/plugins/Referrers/images/searchEngines/meta.rrzn.uni-hannover.de.png
diff --git a/plugins/Referers/images/searchEngines/meta.ua.png b/plugins/Referrers/images/searchEngines/meta.ua.png
index a98d7fef84..a98d7fef84 100644
--- a/plugins/Referers/images/searchEngines/meta.ua.png
+++ b/plugins/Referrers/images/searchEngines/meta.ua.png
diff --git a/plugins/Referers/images/searchEngines/metager2.de.png b/plugins/Referrers/images/searchEngines/metager2.de.png
index 011683a0ee..011683a0ee 100644
--- a/plugins/Referers/images/searchEngines/metager2.de.png
+++ b/plugins/Referrers/images/searchEngines/metager2.de.png
diff --git a/plugins/Referers/images/searchEngines/news.google.com.png b/plugins/Referrers/images/searchEngines/news.google.com.png
index 6745d4b002..6745d4b002 100644
--- a/plugins/Referers/images/searchEngines/news.google.com.png
+++ b/plugins/Referrers/images/searchEngines/news.google.com.png
diff --git a/plugins/Referers/images/searchEngines/nigma.ru.png b/plugins/Referrers/images/searchEngines/nigma.ru.png
index 992fadd243..992fadd243 100644
--- a/plugins/Referers/images/searchEngines/nigma.ru.png
+++ b/plugins/Referrers/images/searchEngines/nigma.ru.png
diff --git a/plugins/Referers/images/searchEngines/nova.rambler.ru.png b/plugins/Referrers/images/searchEngines/nova.rambler.ru.png
index 3e16f1bb8f..3e16f1bb8f 100644
--- a/plugins/Referers/images/searchEngines/nova.rambler.ru.png
+++ b/plugins/Referrers/images/searchEngines/nova.rambler.ru.png
diff --git a/plugins/Referers/images/searchEngines/online.no.png b/plugins/Referrers/images/searchEngines/online.no.png
index 5fa700d49c..5fa700d49c 100644
--- a/plugins/Referers/images/searchEngines/online.no.png
+++ b/plugins/Referrers/images/searchEngines/online.no.png
diff --git a/plugins/Referers/images/searchEngines/otsing.delfi.ee.png b/plugins/Referrers/images/searchEngines/otsing.delfi.ee.png
index 730ff3963d..730ff3963d 100644
--- a/plugins/Referers/images/searchEngines/otsing.delfi.ee.png
+++ b/plugins/Referrers/images/searchEngines/otsing.delfi.ee.png
diff --git a/plugins/Referers/images/searchEngines/p.zhongsou.com.png b/plugins/Referrers/images/searchEngines/p.zhongsou.com.png
index f7d0fd5d72..f7d0fd5d72 100644
--- a/plugins/Referers/images/searchEngines/p.zhongsou.com.png
+++ b/plugins/Referrers/images/searchEngines/p.zhongsou.com.png
diff --git a/plugins/Referers/images/searchEngines/pesquisa.clix.pt.png b/plugins/Referrers/images/searchEngines/pesquisa.clix.pt.png
index 1b081257a1..1b081257a1 100644
--- a/plugins/Referers/images/searchEngines/pesquisa.clix.pt.png
+++ b/plugins/Referrers/images/searchEngines/pesquisa.clix.pt.png
diff --git a/plugins/Referers/images/searchEngines/pesquisa.sapo.pt.png b/plugins/Referrers/images/searchEngines/pesquisa.sapo.pt.png
index 3782a811c8..3782a811c8 100644
--- a/plugins/Referers/images/searchEngines/pesquisa.sapo.pt.png
+++ b/plugins/Referrers/images/searchEngines/pesquisa.sapo.pt.png
diff --git a/plugins/Referers/images/searchEngines/poisk.ru.png b/plugins/Referrers/images/searchEngines/poisk.ru.png
index 5887dcec6b..5887dcec6b 100644
--- a/plugins/Referers/images/searchEngines/poisk.ru.png
+++ b/plugins/Referrers/images/searchEngines/poisk.ru.png
diff --git a/plugins/Referers/images/searchEngines/recherche.francite.com.png b/plugins/Referrers/images/searchEngines/recherche.francite.com.png
index fd80433a70..fd80433a70 100644
--- a/plugins/Referers/images/searchEngines/recherche.francite.com.png
+++ b/plugins/Referrers/images/searchEngines/recherche.francite.com.png
diff --git a/plugins/Referers/images/searchEngines/rechercher.aliceadsl.fr.png b/plugins/Referrers/images/searchEngines/rechercher.aliceadsl.fr.png
index 71c8be9af2..71c8be9af2 100644
--- a/plugins/Referers/images/searchEngines/rechercher.aliceadsl.fr.png
+++ b/plugins/Referrers/images/searchEngines/rechercher.aliceadsl.fr.png
diff --git a/plugins/Referers/images/searchEngines/req.hit-parade.com.png b/plugins/Referrers/images/searchEngines/req.hit-parade.com.png
index 85df9e051a..85df9e051a 100644
--- a/plugins/Referers/images/searchEngines/req.hit-parade.com.png
+++ b/plugins/Referrers/images/searchEngines/req.hit-parade.com.png
diff --git a/plugins/Referers/images/searchEngines/ricerca.virgilio.it.png b/plugins/Referrers/images/searchEngines/ricerca.virgilio.it.png
index d2b3651960..d2b3651960 100644
--- a/plugins/Referers/images/searchEngines/ricerca.virgilio.it.png
+++ b/plugins/Referrers/images/searchEngines/ricerca.virgilio.it.png
diff --git a/plugins/Referers/images/searchEngines/rpmfind.net.png b/plugins/Referrers/images/searchEngines/rpmfind.net.png
index 7d2de00d84..7d2de00d84 100644
--- a/plugins/Referers/images/searchEngines/rpmfind.net.png
+++ b/plugins/Referrers/images/searchEngines/rpmfind.net.png
diff --git a/plugins/Referers/images/searchEngines/s1.metacrawler.de.png b/plugins/Referrers/images/searchEngines/s1.metacrawler.de.png
index 0ccebf080b..0ccebf080b 100644
--- a/plugins/Referers/images/searchEngines/s1.metacrawler.de.png
+++ b/plugins/Referrers/images/searchEngines/s1.metacrawler.de.png
diff --git a/plugins/Referers/images/searchEngines/scour.com.png b/plugins/Referrers/images/searchEngines/scour.com.png
index 725e2316e2..725e2316e2 100644
--- a/plugins/Referers/images/searchEngines/scour.com.png
+++ b/plugins/Referrers/images/searchEngines/scour.com.png
diff --git a/plugins/Referers/images/searchEngines/search.aol.com.png b/plugins/Referrers/images/searchEngines/search.aol.com.png
index 0a65239f47..0a65239f47 100644
--- a/plugins/Referers/images/searchEngines/search.aol.com.png
+++ b/plugins/Referrers/images/searchEngines/search.aol.com.png
diff --git a/plugins/Referers/images/searchEngines/search.babylon.com.png b/plugins/Referrers/images/searchEngines/search.babylon.com.png
index 59a8034640..59a8034640 100644
--- a/plugins/Referers/images/searchEngines/search.babylon.com.png
+++ b/plugins/Referrers/images/searchEngines/search.babylon.com.png
diff --git a/plugins/Referers/images/searchEngines/search.bluewin.ch.png b/plugins/Referrers/images/searchEngines/search.bluewin.ch.png
index 6522b29b33..6522b29b33 100644
--- a/plugins/Referers/images/searchEngines/search.bluewin.ch.png
+++ b/plugins/Referrers/images/searchEngines/search.bluewin.ch.png
diff --git a/plugins/Referers/images/searchEngines/search.centrum.cz.png b/plugins/Referrers/images/searchEngines/search.centrum.cz.png
index f7d29907b5..f7d29907b5 100644
--- a/plugins/Referers/images/searchEngines/search.centrum.cz.png
+++ b/plugins/Referrers/images/searchEngines/search.centrum.cz.png
diff --git a/plugins/Referers/images/searchEngines/search.comcast.net.png b/plugins/Referrers/images/searchEngines/search.comcast.net.png
index c49a83ed1a..c49a83ed1a 100644
--- a/plugins/Referers/images/searchEngines/search.comcast.net.png
+++ b/plugins/Referrers/images/searchEngines/search.comcast.net.png
diff --git a/plugins/Referers/images/searchEngines/search.conduit.com.png b/plugins/Referrers/images/searchEngines/search.conduit.com.png
index f0bc797498..f0bc797498 100644
--- a/plugins/Referers/images/searchEngines/search.conduit.com.png
+++ b/plugins/Referrers/images/searchEngines/search.conduit.com.png
diff --git a/plugins/Referers/images/searchEngines/search.daum.net.png b/plugins/Referrers/images/searchEngines/search.daum.net.png
index 55e2aa3c00..55e2aa3c00 100644
--- a/plugins/Referers/images/searchEngines/search.daum.net.png
+++ b/plugins/Referrers/images/searchEngines/search.daum.net.png
diff --git a/plugins/Referers/images/searchEngines/search.earthlink.net.png b/plugins/Referrers/images/searchEngines/search.earthlink.net.png
index 8cee1b2148..8cee1b2148 100644
--- a/plugins/Referers/images/searchEngines/search.earthlink.net.png
+++ b/plugins/Referrers/images/searchEngines/search.earthlink.net.png
diff --git a/plugins/Referers/images/searchEngines/search.excite.it.png b/plugins/Referrers/images/searchEngines/search.excite.it.png
index 369a480605..369a480605 100644
--- a/plugins/Referers/images/searchEngines/search.excite.it.png
+++ b/plugins/Referrers/images/searchEngines/search.excite.it.png
diff --git a/plugins/Referers/images/searchEngines/search.free.fr.png b/plugins/Referrers/images/searchEngines/search.free.fr.png
index 9954781aca..9954781aca 100644
--- a/plugins/Referers/images/searchEngines/search.free.fr.png
+++ b/plugins/Referrers/images/searchEngines/search.free.fr.png
diff --git a/plugins/Referers/images/searchEngines/search.freecause.com.png b/plugins/Referrers/images/searchEngines/search.freecause.com.png
index 05976030d5..05976030d5 100644
--- a/plugins/Referers/images/searchEngines/search.freecause.com.png
+++ b/plugins/Referrers/images/searchEngines/search.freecause.com.png
diff --git a/plugins/Referers/images/searchEngines/search.goo.ne.jp.png b/plugins/Referrers/images/searchEngines/search.goo.ne.jp.png
index d64ce99dea..d64ce99dea 100644
--- a/plugins/Referers/images/searchEngines/search.goo.ne.jp.png
+++ b/plugins/Referrers/images/searchEngines/search.goo.ne.jp.png
diff --git a/plugins/Referers/images/searchEngines/search.imesh.com.png b/plugins/Referrers/images/searchEngines/search.imesh.com.png
index 8d8f1a782e..8d8f1a782e 100644
--- a/plugins/Referers/images/searchEngines/search.imesh.com.png
+++ b/plugins/Referrers/images/searchEngines/search.imesh.com.png
diff --git a/plugins/Referers/images/searchEngines/search.ke.voila.fr.png b/plugins/Referrers/images/searchEngines/search.ke.voila.fr.png
index 1266687f8f..1266687f8f 100644
--- a/plugins/Referers/images/searchEngines/search.ke.voila.fr.png
+++ b/plugins/Referrers/images/searchEngines/search.ke.voila.fr.png
diff --git a/plugins/Referers/images/searchEngines/search.lycos.com.png b/plugins/Referrers/images/searchEngines/search.lycos.com.png
index f320407661..f320407661 100644
--- a/plugins/Referers/images/searchEngines/search.lycos.com.png
+++ b/plugins/Referrers/images/searchEngines/search.lycos.com.png
diff --git a/plugins/Referers/images/searchEngines/search.nate.com.png b/plugins/Referrers/images/searchEngines/search.nate.com.png
index 89560471ba..89560471ba 100644
--- a/plugins/Referers/images/searchEngines/search.nate.com.png
+++ b/plugins/Referrers/images/searchEngines/search.nate.com.png
diff --git a/plugins/Referers/images/searchEngines/search.naver.com.png b/plugins/Referrers/images/searchEngines/search.naver.com.png
index 776ddf26e4..776ddf26e4 100644
--- a/plugins/Referers/images/searchEngines/search.naver.com.png
+++ b/plugins/Referrers/images/searchEngines/search.naver.com.png
diff --git a/plugins/Referers/images/searchEngines/search.nifty.com.png b/plugins/Referrers/images/searchEngines/search.nifty.com.png
index 6e76348780..6e76348780 100644
--- a/plugins/Referers/images/searchEngines/search.nifty.com.png
+++ b/plugins/Referrers/images/searchEngines/search.nifty.com.png
diff --git a/plugins/Referers/images/searchEngines/search.peoplepc.com.png b/plugins/Referrers/images/searchEngines/search.peoplepc.com.png
index 502014c50c..502014c50c 100644
--- a/plugins/Referers/images/searchEngines/search.peoplepc.com.png
+++ b/plugins/Referrers/images/searchEngines/search.peoplepc.com.png
diff --git a/plugins/Referers/images/searchEngines/search.qip.ru.png b/plugins/Referrers/images/searchEngines/search.qip.ru.png
index d5f547ffca..d5f547ffca 100644
--- a/plugins/Referers/images/searchEngines/search.qip.ru.png
+++ b/plugins/Referrers/images/searchEngines/search.qip.ru.png
diff --git a/plugins/Referers/images/searchEngines/search.rr.com.png b/plugins/Referrers/images/searchEngines/search.rr.com.png
index 6b0a8faa1e..6b0a8faa1e 100644
--- a/plugins/Referers/images/searchEngines/search.rr.com.png
+++ b/plugins/Referrers/images/searchEngines/search.rr.com.png
diff --git a/plugins/Referers/images/searchEngines/search.seznam.cz.png b/plugins/Referrers/images/searchEngines/search.seznam.cz.png
index 7764196ea7..7764196ea7 100644
--- a/plugins/Referers/images/searchEngines/search.seznam.cz.png
+++ b/plugins/Referrers/images/searchEngines/search.seznam.cz.png
diff --git a/plugins/Referers/images/searchEngines/search.snap.do.png b/plugins/Referrers/images/searchEngines/search.snap.do.png
index fc8131e8bc..fc8131e8bc 100644
--- a/plugins/Referers/images/searchEngines/search.snap.do.png
+++ b/plugins/Referrers/images/searchEngines/search.snap.do.png
diff --git a/plugins/Referers/images/searchEngines/search.softonic.com.png b/plugins/Referrers/images/searchEngines/search.softonic.com.png
index 293b3e5065..293b3e5065 100644
--- a/plugins/Referers/images/searchEngines/search.softonic.com.png
+++ b/plugins/Referrers/images/searchEngines/search.softonic.com.png
diff --git a/plugins/Referers/images/searchEngines/search.tiscali.it.png b/plugins/Referrers/images/searchEngines/search.tiscali.it.png
index f104522082..f104522082 100644
--- a/plugins/Referers/images/searchEngines/search.tiscali.it.png
+++ b/plugins/Referrers/images/searchEngines/search.tiscali.it.png
diff --git a/plugins/Referers/images/searchEngines/search.winamp.com.png b/plugins/Referrers/images/searchEngines/search.winamp.com.png
index d0c29c5981..d0c29c5981 100644
--- a/plugins/Referers/images/searchEngines/search.winamp.com.png
+++ b/plugins/Referrers/images/searchEngines/search.winamp.com.png
diff --git a/plugins/Referers/images/searchEngines/search.www.ee.png b/plugins/Referrers/images/searchEngines/search.www.ee.png
index ff3dac11be..ff3dac11be 100644
--- a/plugins/Referers/images/searchEngines/search.www.ee.png
+++ b/plugins/Referrers/images/searchEngines/search.www.ee.png
diff --git a/plugins/Referers/images/searchEngines/search.yahoo.com.png b/plugins/Referrers/images/searchEngines/search.yahoo.com.png
index 1077fb3d89..1077fb3d89 100644
--- a/plugins/Referers/images/searchEngines/search.yahoo.com.png
+++ b/plugins/Referrers/images/searchEngines/search.yahoo.com.png
diff --git a/plugins/Referers/images/searchEngines/search.yam.com.png b/plugins/Referrers/images/searchEngines/search.yam.com.png
index 828e735e2d..828e735e2d 100644
--- a/plugins/Referers/images/searchEngines/search.yam.com.png
+++ b/plugins/Referrers/images/searchEngines/search.yam.com.png
diff --git a/plugins/Referers/images/searchEngines/search.yippy.com.png b/plugins/Referrers/images/searchEngines/search.yippy.com.png
index 8c6530c49d..8c6530c49d 100644
--- a/plugins/Referers/images/searchEngines/search.yippy.com.png
+++ b/plugins/Referrers/images/searchEngines/search.yippy.com.png
diff --git a/plugins/Referers/images/searchEngines/searchalot.com.png b/plugins/Referrers/images/searchEngines/searchalot.com.png
index 22664b3ff3..22664b3ff3 100644
--- a/plugins/Referers/images/searchEngines/searchalot.com.png
+++ b/plugins/Referrers/images/searchEngines/searchalot.com.png
diff --git a/plugins/Referers/images/searchEngines/searchatlas.centrum.cz.png b/plugins/Referrers/images/searchEngines/searchatlas.centrum.cz.png
index 6307949db7..6307949db7 100644
--- a/plugins/Referers/images/searchEngines/searchatlas.centrum.cz.png
+++ b/plugins/Referrers/images/searchEngines/searchatlas.centrum.cz.png
diff --git a/plugins/Referers/images/searchEngines/searchservice.myspace.com.png b/plugins/Referrers/images/searchEngines/searchservice.myspace.com.png
index b805294346..b805294346 100644
--- a/plugins/Referers/images/searchEngines/searchservice.myspace.com.png
+++ b/plugins/Referrers/images/searchEngines/searchservice.myspace.com.png
diff --git a/plugins/Referers/images/searchEngines/sm.aport.ru.png b/plugins/Referrers/images/searchEngines/sm.aport.ru.png
index 92796e9fbc..92796e9fbc 100644
--- a/plugins/Referers/images/searchEngines/sm.aport.ru.png
+++ b/plugins/Referrers/images/searchEngines/sm.aport.ru.png
diff --git a/plugins/Referers/images/searchEngines/smart.delfi.lv.png b/plugins/Referrers/images/searchEngines/smart.delfi.lv.png
index 730ff3963d..730ff3963d 100644
--- a/plugins/Referers/images/searchEngines/smart.delfi.lv.png
+++ b/plugins/Referrers/images/searchEngines/smart.delfi.lv.png
diff --git a/plugins/Referers/images/searchEngines/so.360.cn.png b/plugins/Referrers/images/searchEngines/so.360.cn.png
index 39ee2a3c3e..39ee2a3c3e 100755..100644
--- a/plugins/Referers/images/searchEngines/so.360.cn.png
+++ b/plugins/Referrers/images/searchEngines/so.360.cn.png
diff --git a/plugins/Referers/images/searchEngines/start.iplay.com.png b/plugins/Referrers/images/searchEngines/start.iplay.com.png
index 47103d6e36..47103d6e36 100644
--- a/plugins/Referers/images/searchEngines/start.iplay.com.png
+++ b/plugins/Referrers/images/searchEngines/start.iplay.com.png
diff --git a/plugins/Referers/images/searchEngines/startgoogle.startpagina.nl.png b/plugins/Referrers/images/searchEngines/startgoogle.startpagina.nl.png
index f46101995e..f46101995e 100644
--- a/plugins/Referers/images/searchEngines/startgoogle.startpagina.nl.png
+++ b/plugins/Referrers/images/searchEngines/startgoogle.startpagina.nl.png
diff --git a/plugins/Referers/images/searchEngines/suche.freenet.de.png b/plugins/Referrers/images/searchEngines/suche.freenet.de.png
index c3c6f71fc4..c3c6f71fc4 100644
--- a/plugins/Referers/images/searchEngines/suche.freenet.de.png
+++ b/plugins/Referrers/images/searchEngines/suche.freenet.de.png
diff --git a/plugins/Referers/images/searchEngines/suche.info.png b/plugins/Referrers/images/searchEngines/suche.info.png
index 05b425f292..05b425f292 100644
--- a/plugins/Referers/images/searchEngines/suche.info.png
+++ b/plugins/Referrers/images/searchEngines/suche.info.png
diff --git a/plugins/Referers/images/searchEngines/suche.t-online.de.png b/plugins/Referrers/images/searchEngines/suche.t-online.de.png
index 37eba0451b..37eba0451b 100644
--- a/plugins/Referers/images/searchEngines/suche.t-online.de.png
+++ b/plugins/Referrers/images/searchEngines/suche.t-online.de.png
diff --git a/plugins/Referers/images/searchEngines/suche.web.de.png b/plugins/Referrers/images/searchEngines/suche.web.de.png
index 1cf156d412..1cf156d412 100644
--- a/plugins/Referers/images/searchEngines/suche.web.de.png
+++ b/plugins/Referrers/images/searchEngines/suche.web.de.png
diff --git a/plugins/Referers/images/searchEngines/szukaj.onet.pl.png b/plugins/Referrers/images/searchEngines/szukaj.onet.pl.png
index 9df61e4c61..9df61e4c61 100644
--- a/plugins/Referers/images/searchEngines/szukaj.onet.pl.png
+++ b/plugins/Referrers/images/searchEngines/szukaj.onet.pl.png
diff --git a/plugins/Referers/images/searchEngines/szukaj.wp.pl.png b/plugins/Referrers/images/searchEngines/szukaj.wp.pl.png
index 53a9a6be3a..53a9a6be3a 100644
--- a/plugins/Referers/images/searchEngines/szukaj.wp.pl.png
+++ b/plugins/Referrers/images/searchEngines/szukaj.wp.pl.png
diff --git a/plugins/Referers/images/searchEngines/technorati.com.png b/plugins/Referrers/images/searchEngines/technorati.com.png
index 5a5c74407d..5a5c74407d 100644
--- a/plugins/Referers/images/searchEngines/technorati.com.png
+++ b/plugins/Referrers/images/searchEngines/technorati.com.png
diff --git a/plugins/Referers/images/searchEngines/translate.google.com.png b/plugins/Referrers/images/searchEngines/translate.google.com.png
index 6745d4b002..6745d4b002 100644
--- a/plugins/Referers/images/searchEngines/translate.google.com.png
+++ b/plugins/Referrers/images/searchEngines/translate.google.com.png
diff --git a/plugins/Referers/images/searchEngines/video.google.com.png b/plugins/Referrers/images/searchEngines/video.google.com.png
index 6745d4b002..6745d4b002 100644
--- a/plugins/Referers/images/searchEngines/video.google.com.png
+++ b/plugins/Referrers/images/searchEngines/video.google.com.png
diff --git a/plugins/Referers/images/searchEngines/web.canoe.ca.png b/plugins/Referrers/images/searchEngines/web.canoe.ca.png
index fada634cac..fada634cac 100644
--- a/plugins/Referers/images/searchEngines/web.canoe.ca.png
+++ b/plugins/Referrers/images/searchEngines/web.canoe.ca.png
diff --git a/plugins/Referers/images/searchEngines/web.volny.cz.png b/plugins/Referrers/images/searchEngines/web.volny.cz.png
index 8289c943a0..8289c943a0 100644
--- a/plugins/Referers/images/searchEngines/web.volny.cz.png
+++ b/plugins/Referrers/images/searchEngines/web.volny.cz.png
diff --git a/plugins/Referers/images/searchEngines/websearch.cs.com.png b/plugins/Referrers/images/searchEngines/websearch.cs.com.png
index 6245b6d2ed..6245b6d2ed 100644
--- a/plugins/Referers/images/searchEngines/websearch.cs.com.png
+++ b/plugins/Referrers/images/searchEngines/websearch.cs.com.png
diff --git a/plugins/Referers/images/searchEngines/websearch.rakuten.co.jp.png b/plugins/Referrers/images/searchEngines/websearch.rakuten.co.jp.png
index aa089090dc..aa089090dc 100644
--- a/plugins/Referers/images/searchEngines/websearch.rakuten.co.jp.png
+++ b/plugins/Referrers/images/searchEngines/websearch.rakuten.co.jp.png
diff --git a/plugins/Referers/images/searchEngines/www.123people.com.png b/plugins/Referrers/images/searchEngines/www.123people.com.png
index 30d938ea19..30d938ea19 100644
--- a/plugins/Referers/images/searchEngines/www.123people.com.png
+++ b/plugins/Referrers/images/searchEngines/www.123people.com.png
diff --git a/plugins/Referers/images/searchEngines/www.1881.no.png b/plugins/Referrers/images/searchEngines/www.1881.no.png
index 7e1019f868..7e1019f868 100644
--- a/plugins/Referers/images/searchEngines/www.1881.no.png
+++ b/plugins/Referrers/images/searchEngines/www.1881.no.png
diff --git a/plugins/Referers/images/searchEngines/www.abacho.de.png b/plugins/Referrers/images/searchEngines/www.abacho.de.png
index fb35c78f12..fb35c78f12 100644
--- a/plugins/Referers/images/searchEngines/www.abacho.de.png
+++ b/plugins/Referrers/images/searchEngines/www.abacho.de.png
diff --git a/plugins/Referers/images/searchEngines/www.acoon.de.png b/plugins/Referrers/images/searchEngines/www.acoon.de.png
index 0740cef1a7..0740cef1a7 100644
--- a/plugins/Referers/images/searchEngines/www.acoon.de.png
+++ b/plugins/Referrers/images/searchEngines/www.acoon.de.png
diff --git a/plugins/Referers/images/searchEngines/www.allesklar.de.png b/plugins/Referrers/images/searchEngines/www.allesklar.de.png
index d93f686f5e..d93f686f5e 100644
--- a/plugins/Referers/images/searchEngines/www.allesklar.de.png
+++ b/plugins/Referrers/images/searchEngines/www.allesklar.de.png
diff --git a/plugins/Referers/images/searchEngines/www.alltheweb.com.png b/plugins/Referrers/images/searchEngines/www.alltheweb.com.png
index 9b635649d2..9b635649d2 100644
--- a/plugins/Referers/images/searchEngines/www.alltheweb.com.png
+++ b/plugins/Referrers/images/searchEngines/www.alltheweb.com.png
diff --git a/plugins/Referers/images/searchEngines/www.altavista.com.png b/plugins/Referrers/images/searchEngines/www.altavista.com.png
index 6f26cbc780..6f26cbc780 100644
--- a/plugins/Referers/images/searchEngines/www.altavista.com.png
+++ b/plugins/Referrers/images/searchEngines/www.altavista.com.png
diff --git a/plugins/Referers/images/searchEngines/www.arcor.de.png b/plugins/Referrers/images/searchEngines/www.arcor.de.png
index 7829fd1a28..7829fd1a28 100644
--- a/plugins/Referers/images/searchEngines/www.arcor.de.png
+++ b/plugins/Referrers/images/searchEngines/www.arcor.de.png
diff --git a/plugins/Referers/images/searchEngines/www.baidu.com.png b/plugins/Referrers/images/searchEngines/www.baidu.com.png
index 3166471622..3166471622 100644
--- a/plugins/Referers/images/searchEngines/www.baidu.com.png
+++ b/plugins/Referrers/images/searchEngines/www.baidu.com.png
diff --git a/plugins/Referers/images/searchEngines/www.blogdigger.com.png b/plugins/Referrers/images/searchEngines/www.blogdigger.com.png
index 10b7b00331..10b7b00331 100644
--- a/plugins/Referers/images/searchEngines/www.blogdigger.com.png
+++ b/plugins/Referrers/images/searchEngines/www.blogdigger.com.png
diff --git a/plugins/Referers/images/searchEngines/www.blogpulse.com.png b/plugins/Referrers/images/searchEngines/www.blogpulse.com.png
index b44009ceea..b44009ceea 100644
--- a/plugins/Referers/images/searchEngines/www.blogpulse.com.png
+++ b/plugins/Referrers/images/searchEngines/www.blogpulse.com.png
diff --git a/plugins/Referers/images/searchEngines/www.charter.net.png b/plugins/Referrers/images/searchEngines/www.charter.net.png
index 9dbbe861f9..9dbbe861f9 100644
--- a/plugins/Referers/images/searchEngines/www.charter.net.png
+++ b/plugins/Referrers/images/searchEngines/www.charter.net.png
diff --git a/plugins/Referers/images/searchEngines/www.crawler.com.png b/plugins/Referrers/images/searchEngines/www.crawler.com.png
index 3e71d3ce83..3e71d3ce83 100644
--- a/plugins/Referers/images/searchEngines/www.crawler.com.png
+++ b/plugins/Referrers/images/searchEngines/www.crawler.com.png
diff --git a/plugins/Referers/images/searchEngines/www.cuil.com.png b/plugins/Referrers/images/searchEngines/www.cuil.com.png
index e4cfb87a94..e4cfb87a94 100644
--- a/plugins/Referers/images/searchEngines/www.cuil.com.png
+++ b/plugins/Referrers/images/searchEngines/www.cuil.com.png
diff --git a/plugins/Referers/images/searchEngines/www.dasoertliche.de.png b/plugins/Referrers/images/searchEngines/www.dasoertliche.de.png
index 1050f39334..1050f39334 100644
--- a/plugins/Referers/images/searchEngines/www.dasoertliche.de.png
+++ b/plugins/Referrers/images/searchEngines/www.dasoertliche.de.png
diff --git a/plugins/Referers/images/searchEngines/www.eniro.se.png b/plugins/Referrers/images/searchEngines/www.eniro.se.png
index b0b7b2985c..b0b7b2985c 100644
--- a/plugins/Referers/images/searchEngines/www.eniro.se.png
+++ b/plugins/Referrers/images/searchEngines/www.eniro.se.png
diff --git a/plugins/Referers/images/searchEngines/www.eurip.com.png b/plugins/Referrers/images/searchEngines/www.eurip.com.png
index 0740cef1a7..0740cef1a7 100644
--- a/plugins/Referers/images/searchEngines/www.eurip.com.png
+++ b/plugins/Referrers/images/searchEngines/www.eurip.com.png
diff --git a/plugins/Referers/images/searchEngines/www.euroseek.com.png b/plugins/Referrers/images/searchEngines/www.euroseek.com.png
index 4789b91046..4789b91046 100644
--- a/plugins/Referers/images/searchEngines/www.euroseek.com.png
+++ b/plugins/Referrers/images/searchEngines/www.euroseek.com.png
diff --git a/plugins/Referers/images/searchEngines/www.everyclick.com.png b/plugins/Referrers/images/searchEngines/www.everyclick.com.png
index 91345abc80..91345abc80 100644
--- a/plugins/Referers/images/searchEngines/www.everyclick.com.png
+++ b/plugins/Referrers/images/searchEngines/www.everyclick.com.png
diff --git a/plugins/Referers/images/searchEngines/www.exalead.fr.png b/plugins/Referrers/images/searchEngines/www.exalead.fr.png
index b308c6eb0b..b308c6eb0b 100644
--- a/plugins/Referers/images/searchEngines/www.exalead.fr.png
+++ b/plugins/Referrers/images/searchEngines/www.exalead.fr.png
diff --git a/plugins/Referers/images/searchEngines/www.facebook.com.png b/plugins/Referrers/images/searchEngines/www.facebook.com.png
index 80561bd547..80561bd547 100644
--- a/plugins/Referers/images/searchEngines/www.facebook.com.png
+++ b/plugins/Referrers/images/searchEngines/www.facebook.com.png
diff --git a/plugins/Referers/images/searchEngines/www.fastbrowsersearch.com.png b/plugins/Referrers/images/searchEngines/www.fastbrowsersearch.com.png
index cfa0fc35a0..cfa0fc35a0 100644
--- a/plugins/Referers/images/searchEngines/www.fastbrowsersearch.com.png
+++ b/plugins/Referrers/images/searchEngines/www.fastbrowsersearch.com.png
diff --git a/plugins/Referers/images/searchEngines/www.fireball.de.png b/plugins/Referrers/images/searchEngines/www.fireball.de.png
index b2b94bc506..b2b94bc506 100644
--- a/plugins/Referers/images/searchEngines/www.fireball.de.png
+++ b/plugins/Referrers/images/searchEngines/www.fireball.de.png
diff --git a/plugins/Referers/images/searchEngines/www.firstsfind.com.png b/plugins/Referrers/images/searchEngines/www.firstsfind.com.png
index 0740cef1a7..0740cef1a7 100644
--- a/plugins/Referers/images/searchEngines/www.firstsfind.com.png
+++ b/plugins/Referrers/images/searchEngines/www.firstsfind.com.png
diff --git a/plugins/Referers/images/searchEngines/www.fixsuche.de.png b/plugins/Referrers/images/searchEngines/www.fixsuche.de.png
index 713d5ca1d5..713d5ca1d5 100644
--- a/plugins/Referers/images/searchEngines/www.fixsuche.de.png
+++ b/plugins/Referrers/images/searchEngines/www.fixsuche.de.png
diff --git a/plugins/Referers/images/searchEngines/www.flix.de.png b/plugins/Referrers/images/searchEngines/www.flix.de.png
index a99560bde3..a99560bde3 100644
--- a/plugins/Referers/images/searchEngines/www.flix.de.png
+++ b/plugins/Referrers/images/searchEngines/www.flix.de.png
diff --git a/plugins/Referers/images/searchEngines/www.gigablast.com.png b/plugins/Referrers/images/searchEngines/www.gigablast.com.png
index 56a15084a0..56a15084a0 100644
--- a/plugins/Referers/images/searchEngines/www.gigablast.com.png
+++ b/plugins/Referrers/images/searchEngines/www.gigablast.com.png
diff --git a/plugins/Referers/images/searchEngines/www.gnadenmeer.de.png b/plugins/Referrers/images/searchEngines/www.gnadenmeer.de.png
index 4986298d76..4986298d76 100644
--- a/plugins/Referers/images/searchEngines/www.gnadenmeer.de.png
+++ b/plugins/Referrers/images/searchEngines/www.gnadenmeer.de.png
diff --git a/plugins/Referers/images/searchEngines/www.gomeo.com.png b/plugins/Referrers/images/searchEngines/www.gomeo.com.png
index b190f14390..b190f14390 100644
--- a/plugins/Referers/images/searchEngines/www.gomeo.com.png
+++ b/plugins/Referrers/images/searchEngines/www.gomeo.com.png
diff --git a/plugins/Referers/images/searchEngines/www.google.interia.pl.png b/plugins/Referrers/images/searchEngines/www.google.interia.pl.png
index 3e6babbe51..3e6babbe51 100644
--- a/plugins/Referers/images/searchEngines/www.google.interia.pl.png
+++ b/plugins/Referrers/images/searchEngines/www.google.interia.pl.png
diff --git a/plugins/Referers/images/searchEngines/www.goyellow.de.png b/plugins/Referrers/images/searchEngines/www.goyellow.de.png
index 63acab128b..63acab128b 100644
--- a/plugins/Referers/images/searchEngines/www.goyellow.de.png
+++ b/plugins/Referrers/images/searchEngines/www.goyellow.de.png
diff --git a/plugins/Referers/images/searchEngines/www.gulesider.no.png b/plugins/Referrers/images/searchEngines/www.gulesider.no.png
index e02cf014f9..e02cf014f9 100644
--- a/plugins/Referers/images/searchEngines/www.gulesider.no.png
+++ b/plugins/Referrers/images/searchEngines/www.gulesider.no.png
diff --git a/plugins/Referers/images/searchEngines/www.highbeam.com.png b/plugins/Referrers/images/searchEngines/www.highbeam.com.png
index badb1cfe38..badb1cfe38 100644
--- a/plugins/Referers/images/searchEngines/www.highbeam.com.png
+++ b/plugins/Referrers/images/searchEngines/www.highbeam.com.png
diff --git a/plugins/Referers/images/searchEngines/www.hooseek.com.png b/plugins/Referrers/images/searchEngines/www.hooseek.com.png
index fe21a1f12d..fe21a1f12d 100644
--- a/plugins/Referers/images/searchEngines/www.hooseek.com.png
+++ b/plugins/Referrers/images/searchEngines/www.hooseek.com.png
diff --git a/plugins/Referers/images/searchEngines/www.hotbot.com.png b/plugins/Referrers/images/searchEngines/www.hotbot.com.png
index b2b94bc506..b2b94bc506 100644
--- a/plugins/Referers/images/searchEngines/www.hotbot.com.png
+++ b/plugins/Referrers/images/searchEngines/www.hotbot.com.png
diff --git a/plugins/Referers/images/searchEngines/www.icq.com.png b/plugins/Referrers/images/searchEngines/www.icq.com.png
index 6a926e8264..6a926e8264 100644
--- a/plugins/Referers/images/searchEngines/www.icq.com.png
+++ b/plugins/Referrers/images/searchEngines/www.icq.com.png
diff --git a/plugins/Referers/images/searchEngines/www.ilse.nl.png b/plugins/Referrers/images/searchEngines/www.ilse.nl.png
index e377b212ab..e377b212ab 100644
--- a/plugins/Referers/images/searchEngines/www.ilse.nl.png
+++ b/plugins/Referrers/images/searchEngines/www.ilse.nl.png
diff --git a/plugins/Referers/images/searchEngines/www.jungle-spider.de.png b/plugins/Referrers/images/searchEngines/www.jungle-spider.de.png
index 6996b1f4b7..6996b1f4b7 100644
--- a/plugins/Referers/images/searchEngines/www.jungle-spider.de.png
+++ b/plugins/Referrers/images/searchEngines/www.jungle-spider.de.png
diff --git a/plugins/Referers/images/searchEngines/www.kataweb.it.png b/plugins/Referrers/images/searchEngines/www.kataweb.it.png
index 16d5a90772..16d5a90772 100644
--- a/plugins/Referers/images/searchEngines/www.kataweb.it.png
+++ b/plugins/Referrers/images/searchEngines/www.kataweb.it.png
diff --git a/plugins/Referers/images/searchEngines/www.kvasir.no.png b/plugins/Referrers/images/searchEngines/www.kvasir.no.png
index f1c56613bc..f1c56613bc 100644
--- a/plugins/Referers/images/searchEngines/www.kvasir.no.png
+++ b/plugins/Referrers/images/searchEngines/www.kvasir.no.png
diff --git a/plugins/Referers/images/searchEngines/www.latne.lv.png b/plugins/Referrers/images/searchEngines/www.latne.lv.png
index 38c34b8deb..38c34b8deb 100644
--- a/plugins/Referers/images/searchEngines/www.latne.lv.png
+++ b/plugins/Referrers/images/searchEngines/www.latne.lv.png
diff --git a/plugins/Referers/images/searchEngines/www.looksmart.com.png b/plugins/Referrers/images/searchEngines/www.looksmart.com.png
index 55b9df7cd0..55b9df7cd0 100644
--- a/plugins/Referers/images/searchEngines/www.looksmart.com.png
+++ b/plugins/Referrers/images/searchEngines/www.looksmart.com.png
diff --git a/plugins/Referers/images/searchEngines/www.maailm.com.png b/plugins/Referrers/images/searchEngines/www.maailm.com.png
index 0740cef1a7..0740cef1a7 100644
--- a/plugins/Referers/images/searchEngines/www.maailm.com.png
+++ b/plugins/Referrers/images/searchEngines/www.maailm.com.png
diff --git a/plugins/Referers/images/searchEngines/www.mamma.com.png b/plugins/Referrers/images/searchEngines/www.mamma.com.png
index 9f25b2a2b8..9f25b2a2b8 100644
--- a/plugins/Referers/images/searchEngines/www.mamma.com.png
+++ b/plugins/Referrers/images/searchEngines/www.mamma.com.png
diff --git a/plugins/Referers/images/searchEngines/www.meinestadt.de.png b/plugins/Referrers/images/searchEngines/www.meinestadt.de.png
index 4e14ee5b6d..4e14ee5b6d 100644
--- a/plugins/Referers/images/searchEngines/www.meinestadt.de.png
+++ b/plugins/Referrers/images/searchEngines/www.meinestadt.de.png
diff --git a/plugins/Referers/images/searchEngines/www.mister-wong.com.png b/plugins/Referrers/images/searchEngines/www.mister-wong.com.png
index ce05c10505..ce05c10505 100644
--- a/plugins/Referers/images/searchEngines/www.mister-wong.com.png
+++ b/plugins/Referrers/images/searchEngines/www.mister-wong.com.png
diff --git a/plugins/Referers/images/searchEngines/www.monstercrawler.com.png b/plugins/Referrers/images/searchEngines/www.monstercrawler.com.png
index bf26708d0c..bf26708d0c 100644
--- a/plugins/Referers/images/searchEngines/www.monstercrawler.com.png
+++ b/plugins/Referrers/images/searchEngines/www.monstercrawler.com.png
diff --git a/plugins/Referers/images/searchEngines/www.mozbot.fr.png b/plugins/Referrers/images/searchEngines/www.mozbot.fr.png
index 538ddb1b41..538ddb1b41 100644
--- a/plugins/Referers/images/searchEngines/www.mozbot.fr.png
+++ b/plugins/Referrers/images/searchEngines/www.mozbot.fr.png
diff --git a/plugins/Referers/images/searchEngines/www.mysearch.com.png b/plugins/Referrers/images/searchEngines/www.mysearch.com.png
index ab08d98e48..ab08d98e48 100644
--- a/plugins/Referers/images/searchEngines/www.mysearch.com.png
+++ b/plugins/Referrers/images/searchEngines/www.mysearch.com.png
diff --git a/plugins/Referers/images/searchEngines/www.najdi.si.png b/plugins/Referrers/images/searchEngines/www.najdi.si.png
index 2898171b50..2898171b50 100644
--- a/plugins/Referers/images/searchEngines/www.najdi.si.png
+++ b/plugins/Referrers/images/searchEngines/www.najdi.si.png
diff --git a/plugins/Referers/images/searchEngines/www.neti.ee.png b/plugins/Referrers/images/searchEngines/www.neti.ee.png
index 60691aedaf..60691aedaf 100644
--- a/plugins/Referers/images/searchEngines/www.neti.ee.png
+++ b/plugins/Referrers/images/searchEngines/www.neti.ee.png
diff --git a/plugins/Referers/images/searchEngines/www.paperball.de.png b/plugins/Referrers/images/searchEngines/www.paperball.de.png
index b2b94bc506..b2b94bc506 100644
--- a/plugins/Referers/images/searchEngines/www.paperball.de.png
+++ b/plugins/Referrers/images/searchEngines/www.paperball.de.png
diff --git a/plugins/Referers/images/searchEngines/www.picsearch.com.png b/plugins/Referrers/images/searchEngines/www.picsearch.com.png
index 268174e5f5..268174e5f5 100644
--- a/plugins/Referers/images/searchEngines/www.picsearch.com.png
+++ b/plugins/Referrers/images/searchEngines/www.picsearch.com.png
diff --git a/plugins/Referers/images/searchEngines/www.plazoo.com.png b/plugins/Referrers/images/searchEngines/www.plazoo.com.png
index bfebffa349..bfebffa349 100644
--- a/plugins/Referers/images/searchEngines/www.plazoo.com.png
+++ b/plugins/Referrers/images/searchEngines/www.plazoo.com.png
diff --git a/plugins/Referers/images/searchEngines/www.qualigo.at.png b/plugins/Referrers/images/searchEngines/www.qualigo.at.png
index 7ece5c84fc..7ece5c84fc 100644
--- a/plugins/Referers/images/searchEngines/www.qualigo.at.png
+++ b/plugins/Referrers/images/searchEngines/www.qualigo.at.png
diff --git a/plugins/Referers/images/searchEngines/www.search.ch.png b/plugins/Referrers/images/searchEngines/www.search.ch.png
index a37e8bec2d..a37e8bec2d 100644
--- a/plugins/Referers/images/searchEngines/www.search.ch.png
+++ b/plugins/Referrers/images/searchEngines/www.search.ch.png
diff --git a/plugins/Referers/images/searchEngines/www.search.com.png b/plugins/Referrers/images/searchEngines/www.search.com.png
index 5afc022944..5afc022944 100644
--- a/plugins/Referers/images/searchEngines/www.search.com.png
+++ b/plugins/Referrers/images/searchEngines/www.search.com.png
diff --git a/plugins/Referers/images/searchEngines/www.searchcanvas.com.png b/plugins/Referrers/images/searchEngines/www.searchcanvas.com.png
index 04a7a0dfa1..04a7a0dfa1 100644
--- a/plugins/Referers/images/searchEngines/www.searchcanvas.com.png
+++ b/plugins/Referrers/images/searchEngines/www.searchcanvas.com.png
diff --git a/plugins/Referers/images/searchEngines/www.searchy.co.uk.png b/plugins/Referrers/images/searchEngines/www.searchy.co.uk.png
index 97d1fa2540..97d1fa2540 100644
--- a/plugins/Referers/images/searchEngines/www.searchy.co.uk.png
+++ b/plugins/Referrers/images/searchEngines/www.searchy.co.uk.png
diff --git a/plugins/Referers/images/searchEngines/www.sharelook.fr.png b/plugins/Referrers/images/searchEngines/www.sharelook.fr.png
index a4cb50bb36..a4cb50bb36 100644
--- a/plugins/Referers/images/searchEngines/www.sharelook.fr.png
+++ b/plugins/Referrers/images/searchEngines/www.sharelook.fr.png
diff --git a/plugins/Referers/images/searchEngines/www.skynet.be.png b/plugins/Referrers/images/searchEngines/www.skynet.be.png
index 25bb673414..25bb673414 100644
--- a/plugins/Referers/images/searchEngines/www.skynet.be.png
+++ b/plugins/Referrers/images/searchEngines/www.skynet.be.png
diff --git a/plugins/Referers/images/searchEngines/www.sogou.com.png b/plugins/Referrers/images/searchEngines/www.sogou.com.png
index 23af99bb2d..23af99bb2d 100644
--- a/plugins/Referers/images/searchEngines/www.sogou.com.png
+++ b/plugins/Referrers/images/searchEngines/www.sogou.com.png
diff --git a/plugins/Referers/images/searchEngines/www.soso.com.png b/plugins/Referrers/images/searchEngines/www.soso.com.png
index cd5019d3a7..cd5019d3a7 100644
--- a/plugins/Referers/images/searchEngines/www.soso.com.png
+++ b/plugins/Referrers/images/searchEngines/www.soso.com.png
diff --git a/plugins/Referers/images/searchEngines/www.startsiden.no.png b/plugins/Referrers/images/searchEngines/www.startsiden.no.png
index f8c702acc1..f8c702acc1 100644
--- a/plugins/Referers/images/searchEngines/www.startsiden.no.png
+++ b/plugins/Referrers/images/searchEngines/www.startsiden.no.png
diff --git a/plugins/Referers/images/searchEngines/www.suchmaschine.com.png b/plugins/Referrers/images/searchEngines/www.suchmaschine.com.png
index f627733347..f627733347 100644
--- a/plugins/Referers/images/searchEngines/www.suchmaschine.com.png
+++ b/plugins/Referrers/images/searchEngines/www.suchmaschine.com.png
diff --git a/plugins/Referers/images/searchEngines/www.suchnase.de.png b/plugins/Referrers/images/searchEngines/www.suchnase.de.png
index 2922396a13..2922396a13 100644
--- a/plugins/Referers/images/searchEngines/www.suchnase.de.png
+++ b/plugins/Referrers/images/searchEngines/www.suchnase.de.png
diff --git a/plugins/Referers/images/searchEngines/www.talimba.com.png b/plugins/Referrers/images/searchEngines/www.talimba.com.png
index 4403a249b1..4403a249b1 100644
--- a/plugins/Referers/images/searchEngines/www.talimba.com.png
+++ b/plugins/Referrers/images/searchEngines/www.talimba.com.png
diff --git a/plugins/Referers/images/searchEngines/www.talktalk.co.uk.png b/plugins/Referrers/images/searchEngines/www.talktalk.co.uk.png
index 90162cd25d..90162cd25d 100644
--- a/plugins/Referers/images/searchEngines/www.talktalk.co.uk.png
+++ b/plugins/Referrers/images/searchEngines/www.talktalk.co.uk.png
diff --git a/plugins/Referers/images/searchEngines/www.teoma.com.png b/plugins/Referrers/images/searchEngines/www.teoma.com.png
index 8307f5428c..8307f5428c 100644
--- a/plugins/Referers/images/searchEngines/www.teoma.com.png
+++ b/plugins/Referrers/images/searchEngines/www.teoma.com.png
diff --git a/plugins/Referers/images/searchEngines/www.tixuma.de.png b/plugins/Referrers/images/searchEngines/www.tixuma.de.png
index 5bc3b0d063..5bc3b0d063 100644
--- a/plugins/Referers/images/searchEngines/www.tixuma.de.png
+++ b/plugins/Referrers/images/searchEngines/www.tixuma.de.png
diff --git a/plugins/Referers/images/searchEngines/www.toile.com.png b/plugins/Referrers/images/searchEngines/www.toile.com.png
index d696996369..d696996369 100644
--- a/plugins/Referers/images/searchEngines/www.toile.com.png
+++ b/plugins/Referrers/images/searchEngines/www.toile.com.png
diff --git a/plugins/Referers/images/searchEngines/www.toolbarhome.com.png b/plugins/Referrers/images/searchEngines/www.toolbarhome.com.png
index 5bd6311d31..5bd6311d31 100644
--- a/plugins/Referers/images/searchEngines/www.toolbarhome.com.png
+++ b/plugins/Referrers/images/searchEngines/www.toolbarhome.com.png
diff --git a/plugins/Referers/images/searchEngines/www.trouvez.com.png b/plugins/Referrers/images/searchEngines/www.trouvez.com.png
index fea4b8a110..fea4b8a110 100644
--- a/plugins/Referers/images/searchEngines/www.trouvez.com.png
+++ b/plugins/Referrers/images/searchEngines/www.trouvez.com.png
diff --git a/plugins/Referers/images/searchEngines/www.trovarapido.com.png b/plugins/Referrers/images/searchEngines/www.trovarapido.com.png
index 178db0cb48..178db0cb48 100644
--- a/plugins/Referers/images/searchEngines/www.trovarapido.com.png
+++ b/plugins/Referrers/images/searchEngines/www.trovarapido.com.png
diff --git a/plugins/Referers/images/searchEngines/www.trusted-search.com.png b/plugins/Referrers/images/searchEngines/www.trusted-search.com.png
index 0740cef1a7..0740cef1a7 100644
--- a/plugins/Referers/images/searchEngines/www.trusted-search.com.png
+++ b/plugins/Referrers/images/searchEngines/www.trusted-search.com.png
diff --git a/plugins/Referers/images/searchEngines/www.twingly.com.png b/plugins/Referrers/images/searchEngines/www.twingly.com.png
index 90bb98e73d..90bb98e73d 100644
--- a/plugins/Referers/images/searchEngines/www.twingly.com.png
+++ b/plugins/Referrers/images/searchEngines/www.twingly.com.png
diff --git a/plugins/Referers/images/searchEngines/www.url.org.png b/plugins/Referrers/images/searchEngines/www.url.org.png
index bab829ef20..bab829ef20 100644
--- a/plugins/Referers/images/searchEngines/www.url.org.png
+++ b/plugins/Referrers/images/searchEngines/www.url.org.png
diff --git a/plugins/Referers/images/searchEngines/www.vinden.nl.png b/plugins/Referrers/images/searchEngines/www.vinden.nl.png
index dbccde0feb..dbccde0feb 100644
--- a/plugins/Referers/images/searchEngines/www.vinden.nl.png
+++ b/plugins/Referrers/images/searchEngines/www.vinden.nl.png
diff --git a/plugins/Referers/images/searchEngines/www.vindex.nl.png b/plugins/Referrers/images/searchEngines/www.vindex.nl.png
index 735107c64e..735107c64e 100644
--- a/plugins/Referers/images/searchEngines/www.vindex.nl.png
+++ b/plugins/Referrers/images/searchEngines/www.vindex.nl.png
diff --git a/plugins/Referers/images/searchEngines/www.walhello.info.png b/plugins/Referrers/images/searchEngines/www.walhello.info.png
index e02068c6fc..e02068c6fc 100644
--- a/plugins/Referers/images/searchEngines/www.walhello.info.png
+++ b/plugins/Referrers/images/searchEngines/www.walhello.info.png
diff --git a/plugins/Referers/images/searchEngines/www.web.nl.png b/plugins/Referrers/images/searchEngines/www.web.nl.png
index 0740cef1a7..0740cef1a7 100644
--- a/plugins/Referers/images/searchEngines/www.web.nl.png
+++ b/plugins/Referrers/images/searchEngines/www.web.nl.png
diff --git a/plugins/Referers/images/searchEngines/www.weborama.fr.png b/plugins/Referrers/images/searchEngines/www.weborama.fr.png
index 096891a617..096891a617 100644
--- a/plugins/Referers/images/searchEngines/www.weborama.fr.png
+++ b/plugins/Referrers/images/searchEngines/www.weborama.fr.png
diff --git a/plugins/Referers/images/searchEngines/www.websearch.com.png b/plugins/Referrers/images/searchEngines/www.websearch.com.png
index a161533a0a..a161533a0a 100644
--- a/plugins/Referers/images/searchEngines/www.websearch.com.png
+++ b/plugins/Referrers/images/searchEngines/www.websearch.com.png
diff --git a/plugins/Referers/images/searchEngines/www.witch.de.png b/plugins/Referrers/images/searchEngines/www.witch.de.png
index e44548ec3f..e44548ec3f 100644
--- a/plugins/Referers/images/searchEngines/www.witch.de.png
+++ b/plugins/Referrers/images/searchEngines/www.witch.de.png
diff --git a/plugins/Referers/images/searchEngines/www.x-recherche.com.png b/plugins/Referrers/images/searchEngines/www.x-recherche.com.png
index 0e44c0d93d..0e44c0d93d 100644
--- a/plugins/Referers/images/searchEngines/www.x-recherche.com.png
+++ b/plugins/Referrers/images/searchEngines/www.x-recherche.com.png
diff --git a/plugins/Referers/images/searchEngines/www.yasni.de.png b/plugins/Referrers/images/searchEngines/www.yasni.de.png
index 9440cb8ebb..9440cb8ebb 100644
--- a/plugins/Referers/images/searchEngines/www.yasni.de.png
+++ b/plugins/Referrers/images/searchEngines/www.yasni.de.png
diff --git a/plugins/Referers/images/searchEngines/www.yatedo.com.png b/plugins/Referrers/images/searchEngines/www.yatedo.com.png
index b77082edbe..b77082edbe 100644
--- a/plugins/Referers/images/searchEngines/www.yatedo.com.png
+++ b/plugins/Referrers/images/searchEngines/www.yatedo.com.png
diff --git a/plugins/Referers/images/searchEngines/www.yougoo.fr.png b/plugins/Referrers/images/searchEngines/www.yougoo.fr.png
index 6e0e19c461..6e0e19c461 100644
--- a/plugins/Referers/images/searchEngines/www.yougoo.fr.png
+++ b/plugins/Referrers/images/searchEngines/www.yougoo.fr.png
diff --git a/plugins/Referers/images/searchEngines/www.zapmeta.com.png b/plugins/Referrers/images/searchEngines/www.zapmeta.com.png
index ff98d107f8..ff98d107f8 100644
--- a/plugins/Referers/images/searchEngines/www.zapmeta.com.png
+++ b/plugins/Referrers/images/searchEngines/www.zapmeta.com.png
diff --git a/plugins/Referers/images/searchEngines/www.zoeken.nl.png b/plugins/Referrers/images/searchEngines/www.zoeken.nl.png
index b66c4e36bc..b66c4e36bc 100644
--- a/plugins/Referers/images/searchEngines/www.zoeken.nl.png
+++ b/plugins/Referrers/images/searchEngines/www.zoeken.nl.png
diff --git a/plugins/Referers/images/searchEngines/www.zoznam.sk.png b/plugins/Referrers/images/searchEngines/www.zoznam.sk.png
index c6e9963fe5..c6e9963fe5 100644
--- a/plugins/Referers/images/searchEngines/www.zoznam.sk.png
+++ b/plugins/Referrers/images/searchEngines/www.zoznam.sk.png
diff --git a/plugins/Referers/images/searchEngines/www1.dastelefonbuch.de.png b/plugins/Referrers/images/searchEngines/www1.dastelefonbuch.de.png
index 8912f991a4..8912f991a4 100644
--- a/plugins/Referers/images/searchEngines/www1.dastelefonbuch.de.png
+++ b/plugins/Referrers/images/searchEngines/www1.dastelefonbuch.de.png
diff --git a/plugins/Referers/images/searchEngines/www2.austronaut.at.png b/plugins/Referrers/images/searchEngines/www2.austronaut.at.png
index bf9c47dafa..bf9c47dafa 100644
--- a/plugins/Referers/images/searchEngines/www2.austronaut.at.png
+++ b/plugins/Referrers/images/searchEngines/www2.austronaut.at.png
diff --git a/plugins/Referers/images/searchEngines/www2.inbox.com.png b/plugins/Referrers/images/searchEngines/www2.inbox.com.png
index 254592427d..254592427d 100644
--- a/plugins/Referers/images/searchEngines/www2.inbox.com.png
+++ b/plugins/Referrers/images/searchEngines/www2.inbox.com.png
diff --git a/plugins/Referers/images/searchEngines/www3.zoek.nl.png b/plugins/Referrers/images/searchEngines/www3.zoek.nl.png
index 7c5a5a11b7..7c5a5a11b7 100644
--- a/plugins/Referers/images/searchEngines/www3.zoek.nl.png
+++ b/plugins/Referrers/images/searchEngines/www3.zoek.nl.png
diff --git a/plugins/Referers/images/searchEngines/xx.gif b/plugins/Referrers/images/searchEngines/xx.gif
index 5ddb8b8edb..5ddb8b8edb 100644
--- a/plugins/Referers/images/searchEngines/xx.gif
+++ b/plugins/Referrers/images/searchEngines/xx.gif
diff --git a/plugins/Referers/images/searchEngines/xx.png b/plugins/Referrers/images/searchEngines/xx.png
index fe2401be73..fe2401be73 100644
--- a/plugins/Referers/images/searchEngines/xx.png
+++ b/plugins/Referrers/images/searchEngines/xx.png
diff --git a/plugins/Referers/images/searchEngines/yandex.ru.png b/plugins/Referrers/images/searchEngines/yandex.ru.png
index b6cf192fb9..b6cf192fb9 100644
--- a/plugins/Referers/images/searchEngines/yandex.ru.png
+++ b/plugins/Referrers/images/searchEngines/yandex.ru.png
diff --git a/plugins/Referers/images/searchEngines/yellowmap.de.png b/plugins/Referrers/images/searchEngines/yellowmap.de.png
index 19e486fc98..19e486fc98 100644
--- a/plugins/Referers/images/searchEngines/yellowmap.de.png
+++ b/plugins/Referrers/images/searchEngines/yellowmap.de.png
diff --git a/plugins/Referers/images/searchEngines/zoohoo.cz.png b/plugins/Referrers/images/searchEngines/zoohoo.cz.png
index ce7993d311..ce7993d311 100644
--- a/plugins/Referers/images/searchEngines/zoohoo.cz.png
+++ b/plugins/Referrers/images/searchEngines/zoohoo.cz.png
diff --git a/plugins/Referers/images/socials/badoo.com.png b/plugins/Referrers/images/socials/badoo.com.png
index aea21cd1c5..aea21cd1c5 100755..100644
--- a/plugins/Referers/images/socials/badoo.com.png
+++ b/plugins/Referrers/images/socials/badoo.com.png
diff --git a/plugins/Referers/images/socials/bebo.com.png b/plugins/Referrers/images/socials/bebo.com.png
index 35f19be55f..35f19be55f 100755..100644
--- a/plugins/Referers/images/socials/bebo.com.png
+++ b/plugins/Referrers/images/socials/bebo.com.png
diff --git a/plugins/Referers/images/socials/blackplanet.com.png b/plugins/Referrers/images/socials/blackplanet.com.png
index 99387eae4e..99387eae4e 100755..100644
--- a/plugins/Referers/images/socials/blackplanet.com.png
+++ b/plugins/Referrers/images/socials/blackplanet.com.png
diff --git a/plugins/Referers/images/socials/buzznet.com.png b/plugins/Referrers/images/socials/buzznet.com.png
index 837837a01c..837837a01c 100755..100644
--- a/plugins/Referers/images/socials/buzznet.com.png
+++ b/plugins/Referrers/images/socials/buzznet.com.png
diff --git a/plugins/Referers/images/socials/classmates.com.png b/plugins/Referrers/images/socials/classmates.com.png
index 3b03cb44df..3b03cb44df 100755..100644
--- a/plugins/Referers/images/socials/classmates.com.png
+++ b/plugins/Referrers/images/socials/classmates.com.png
diff --git a/plugins/Referers/images/socials/douban.com.png b/plugins/Referrers/images/socials/douban.com.png
index 3e0b36a646..3e0b36a646 100755..100644
--- a/plugins/Referers/images/socials/douban.com.png
+++ b/plugins/Referrers/images/socials/douban.com.png
diff --git a/plugins/Referers/images/socials/facebook.com.png b/plugins/Referrers/images/socials/facebook.com.png
index 5984d34da6..5984d34da6 100755..100644
--- a/plugins/Referers/images/socials/facebook.com.png
+++ b/plugins/Referrers/images/socials/facebook.com.png
diff --git a/plugins/Referers/images/socials/flickr.com.png b/plugins/Referrers/images/socials/flickr.com.png
index d1aa296e5c..d1aa296e5c 100755..100644
--- a/plugins/Referers/images/socials/flickr.com.png
+++ b/plugins/Referrers/images/socials/flickr.com.png
diff --git a/plugins/Referers/images/socials/flixster.com.png b/plugins/Referrers/images/socials/flixster.com.png
index 94f96d3230..94f96d3230 100755..100644
--- a/plugins/Referers/images/socials/flixster.com.png
+++ b/plugins/Referrers/images/socials/flixster.com.png
diff --git a/plugins/Referers/images/socials/foursquare.com.png b/plugins/Referrers/images/socials/foursquare.com.png
index 17d295088b..17d295088b 100755..100644
--- a/plugins/Referers/images/socials/foursquare.com.png
+++ b/plugins/Referrers/images/socials/foursquare.com.png
diff --git a/plugins/Referers/images/socials/friendsreunited.com.png b/plugins/Referrers/images/socials/friendsreunited.com.png
index b12f23d8c1..b12f23d8c1 100755..100644
--- a/plugins/Referers/images/socials/friendsreunited.com.png
+++ b/plugins/Referrers/images/socials/friendsreunited.com.png
diff --git a/plugins/Referers/images/socials/friendster.com.png b/plugins/Referrers/images/socials/friendster.com.png
index 918641431c..918641431c 100755..100644
--- a/plugins/Referers/images/socials/friendster.com.png
+++ b/plugins/Referrers/images/socials/friendster.com.png
diff --git a/plugins/Referers/images/socials/gaiaonline.com.png b/plugins/Referrers/images/socials/gaiaonline.com.png
index 720fb21f05..720fb21f05 100755..100644
--- a/plugins/Referers/images/socials/gaiaonline.com.png
+++ b/plugins/Referrers/images/socials/gaiaonline.com.png
diff --git a/plugins/Referers/images/socials/geni.com.png b/plugins/Referrers/images/socials/geni.com.png
index 89489a9a7b..89489a9a7b 100755..100644
--- a/plugins/Referers/images/socials/geni.com.png
+++ b/plugins/Referrers/images/socials/geni.com.png
diff --git a/plugins/Referers/images/socials/github.com.png b/plugins/Referrers/images/socials/github.com.png
index 3f7a5b4ac0..3f7a5b4ac0 100644
--- a/plugins/Referers/images/socials/github.com.png
+++ b/plugins/Referrers/images/socials/github.com.png
diff --git a/plugins/Referers/images/socials/habbo.com.png b/plugins/Referrers/images/socials/habbo.com.png
index 4e6437f8b6..4e6437f8b6 100755..100644
--- a/plugins/Referers/images/socials/habbo.com.png
+++ b/plugins/Referrers/images/socials/habbo.com.png
diff --git a/plugins/Referers/images/socials/hi5.com.png b/plugins/Referrers/images/socials/hi5.com.png
index ff369f74da..ff369f74da 100755..100644
--- a/plugins/Referers/images/socials/hi5.com.png
+++ b/plugins/Referrers/images/socials/hi5.com.png
diff --git a/plugins/Referers/images/socials/hyves.nl.png b/plugins/Referrers/images/socials/hyves.nl.png
index dcfd56d926..dcfd56d926 100755..100644
--- a/plugins/Referers/images/socials/hyves.nl.png
+++ b/plugins/Referrers/images/socials/hyves.nl.png
diff --git a/plugins/Referers/images/socials/identi.ca.png b/plugins/Referrers/images/socials/identi.ca.png
index d31743c89c..d31743c89c 100644
--- a/plugins/Referers/images/socials/identi.ca.png
+++ b/plugins/Referrers/images/socials/identi.ca.png
diff --git a/plugins/Referers/images/socials/lastfm.ru.png b/plugins/Referrers/images/socials/lastfm.ru.png
index 9362fd4eff..9362fd4eff 100755..100644
--- a/plugins/Referers/images/socials/lastfm.ru.png
+++ b/plugins/Referrers/images/socials/lastfm.ru.png
diff --git a/plugins/Referers/images/socials/linkedin.com.png b/plugins/Referrers/images/socials/linkedin.com.png
index e6a5034b39..e6a5034b39 100755..100644
--- a/plugins/Referers/images/socials/linkedin.com.png
+++ b/plugins/Referrers/images/socials/linkedin.com.png
diff --git a/plugins/Referers/images/socials/livejournal.ru.png b/plugins/Referrers/images/socials/livejournal.ru.png
index aab5626528..aab5626528 100755..100644
--- a/plugins/Referers/images/socials/livejournal.ru.png
+++ b/plugins/Referrers/images/socials/livejournal.ru.png
diff --git a/plugins/Referers/images/socials/login.live.com.png b/plugins/Referrers/images/socials/login.live.com.png
index 7db0eafb2b..7db0eafb2b 100755..100644
--- a/plugins/Referers/images/socials/login.live.com.png
+++ b/plugins/Referrers/images/socials/login.live.com.png
diff --git a/plugins/Referers/images/socials/mixi.jp.png b/plugins/Referrers/images/socials/mixi.jp.png
index 69bd263d00..69bd263d00 100755..100644
--- a/plugins/Referers/images/socials/mixi.jp.png
+++ b/plugins/Referrers/images/socials/mixi.jp.png
diff --git a/plugins/Referers/images/socials/moikrug.ru.png b/plugins/Referrers/images/socials/moikrug.ru.png
index 5629a38af9..5629a38af9 100755..100644
--- a/plugins/Referers/images/socials/moikrug.ru.png
+++ b/plugins/Referrers/images/socials/moikrug.ru.png
diff --git a/plugins/Referers/images/socials/multiply.com.png b/plugins/Referrers/images/socials/multiply.com.png
index 9606837896..9606837896 100755..100644
--- a/plugins/Referers/images/socials/multiply.com.png
+++ b/plugins/Referrers/images/socials/multiply.com.png
diff --git a/plugins/Referers/images/socials/myheritage.com.png b/plugins/Referrers/images/socials/myheritage.com.png
index f55732a34c..f55732a34c 100755..100644
--- a/plugins/Referers/images/socials/myheritage.com.png
+++ b/plugins/Referrers/images/socials/myheritage.com.png
diff --git a/plugins/Referers/images/socials/mylife.ru.png b/plugins/Referrers/images/socials/mylife.ru.png
index cfa4ac14c2..cfa4ac14c2 100755..100644
--- a/plugins/Referers/images/socials/mylife.ru.png
+++ b/plugins/Referrers/images/socials/mylife.ru.png
diff --git a/plugins/Referers/images/socials/myspace.com.png b/plugins/Referrers/images/socials/myspace.com.png
index 274cd18012..274cd18012 100755..100644
--- a/plugins/Referers/images/socials/myspace.com.png
+++ b/plugins/Referrers/images/socials/myspace.com.png
diff --git a/plugins/Referers/images/socials/myyearbook.com.png b/plugins/Referrers/images/socials/myyearbook.com.png
index 6e73c715fc..6e73c715fc 100755..100644
--- a/plugins/Referers/images/socials/myyearbook.com.png
+++ b/plugins/Referrers/images/socials/myyearbook.com.png
diff --git a/plugins/Referers/images/socials/news.ycombinator.com.png b/plugins/Referrers/images/socials/news.ycombinator.com.png
index f64ec3b0da..f64ec3b0da 100644
--- a/plugins/Referers/images/socials/news.ycombinator.com.png
+++ b/plugins/Referrers/images/socials/news.ycombinator.com.png
diff --git a/plugins/Referers/images/socials/nk.pl.png b/plugins/Referrers/images/socials/nk.pl.png
index 378fde1bf2..378fde1bf2 100755..100644
--- a/plugins/Referers/images/socials/nk.pl.png
+++ b/plugins/Referrers/images/socials/nk.pl.png
diff --git a/plugins/Referers/images/socials/odnoklassniki.ru.png b/plugins/Referrers/images/socials/odnoklassniki.ru.png
index b20fbbbec1..b20fbbbec1 100755..100644
--- a/plugins/Referers/images/socials/odnoklassniki.ru.png
+++ b/plugins/Referrers/images/socials/odnoklassniki.ru.png
diff --git a/plugins/Referers/images/socials/orkut.com.png b/plugins/Referrers/images/socials/orkut.com.png
index d0b72ab1f4..d0b72ab1f4 100755..100644
--- a/plugins/Referers/images/socials/orkut.com.png
+++ b/plugins/Referrers/images/socials/orkut.com.png
diff --git a/plugins/Referers/images/socials/pinterest.com.png b/plugins/Referrers/images/socials/pinterest.com.png
index d1f61b99eb..d1f61b99eb 100644
--- a/plugins/Referers/images/socials/pinterest.com.png
+++ b/plugins/Referrers/images/socials/pinterest.com.png
diff --git a/plugins/Referers/images/socials/plaxo.com.png b/plugins/Referrers/images/socials/plaxo.com.png
index 9d1351e0e6..9d1351e0e6 100755..100644
--- a/plugins/Referers/images/socials/plaxo.com.png
+++ b/plugins/Referrers/images/socials/plaxo.com.png
diff --git a/plugins/Referers/images/socials/qzone.qq.com.png b/plugins/Referrers/images/socials/qzone.qq.com.png
index 355b9d137b..355b9d137b 100755..100644
--- a/plugins/Referers/images/socials/qzone.qq.com.png
+++ b/plugins/Referrers/images/socials/qzone.qq.com.png
diff --git a/plugins/Referers/images/socials/reddit.com.png b/plugins/Referrers/images/socials/reddit.com.png
index 234a096eba..234a096eba 100644
--- a/plugins/Referers/images/socials/reddit.com.png
+++ b/plugins/Referrers/images/socials/reddit.com.png
diff --git a/plugins/Referers/images/socials/renren.com.png b/plugins/Referrers/images/socials/renren.com.png
index 05dae81d48..05dae81d48 100755..100644
--- a/plugins/Referers/images/socials/renren.com.png
+++ b/plugins/Referrers/images/socials/renren.com.png
diff --git a/plugins/Referers/images/socials/ru.netlog.com.png b/plugins/Referrers/images/socials/ru.netlog.com.png
index ac2dc071c4..ac2dc071c4 100755..100644
--- a/plugins/Referers/images/socials/ru.netlog.com.png
+++ b/plugins/Referrers/images/socials/ru.netlog.com.png
diff --git a/plugins/Referers/images/socials/skyrock.com.png b/plugins/Referrers/images/socials/skyrock.com.png
index 9c6c336faa..9c6c336faa 100755..100644
--- a/plugins/Referers/images/socials/skyrock.com.png
+++ b/plugins/Referrers/images/socials/skyrock.com.png
diff --git a/plugins/Referers/images/socials/sonico.com.png b/plugins/Referrers/images/socials/sonico.com.png
index 74450ea939..74450ea939 100755..100644
--- a/plugins/Referers/images/socials/sonico.com.png
+++ b/plugins/Referrers/images/socials/sonico.com.png
diff --git a/plugins/Referers/images/socials/sourceforge.net.png b/plugins/Referrers/images/socials/sourceforge.net.png
index 9e0a44c089..9e0a44c089 100644
--- a/plugins/Referers/images/socials/sourceforge.net.png
+++ b/plugins/Referrers/images/socials/sourceforge.net.png
diff --git a/plugins/Referers/images/socials/stackoverflow.com.png b/plugins/Referrers/images/socials/stackoverflow.com.png
index 7ae008ff52..7ae008ff52 100644
--- a/plugins/Referers/images/socials/stackoverflow.com.png
+++ b/plugins/Referrers/images/socials/stackoverflow.com.png
diff --git a/plugins/Referers/images/socials/studivz.net.png b/plugins/Referrers/images/socials/studivz.net.png
index 640e8d27db..640e8d27db 100755..100644
--- a/plugins/Referers/images/socials/studivz.net.png
+++ b/plugins/Referrers/images/socials/studivz.net.png
diff --git a/plugins/Referers/images/socials/stumbleupon.com.png b/plugins/Referrers/images/socials/stumbleupon.com.png
index a76f852646..a76f852646 100755..100644
--- a/plugins/Referers/images/socials/stumbleupon.com.png
+++ b/plugins/Referrers/images/socials/stumbleupon.com.png
diff --git a/plugins/Referers/images/socials/tagged.com.png b/plugins/Referrers/images/socials/tagged.com.png
index ff369f74da..ff369f74da 100755..100644
--- a/plugins/Referers/images/socials/tagged.com.png
+++ b/plugins/Referrers/images/socials/tagged.com.png
diff --git a/plugins/Referers/images/socials/taringa.net.png b/plugins/Referrers/images/socials/taringa.net.png
index edb1e20527..edb1e20527 100755..100644
--- a/plugins/Referers/images/socials/taringa.net.png
+++ b/plugins/Referrers/images/socials/taringa.net.png
diff --git a/plugins/Referers/images/socials/tuenti.com.png b/plugins/Referrers/images/socials/tuenti.com.png
index db0ad5254a..db0ad5254a 100755..100644
--- a/plugins/Referers/images/socials/tuenti.com.png
+++ b/plugins/Referrers/images/socials/tuenti.com.png
diff --git a/plugins/Referers/images/socials/twitter.com.png b/plugins/Referrers/images/socials/twitter.com.png
index b90f3a05d2..b90f3a05d2 100755..100644
--- a/plugins/Referers/images/socials/twitter.com.png
+++ b/plugins/Referrers/images/socials/twitter.com.png
diff --git a/plugins/Referers/images/socials/url.google.com.png b/plugins/Referrers/images/socials/url.google.com.png
index 8de0de27d7..8de0de27d7 100755..100644
--- a/plugins/Referers/images/socials/url.google.com.png
+++ b/plugins/Referrers/images/socials/url.google.com.png
diff --git a/plugins/Referers/images/socials/viadeo.com.png b/plugins/Referrers/images/socials/viadeo.com.png
index 1d0ad9d0ad..1d0ad9d0ad 100755..100644
--- a/plugins/Referers/images/socials/viadeo.com.png
+++ b/plugins/Referrers/images/socials/viadeo.com.png
diff --git a/plugins/Referers/images/socials/vimeo.com.png b/plugins/Referrers/images/socials/vimeo.com.png
index 4909f55931..4909f55931 100644
--- a/plugins/Referers/images/socials/vimeo.com.png
+++ b/plugins/Referrers/images/socials/vimeo.com.png
diff --git a/plugins/Referers/images/socials/vk.com.png b/plugins/Referrers/images/socials/vk.com.png
index 0ce476e6d6..0ce476e6d6 100755..100644
--- a/plugins/Referers/images/socials/vk.com.png
+++ b/plugins/Referrers/images/socials/vk.com.png
diff --git a/plugins/Referers/images/socials/vkontakte.ru.png b/plugins/Referrers/images/socials/vkontakte.ru.png
index e984ddbfb5..e984ddbfb5 100755..100644
--- a/plugins/Referers/images/socials/vkontakte.ru.png
+++ b/plugins/Referrers/images/socials/vkontakte.ru.png
diff --git a/plugins/Referers/images/socials/vkrugudruzei.ru.png b/plugins/Referrers/images/socials/vkrugudruzei.ru.png
index a320387c01..a320387c01 100755..100644
--- a/plugins/Referers/images/socials/vkrugudruzei.ru.png
+++ b/plugins/Referrers/images/socials/vkrugudruzei.ru.png
diff --git a/plugins/Referers/images/socials/weibo.com.png b/plugins/Referrers/images/socials/weibo.com.png
index 3b25d6ae6c..3b25d6ae6c 100644
--- a/plugins/Referers/images/socials/weibo.com.png
+++ b/plugins/Referrers/images/socials/weibo.com.png
diff --git a/plugins/Referers/images/socials/xing.com.png b/plugins/Referrers/images/socials/xing.com.png
index 1d6a8a4395..1d6a8a4395 100755..100644
--- a/plugins/Referers/images/socials/xing.com.png
+++ b/plugins/Referrers/images/socials/xing.com.png
diff --git a/plugins/Referers/images/socials/xx.png b/plugins/Referrers/images/socials/xx.png
index fe2401be73..fe2401be73 100644
--- a/plugins/Referers/images/socials/xx.png
+++ b/plugins/Referrers/images/socials/xx.png
diff --git a/plugins/Referers/images/socials/youtube.com.png b/plugins/Referrers/images/socials/youtube.com.png
index c5346b61a2..c5346b61a2 100644
--- a/plugins/Referers/images/socials/youtube.com.png
+++ b/plugins/Referrers/images/socials/youtube.com.png
diff --git a/plugins/Referers/templates/getSearchEnginesAndKeywords.twig b/plugins/Referrers/templates/getSearchEnginesAndKeywords.twig
index c24463ba7d..c24463ba7d 100644
--- a/plugins/Referers/templates/getSearchEnginesAndKeywords.twig
+++ b/plugins/Referrers/templates/getSearchEnginesAndKeywords.twig
diff --git a/plugins/Referers/templates/index.twig b/plugins/Referrers/templates/index.twig
index 758f995a06..4e1c7a6719 100644
--- a/plugins/Referers/templates/index.twig
+++ b/plugins/Referrers/templates/index.twig
@@ -1,5 +1,5 @@
-<h2 data-graph-id="{{ nameGraphEvolutionReferers }}">{{ 'General_EvolutionOverPeriod'|translate }}</h2>
-{{ graphEvolutionReferers|raw }}
+<h2 data-graph-id="{{ nameGraphEvolutionReferrers }}">{{ 'General_EvolutionOverPeriod'|translate }}</h2>
+{{ graphEvolutionReferrers|raw }}
 
 <br/>
 <div id='leftcolumn' style="position:relative;">
@@ -96,15 +96,15 @@
     <p style="clear:both;"/>
 
     <div style="float:left;">{{ 'General_View'|translate }}
-        <a href="javascript:broadcast.propagateAjax('module=Referers&action=getSearchEnginesAndKeywords')">{{ 'Referrers_SubmenuSearchEngines'|translate }}</a>,
-        <a href="javascript:broadcast.propagateAjax('module=Referers&action=indexWebsites')">{{ 'Referrers_SubmenuWebsites'|translate }}</a>,
-        <a href="javascript:broadcast.propagateAjax('module=Referers&action=indexCampaigns')">{{ 'Referrers_Campaigns'|translate }}</a>.
+        <a href="javascript:broadcast.propagateAjax('module=Referrers&action=getSearchEnginesAndKeywords')">{{ 'Referrers_SubmenuSearchEngines'|translate }}</a>,
+        <a href="javascript:broadcast.propagateAjax('module=Referrers&action=indexWebsites')">{{ 'Referrers_SubmenuWebsites'|translate }}</a>,
+        <a href="javascript:broadcast.propagateAjax('module=Referrers&action=indexCampaigns')">{{ 'Referrers_Campaigns'|translate }}</a>.
     </div>
 </div>
 
 <div id='rightcolumn'>
     <h2>{{ 'Referrers_DetailsByReferrerType'|translate }}</h2>
-    {{ dataTableRefererType|raw }}
+    {{ dataTableReferrerType|raw }}
 </div>
 
 <div style="clear:both;"></div>
diff --git a/plugins/Referers/templates/indexWebsites.twig b/plugins/Referrers/templates/indexWebsites.twig
index 10a844eeb5..10a844eeb5 100755..100644
--- a/plugins/Referers/templates/indexWebsites.twig
+++ b/plugins/Referrers/templates/indexWebsites.twig
diff --git a/plugins/SEO/API.php b/plugins/SEO/API.php
index 74dd10ac56..307e20fc78 100644
--- a/plugins/SEO/API.php
+++ b/plugins/SEO/API.php
@@ -16,9 +16,9 @@ use Piwik\Plugins\SEO\MajesticClient;
 use Piwik\Plugins\SEO\RankChecker;
 
 /**
- * @see plugins/Referers/functions.php
+ * @see plugins/Referrers/functions.php
  */
-require_once PIWIK_INCLUDE_PATH . '/plugins/Referers/functions.php';
+require_once PIWIK_INCLUDE_PATH . '/plugins/Referrers/functions.php';
 
 /**
  * The SEO API lets you access a list of SEO metrics for the specified URL: Google Pagerank, Goolge/Bing indexed pages
@@ -57,22 +57,22 @@ class API
         $data = array(
             'Google PageRank'                          => array(
                 'rank' => $rank->getPageRank(),
-                'logo' => \Piwik\Plugins\Referers\getSearchEngineLogoFromUrl('http://google.com'),
+                'logo' => \Piwik\Plugins\Referrers\getSearchEngineLogoFromUrl('http://google.com'),
                 'id'   => 'pagerank'
             ),
             Piwik_Translate('SEO_Google_IndexedPages') => array(
                 'rank' => $rank->getIndexedPagesGoogle(),
-                'logo' => \Piwik\Plugins\Referers\getSearchEngineLogoFromUrl('http://google.com'),
+                'logo' => \Piwik\Plugins\Referrers\getSearchEngineLogoFromUrl('http://google.com'),
                 'id'   => 'google-index',
             ),
             Piwik_Translate('SEO_Bing_IndexedPages')   => array(
                 'rank' => $rank->getIndexedPagesBing(),
-                'logo' => \Piwik\Plugins\Referers\getSearchEngineLogoFromUrl('http://bing.com'),
+                'logo' => \Piwik\Plugins\Referrers\getSearchEngineLogoFromUrl('http://bing.com'),
                 'id'   => 'bing-index',
             ),
             Piwik_Translate('SEO_AlexaRank')           => array(
                 'rank' => $rank->getAlexaRank(),
-                'logo' => \Piwik\Plugins\Referers\getSearchEngineLogoFromUrl('http://alexa.com'),
+                'logo' => \Piwik\Plugins\Referrers\getSearchEngineLogoFromUrl('http://alexa.com'),
                 'id'   => 'alexa',
             ),
             Piwik_Translate('SEO_DomainAge')           => array(
@@ -99,7 +99,7 @@ class API
         // Add DMOZ only if > 0 entries found
         $dmozRank = array(
             'rank' => $rank->getDmoz(),
-            'logo' => \Piwik\Plugins\Referers\getSearchEngineLogoFromUrl('http://dmoz.org'),
+            'logo' => \Piwik\Plugins\Referrers\getSearchEngineLogoFromUrl('http://dmoz.org'),
             'id'   => 'dmoz',
         );
         if ($dmozRank['rank'] > 0) {
diff --git a/plugins/Transitions/API.php b/plugins/Transitions/API.php
index 05b3f3244c..6d3744f0f3 100644
--- a/plugins/Transitions/API.php
+++ b/plugins/Transitions/API.php
@@ -392,7 +392,7 @@ class API
 
             foreach ($subData as &$row) {
                 if ($referrerType == Common::REFERRER_TYPE_SEARCH_ENGINE && empty($row['referrer_data'])) {
-                    $row['referrer_data'] = \Piwik\Plugins\Referers\API::LABEL_KEYWORD_NOT_DEFINED;
+                    $row['referrer_data'] = \Piwik\Plugins\Referrers\API::LABEL_KEYWORD_NOT_DEFINED;
                 }
 
                 $referrerData[$referrerType][Metrics::INDEX_NB_VISITS] += $row[Metrics::INDEX_NB_VISITS];
@@ -585,7 +585,7 @@ class API
                 }
                 $report['referrers'][] = array(
                     'label'     => $this->getReferrerLabel($referrerId),
-                    'shortName' => \Piwik\Plugins\Referers\getRefererTypeFromShortName($referrerId),
+                    'shortName' => \Piwik\Plugins\Referrers\getReferrerTypeFromShortName($referrerId),
                     'visits'    => $visits,
                     'details'   => $details
                 );
@@ -599,7 +599,7 @@ class API
         if (count($report['referrers']) == 0) {
             $report['referrers'][] = array(
                 'label'     => $this->getReferrerLabel(Common::REFERRER_TYPE_DIRECT_ENTRY),
-                'shortName' => \Piwik\Plugins\Referers\getRefererTypeLabel(Common::REFERRER_TYPE_DIRECT_ENTRY),
+                'shortName' => \Piwik\Plugins\Referrers\getReferrerTypeLabel(Common::REFERRER_TYPE_DIRECT_ENTRY),
                 'visits'    => 0
             );
         }
diff --git a/plugins/Widgetize/Controller.php b/plugins/Widgetize/Controller.php
index 1dea78feb4..5c122f825c 100644
--- a/plugins/Widgetize/Controller.php
+++ b/plugins/Widgetize/Controller.php
@@ -43,7 +43,7 @@ class Controller extends \Piwik\Controller
         $view = new View('@Widgetize/testJsInclude2');
         $view->url1 = '?module=Widgetize&action=js&moduleToWidgetize=UserSettings&actionToWidgetize=getBrowser&idSite=1&period=day&date=yesterday';
         $view->url2 = '?module=Widgetize&action=js&moduleToWidgetize=UserCountry&actionToWidgetize=getCountry&idSite=1&period=day&date=yesterday&viewDataTable=cloud&show_footer=0';
-        $view->url3 = '?module=Widgetize&action=js&moduleToWidgetize=Referers&actionToWidgetize=getKeywords&idSite=1&period=day&date=yesterday&viewDataTable=table&show_footer=0';
+        $view->url3 = '?module=Widgetize&action=js&moduleToWidgetize=Referrers&actionToWidgetize=getKeywords&idSite=1&period=day&date=yesterday&viewDataTable=table&show_footer=0';
         echo $view->render();
     }