diff --git a/src/gui/gui_console.hpp b/src/gui/gui_console.hpp
index 445e5b8c0..7a332aa14 100644
--- a/src/gui/gui_console.hpp
+++ b/src/gui/gui_console.hpp
@@ -76,7 +76,7 @@ class console_list_entry : public listbox_row_element_base<std::string> {
 		}
 	}
 
-	void update(sys::state& state) noexcept override {
+	void on_update(sys::state& state) noexcept override {
 		entry_text_box->set_text(state, content);
 	}
 };
diff --git a/src/gui/gui_element_types.cpp b/src/gui/gui_element_types.cpp
index 2e3431cd2..57ef48da6 100644
--- a/src/gui/gui_element_types.cpp
+++ b/src/gui/gui_element_types.cpp
@@ -1113,7 +1113,7 @@ message_result listbox_row_element_base<RowConT>::get(sys::state& state, Cyto::A
 		return message_result::consumed;
 	} else if(payload.holds_type<wrapped_listbox_row_content<RowConT>>()) {
 		content = any_cast<wrapped_listbox_row_content<RowConT>>(payload).content;
-		update(state);
+		impl_on_update(state);
 		return message_result::consumed;
 	}
 	return message_result::unseen;
diff --git a/src/gui/gui_element_types.hpp b/src/gui/gui_element_types.hpp
index 86b66f15a..5cb153304 100644
--- a/src/gui/gui_element_types.hpp
+++ b/src/gui/gui_element_types.hpp
@@ -771,7 +771,6 @@ class listbox_row_element_base : public window_element_base {
 	RowConT content{};
 
 public:
-	virtual void update(sys::state& state) noexcept { }
 	message_result get(sys::state& state, Cyto::Any& payload) noexcept override;
 };
 
diff --git a/src/gui/gui_ledger_window.hpp b/src/gui/gui_ledger_window.hpp
index 0635042aa..412db276b 100644
--- a/src/gui/gui_ledger_window.hpp
+++ b/src/gui/gui_ledger_window.hpp
@@ -111,8 +111,7 @@ class ledger_nation_ranking_entry : public listbox_row_element_base<dcon::nation
 		return listbox_row_element_base::get(state, payload);
 	}
 
-	void update(sys::state& state) noexcept override {
-		country_flag->on_update(state);
+	void on_update(sys::state& state) noexcept override {
 		Cyto::Any payload = content;
 		impl_set(state, payload);
 	}
@@ -618,7 +617,7 @@ class ledger_province_entry : public listbox_row_element_base<dcon::province_id>
 		return listbox_row_element_base::get(state, payload);
 	}
 
-	void update(sys::state& state) noexcept override {
+	void on_update(sys::state& state) noexcept override {
 		Cyto::Any payload = content;
 		impl_set(state, payload);
 	}
@@ -785,7 +784,7 @@ class ledger_provinces_production_entry : public listbox_row_element_base<dcon::
 		return listbox_row_element_base::get(state, payload);
 	}
 
-	void update(sys::state& state) noexcept override {
+	void on_update(sys::state& state) noexcept override {
 		Cyto::Any payload = content;
 		impl_set(state, payload);
 	}
diff --git a/src/gui/topbar_subwindows/gui_population_window.hpp b/src/gui/topbar_subwindows/gui_population_window.hpp
index cf9ba76ae..c216402f4 100644
--- a/src/gui/topbar_subwindows/gui_population_window.hpp
+++ b/src/gui/topbar_subwindows/gui_population_window.hpp
@@ -1624,7 +1624,7 @@ class pop_left_side_item : public listbox_row_element_base<pop_left_side_data> {
 		// After this, the widget will be immediately set by the parent
 	}
 
-	void update(sys::state& state) noexcept override {
+	void on_update(sys::state& state) noexcept override {
 		country_window->set_visible(state, std::holds_alternative<dcon::nation_id>(content));
 		state_window->set_visible(state, std::holds_alternative<dcon::state_instance_id>(content));
 		province_window->set_visible(state, std::holds_alternative<dcon::province_id>(content));
@@ -1761,10 +1761,8 @@ class pop_distribution_item : public listbox_row_element_base<std::pair<T, float
 		}
 	}
 
-	void update(sys::state& state) noexcept override {
+	void on_update(sys::state& state) noexcept override {
 		value_text->set_text(state, text::format_percentage(listbox_row_element_base<std::pair<T, float>>::content.second, 1));
-		for(auto& c : listbox_row_element_base<std::pair<T, float>>::children)
-			c->impl_on_update(state);
 	}
 
 	message_result get(sys::state& state, Cyto::Any& payload) noexcept override {
@@ -1969,7 +1967,7 @@ class pop_detailed_issue_distribution_item : public listbox_row_element_base<std
 		}
 	}
 
-	void update(sys::state& state) noexcept override {
+	void on_update(sys::state& state) noexcept override {
 		value_text->set_text(state, text::format_percentage(listbox_row_element_base<std::pair<dcon::issue_option_id, float>>::content.second, 1));
 		for(auto& c : listbox_row_element_base<std::pair<dcon::issue_option_id, float>>::children)
 			c->impl_on_update(state);
@@ -2120,10 +2118,8 @@ class pop_detailed_ideology_distribution_item : public listbox_row_element_base<
 		}
 	}
 
-	void update(sys::state& state) noexcept override {
+	void on_update(sys::state& state) noexcept override {
 		value_text->set_text(state, text::format_percentage(listbox_row_element_base<std::pair<dcon::ideology_id, float>>::content.second, 1));
-		for(auto& c : listbox_row_element_base<std::pair<dcon::ideology_id, float>>::children)
-			c->impl_on_update(state);
 	}
 
 	message_result get(sys::state& state, Cyto::Any& payload) noexcept override {
@@ -2283,7 +2279,7 @@ class pop_details_needs_item : public listbox_row_element_base<pop_details_needs
 		}
 	}
 
-	void update(sys::state& state) noexcept override {
+	void on_update(sys::state& state) noexcept override {
 		value_text->set_text(state, text::format_float(content.second, 1));
 	}
 
diff --git a/src/gui/topbar_subwindows/gui_trade_window.hpp b/src/gui/topbar_subwindows/gui_trade_window.hpp
index 5655558e0..e4c1d1353 100644
--- a/src/gui/topbar_subwindows/gui_trade_window.hpp
+++ b/src/gui/topbar_subwindows/gui_trade_window.hpp
@@ -557,7 +557,7 @@ class trade_flow_entry : public listbox_row_element_base<trade_flow_data> {
 		}
 	}
 
-	void update(sys::state& state) noexcept override {
+	void on_update(sys::state& state) noexcept override {
 		auto commodity_id = retrieve<dcon::commodity_id>(state, parent);
 
 		icon->frame = int32_t(content.type);
diff --git a/src/gui/topbar_subwindows/military_subwindows/gui_build_unit_large_window.hpp b/src/gui/topbar_subwindows/military_subwindows/gui_build_unit_large_window.hpp
index 8269fc1ce..03490aeec 100644
--- a/src/gui/topbar_subwindows/military_subwindows/gui_build_unit_large_window.hpp
+++ b/src/gui/topbar_subwindows/military_subwindows/gui_build_unit_large_window.hpp
@@ -319,7 +319,7 @@ class units_build_item : public listbox_row_element_base<buildable_unit_entry_in
 		}
 	}
 
-	void update(sys::state& state) noexcept override {
+	void on_update(sys::state& state) noexcept override {
 		dcon::unit_type_id utid = retrieve<dcon::unit_type_id>(state, parent);
 		if(!content.continent) {
 			build_button->set_visible(state, true);
@@ -531,7 +531,7 @@ class units_queue_item : public listbox_row_element_base<queue_unit_entry_info>
 		}
 	}
 
-	void update(sys::state& state) noexcept override {
+	void on_update(sys::state& state) noexcept override {
 		if(!content.is_navy) {
 			auto c = content.land_id;
 
diff --git a/src/gui/topbar_subwindows/military_subwindows/gui_leaders_window.hpp b/src/gui/topbar_subwindows/military_subwindows/gui_leaders_window.hpp
index cd076e5e1..35d858d73 100644
--- a/src/gui/topbar_subwindows/military_subwindows/gui_leaders_window.hpp
+++ b/src/gui/topbar_subwindows/military_subwindows/gui_leaders_window.hpp
@@ -89,7 +89,7 @@ class military_leaders : public listbox_row_element_base<dcon::leader_id> {
 		}
 	}
 
-	void update(sys::state& state) noexcept override {
+	void on_update(sys::state& state) noexcept override {
 		auto name_id = state.world.leader_get_name(content);
 		auto name_content = state.to_string_view(name_id);
 		leader_name->set_text(state, std::string(name_content));
diff --git a/src/gui/topbar_subwindows/military_subwindows/gui_units_window.hpp b/src/gui/topbar_subwindows/military_subwindows/gui_units_window.hpp
index d7d83b394..12739e0a2 100644
--- a/src/gui/topbar_subwindows/military_subwindows/gui_units_window.hpp
+++ b/src/gui/topbar_subwindows/military_subwindows/gui_units_window.hpp
@@ -340,7 +340,7 @@ class military_unit_entry : public listbox_row_element_base<military_unit_info<T
 		}
 	}
 
-	void update(sys::state& state) noexcept override {
+	void on_update(sys::state& state) noexcept override {
 		auto const& content = listbox_row_element_base<military_unit_info<T>>::content;
 
 		bool is_building = !std::holds_alternative<T>(content);
diff --git a/src/gui/topbar_subwindows/politics_subwindows/gui_decision_window.hpp b/src/gui/topbar_subwindows/politics_subwindows/gui_decision_window.hpp
index 000b12375..f57514388 100644
--- a/src/gui/topbar_subwindows/politics_subwindows/gui_decision_window.hpp
+++ b/src/gui/topbar_subwindows/politics_subwindows/gui_decision_window.hpp
@@ -218,12 +218,6 @@ class decision_item : public listbox_row_element_base<dcon::decision_id> {
 			return message_result::unseen;
 		}
 	}
-
-	void update(sys::state& state) noexcept override {
-		for(auto& child : children) {
-			child->impl_on_update(state);
-		}
-	}
 };
 
 // ----------------
diff --git a/src/gui/topbar_subwindows/politics_subwindows/gui_reforms_window.hpp b/src/gui/topbar_subwindows/politics_subwindows/gui_reforms_window.hpp
index 973e13dfe..f23c0c4fc 100644
--- a/src/gui/topbar_subwindows/politics_subwindows/gui_reforms_window.hpp
+++ b/src/gui/topbar_subwindows/politics_subwindows/gui_reforms_window.hpp
@@ -201,7 +201,6 @@ class reforms_option : public listbox_row_element_base<dcon::issue_option_id> {
 
 	void on_update(sys::state& state) noexcept override {
 		selected_icon->set_visible(state, politics::issue_is_selected(state, state.local_player_nation, content));
-		update(state);
 	}
 };
 
diff --git a/src/gui/topbar_subwindows/politics_subwindows/gui_unciv_reforms_window.hpp b/src/gui/topbar_subwindows/politics_subwindows/gui_unciv_reforms_window.hpp
index eb0130711..99133fcc5 100644
--- a/src/gui/topbar_subwindows/politics_subwindows/gui_unciv_reforms_window.hpp
+++ b/src/gui/topbar_subwindows/politics_subwindows/gui_unciv_reforms_window.hpp
@@ -229,7 +229,6 @@ class unciv_reforms_option : public listbox_row_element_base<dcon::reform_option
 
 	void on_update(sys::state& state) noexcept override {
 		selected_icon->set_visible(state, politics::reform_is_selected(state, state.local_player_nation, content));
-		update(state);
 	}
 };
 
diff --git a/src/gui/topbar_subwindows/production_subwindows/gui_projects_window.hpp b/src/gui/topbar_subwindows/production_subwindows/gui_projects_window.hpp
index 36b5c9aa6..2d9e2c41d 100644
--- a/src/gui/topbar_subwindows/production_subwindows/gui_projects_window.hpp
+++ b/src/gui/topbar_subwindows/production_subwindows/gui_projects_window.hpp
@@ -39,7 +39,7 @@ class production_project_input_item : public listbox_row_element_base<production
 		}
 	}
 
-	void update(sys::state& state) noexcept override {
+	void on_update(sys::state& state) noexcept override {
 		amount_text->set_text(state, text::format_float(content.satisfied, 1) + "/" + text::format_float(content.needed, 1));
 	}