diff --git a/data/weather/Makefile.am b/data/weather/Makefile.am
index 8c03d08a1..f74af2d60 100644
--- a/data/weather/Makefile.am
+++ b/data/weather/Makefile.am
@@ -1,9 +1,9 @@
 configdir = $(CONFIGDIR)
 
 config_DATA = \
-	weather_favorites.xml
+	weather-favorites.xml
 
 weatherdir = $(DATADIR)/neutrino/weather
 
 weather_DATA = \
-	weather_locations.xml
+	weather-locations.xml
diff --git a/data/weather/weather_favorites.xml b/data/weather/weather-favorites.xml
similarity index 100%
rename from data/weather/weather_favorites.xml
rename to data/weather/weather-favorites.xml
diff --git a/data/weather/weather_locations.xml b/data/weather/weather-locations.xml
similarity index 100%
rename from data/weather/weather_locations.xml
rename to data/weather/weather-locations.xml
diff --git a/src/gui/weather_setup.cpp b/src/gui/weather_setup.cpp
index 6cafa4b3f..e505f91a9 100644
--- a/src/gui/weather_setup.cpp
+++ b/src/gui/weather_setup.cpp
@@ -43,8 +43,8 @@ CWeatherSetup::CWeatherSetup()
 	selected = -1;
 
 	locations.clear();
-	loadLocations(CONFIGDIR "/weather_favorites.xml");
-	loadLocations(WEATHERDIR "/weather_locations.xml");
+	loadLocations(CONFIGDIR "/weather-favorites.xml");
+	loadLocations(WEATHERDIR "/weather-locations.xml");
 }
 
 CWeatherSetup::~CWeatherSetup()
@@ -103,7 +103,8 @@ int CWeatherSetup::showSelectWeatherLocation()
 
 	if (locations.empty())
 	{
-		ShowHint("Warning", "Failed to load weather_locations.xml\nPlease press any key or wait some seconds! ...", 700, 10, NULL, NEUTRINO_ICON_HINT_IMAGEINFO, CComponentsHeader::CC_BTN_EXIT);
+		// TODO: localize hint
+		ShowHint("Warning", "Failed to load weather-favorites.xml or weather-locations.xml\nPlease press any key or wait some seconds! ...", 700, 10, NULL, NEUTRINO_ICON_HINT_IMAGEINFO, CComponentsHeader::CC_BTN_EXIT);
 		g_settings.weather_location = "52.52,13.40";
 		g_settings.weather_city = "Berlin";
 		CWeather::getInstance()->setCoords(g_settings.weather_location, g_settings.weather_city);