diff --git a/src/gui/dialogs/message.cpp b/src/gui/dialogs/message.cpp
index 1483e2d8d113..c9cabbbe72ac 100644
--- a/src/gui/dialogs/message.cpp
+++ b/src/gui/dialogs/message.cpp
@@ -48,7 +48,7 @@ struct message_implementation
 	 * @param id                  The id of the button.
 	 */
 	static void init_button(window& window,
-							message::tbutton_status& button_status,
+							message::button_status& button_status,
 							const std::string& id)
 	{
 		button_status.ptr = find_widget<button>(&window, id, false, true);
@@ -136,7 +136,7 @@ void message::set_button_retval(const button_id button, const int retval)
 	}
 }
 
-message::tbutton_status::tbutton_status()
+message::button_status::button_status()
 	: ptr(nullptr)
 	, caption()
 	, visible(widget::visibility::invisible)
diff --git a/src/gui/dialogs/message.hpp b/src/gui/dialogs/message.hpp
index 15c0dffc2b05..680f96207d70 100644
--- a/src/gui/dialogs/message.hpp
+++ b/src/gui/dialogs/message.hpp
@@ -138,9 +138,9 @@ class message : public modal_dialog
 	/** Whether to enable formatting markup for the dialog message. */
 	bool message_use_markup_;
 
-	struct tbutton_status
+	struct button_status
 	{
-		tbutton_status();
+		button_status();
 
 		button* ptr;
 		std::string caption;
@@ -149,7 +149,7 @@ class message : public modal_dialog
 	};
 
 	/** Holds a pointer to the buttons. */
-	std::vector<tbutton_status> buttons_;
+	std::vector<button_status> buttons_;
 
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
 	virtual const std::string& window_id() const override;