diff --git a/data/gui/default/window/addon.cfg b/data/gui/default/window/addon.cfg
index 77513e30a58..aff1fa064d6 100644
--- a/data/gui/default/window/addon.cfg
+++ b/data/gui/default/window/addon.cfg
@@ -14,7 +14,7 @@
 		width = 600
 		height = 200
 
-		window_definition = "default"
+		definition = "default"
 
 		[grid]
 			
@@ -29,7 +29,7 @@
 					border_size = 5
 					horizontal_alignment = "left"
 					[label]
-						label_definition = "default"
+						definition = "default"
 
 						label = _ "Connect to Server"
 					[/label]
@@ -48,7 +48,7 @@
 					border_size = 5
 					horizontal_alignment = "left"
 					[label]
-						label_definition = "default"
+						definition = "default"
 
 						label = _ "You will now connect to a server to download add-ons."
 					[/label]
@@ -78,7 +78,7 @@
 								horizontal_alignment = "left"
 
 								[label]
-									label_definition = "default"
+									definition = "default"
 
 									label = _ "name :"
 								[/label]
@@ -94,7 +94,7 @@
 
 								[text_box]
 									id = "host_name"
-									edit_box_definition = "default"
+									definition = "default"
 
 									size_text = _ "very long text which might need to fit"
 									label = ""
@@ -126,7 +126,7 @@
 
 								[label]
 									# Dummy; empty cells aren't allowed (yet).
-									label_definition = "default"
+									definition = "default"
 
 									label = ""
 								[/label]
@@ -140,7 +140,7 @@
 
 								[button]
 									# just show how the default looks.
-									button_definition = "default"
+									definition = "default"
 
 									size_text = _ "manage addons"
 									label = _ "manage addons"
@@ -165,7 +165,7 @@
 
 								[button]
 									id = "ok"
-									button_definition = "default"
+									definition = "default"
 
 									size_text = _ "connect"
 									label = _ "connect"
@@ -180,7 +180,7 @@
 
 								[button]
 									id = "cancel"
-									button_definition = "default"
+									definition = "default"
 
 									label = _ "cancel"
 								[/button]
diff --git a/src/gui/widgets/window_builder.cpp b/src/gui/widgets/window_builder.cpp
index cb976e8514f..b7e28d1cb0b 100644
--- a/src/gui/widgets/window_builder.cpp
+++ b/src/gui/widgets/window_builder.cpp
@@ -212,7 +212,7 @@ twindow_builder::tresolution::tresolution(const config& cfg) :
 	window_height(lexical_cast_default<unsigned>(cfg["window_height"])),
 	width(lexical_cast_default<unsigned>(cfg["width"])),
 	height(lexical_cast_default<unsigned>(cfg["height"])),
-	definition(cfg["window_definition"]),
+	definition(cfg["definition"]),
 	grid(0) //new tbuilder_grid(cfg.child("grid")))
 {
 /*WIKI
@@ -223,7 +223,7 @@ twindow_builder::tresolution::tresolution(const config& cfg) :
  *     width = (unsigned)            Width of the window to show.
  *     height = (unsigned)           Height of the window to show.
  *
- *     window_definition = (string = "default")
+ *     definition = (string = "default")
  *                                   Definition of the window which we want to show.
  *
  *     [grid]                        The grid with the widgets to show.
@@ -359,7 +359,7 @@ tbuilder_grid::tbuilder_grid(const config& cfg) :
 tbuilder_control::tbuilder_control(const config& cfg) :
 	tbuilder_widget(cfg),
 	id(cfg["id"]),
-	definition(cfg["button_definition"]),
+	definition(cfg["definition"]),
 	label(cfg["label"])
 {