diff --git a/src/fr/devinsy/statoolinfos/core/Organization.java b/src/fr/devinsy/statoolinfos/core/Organization.java
index 70eb328..d6974bb 100644
--- a/src/fr/devinsy/statoolinfos/core/Organization.java
+++ b/src/fr/devinsy/statoolinfos/core/Organization.java
@@ -344,16 +344,15 @@ public class Organization extends PathPropertyList
     }
 
     /**
-     * Gets the technical doc website.
+     * Gets the technical guide website.
      *
-     * @return the technical doc website
+     * @return the technical guide website
      */
-    public String getTechnicalDocWebsite()
+    public String getTechnicalGuideWebsite()
     {
         String result;
 
-        result = get("organization.documentation.technical", "organization.documentationtechnical.url", "organization.technical", "organization.technical.url", "service.guide.technical",
-                "organization.guide.technical.url");
+        result = get("service.guide.technical", "organization.guide.technical.url");
 
         //
         return result;
@@ -390,18 +389,15 @@ public class Organization extends PathPropertyList
     }
 
     /**
-     * Gets the user doc website.
+     * Gets the user guide website.
      *
-     * @return the user doc website
+     * @return the user guide website
      */
-    public String getUserDocWebsite()
+    public String getUserGuideWebsite()
     {
         String result;
 
-        result = get("organization.documentation", "organization.documentation.url", "organization.documentation.user", "organization.documentation.user.url", "service.documentation.tutorial",
-                "organization.documentation.tutorial.url",
-                "organization.guide.user",
-                "organization.guide.user.url");
+        result = get("organization.guide.user", "organization.guide.user.url");
 
         //
         return result;
diff --git a/src/fr/devinsy/statoolinfos/htmlize/OrganizationPage.java b/src/fr/devinsy/statoolinfos/htmlize/OrganizationPage.java
index 412ffa0..f4d651a 100644
--- a/src/fr/devinsy/statoolinfos/htmlize/OrganizationPage.java
+++ b/src/fr/devinsy/statoolinfos/htmlize/OrganizationPage.java
@@ -89,15 +89,15 @@ public class OrganizationPage
                 data.setAttribute("emailLinkImg", "class", "");
                 data.getIdData("emailLinkImg").getAttribute("class").setMode(DisplayMode.REPLACE);
             }
-            if (StringUtils.isNotBlank(organization.getUserDocWebsite()))
+            if (StringUtils.isNotBlank(organization.getUserGuideWebsite()))
             {
-                data.setAttribute("userDocLink", "href", organization.getUserDocWebsite());
+                data.setAttribute("userDocLink", "href", organization.getUserGuideWebsite());
                 data.setAttribute("userDocLinkImg", "class", "");
                 data.getIdData("userDocLinkImg").getAttribute("class").setMode(DisplayMode.REPLACE);
             }
-            if (StringUtils.isNotBlank(organization.getTechnicalDocWebsite()))
+            if (StringUtils.isNotBlank(organization.getTechnicalGuideWebsite()))
             {
-                data.setAttribute("technicalDocLink", "href", organization.getTechnicalDocWebsite());
+                data.setAttribute("technicalDocLink", "href", organization.getTechnicalGuideWebsite());
                 data.setAttribute("technicalDocLinkImg", "class", "");
                 data.getIdData("technicalDocLinkImg").getAttribute("class").setMode(DisplayMode.REPLACE);
             }