Index: applications/editors/josm/plugins/opendata/modules/fr.datagouvfr/src/org/openstreetmap/josm/plugins/opendata/modules/fr/datagouvfr/datasets/ecologie/ForetsPubliquesHandler.java
===================================================================
--- applications/editors/josm/plugins/opendata/modules/fr.datagouvfr/src/org/openstreetmap/josm/plugins/opendata/modules/fr/datagouvfr/datasets/ecologie/ForetsPubliquesHandler.java	(revision 30210)
+++ applications/editors/josm/plugins/opendata/modules/fr.datagouvfr/src/org/openstreetmap/josm/plugins/opendata/modules/fr/datagouvfr/datasets/ecologie/ForetsPubliquesHandler.java	(revision 30211)
@@ -121,7 +121,4 @@
 	}
 
-	/* (non-Javadoc)
-	 * @see org.openstreetmap.josm.plugins.opendata.core.datasets.AbstractDataSetHandler#getDataURLs()
-	 */
 	@Override
 	public List<Pair<String, URL>> getDataURLs() {
@@ -139,6 +136,6 @@
 	}
 
-	private Pair<String, URL> getForetURL(String code, String name) throws MalformedURLException {
-		return new Pair<String, URL>(name, new URL(FRENCH_PORTAL+"var/download/"+"for_publ_v2011_reg"+code+".zip"));
+	private Pair<String, URL> getForetURL(String code, String regionName) throws MalformedURLException {
+		return new Pair<String, URL>("PublicForests_"+regionName, new URL(FRENCH_PORTAL+"var/download/"+"for_publ_v2011_reg"+code+".zip"));
 	}
 }
Index: applications/editors/josm/plugins/opendata/modules/fr.datagouvfr/src/org/openstreetmap/josm/plugins/opendata/modules/fr/datagouvfr/datasets/hydrologie/EauxDeSurfaceHandler.java
===================================================================
--- applications/editors/josm/plugins/opendata/modules/fr.datagouvfr/src/org/openstreetmap/josm/plugins/opendata/modules/fr/datagouvfr/datasets/hydrologie/EauxDeSurfaceHandler.java	(revision 30210)
+++ applications/editors/josm/plugins/opendata/modules/fr.datagouvfr/src/org/openstreetmap/josm/plugins/opendata/modules/fr/datagouvfr/datasets/hydrologie/EauxDeSurfaceHandler.java	(revision 30211)
@@ -53,5 +53,5 @@
 		new WaterAgency("B1", "Meuse", "Meuse-30381855"),
 		new WaterAgency("B2", "Sambre", "Sambre-30381857"),
-		new WaterAgency("C", "Rhin", "Rhin-30381951"),
+		new WaterAgency("C",  "Rhin", "Rhin-30381951"),
 		new WaterAgency("D",  "Rhône Méditerranée", "Rhône-Méditerranée-30382014"),
 		new WaterAgency("E",  "Corse", "Corse-30381905"),
@@ -106,13 +106,10 @@
 	}
 	
-	/* (non-Javadoc)
-	 * @see org.openstreetmap.josm.plugins.opendata.core.datasets.AbstractDataSetHandler#getDataURLs()
-	 */
 	@Override
 	public List<Pair<String, URL>> getDataURLs() {
 		List<Pair<String, URL>> result = new ArrayList<Pair<String,URL>>();
 		try {
-			for (int i =0; i<waterAgencies.length; i++) {
-				result.add(getDownloadURL(waterAgencies[i]));
+			for (WaterAgency wa : waterAgencies) {
+				result.add(getDownloadURL(wa));
 			}
 		} catch (MalformedURLException e) {
@@ -123,5 +120,5 @@
 
 	private Pair<String, URL> getDownloadURL(WaterAgency a) throws MalformedURLException {
-		return new Pair<String, URL>(a.name, new URL("http://www.rapportage.eaufrance.fr/sites/default/files/SIG/FR"+a.code+"_SW.zip"));
+		return new Pair<String, URL>("SurfaceWater_"+a.name, new URL("http://www.rapportage.eaufrance.fr/sites/default/files/SIG/FR"+a.code+"_SW.zip"));
 	}
 	
Index: applications/editors/josm/plugins/opendata/modules/fr.lemans/src/org/openstreetmap/josm/plugins/opendata/modules/fr/lemans/datasets/LeMansDataSetHandler.java
===================================================================
--- applications/editors/josm/plugins/opendata/modules/fr.lemans/src/org/openstreetmap/josm/plugins/opendata/modules/fr/lemans/datasets/LeMansDataSetHandler.java	(revision 30210)
+++ applications/editors/josm/plugins/opendata/modules/fr.lemans/src/org/openstreetmap/josm/plugins/opendata/modules/fr/lemans/datasets/LeMansDataSetHandler.java	(revision 30211)
@@ -72,7 +72,4 @@
 	}
 
-	/* (non-Javadoc)
-	 * @see org.openstreetmap.josm.plugins.opendata.core.datasets.AbstractDataSetHandler#getSource()
-	 */
 	@Override
 	public String getSource() {
@@ -80,7 +77,4 @@
 	}
 	
-	/* (non-Javadoc)
-	 * @see org.openstreetmap.josm.plugins.opendata.core.datasets.AbstractDataSetHandler#getLicenseURL()
-	 */
 	/*@Override
 	public URL getLicenseURL() {
@@ -93,13 +87,10 @@
 	}*/
 
-	/* (non-Javadoc)
-	 * @see org.openstreetmap.josm.plugins.opendata.core.datasets.AbstractDataSetHandler#getDataURLs()
-	 */
 	@Override
 	public List<Pair<String, URL>> getDataURLs() {
 		List<Pair<String, URL>> result = new ArrayList<Pair<String,URL>>();
 		try {
-			if (kmzUuid != null && !kmzUuid.isEmpty()) result.add(new Pair<String, URL>("KMZ", new URL(PORTAL + "download.do?uuid=" + kmzUuid)));
-			if (shpUuid != null && !shpUuid.isEmpty()) result.add(new Pair<String, URL>("SHP", new URL(PORTAL + "download.do?uuid=" + shpUuid)));
+			if (kmzUuid != null && !kmzUuid.isEmpty()) result.add(new Pair<String, URL>(getName() + " (KMZ)", new URL(PORTAL + "download.do?uuid=" + kmzUuid)));
+			if (shpUuid != null && !shpUuid.isEmpty()) result.add(new Pair<String, URL>(getName() + " (SHP)", new URL(PORTAL + "download.do?uuid=" + shpUuid)));
 		} catch (MalformedURLException e) {
 			e.printStackTrace();
Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/OdPlugin.java
===================================================================
--- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/OdPlugin.java	(revision 30210)
+++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/OdPlugin.java	(revision 30211)
@@ -121,5 +121,7 @@
         	JMenu moduleMenu = null;
         	for (AbstractDataSetHandler handler: module.getNewlyInstanciatedHandlers()) {
-        		if (handler.getDataURL() != null || (handler.getDataURLs() != null && !handler.getDataURLs().isEmpty())) {
+        	    URL dataURL = handler.getDataURL();
+        	    List<Pair<String, URL>> dataURLs = handler.getDataURLs();
+        		if (dataURL != null || (dataURLs != null && !dataURLs.isEmpty())) {
         			if (moduleMenu == null) {
         				moduleMenu = getModuleMenu(module);
@@ -142,10 +144,10 @@
         			}
         			JMenuItem handlerItem = null;
-        			if (handler.getDataURL() != null) {
-        			    handlerItem = endMenu.add(new DownloadDataAction(handlerName, handler.getDataURL()));
-        			} else if (handler.getDataURLs() != null) {
+        			if (dataURL != null) {
+        			    handlerItem = endMenu.add(new DownloadDataAction(module.getDisplayedName()+"_"+handlerName, dataURL));
+        			} else if (dataURLs != null) {
         				JMenu handlerMenu = new JMenu(handlerName);
         				JMenuItem item = null;
-        				for (Pair<String, URL> pair : handler.getDataURLs()) {
+        				for (Pair<String, URL> pair : dataURLs) {
         					if (pair != null && pair.a != null && pair.b != null) {
         						item = handlerMenu.add(new DownloadDataAction(pair.a, pair.b));
Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/AbstractDataSetHandler.java
===================================================================
--- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/AbstractDataSetHandler.java	(revision 30210)
+++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/AbstractDataSetHandler.java	(revision 30211)
@@ -427,9 +427,11 @@
 	
 	public boolean acceptsUrl(String url) {
-		if (getDataURL() != null && url.equals(getDataURL().toString())) {
+	    URL dataURL = getDataURL();
+		if (dataURL != null && url.equals(dataURL.toString())) {
 			return true;
 		}
-		if (getDataURLs() != null) {
-			for (Pair<String, URL> pair : getDataURLs()) {
+		List<Pair<String, URL>> dataURLs = getDataURLs();
+		if (dataURLs != null) {
+			for (Pair<String, URL> pair : dataURLs) {
 				if (pair.b != null && url.equals(pair.b.toString())) {
 					return true;