diff --git a/res/gamedata/configs/mp/map_list.ltx b/res/gamedata/configs/mp/map_list.ltx
index 0dc36f5e5fc..38bd861d05a 100644
--- a/res/gamedata/configs/mp/map_list.ltx
+++ b/res/gamedata/configs/mp/map_list.ltx
@@ -1,5 +1,5 @@
 [weather]
-Clear = 9:00
-Rain  =16:00
-Night = 01:00
-Cloudy = 13:00
\ No newline at end of file
+clear = 9:00
+rain = 16:00
+night = 01:00
+cloudy = 13:00
diff --git a/res/gamedata/configs/ui/voting_category.xml b/res/gamedata/configs/ui/voting_category.xml
index 1327361d151..74a21284b96 100644
--- a/res/gamedata/configs/ui/voting_category.xml
+++ b/res/gamedata/configs/ui/voting_category.xml
@@ -124,30 +124,30 @@
 	        <text y="2" font="graffiti19" align="c">mm_mp_cancel</text>
 	        <texture>ui_inGame2_Mp_bigbuttone</texture>
 		</btn_cancel>
-	    <btn_1 x="214" y="127" width="210" height="28" stretch="1">
+	    <btn_clear x="214" y="127" width="210" height="28" stretch="1">
 	        <texture>ui_inGame2_vote_button</texture>
-	    </btn_1>
-	    <btn_2 x="214" y="155" width="210" height="28" stretch="1">
+	    </btn_clear>
+	    <btn_rain x="214" y="155" width="210" height="28" stretch="1">
 	        <texture>ui_inGame2_vote_button</texture>
-	    </btn_2>
-	    <btn_3 x="214" y="184" width="210" height="28" stretch="1">
+	    </btn_rain>
+	    <btn_night x="214" y="184" width="210" height="28" stretch="1">
 	        <texture>ui_inGame2_vote_button</texture>
-	    </btn_3>
-	    <btn_4 x="214" y="212" width="210" height="28" stretch="1">
+	    </btn_night>
+	    <btn_cloudy x="214" y="212" width="210" height="28" stretch="1">
 	        <texture>ui_inGame2_vote_button</texture>
-	    </btn_4>
-	    <txt_1 x="222" y="127" width="200" height="28">
+	    </btn_cloudy>
+	    <txt_clear x="222" y="127" width="200" height="28">
 		    <text font="letterica16" r="170" g="170" b="170" vert_align="c" align="l">mp_weather_clear</text>
-	    </txt_1>
-	    <txt_2 x="222" y="155" width="200" height="28">
+	    </txt_clear>
+	    <txt_rain x="222" y="155" width="200" height="28">
 		    <text font="letterica16" r="170" g="170" b="170" vert_align="c" align="l">mp_weather_rain</text>
-	    </txt_2>
-	    <txt_3 x="222" y="184" width="200" height="28">
+	    </txt_rain>
+	    <txt_night x="222" y="184" width="200" height="28">
 		    <text font="letterica16" r="170" g="170" b="170" vert_align="c" align="l">mp_weather_night</text>
-	    </txt_3>
-	    <txt_4 x="222" y="212" width="200" height="28">
+	    </txt_night>
+	    <txt_cloudy x="222" y="212" width="200" height="28">
 		    <text font="letterica16" r="170" g="170" b="170" vert_align="c" align="l">mp_weather_cloudy</text>
-	    </txt_4>
+	    </txt_cloudy>
 	</change_weather>
 	<change_gametype x="205" y="166" width="624" height="411">
 	    <background x="0" y="0" width="624" height="411">
diff --git a/res/gamedata/configs/ui/voting_category_16.xml b/res/gamedata/configs/ui/voting_category_16.xml
index 8ba0cca7f9f..4c92a0cc987 100644
--- a/res/gamedata/configs/ui/voting_category_16.xml
+++ b/res/gamedata/configs/ui/voting_category_16.xml
@@ -124,30 +124,30 @@
 	        <text y="2" font="graffiti19" align="c">mm_mp_cancel</text>
 	        <texture>ui_inGame2_Mp_bigbuttone</texture>
 		</btn_cancel>
-	    <btn_1 x="171" y="127" width="168" height="28" stretch="1">
+	    <btn_clear x="171" y="127" width="168" height="28" stretch="1">
 	        <texture>ui_inGame2_vote_button</texture>
-	    </btn_1>
-	    <btn_2 x="171" y="155" width="168" height="28" stretch="1">
+	    </btn_clear>
+	    <btn_rain x="171" y="155" width="168" height="28" stretch="1">
 	        <texture>ui_inGame2_vote_button</texture>
-	    </btn_2>
-	    <btn_3 x="171" y="184" width="168" height="28" stretch="1">
+	    </btn_rain>
+	    <btn_night x="171" y="184" width="168" height="28" stretch="1">
 	        <texture>ui_inGame2_vote_button</texture>
-	    </btn_3>
-	    <btn_4 x="171" y="212" width="168" height="28" stretch="1">
+	    </btn_night>
+	    <btn_cloudy x="171" y="212" width="168" height="28" stretch="1">
 	        <texture>ui_inGame2_vote_button</texture>
-	    </btn_4>
-	    <txt_1 x="177" y="127" width="160" height="28">
+	    </btn_cloudy>
+	    <txt_clear x="177" y="127" width="160" height="28">
 		    <text font="letterica16" r="170" g="170" b="170" vert_align="c" align="l">mp_weather_clear</text>
-	    </txt_1>
-	    <txt_2 x="177" y="155" width="160" height="28">
+	    </txt_clear>
+	    <txt_rain x="177" y="155" width="160" height="28">
 		    <text font="letterica16" r="170" g="170" b="170" vert_align="c" align="l">mp_weather_rain</text>
-	    </txt_2>
-	    <txt_3 x="177" y="184" width="160" height="28">
+	    </txt_rain>
+	    <txt_night x="177" y="184" width="160" height="28">
 		    <text font="letterica16" r="170" g="170" b="170" vert_align="c" align="l">mp_weather_night</text>
-	    </txt_3>
-	    <txt_4 x="177" y="212" width="160" height="28">
+	    </txt_night>
+	    <txt_cloudy x="177" y="212" width="160" height="28">
 		    <text font="letterica16" r="170" g="170" b="170" vert_align="c" align="l">mp_weather_cloudy</text>
-	    </txt_4>
+	    </txt_cloudy>
 	</change_weather>
 	<change_gametype x="266" y="166" width="499" height="411">
 	    <background x="0" y="0" width="499" height="411" stretch="1">
diff --git a/src/xrGame/ui/ChangeWeatherDialog.cpp b/src/xrGame/ui/ChangeWeatherDialog.cpp
index cf29ddd70a8..4188e6881cb 100644
--- a/src/xrGame/ui/ChangeWeatherDialog.cpp
+++ b/src/xrGame/ui/ChangeWeatherDialog.cpp
@@ -98,9 +98,9 @@ void ChangeWeatherDialog::InitChangeWeather(CUIXml& xmlDoc)
 	string256 path;
     for (u32 i = 0; i < weatherItems.size(); i++)
     {
-        xr_sprintf(path, "change_weather:btn_%d", i+1);
+        xr_sprintf(path, "change_weather:btn_%s", gameWeathers[i].m_weather_name.c_str());
         CUIXmlInit::Init3tButton(xmlDoc, path, 0, GetButton(i).Button);
-        xr_sprintf(path, "change_weather:txt_%d", i+1);
+        xr_sprintf(path, "change_weather:txt_%s", gameWeathers[i].m_weather_name.c_str());
         CUIXmlInit::InitTextWnd(xmlDoc, path, 0, GetButton(i).Text);
         weatherItems[i].Name = gameWeathers[i].m_weather_name;
         weatherItems[i].Time = gameWeathers[i].m_start_time;