fix system tests after merging master

1 files changed, 216 insertions, 239 deletions

diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml
index 5ac9f04dd7..b5424bf029 100644
--- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml
+++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
 	<row>
-		<name>Real Time Visitor Count</name>
+		<name>Visitors in Real-time</name>
 		<category>
 			<id>Live!</id>
 			<name>Live!</name>
@@ -9,18 +9,16 @@
 		</category>
 		<subcategory />
 		<module>Live</module>
-		<action>getSimpleLastVisitCount</action>
-		<order>15</order>
+		<action>widget</action>
+		<order>20</order>
 		<parameters>
 			<module>Live</module>
-			<action>getSimpleLastVisitCount</action>
+			<action>widget</action>
 		</parameters>
-		<uniqueId>widgetLivegetSimpleLastVisitCount</uniqueId>
-		<viewDataTable>table</viewDataTable>
-		<isReport>1</isReport>
+		<uniqueId>widgetLivewidget</uniqueId>
 	</row>
 	<row>
-		<name>Visitors in Real-time</name>
+		<name>Real Time Visitor Count</name>
 		<category>
 			<id>Live!</id>
 			<name>Live!</name>
@@ -28,16 +26,18 @@
 		</category>
 		<subcategory />
 		<module>Live</module>
-		<action>widget</action>
-		<order>20</order>
+		<action>getSimpleLastVisitCount</action>
+		<order>15</order>
 		<parameters>
 			<module>Live</module>
-			<action>widget</action>
+			<action>getSimpleLastVisitCount</action>
 		</parameters>
-		<uniqueId>widgetLivewidget</uniqueId>
+		<uniqueId>widgetLivegetSimpleLastVisitCount</uniqueId>
+		<viewDataTable>table</viewDataTable>
+		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Visits Overview</name>
+		<name>Visits Over Time</name>
 		<category>
 			<id>General_Visitors</id>
 			<name>Visitors</name>
@@ -49,20 +49,20 @@
 			<order>2</order>
 		</subcategory>
 		<module>VisitsSummary</module>
-		<action>get</action>
-		<order>10</order>
+		<action>getEvolutionGraph</action>
+		<order>5</order>
 		<parameters>
 			<forceView>1</forceView>
-			<viewDataTable>sparklines</viewDataTable>
+			<viewDataTable>graphEvolution</viewDataTable>
 			<module>VisitsSummary</module>
-			<action>get</action>
+			<action>getEvolutionGraph</action>
 		</parameters>
-		<uniqueId>widgetVisitsSummarygetforceView1viewDataTablesparklines</uniqueId>
-		<viewDataTable>sparklines</viewDataTable>
+		<uniqueId>widgetVisitsSummarygetEvolutionGraphforceView1viewDataTablegraphEvolution</uniqueId>
+		<viewDataTable>graphEvolution</viewDataTable>
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Visits Over Time</name>
+		<name>Visits Overview</name>
 		<category>
 			<id>General_Visitors</id>
 			<name>Visitors</name>
@@ -74,16 +74,16 @@
 			<order>2</order>
 		</subcategory>
 		<module>VisitsSummary</module>
-		<action>getEvolutionGraph</action>
-		<order>5</order>
+		<action>get</action>
+		<order>10</order>
 		<parameters>
 			<forceView>1</forceView>
-			<viewDataTable>graphEvolution</viewDataTable>
+			<viewDataTable>sparklines</viewDataTable>
 			<module>VisitsSummary</module>
-			<action>getEvolutionGraph</action>
+			<action>get</action>
 		</parameters>
-		<uniqueId>widgetVisitsSummarygetEvolutionGraphforceView1viewDataTablegraphEvolution</uniqueId>
-		<viewDataTable>graphEvolution</viewDataTable>
+		<uniqueId>widgetVisitsSummarygetforceView1viewDataTablesparklines</uniqueId>
+		<viewDataTable>sparklines</viewDataTable>
 		<isReport>1</isReport>
 	</row>
 	<row>
@@ -103,13 +103,13 @@
 		<order>10</order>
 		<parameters>
 			<forceView>1</forceView>
-			<viewDataTable>Piwik\Plugins\Live\VisitorLog</viewDataTable>
+			<viewDataTable>VisitorLog</viewDataTable>
 			<module>Live</module>
 			<action>getLastVisitsDetails</action>
 			<small>1</small>
 		</parameters>
-		<uniqueId>widgetLivegetLastVisitsDetailsforceView1viewDataTablePiwik%5CPlugins%5CLive%5CVisitorLogsmall1</uniqueId>
-		<viewDataTable>Piwik\Plugins\Live\VisitorLog</viewDataTable>
+		<uniqueId>widgetLivegetLastVisitsDetailsforceView1viewDataTableVisitorLogsmall1</uniqueId>
+		<viewDataTable>VisitorLog</viewDataTable>
 		<isReport>1</isReport>
 	</row>
 	<row>
@@ -159,7 +159,7 @@
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Device type</name>
+		<name>Device brand</name>
 		<category>
 			<id>General_Visitors</id>
 			<name>Visitors</name>
@@ -171,18 +171,18 @@
 			<order>15</order>
 		</subcategory>
 		<module>DevicesDetection</module>
-		<action>getType</action>
-		<order>100</order>
+		<action>getBrand</action>
+		<order>104</order>
 		<parameters>
 			<module>DevicesDetection</module>
-			<action>getType</action>
+			<action>getBrand</action>
 		</parameters>
-		<uniqueId>widgetDevicesDetectiongetType</uniqueId>
+		<uniqueId>widgetDevicesDetectiongetBrand</uniqueId>
 		<viewDataTable>table</viewDataTable>
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Device brand</name>
+		<name>Device type</name>
 		<category>
 			<id>General_Visitors</id>
 			<name>Visitors</name>
@@ -194,13 +194,13 @@
 			<order>15</order>
 		</subcategory>
 		<module>DevicesDetection</module>
-		<action>getBrand</action>
-		<order>104</order>
+		<action>getType</action>
+		<order>100</order>
 		<parameters>
 			<module>DevicesDetection</module>
-			<action>getBrand</action>
+			<action>getType</action>
 		</parameters>
-		<uniqueId>widgetDevicesDetectiongetBrand</uniqueId>
+		<uniqueId>widgetDevicesDetectiongetType</uniqueId>
 		<viewDataTable>table</viewDataTable>
 		<isReport>1</isReport>
 	</row>
@@ -228,7 +228,7 @@
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Browsers</name>
+		<name>Operating System versions</name>
 		<category>
 			<id>General_Visitors</id>
 			<name>Visitors</name>
@@ -240,18 +240,18 @@
 			<order>20</order>
 		</subcategory>
 		<module>DevicesDetection</module>
-		<action>getBrowsers</action>
-		<order>105</order>
+		<action>getOsVersions</action>
+		<order>102</order>
 		<parameters>
 			<module>DevicesDetection</module>
-			<action>getBrowsers</action>
+			<action>getOsVersions</action>
 		</parameters>
-		<uniqueId>widgetDevicesDetectiongetBrowsers</uniqueId>
+		<uniqueId>widgetDevicesDetectiongetOsVersions</uniqueId>
 		<viewDataTable>table</viewDataTable>
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Operating System versions</name>
+		<name>Browsers</name>
 		<category>
 			<id>General_Visitors</id>
 			<name>Visitors</name>
@@ -263,18 +263,18 @@
 			<order>20</order>
 		</subcategory>
 		<module>DevicesDetection</module>
-		<action>getOsVersions</action>
-		<order>102</order>
+		<action>getBrowsers</action>
+		<order>105</order>
 		<parameters>
 			<module>DevicesDetection</module>
-			<action>getOsVersions</action>
+			<action>getBrowsers</action>
 		</parameters>
-		<uniqueId>widgetDevicesDetectiongetOsVersions</uniqueId>
+		<uniqueId>widgetDevicesDetectiongetBrowsers</uniqueId>
 		<viewDataTable>table</viewDataTable>
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Browser version</name>
+		<name>Operating System families</name>
 		<category>
 			<id>General_Visitors</id>
 			<name>Visitors</name>
@@ -286,13 +286,13 @@
 			<order>20</order>
 		</subcategory>
 		<module>DevicesDetection</module>
-		<action>getBrowserVersions</action>
-		<order>106</order>
+		<action>getOsFamilies</action>
+		<order>108</order>
 		<parameters>
 			<module>DevicesDetection</module>
-			<action>getBrowserVersions</action>
+			<action>getOsFamilies</action>
 		</parameters>
-		<uniqueId>widgetDevicesDetectiongetBrowserVersions</uniqueId>
+		<uniqueId>widgetDevicesDetectiongetOsFamilies</uniqueId>
 		<viewDataTable>table</viewDataTable>
 		<isReport>1</isReport>
 	</row>
@@ -320,7 +320,7 @@
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Operating System families</name>
+		<name>Configurations</name>
 		<category>
 			<id>General_Visitors</id>
 			<name>Visitors</name>
@@ -331,14 +331,14 @@
 			<name>Software</name>
 			<order>20</order>
 		</subcategory>
-		<module>DevicesDetection</module>
-		<action>getOsFamilies</action>
-		<order>108</order>
+		<module>Resolution</module>
+		<action>getConfiguration</action>
+		<order>107</order>
 		<parameters>
-			<module>DevicesDetection</module>
-			<action>getOsFamilies</action>
+			<module>Resolution</module>
+			<action>getConfiguration</action>
 		</parameters>
-		<uniqueId>widgetDevicesDetectiongetOsFamilies</uniqueId>
+		<uniqueId>widgetResolutiongetConfiguration</uniqueId>
 		<viewDataTable>table</viewDataTable>
 		<isReport>1</isReport>
 	</row>
@@ -367,7 +367,7 @@
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Configurations</name>
+		<name>Browser version</name>
 		<category>
 			<id>General_Visitors</id>
 			<name>Visitors</name>
@@ -378,19 +378,91 @@
 			<name>Software</name>
 			<order>20</order>
 		</subcategory>
-		<module>Resolution</module>
-		<action>getConfiguration</action>
-		<order>107</order>
+		<module>DevicesDetection</module>
+		<action>getBrowserVersions</action>
+		<order>106</order>
 		<parameters>
-			<module>Resolution</module>
-			<action>getConfiguration</action>
+			<module>DevicesDetection</module>
+			<action>getBrowserVersions</action>
 		</parameters>
-		<uniqueId>widgetResolutiongetConfiguration</uniqueId>
+		<uniqueId>widgetDevicesDetectiongetBrowserVersions</uniqueId>
 		<viewDataTable>table</viewDataTable>
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Language code</name>
+		<name>Visits Overview (with graph)</name>
+		<category>
+			<id>General_Visitors</id>
+			<name>Visitors</name>
+			<order>5</order>
+		</category>
+		<subcategory />
+		<module>CoreHome</module>
+		<action>renderWidgetContainer</action>
+		<order>99</order>
+		<parameters>
+			<module>CoreHome</module>
+			<action>renderWidgetContainer</action>
+			<containerId>VisitOverviewWithGraph</containerId>
+		</parameters>
+		<uniqueId>widgetVisitOverviewWithGraph</uniqueId>
+		<layout />
+		<isContainer>1</isContainer>
+		<widgets>
+			<row>
+				<name>Visits Over Time</name>
+				<category>
+					<id>General_Visitors</id>
+					<name>Visitors</name>
+					<order>99</order>
+				</category>
+				<subcategory>
+					<id>General_Overview</id>
+					<name>Overview</name>
+					<order>99</order>
+				</subcategory>
+				<module>VisitsSummary</module>
+				<action>getEvolutionGraph</action>
+				<order>5</order>
+				<parameters>
+					<forceView>1</forceView>
+					<viewDataTable>graphEvolution</viewDataTable>
+					<module>VisitsSummary</module>
+					<action>getEvolutionGraph</action>
+				</parameters>
+				<uniqueId>widgetVisitsSummarygetEvolutionGraphforceView1viewDataTablegraphEvolution</uniqueId>
+				<viewDataTable>graphEvolution</viewDataTable>
+				<isReport>1</isReport>
+			</row>
+			<row>
+				<name>Visits Overview</name>
+				<category>
+					<id>General_Visitors</id>
+					<name>Visitors</name>
+					<order>99</order>
+				</category>
+				<subcategory>
+					<id>General_Overview</id>
+					<name>Overview</name>
+					<order>99</order>
+				</subcategory>
+				<module>VisitsSummary</module>
+				<action>get</action>
+				<order>10</order>
+				<parameters>
+					<forceView>1</forceView>
+					<viewDataTable>sparklines</viewDataTable>
+					<module>VisitsSummary</module>
+					<action>get</action>
+				</parameters>
+				<uniqueId>widgetVisitsSummarygetforceView1viewDataTablesparklines</uniqueId>
+				<viewDataTable>sparklines</viewDataTable>
+				<isReport>1</isReport>
+			</row>
+		</widgets>
+	</row>
+	<row>
+		<name>City</name>
 		<category>
 			<id>General_Visitors</id>
 			<name>Visitors</name>
@@ -401,19 +473,19 @@
 			<name>Locations</name>
 			<order>25</order>
 		</subcategory>
-		<module>UserLanguage</module>
-		<action>getLanguageCode</action>
-		<order>111</order>
+		<module>UserCountry</module>
+		<action>getCity</action>
+		<order>110</order>
 		<parameters>
-			<module>UserLanguage</module>
-			<action>getLanguageCode</action>
+			<module>UserCountry</module>
+			<action>getCity</action>
 		</parameters>
-		<uniqueId>widgetUserLanguagegetLanguageCode</uniqueId>
+		<uniqueId>widgetUserCountrygetCity</uniqueId>
 		<viewDataTable>table</viewDataTable>
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Providers</name>
+		<name>Language code</name>
 		<category>
 			<id>General_Visitors</id>
 			<name>Visitors</name>
@@ -424,19 +496,19 @@
 			<name>Locations</name>
 			<order>25</order>
 		</subcategory>
-		<module>Provider</module>
-		<action>getProvider</action>
-		<order>150</order>
+		<module>UserLanguage</module>
+		<action>getLanguageCode</action>
+		<order>111</order>
 		<parameters>
-			<module>Provider</module>
-			<action>getProvider</action>
+			<module>UserLanguage</module>
+			<action>getLanguageCode</action>
 		</parameters>
-		<uniqueId>widgetProvidergetProvider</uniqueId>
+		<uniqueId>widgetUserLanguagegetLanguageCode</uniqueId>
 		<viewDataTable>table</viewDataTable>
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>City</name>
+		<name>Browser language</name>
 		<category>
 			<id>General_Visitors</id>
 			<name>Visitors</name>
@@ -447,14 +519,14 @@
 			<name>Locations</name>
 			<order>25</order>
 		</subcategory>
-		<module>UserCountry</module>
-		<action>getCity</action>
-		<order>110</order>
+		<module>UserLanguage</module>
+		<action>getLanguage</action>
+		<order>108</order>
 		<parameters>
-			<module>UserCountry</module>
-			<action>getCity</action>
+			<module>UserLanguage</module>
+			<action>getLanguage</action>
 		</parameters>
-		<uniqueId>widgetUserCountrygetCity</uniqueId>
+		<uniqueId>widgetUserLanguagegetLanguage</uniqueId>
 		<viewDataTable>table</viewDataTable>
 		<isReport>1</isReport>
 	</row>
@@ -526,7 +598,7 @@
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Browser language</name>
+		<name>Country</name>
 		<category>
 			<id>General_Visitors</id>
 			<name>Visitors</name>
@@ -537,110 +609,64 @@
 			<name>Locations</name>
 			<order>25</order>
 		</subcategory>
-		<module>UserLanguage</module>
-		<action>getLanguage</action>
-		<order>108</order>
+		<module>UserCountry</module>
+		<action>getCountry</action>
+		<order>105</order>
 		<parameters>
-			<module>UserLanguage</module>
-			<action>getLanguage</action>
+			<module>UserCountry</module>
+			<action>getCountry</action>
 		</parameters>
-		<uniqueId>widgetUserLanguagegetLanguage</uniqueId>
+		<uniqueId>widgetUserCountrygetCountry</uniqueId>
 		<viewDataTable>table</viewDataTable>
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Visits Overview (with graph)</name>
+		<name>Returning Visits Over Time</name>
 		<category>
 			<id>General_Visitors</id>
 			<name>Visitors</name>
 			<order>5</order>
 		</category>
-		<subcategory />
-		<module>CoreHome</module>
-		<action>renderWidgetContainer</action>
-		<order>99</order>
+		<subcategory>
+			<id>VisitorInterest_Engagement</id>
+			<name>Engagement</name>
+			<order>30</order>
+		</subcategory>
+		<module>VisitFrequency</module>
+		<action>getEvolutionGraph</action>
+		<order>1</order>
 		<parameters>
-			<module>CoreHome</module>
-			<action>renderWidgetContainer</action>
-			<containerId>VisitOverviewWithGraph</containerId>
+			<forceView>1</forceView>
+			<viewDataTable>graphEvolution</viewDataTable>
+			<module>VisitFrequency</module>
+			<action>getEvolutionGraph</action>
 		</parameters>
-		<uniqueId>widgetVisitOverviewWithGraph</uniqueId>
-		<layout />
-		<isContainer>1</isContainer>
-		<widgets>
-			<row>
-				<name>Visits Over Time</name>
-				<category>
-					<id>General_Visitors</id>
-					<name>Visitors</name>
-					<order>99</order>
-				</category>
-				<subcategory>
-					<id>General_Overview</id>
-					<name>Overview</name>
-					<order>99</order>
-				</subcategory>
-				<module>VisitsSummary</module>
-				<action>getEvolutionGraph</action>
-				<order>5</order>
-				<parameters>
-					<forceView>1</forceView>
-					<viewDataTable>graphEvolution</viewDataTable>
-					<module>VisitsSummary</module>
-					<action>getEvolutionGraph</action>
-				</parameters>
-				<uniqueId>widgetVisitsSummarygetEvolutionGraphforceView1viewDataTablegraphEvolution</uniqueId>
-				<viewDataTable>graphEvolution</viewDataTable>
-				<isReport>1</isReport>
-			</row>
-			<row>
-				<name>Visits Overview</name>
-				<category>
-					<id>General_Visitors</id>
-					<name>Visitors</name>
-					<order>99</order>
-				</category>
-				<subcategory>
-					<id>General_Overview</id>
-					<name>Overview</name>
-					<order>99</order>
-				</subcategory>
-				<module>VisitsSummary</module>
-				<action>get</action>
-				<order>10</order>
-				<parameters>
-					<forceView>1</forceView>
-					<viewDataTable>sparklines</viewDataTable>
-					<module>VisitsSummary</module>
-					<action>get</action>
-				</parameters>
-				<uniqueId>widgetVisitsSummarygetforceView1viewDataTablesparklines</uniqueId>
-				<viewDataTable>sparklines</viewDataTable>
-				<isReport>1</isReport>
-			</row>
-		</widgets>
+		<uniqueId>widgetVisitFrequencygetEvolutionGraphforceView1viewDataTablegraphEvolution</uniqueId>
+		<viewDataTable>graphEvolution</viewDataTable>
+		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Country</name>
+		<name>Visits per number of pages</name>
 		<category>
 			<id>General_Visitors</id>
 			<name>Visitors</name>
 			<order>5</order>
 		</category>
 		<subcategory>
-			<id>UserCountry_SubmenuLocations</id>
-			<name>Locations</name>
-			<order>25</order>
+			<id>VisitorInterest_Engagement</id>
+			<name>Engagement</name>
+			<order>30</order>
 		</subcategory>
-		<module>UserCountry</module>
-		<action>getCountry</action>
-		<order>105</order>
+		<module>VisitorInterest</module>
+		<action>getNumberOfVisitsPerPage</action>
+		<order>120</order>
 		<parameters>
-			<module>UserCountry</module>
-			<action>getCountry</action>
+			<viewDataTable>cloud</viewDataTable>
+			<module>VisitorInterest</module>
+			<action>getNumberOfVisitsPerPage</action>
 		</parameters>
-		<uniqueId>widgetUserCountrygetCountry</uniqueId>
-		<viewDataTable>table</viewDataTable>
+		<uniqueId>widgetVisitorInterestgetNumberOfVisitsPerPageviewDataTablecloud</uniqueId>
+		<viewDataTable>cloud</viewDataTable>
 		<isReport>1</isReport>
 	</row>
 	<row>
@@ -707,55 +733,6 @@
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Visits per number of pages</name>
-		<category>
-			<id>General_Visitors</id>
-			<name>Visitors</name>
-			<order>5</order>
-		</category>
-		<subcategory>
-			<id>VisitorInterest_Engagement</id>
-			<name>Engagement</name>
-			<order>30</order>
-		</subcategory>
-		<module>VisitorInterest</module>
-		<action>getNumberOfVisitsPerPage</action>
-		<order>120</order>
-		<parameters>
-			<viewDataTable>cloud</viewDataTable>
-			<module>VisitorInterest</module>
-			<action>getNumberOfVisitsPerPage</action>
-		</parameters>
-		<uniqueId>widgetVisitorInterestgetNumberOfVisitsPerPageviewDataTablecloud</uniqueId>
-		<viewDataTable>cloud</viewDataTable>
-		<isReport>1</isReport>
-	</row>
-	<row>
-		<name>Returning Visits Over Time</name>
-		<category>
-			<id>General_Visitors</id>
-			<name>Visitors</name>
-			<order>5</order>
-		</category>
-		<subcategory>
-			<id>VisitorInterest_Engagement</id>
-			<name>Engagement</name>
-			<order>30</order>
-		</subcategory>
-		<module>VisitFrequency</module>
-		<action>getEvolutionGraph</action>
-		<order>1</order>
-		<parameters>
-			<forceView>1</forceView>
-			<viewDataTable>graphEvolution</viewDataTable>
-			<module>VisitFrequency</module>
-			<action>getEvolutionGraph</action>
-		</parameters>
-		<uniqueId>widgetVisitFrequencygetEvolutionGraphforceView1viewDataTablegraphEvolution</uniqueId>
-		<viewDataTable>graphEvolution</viewDataTable>
-		<isReport>1</isReport>
-	</row>
-	<row>
 		<name>Frequency Overview</name>
 		<category>
 			<id>General_Visitors</id>
@@ -2556,7 +2533,7 @@
 		<uniqueId>widgetReferrersgetKeywordsForPage</uniqueId>
 	</row>
 	<row>
-		<name>Movers and Shakers</name>
+		<name>Insights Overview</name>
 		<category>
 			<id>Insights_WidgetCategory</id>
 			<name>Insights</name>
@@ -2564,13 +2541,13 @@
 		</category>
 		<subcategory />
 		<module>Insights</module>
-		<action>getOverallMoversAndShakers</action>
+		<action>getInsightsOverview</action>
 		<order>99</order>
 		<parameters>
 			<module>Insights</module>
-			<action>getOverallMoversAndShakers</action>
+			<action>getInsightsOverview</action>
 		</parameters>
-		<uniqueId>widgetInsightsgetOverallMoversAndShakers</uniqueId>
+		<uniqueId>widgetInsightsgetInsightsOverview</uniqueId>
 	</row>
 	<row>
 		<name>Example Widget Name</name>
@@ -2590,21 +2567,21 @@
 		<uniqueId>widgetExamplePluginmyExampleWidget</uniqueId>
 	</row>
 	<row>
-		<name>Piwik Changelog</name>
+		<name>Movers and Shakers</name>
 		<category>
-			<id>Example Widgets</id>
-			<name>Example Widgets</name>
+			<id>Insights_WidgetCategory</id>
+			<name>Insights</name>
 			<order>99</order>
 		</category>
 		<subcategory />
-		<module>ExampleRssWidget</module>
-		<action>rssChangelog</action>
+		<module>Insights</module>
+		<action>getOverallMoversAndShakers</action>
 		<order>99</order>
 		<parameters>
-			<module>ExampleRssWidget</module>
-			<action>rssChangelog</action>
+			<module>Insights</module>
+			<action>getOverallMoversAndShakers</action>
 		</parameters>
-		<uniqueId>widgetExampleRssWidgetrssChangelog</uniqueId>
+		<uniqueId>widgetInsightsgetOverallMoversAndShakers</uniqueId>
 	</row>
 	<row>
 		<name>SEO Rankings</name>
@@ -2624,21 +2601,21 @@
 		<uniqueId>widgetSEOgetRank</uniqueId>
 	</row>
 	<row>
-		<name>Insights Overview</name>
+		<name>Piwik Changelog</name>
 		<category>
-			<id>Insights_WidgetCategory</id>
-			<name>Insights</name>
+			<id>Example Widgets</id>
+			<name>Example Widgets</name>
 			<order>99</order>
 		</category>
 		<subcategory />
-		<module>Insights</module>
-		<action>getInsightsOverview</action>
+		<module>ExampleRssWidget</module>
+		<action>rssChangelog</action>
 		<order>99</order>
 		<parameters>
-			<module>Insights</module>
-			<action>getInsightsOverview</action>
+			<module>ExampleRssWidget</module>
+			<action>rssChangelog</action>
 		</parameters>
-		<uniqueId>widgetInsightsgetInsightsOverview</uniqueId>
+		<uniqueId>widgetExampleRssWidgetrssChangelog</uniqueId>
 	</row>
 	<row>
 		<name>Welcome!</name>