diff --git a/src/fr/devinsy/statoolinfos/htmlize/ServiceGenericMetricPage.java b/src/fr/devinsy/statoolinfos/htmlize/ServiceMetricGenericPage.java
similarity index 97%
rename from src/fr/devinsy/statoolinfos/htmlize/ServiceGenericMetricPage.java
rename to src/fr/devinsy/statoolinfos/htmlize/ServiceMetricGenericPage.java
index 7244aa4..a6afe76 100644
--- a/src/fr/devinsy/statoolinfos/htmlize/ServiceGenericMetricPage.java
+++ b/src/fr/devinsy/statoolinfos/htmlize/ServiceMetricGenericPage.java
@@ -31,9 +31,9 @@ import fr.devinsy.xidyn.presenters.PresenterUtils;
 /**
  * The Class ServicePage.
  */
-public class ServiceGenericMetricPage
+public class ServiceMetricGenericPage
 {
-    private static Logger logger = LoggerFactory.getLogger(ServiceGenericMetricPage.class);
+    private static Logger logger = LoggerFactory.getLogger(ServiceMetricGenericPage.class);
 
     /**
      * Builds the.
diff --git a/src/fr/devinsy/statoolinfos/htmlize/ServiceSpecificMetricPage.java b/src/fr/devinsy/statoolinfos/htmlize/ServiceMetricSpecificPage.java
similarity index 97%
rename from src/fr/devinsy/statoolinfos/htmlize/ServiceSpecificMetricPage.java
rename to src/fr/devinsy/statoolinfos/htmlize/ServiceMetricSpecificPage.java
index f68aaa6..6b27104 100644
--- a/src/fr/devinsy/statoolinfos/htmlize/ServiceSpecificMetricPage.java
+++ b/src/fr/devinsy/statoolinfos/htmlize/ServiceMetricSpecificPage.java
@@ -31,9 +31,9 @@ import fr.devinsy.xidyn.presenters.PresenterUtils;
 /**
  * The Class ServicePage.
  */
-public class ServiceSpecificMetricPage
+public class ServiceMetricSpecificPage
 {
-    private static Logger logger = LoggerFactory.getLogger(ServiceSpecificMetricPage.class);
+    private static Logger logger = LoggerFactory.getLogger(ServiceMetricSpecificPage.class);
 
     /**
      * Builds the.
diff --git a/src/fr/devinsy/statoolinfos/htmlize/ServiceSummaryMetricPage.java b/src/fr/devinsy/statoolinfos/htmlize/ServiceMetricSummaryPage.java
similarity index 98%
rename from src/fr/devinsy/statoolinfos/htmlize/ServiceSummaryMetricPage.java
rename to src/fr/devinsy/statoolinfos/htmlize/ServiceMetricSummaryPage.java
index 9b28b65..f876487 100644
--- a/src/fr/devinsy/statoolinfos/htmlize/ServiceSummaryMetricPage.java
+++ b/src/fr/devinsy/statoolinfos/htmlize/ServiceMetricSummaryPage.java
@@ -35,9 +35,9 @@ import fr.devinsy.xidyn.presenters.PresenterUtils;
 /**
  * The Class ServiceSummaryMetricPage.
  */
-public class ServiceSummaryMetricPage
+public class ServiceMetricSummaryPage
 {
-    private static Logger logger = LoggerFactory.getLogger(ServiceSummaryMetricPage.class);
+    private static Logger logger = LoggerFactory.getLogger(ServiceMetricSummaryPage.class);
 
     /**
      * Builds the.
diff --git a/src/fr/devinsy/statoolinfos/htmlize/ServiceWebMetricPage.java b/src/fr/devinsy/statoolinfos/htmlize/ServiceMetricWebPage.java
similarity index 99%
rename from src/fr/devinsy/statoolinfos/htmlize/ServiceWebMetricPage.java
rename to src/fr/devinsy/statoolinfos/htmlize/ServiceMetricWebPage.java
index 869f624..b63419a 100644
--- a/src/fr/devinsy/statoolinfos/htmlize/ServiceWebMetricPage.java
+++ b/src/fr/devinsy/statoolinfos/htmlize/ServiceMetricWebPage.java
@@ -35,9 +35,9 @@ import fr.devinsy.xidyn.presenters.PresenterUtils;
 /**
  * The Class ServicePage.
  */
-public class ServiceWebMetricPage
+public class ServiceMetricWebPage
 {
-    private static Logger logger = LoggerFactory.getLogger(ServiceWebMetricPage.class);
+    private static Logger logger = LoggerFactory.getLogger(ServiceMetricWebPage.class);
 
     /**
      * Builds the.
diff --git a/src/fr/devinsy/statoolinfos/htmlize/ServicePage.java b/src/fr/devinsy/statoolinfos/htmlize/ServicePage.java
index 6111156..83684b1 100644
--- a/src/fr/devinsy/statoolinfos/htmlize/ServicePage.java
+++ b/src/fr/devinsy/statoolinfos/htmlize/ServicePage.java
@@ -77,20 +77,20 @@ public class ServicePage
 
         //
         logger.info("Htmlize service summary metric page: {}.", service.getName());
-        page = ServiceSummaryMetricPage.htmlize(service);
+        page = ServiceMetricSummaryPage.htmlize(service);
         FileUtils.write(new File(htmlizeDirectory, service.getLocalFileBaseName() + "-metrics.xhtml"), page, StandardCharsets.UTF_8);
 
         //
         logger.info("Htmlize service generic metric page: {}.", service.getName());
-        page = ServiceGenericMetricPage.htmlize(service);
+        page = ServiceMetricGenericPage.htmlize(service);
         FileUtils.write(new File(htmlizeDirectory, service.getLocalFileBaseName() + "-metrics-generic.xhtml"), page, StandardCharsets.UTF_8);
 
         logger.info("Htmlize service web metric page: {}.", service.getName());
-        page = ServiceWebMetricPage.htmlize(service);
+        page = ServiceMetricWebPage.htmlize(service);
         FileUtils.write(new File(htmlizeDirectory, service.getLocalFileBaseName() + "-metrics-web.xhtml"), page, StandardCharsets.UTF_8);
 
         logger.info("Htmlize service specific metric page: {}.", service.getName());
-        page = ServiceSpecificMetricPage.htmlize(service);
+        page = ServiceMetricSpecificPage.htmlize(service);
         FileUtils.write(new File(htmlizeDirectory, service.getLocalFileBaseName() + "-metrics-specific.xhtml"), page, StandardCharsets.UTF_8);
     }