diff --git a/.cursor/rules/rpl_guide.mdc b/.cursor/rules/rpl_guide.mdc
index 628a1d7e50..733584ad0b 100644
--- a/.cursor/rules/rpl_guide.mdc
+++ b/.cursor/rules/rpl_guide.mdc
@@ -60,7 +60,7 @@ rpl::lifetime &parentLifetime = /* ... get lifetime from context ... */;
 
 To consume values from a producer, you start a pipeline using one of the `rpl::start_...` methods. These methods subscribe to the producer and execute callbacks for the events they handle.
 
-The most common method is `rpl::start_with_next`:
+The most common method is `rpl::on_next`:
 
 ```cpp
 auto counter = /* ... */; // Type: rpl::producer<int>
@@ -69,20 +69,20 @@ rpl::lifetime lifetime;
 // Counter is consumed here, use std::move if it's an l-value.
 std::move(
     counter
-) | rpl::start_with_next([=]\(int nextValue) {
+) | rpl::on_next([=]\(int nextValue) {
     // Process the next integer value emitted by the producer.
     qDebug() << "Received: " << nextValue;
 }, lifetime); // Pass the lifetime to manage the subscription.
 // Note: `counter` is now in a moved-from state and likely invalid.
 
 // If you need to start the same producer multiple times, duplicate it:
-// rpl::duplicate(counter) | rpl::start_with_next(...);
+// rpl::duplicate(counter) | rpl::on_next(...);
 
 // If you DON'T pass a lifetime to a start_... method:
 auto counter2 = /* ... */; // Type: rpl::producer<int>
 rpl::lifetime subscriptionLifetime = std::move(
     counter2
-) | rpl::start_with_next([=]\(int nextValue) { /* ... */ });
+) | rpl::on_next([=]\(int nextValue) { /* ... */ });
 // The returned lifetime MUST be stored. If it's discarded immediately,
 // the subscription stops instantly.
 // `counter2` is also moved-from here.
@@ -98,7 +98,7 @@ rpl::lifetime lifetime;
 // If it's the only use, std::move(dataStream) would be preferred.
 rpl::duplicate(
     dataStream
-) | rpl::start_with_error([=]\(Error &&error) {
+) | rpl::on_error([=]\(Error &&error) {
     // Handle the error signaled by the producer.
     qDebug() << "Error: " << error.text();
 }, lifetime);
@@ -106,7 +106,7 @@ rpl::duplicate(
 // Using dataStream again, perhaps duplicated again or moved if last use.
 rpl::duplicate(
     dataStream
-) | rpl::start_with_done([=] {
+) | rpl::on_done([=] {
     // Execute when the producer signals it's finished emitting values.
     qDebug() << "Stream finished.";
 }, lifetime);
@@ -114,7 +114,7 @@ rpl::duplicate(
 // Last use of dataStream, so we move it.
 std::move(
     dataStream
-) | rpl::start_with_next_error_done(
+) | rpl::on_next_error_done(
     [=]\(QString &&value) { /* handle next value */ },
     [=]\(Error &&error) { /* handle error */ },
     [=] { /* handle done */ },
@@ -169,7 +169,7 @@ You can combine multiple producers into one:
     // The lambda receives unpacked arguments, not the tuple itself.
     std::move(
         combined
-    ) | rpl::start_with_next([=]\(int count, const QString &text) {
+    ) | rpl::on_next([=]\(int count, const QString &text) {
         // No need for std::get<0>(latest), etc.
         qDebug() << "Combined: Count=" << count << ", Text=" << text;
     }, lifetime);
@@ -181,7 +181,7 @@ You can combine multiple producers into one:
         return count > 0 && !text.isEmpty();
     }) | rpl::map([=]\(int count, const QString &text) {
         return text.repeated(count);
-    }) | rpl::start_with_next([=]\(const QString &result) {
+    }) | rpl::on_next([=]\(const QString &result) {
         qDebug() << "Mapped & Filtered: " << result;
     }, lifetime);
     ```
@@ -197,7 +197,7 @@ You can combine multiple producers into one:
     // Starting the merged producer consumes it.
     std::move(
         merged
-    ) | rpl::start_with_next([=]\(QString &&value) {
+    ) | rpl::on_next([=]\(QString &&value) {
         // Receives values from either sourceA or sourceB as they arrive.
         qDebug() << "Merged value: " << value;
     }, lifetime);
diff --git a/Telegram/SourceFiles/api/api_authorizations.cpp b/Telegram/SourceFiles/api/api_authorizations.cpp
index 985cdde1a8..9652e7fedd 100644
--- a/Telegram/SourceFiles/api/api_authorizations.cpp
+++ b/Telegram/SourceFiles/api/api_authorizations.cpp
@@ -100,7 +100,7 @@ Authorizations::Authorizations(not_null<ApiWrap*> api)
 	_unreviewed = api->session().settings().unreviewed();
 	crl::on_main(&api->session(), [=] { removeExpiredUnreviewed(); });
 	Core::App().settings().deviceModelChanges(
-	) | rpl::start_with_next([=](const QString &model) {
+	) | rpl::on_next([=](const QString &model) {
 		auto changed = false;
 		for (auto &entry : _list) {
 			if (!entry.hash) {
diff --git a/Telegram/SourceFiles/api/api_bot.cpp b/Telegram/SourceFiles/api/api_bot.cpp
index 5eeddb0a18..5592dd0269 100644
--- a/Telegram/SourceFiles/api/api_bot.cpp
+++ b/Telegram/SourceFiles/api/api_bot.cpp
@@ -227,7 +227,7 @@ void SendBotCallbackDataWithPassword(
 			api->cloudPassword().state(
 			) | rpl::take(
 				1
-			) | rpl::start_with_next([=](const Core::CloudPasswordState &state) mutable {
+			) | rpl::on_next([=](const Core::CloudPasswordState &state) mutable {
 				if (lifetime) {
 					base::take(lifetime)->destroy();
 				}
diff --git a/Telegram/SourceFiles/api/api_chat_filters.cpp b/Telegram/SourceFiles/api/api_chat_filters.cpp
index 55bbabbc57..a3ef0d82e5 100644
--- a/Telegram/SourceFiles/api/api_chat_filters.cpp
+++ b/Telegram/SourceFiles/api/api_chat_filters.cpp
@@ -174,13 +174,13 @@ void InitFilterLinkHeader(
 	box->setAddedTopScrollSkip(max);
 	std::move(
 		header.wheelEvents
-	) | rpl::start_with_next([=](not_null<QWheelEvent*> e) {
+	) | rpl::on_next([=](not_null<QWheelEvent*> e) {
 		box->sendScrollViewportEvent(e);
 	}, widget->lifetime());
 
 	std::move(
 		header.closeRequests
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		box->closeBox();
 	}, widget->lifetime());
 
@@ -193,7 +193,7 @@ void InitFilterLinkHeader(
 	box->scrolls(
 	) | rpl::filter([=] {
 		return !state->processing;
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		state->processing = true;
 		const auto guard = gsl::finally([&] { state->processing = false; });
 
@@ -470,7 +470,7 @@ void ToggleChatsController::adjust(
 void ToggleChatsController::setRealContentHeight(rpl::producer<int> value) {
 	std::move(
 		value
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		const auto desired = _desiredHeight.current();
 		if (height <= computeListSt().item.height) {
 			return;
@@ -644,7 +644,7 @@ void ProcessFilterInvite(
 
 		const auto button = owned.data();
 		box->widthValue(
-		) | rpl::start_with_next([=](int width) {
+		) | rpl::on_next([=](int width) {
 			const auto &padding = st::filterInviteBox.buttonPadding;
 			button->resizeToWidth(width
 				- padding.left()
@@ -662,7 +662,7 @@ void ProcessFilterInvite(
 		const auto state = box->lifetime().make_state<State>();
 
 		raw->selectedValue(
-		) | rpl::start_with_next([=](
+		) | rpl::on_next([=](
 				base::flat_set<not_null<PeerData*>> &&peers) {
 			button->setClickedCallback([=] {
 				if (peers.empty()) {
@@ -777,7 +777,7 @@ void CheckFilterInvite(
 		if (notLoaded) {
 			const auto lifetime = std::make_shared<rpl::lifetime>();
 			owner.chatsFilters().changed(
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				lifetime->destroy();
 				ProcessFilterInvite(
 					weak,
@@ -873,7 +873,7 @@ void ProcessFilterRemove(
 
 		const auto button = owned.data();
 		box->widthValue(
-		) | rpl::start_with_next([=](int width) {
+		) | rpl::on_next([=](int width) {
 			const auto &padding = st::filterInviteBox.buttonPadding;
 			button->resizeToWidth(width
 				- padding.left()
@@ -886,7 +886,7 @@ void ProcessFilterRemove(
 		HandleEnterInBox(box);
 
 		raw->selectedValue(
-		) | rpl::start_with_next([=](
+		) | rpl::on_next([=](
 				base::flat_set<not_null<PeerData*>> &&peers) {
 			button->setClickedCallback([=] {
 				done(peers | ranges::to_vector);
diff --git a/Telegram/SourceFiles/api/api_chat_invite.cpp b/Telegram/SourceFiles/api/api_chat_invite.cpp
index 415c1a8296..ccbab9fca1 100644
--- a/Telegram/SourceFiles/api/api_chat_invite.cpp
+++ b/Telegram/SourceFiles/api/api_chat_invite.cpp
@@ -159,7 +159,7 @@ void ConfirmSubscriptionBox(
 	state->frame.setDevicePixelRatio(style::DevicePixelRatio());
 	const auto options = Images::Option::RoundCircle;
 	userpic->paintRequest(
-	) | rpl::start_with_next([=, small = Data::PhotoSize::Small] {
+	) | rpl::on_next([=, small = Data::PhotoSize::Small] {
 		state->frame.fill(Qt::transparent);
 		{
 			auto p = QPainter(&state->frame);
@@ -194,7 +194,7 @@ void ConfirmSubscriptionBox(
 		state->photoMedia->wanted(Data::PhotoSize::Small, Data::FileOrigin());
 		if (!state->photoMedia->image(Data::PhotoSize::Small)) {
 			session->downloaderTaskFinished(
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				userpic->update();
 			}, userpic->lifetime());
 		}
@@ -260,7 +260,7 @@ void ConfirmSubscriptionBox(
 		rpl::combine(
 			balance->sizeValue(),
 			content->sizeValue()
-		) | rpl::start_with_next([=](const QSize &, const QSize &) {
+		) | rpl::on_next([=](const QSize &, const QSize &) {
 			balance->moveToRight(
 				st::creditsHistoryRightSkip * 2,
 				st::creditsHistoryRightSkip);
@@ -408,7 +408,7 @@ void CheckChatInvite(
 				box->boxClosing(
 				) | rpl::filter([=] {
 					return !invitePeekChannel->amIn();
-				}) | rpl::start_with_next([=] {
+				}) | rpl::on_next([=] {
 					if (const auto strong = weak.get()) {
 						strong->clearSectionStack(Window::SectionShow(
 							Window::SectionShow::Way::ClearStack,
@@ -527,7 +527,7 @@ ConfirmInviteBox::ConfirmInviteBox(
 		_photo->wanted(Data::PhotoSize::Small, Data::FileOrigin());
 		if (!_photo->image(Data::PhotoSize::Small)) {
 			_session->downloaderTaskFinished(
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				update();
 			}, lifetime());
 		}
diff --git a/Telegram/SourceFiles/api/api_confirm_phone.cpp b/Telegram/SourceFiles/api/api_confirm_phone.cpp
index 7379681138..a080571a0e 100644
--- a/Telegram/SourceFiles/api/api_confirm_phone.cpp
+++ b/Telegram/SourceFiles/api/api_confirm_phone.cpp
@@ -95,7 +95,7 @@ void ConfirmPhone::resolve(
 				codeHandles->fire_copy(code);
 			});
 			box->resendRequests(
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				_api.request(MTPauth_ResendCode(
 					MTP_flags(0),
 					MTP_string(phone),
@@ -110,7 +110,7 @@ void ConfirmPhone::resolve(
 			rpl::merge(
 				codeHandles->events(),
 				box->checkRequests()
-			) | rpl::start_with_next([=](const QString &code) {
+			) | rpl::on_next([=](const QString &code) {
 				if (_checkRequestId) {
 					return;
 				}
@@ -142,7 +142,7 @@ void ConfirmPhone::resolve(
 				}).handleFloodErrors().send();
 			}, box->lifetime());
 			box->boxClosing(
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				controller->session().account().setHandleLoginCode(nullptr);
 			}, box->lifetime());
 
diff --git a/Telegram/SourceFiles/api/api_earn.cpp b/Telegram/SourceFiles/api/api_earn.cpp
index 3b8272fc4e..ef509eddde 100644
--- a/Telegram/SourceFiles/api/api_earn.cpp
+++ b/Telegram/SourceFiles/api/api_earn.cpp
@@ -69,7 +69,7 @@ void HandleWithdrawalButton(
 		state->lifetime = session->api().cloudPassword().state(
 		) | rpl::take(
 			1
-		) | rpl::start_with_next([=](const Core::CloudPasswordState &pass) {
+		) | rpl::on_next([=](const Core::CloudPasswordState &pass) {
 			state->loading = false;
 
 			auto fields = PasscodeBox::CloudFields::From(pass);
diff --git a/Telegram/SourceFiles/api/api_global_privacy.cpp b/Telegram/SourceFiles/api/api_global_privacy.cpp
index 3dbce0425a..82c35e5a73 100644
--- a/Telegram/SourceFiles/api/api_global_privacy.cpp
+++ b/Telegram/SourceFiles/api/api_global_privacy.cpp
@@ -68,7 +68,7 @@ void GlobalPrivacy::reload(Fn<void()> callback) {
 	}).send();
 
 	_session->appConfig().value(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_showArchiveAndMute = _session->appConfig().get<bool>(
 			u"autoarchive_setting_available"_q,
 			false);
diff --git a/Telegram/SourceFiles/api/api_messages_search_merged.cpp b/Telegram/SourceFiles/api/api_messages_search_merged.cpp
index 5a26e4386b..8e15f5255a 100644
--- a/Telegram/SourceFiles/api/api_messages_search_merged.cpp
+++ b/Telegram/SourceFiles/api/api_messages_search_merged.cpp
@@ -36,7 +36,7 @@ MessagesSearchMerged::MessagesSearchMerged(not_null<History*> history)
 	};
 
 	_apiSearch.messagesFounds(
-	) | rpl::start_with_next([=](const FoundMessages &data) {
+	) | rpl::on_next([=](const FoundMessages &data) {
 		if (data.nextToken == _concatedFound.nextToken) {
 			addFound(data);
 			checkFull(data);
@@ -50,7 +50,7 @@ MessagesSearchMerged::MessagesSearchMerged(not_null<History*> history)
 
 	if (_migratedSearch) {
 		_migratedSearch->messagesFounds(
-		) | rpl::start_with_next([=](const FoundMessages &data) {
+		) | rpl::on_next([=](const FoundMessages &data) {
 			if (_isFull) {
 				addFound(data);
 			}
diff --git a/Telegram/SourceFiles/api/api_peer_photo.cpp b/Telegram/SourceFiles/api/api_peer_photo.cpp
index 9c8a470fa9..e333565aa0 100644
--- a/Telegram/SourceFiles/api/api_peer_photo.cpp
+++ b/Telegram/SourceFiles/api/api_peer_photo.cpp
@@ -153,7 +153,7 @@ PeerPhoto::PeerPhoto(not_null<ApiWrap*> api)
 		// You can't use _session->lifetime() in the constructor,
 		// only queued, because it is not constructed yet.
 		_session->uploader().photoReady(
-		) | rpl::start_with_next([=](const Storage::UploadedMedia &data) {
+		) | rpl::on_next([=](const Storage::UploadedMedia &data) {
 			ready(data.fullId, data.info.file, std::nullopt);
 		}, _session->lifetime());
 	});
diff --git a/Telegram/SourceFiles/api/api_premium.cpp b/Telegram/SourceFiles/api/api_premium.cpp
index 316681746a..713458b275 100644
--- a/Telegram/SourceFiles/api/api_premium.cpp
+++ b/Telegram/SourceFiles/api/api_premium.cpp
@@ -95,7 +95,7 @@ Premium::Premium(not_null<ApiWrap*> api)
 		// only queued, because it is not constructed yet.
 		Data::AmPremiumValue(
 			_session
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			reload();
 			if (_session->premium()) {
 				reloadCloudSet();
diff --git a/Telegram/SourceFiles/api/api_ringtones.cpp b/Telegram/SourceFiles/api/api_ringtones.cpp
index 307ba580a7..203984ab69 100644
--- a/Telegram/SourceFiles/api/api_ringtones.cpp
+++ b/Telegram/SourceFiles/api/api_ringtones.cpp
@@ -66,7 +66,7 @@ Ringtones::Ringtones(not_null<ApiWrap*> api)
 		// You can't use _session->lifetime() in the constructor,
 		// only queued, because it is not constructed yet.
 		_session->uploader().documentReady(
-		) | rpl::start_with_next([=](const Storage::UploadedMedia &data) {
+		) | rpl::on_next([=](const Storage::UploadedMedia &data) {
 			ready(data.fullId, data.info.file);
 		}, _session->lifetime());
 	});
diff --git a/Telegram/SourceFiles/api/api_suggest_post.cpp b/Telegram/SourceFiles/api/api_suggest_post.cpp
index cb5aa52e3c..b72a245700 100644
--- a/Telegram/SourceFiles/api/api_suggest_post.cpp
+++ b/Telegram/SourceFiles/api/api_suggest_post.cpp
@@ -351,7 +351,7 @@ void RequestDeclineComment(
 			}
 		};
 		reason->submits(
-		) | rpl::start_with_next([=](Qt::KeyboardModifiers modifiers) {
+		) | rpl::on_next([=](Qt::KeyboardModifiers modifiers) {
 			if (!(modifiers & Qt::ShiftModifier)) {
 				(*callback)();
 			}
diff --git a/Telegram/SourceFiles/api/api_updates.cpp b/Telegram/SourceFiles/api/api_updates.cpp
index 56b2b333cb..352e80a355 100644
--- a/Telegram/SourceFiles/api/api_updates.cpp
+++ b/Telegram/SourceFiles/api/api_updates.cpp
@@ -246,12 +246,12 @@ Updates::Updates(not_null<Main::Session*> session)
 	_ptsWaiter.setRequesting(true);
 
 	session->account().mtpUpdates(
-	) | rpl::start_with_next([=](const MTPUpdates &updates) {
+	) | rpl::on_next([=](const MTPUpdates &updates) {
 		mtpUpdateReceived(updates);
 	}, _lifetime);
 
 	session->account().mtpNewSessionCreated(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		mtpNewSessionCreated();
 	}, _lifetime);
 
@@ -265,7 +265,7 @@ Updates::Updates(not_null<Main::Session*> session)
 		Data::PeerUpdate::Flag::FullInfo
 	) | rpl::filter([](const Data::PeerUpdate &update) {
 		return update.peer->isChat() || update.peer->isMegagroup();
-	}) | rpl::start_with_next([=](const Data::PeerUpdate &update) {
+	}) | rpl::on_next([=](const Data::PeerUpdate &update) {
 		const auto peer = update.peer;
 		if (const auto list = _pendingSpeakingCallParticipants.take(peer)) {
 			if (const auto call = peer->groupCall()) {
@@ -766,7 +766,7 @@ void Updates::addActiveChat(rpl::producer<PeerData*> chat) {
 	const auto key = _activeChats.empty() ? 0 : _activeChats.back().first + 1;
 	std::move(
 		chat
-	) | rpl::start_with_next_done([=](PeerData *peer) {
+	) | rpl::on_next_done([=](PeerData *peer) {
 		auto &active = _activeChats[key];
 		const auto was = active.peer;
 		if (was != peer) {
diff --git a/Telegram/SourceFiles/api/api_user_names.cpp b/Telegram/SourceFiles/api/api_user_names.cpp
index ec84d719ae..e1a44c2f9d 100644
--- a/Telegram/SourceFiles/api/api_user_names.cpp
+++ b/Telegram/SourceFiles/api/api_user_names.cpp
@@ -251,7 +251,7 @@ void Usernames::requestToCache(not_null<PeerData*> peer) {
 	const auto lifetime = std::make_shared<rpl::lifetime>();
 	*lifetime = loadUsernames(
 		peer
-	) | rpl::start_with_next([=, id = peer->id](Data::Usernames usernames) {
+	) | rpl::on_next([=, id = peer->id](Data::Usernames usernames) {
 		_tinyCache = std::make_pair(id, std::move(usernames));
 		lifetime->destroy();
 	});
diff --git a/Telegram/SourceFiles/api/api_who_reacted.cpp b/Telegram/SourceFiles/api/api_who_reacted.cpp
index b3070fba0d..f2117e3c74 100644
--- a/Telegram/SourceFiles/api/api_who_reacted.cpp
+++ b/Telegram/SourceFiles/api/api_who_reacted.cpp
@@ -174,7 +174,7 @@ struct State {
 	}
 	session->changes().messageUpdates(
 		Data::MessageUpdate::Flag::Destroyed
-	) | rpl::start_with_next([=](const Data::MessageUpdate &update) {
+	) | rpl::on_next([=](const Data::MessageUpdate &update) {
 		const auto i = context->cachedRead.find(update.item);
 		if (i != end(context->cachedRead)) {
 			session->api().request(i->second.requestId).cancel();
@@ -192,7 +192,7 @@ struct State {
 		session
 	) | rpl::skip(1) | rpl::filter(
 		rpl::mappers::_1
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		for (auto &[item, cache] : context->cachedRead) {
 			if (cache.data.current().state == Ui::WhoReadState::MyHidden) {
 				cache.data = Peers{ .state = Ui::WhoReadState::Unknown };
@@ -202,7 +202,7 @@ struct State {
 	session->api().globalPrivacy().hideReadTime(
 	) | rpl::skip(1) | rpl::filter(
 		!rpl::mappers::_1
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		for (auto &[item, cache] : context->cachedRead) {
 			if (cache.data.current().state == Ui::WhoReadState::MyHidden) {
 				cache.data = Peers{ .state = Ui::WhoReadState::Unknown };
@@ -590,7 +590,7 @@ rpl::producer<Ui::WhoReadContent> WhoReacted(
 		}
 		std::move(
 			idsWithReactions
-		) | rpl::start_with_next([=](PeersWithReactions &&peers) {
+		) | rpl::on_next([=](PeersWithReactions &&peers) {
 			if (peers.state == WhoReadState::Unknown) {
 				state->userpics.clear();
 				consumer.put_next(Ui::WhoReadContent{
@@ -624,7 +624,7 @@ rpl::producer<Ui::WhoReadContent> WhoReacted(
 		item->history()->session().downloaderTaskFinished(
 		) | rpl::filter([=] {
 			return state->someUserpicsNotLoaded && !state->scheduled;
-		}) | rpl::start_with_next([=] {
+		}) | rpl::on_next([=] {
 			for (const auto &userpic : state->userpics) {
 				if (userpic.peer->userpicUniqueKey(userpic.view)
 					!= userpic.uniqueKey) {
diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp
index 08f8364162..e982a1a779 100644
--- a/Telegram/SourceFiles/apiwrap.cpp
+++ b/Telegram/SourceFiles/apiwrap.cpp
@@ -199,7 +199,7 @@ ApiWrap::ApiWrap(not_null<Main::Session*> session)
 		_session->data().chatsFilters().changed(
 		) | rpl::filter([=] {
 			return _session->data().chatsFilters().archiveNeeded();
-		}) | rpl::start_with_next([=] {
+		}) | rpl::on_next([=] {
 			requestMoreDialogsIfNeeded();
 		}, _session->lifetime());
 
@@ -248,7 +248,7 @@ void ApiWrap::setupSupportMode() {
 	}
 
 	_session->settings().supportChatsTimeSliceValue(
-	) | rpl::start_with_next([=](int seconds) {
+	) | rpl::on_next([=](int seconds) {
 		_dialogsLoadTill = seconds ? std::max(base::unixtime::now() - seconds, 0) : 0;
 		refreshDialogsLoadBlocked();
 	}, _session->lifetime());
@@ -1902,7 +1902,7 @@ void ApiWrap::updateNotifySettingsDelayed(
 	}
 	if (_updateNotifyTopics.emplace(topic).second) {
 		topic->destroyed(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			_updateNotifyTopics.remove(topic);
 		}, _updateNotifyQueueLifetime);
 		_updateNotifyTimer.callOnce(kNotifySettingSaveTimeout);
diff --git a/Telegram/SourceFiles/boxes/about_box.cpp b/Telegram/SourceFiles/boxes/about_box.cpp
index f270788877..664799d0f1 100644
--- a/Telegram/SourceFiles/boxes/about_box.cpp
+++ b/Telegram/SourceFiles/boxes/about_box.cpp
@@ -186,7 +186,7 @@ void ArchiveHintBox(
 		owned->setNaturalWidth(rect.width());
 		const auto widget = box->addRow(std::move(owned), style::al_top);
 		widget->paintRequest(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			auto p = Painter(widget);
 			auto hq = PainterHighQualityEnabler(p);
 			p.setPen(Qt::NoPen);
@@ -263,13 +263,13 @@ void ArchiveHintBox(
 			const auto left = Ui::CreateChild<Ui::RpWidget>(
 				box->verticalLayout().get());
 			left->paintRequest(
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				auto p = Painter(left);
 				icon.paint(p, 0, 0, left->width());
 			}, left->lifetime());
 			left->resize(icon.size());
 			top->geometryValue(
-			) | rpl::start_with_next([=](const QRect &g) {
+			) | rpl::on_next([=](const QRect &g) {
 				left->moveToLeft(
 					(g.left() - left->width()) / 2,
 					g.top() + st::channelEarnHistoryThreeSkip);
diff --git a/Telegram/SourceFiles/boxes/about_sponsored_box.cpp b/Telegram/SourceFiles/boxes/about_sponsored_box.cpp
index e4e3515c04..e7751ac67b 100644
--- a/Telegram/SourceFiles/boxes/about_sponsored_box.cpp
+++ b/Telegram/SourceFiles/boxes/about_sponsored_box.cpp
@@ -42,7 +42,7 @@ void AboutSponsoredBox(not_null<Ui::GenericBox*> box) {
 		rpl::combine(
 			row->sizeValue(),
 			button->sizeValue()
-		) | rpl::start_with_next([=](
+		) | rpl::on_next([=](
 				const QSize &rowSize,
 				const QSize &buttonSize) {
 			button->moveToLeft(
diff --git a/Telegram/SourceFiles/boxes/add_contact_box.cpp b/Telegram/SourceFiles/boxes/add_contact_box.cpp
index 72e71e0ba7..514d7bc43a 100644
--- a/Telegram/SourceFiles/boxes/add_contact_box.cpp
+++ b/Telegram/SourceFiles/boxes/add_contact_box.cpp
@@ -324,9 +324,9 @@ void AddContactBox::prepare() {
 
 	const auto submitted = [=] { submit(); };
 	_first->submits(
-	) | rpl::start_with_next(submitted, _first->lifetime());
+	) | rpl::on_next(submitted, _first->lifetime());
 	_last->submits(
-	) | rpl::start_with_next(submitted, _last->lifetime());
+	) | rpl::on_next(submitted, _last->lifetime());
 	connect(_phone, &Ui::PhoneInput::submitted, [=] { submit(); });
 
 	setDimensions(
@@ -598,13 +598,13 @@ void GroupInfoBox::prepare() {
 			Core::App().settings().sendSubmitWay());
 
 		_description->heightChanges(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			descriptionResized();
 		}, _description->lifetime());
 		_description->submits(
-		) | rpl::start_with_next([=] { submit(); }, _description->lifetime());
+		) | rpl::on_next([=] { submit(); }, _description->lifetime());
 		_description->cancelled(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			closeBox();
 		}, _description->lifetime());
 
@@ -614,7 +614,7 @@ void GroupInfoBox::prepare() {
 			&_navigation->session());
 	}
 	_title->submits(
-	) | rpl::start_with_next([=] { submitName(); }, _title->lifetime());
+	) | rpl::on_next([=] { submitName(); }, _title->lifetime());
 
 	addButton(
 		((_type != Type::Group || _canAddBot)
@@ -920,7 +920,7 @@ void GroupInfoBox::checkInviteLink() {
 		_createdChannel->session().changes().peerUpdates(
 			_createdChannel,
 			Data::PeerUpdate::Flag::FullInfo
-		) | rpl::take(1) | rpl::start_with_next([=] {
+		) | rpl::take(1) | rpl::on_next([=] {
 			checkInviteLink();
 		}, lifetime());
 	}
@@ -1063,11 +1063,11 @@ void SetupChannelBox::prepare() {
 	_channel->session().changes().peerUpdates(
 		_channel,
 		Data::PeerUpdate::Flag::InviteLinks
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		rtlupdate(_invitationLink);
 	}, lifetime());
 
-	boxClosing() | rpl::start_with_next([=] {
+	boxClosing() | rpl::on_next([=] {
 		if (!_mustBePublic) {
 			AddParticipantsBoxController::Start(_navigation, _channel);
 		}
@@ -1495,7 +1495,7 @@ void SetupChannelBox::showRevokePublicLinkBoxForEdit() {
 		Box(PublicLinksLimitBox, navigation, callback));
 	const auto session = &navigation->session();
 	revoker->boxClosing(
-	) | rpl::start_with_next(crl::guard(session, [=] {
+	) | rpl::on_next(crl::guard(session, [=] {
 		base::call_delayed(200, session, [=] {
 			if (*revoked) {
 				return;
@@ -1563,19 +1563,19 @@ void EditNameBox::prepare() {
 	_last->setMaxLength(Ui::EditPeer::kMaxUserFirstLastName);
 
 	_first->submits(
-	) | rpl::start_with_next([=] { submit(); }, _first->lifetime());
+	) | rpl::on_next([=] { submit(); }, _first->lifetime());
 	_last->submits(
-	) | rpl::start_with_next([=] { submit(); }, _last->lifetime());
+	) | rpl::on_next([=] { submit(); }, _last->lifetime());
 
 	_first->customTab(true);
 	_last->customTab(true);
 
 	_first->tabbed(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_last->setFocus();
 	}, _first->lifetime());
 	_last->tabbed(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_first->setFocus();
 	}, _last->lifetime());
 }
diff --git a/Telegram/SourceFiles/boxes/auto_download_box.cpp b/Telegram/SourceFiles/boxes/auto_download_box.cpp
index 3617a9eb65..ac54402b17 100644
--- a/Telegram/SourceFiles/boxes/auto_download_box.cpp
+++ b/Telegram/SourceFiles/boxes/auto_download_box.cpp
@@ -116,7 +116,7 @@ void AutoDownloadBox::setupContent() {
 		))->toggleOn(
 			rpl::single(value > 0)
 		)->toggledChanges(
-		) | rpl::start_with_next([=](bool enabled) {
+		) | rpl::on_next([=](bool enabled) {
 			(*values)[type] = enabled ? 1 : 0;
 		}, content->lifetime());
 		values->emplace(type, value);
diff --git a/Telegram/SourceFiles/boxes/auto_lock_box.cpp b/Telegram/SourceFiles/boxes/auto_lock_box.cpp
index cc7cdb4271..eb3d44bb85 100644
--- a/Telegram/SourceFiles/boxes/auto_lock_box.cpp
+++ b/Telegram/SourceFiles/boxes/auto_lock_box.cpp
@@ -102,7 +102,7 @@ void AutoLockBox::prepare() {
 	};
 
 	timeInput->focuses(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		group->setValue(kCustom);
 	}, lifetime());
 
@@ -119,7 +119,7 @@ void AutoLockBox::prepare() {
 			[=] { return group->current() == kCustom; }
 		),
 		timeInput->submitRequests()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (const auto result = collect()) {
 			durationChanged(result);
 		} else {
diff --git a/Telegram/SourceFiles/boxes/background_box.cpp b/Telegram/SourceFiles/boxes/background_box.cpp
index 8723572da2..358cc12bb7 100644
--- a/Telegram/SourceFiles/boxes/background_box.cpp
+++ b/Telegram/SourceFiles/boxes/background_box.cpp
@@ -211,12 +211,12 @@ void BackgroundBox::prepare() {
 	setInnerTopSkip(st::lineWidth);
 
 	_inner->chooseEvents(
-	) | rpl::start_with_next([=](const Data::WallPaper &paper) {
+	) | rpl::on_next([=](const Data::WallPaper &paper) {
 		chosen(paper);
 	}, _inner->lifetime());
 
 	_inner->removeRequests(
-	) | rpl::start_with_next([=](const Data::WallPaper &paper) {
+	) | rpl::on_next([=](const Data::WallPaper &paper) {
 		removePaper(paper);
 	}, _inner->lifetime());
 }
@@ -396,30 +396,30 @@ BackgroundBox::Inner::Inner(
 			+ st::backgroundPadding));
 
 	Window::Theme::IsNightModeValue(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updatePapers();
 	}, lifetime());
 	requestPapers();
 
 	_session->downloaderTaskFinished(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		update();
 	}, lifetime());
 
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_check->invalidateCache();
 	}, lifetime());
 
 	if (forChannel()) {
 		_session->data().cloudThemes().chatThemesUpdated(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			updatePapers();
 		}, lifetime());
 	} else {
 		using Update = Window::Theme::BackgroundUpdate;
 		Window::Theme::Background()->updates(
-		) | rpl::start_with_next([=](const Update &update) {
+		) | rpl::on_next([=](const Update &update) {
 			if (update.type == Update::Type::New) {
 				sortPapers();
 				requestPapers();
diff --git a/Telegram/SourceFiles/boxes/background_preview_box.cpp b/Telegram/SourceFiles/boxes/background_preview_box.cpp
index 24d4fd1835..68877dc03d 100644
--- a/Telegram/SourceFiles/boxes/background_preview_box.cpp
+++ b/Telegram/SourceFiles/boxes/background_preview_box.cpp
@@ -225,18 +225,18 @@ BackgroundPreviewBox::BackgroundPreviewBox(
 	}
 	generateBackground();
 	_controller->session().downloaderTaskFinished(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		update();
 	}, lifetime());
 
 	_appNightMode.changes(
-	) | rpl::start_with_next([=](bool night) {
+	) | rpl::on_next([=](bool night) {
 		_boxDarkMode = night;
 		update();
 	}, lifetime());
 
 	_boxDarkMode.changes(
-	) | rpl::start_with_next([=](bool dark) {
+	) | rpl::on_next([=](bool dark) {
 		applyDarkMode(dark);
 	}, lifetime());
 
@@ -373,7 +373,7 @@ void BackgroundPreviewBox::createDimmingSlider(bool dark) {
 	_dimmingContent->resize(inner->size());
 
 	_dimmingContent->paintRequest(
-	) | rpl::start_with_next([=](QRect clip) {
+	) | rpl::on_next([=](QRect clip) {
 		auto p = QPainter(_dimmingContent);
 		const auto palette = (dark ? _darkPalette : _lightPalette).get();
 		p.fillRect(clip, equals ? st::boxBg : palette->boxBg());
@@ -386,13 +386,13 @@ void BackgroundPreviewBox::createDimmingSlider(bool dark) {
 			heightValue(),
 			_dimmingWrap->heightValue(),
 			rpl::mappers::_1 - rpl::mappers::_2
-		) | rpl::start_with_next([=](int top) {
+		) | rpl::on_next([=](int top) {
 			_dimmingWrap->move(0, top);
 		}, _dimmingWrap->lifetime());
 
 		_dimmingWrap->toggle(dark, anim::type::instant);
 		_dimmingHeight = _dimmingWrap->heightValue();
-		_dimmingHeight.changes() | rpl::start_with_next([=] {
+		_dimmingHeight.changes() | rpl::on_next([=] {
 			update();
 		}, _dimmingWrap->lifetime());
 	}
@@ -554,7 +554,7 @@ void BackgroundPreviewBox::recreateBlurCheckbox() {
 		sizeValue(),
 		_blur->sizeValue(),
 		_dimmingHeight.value()
-	) | rpl::start_with_next([=](QSize outer, QSize inner, int dimming) {
+	) | rpl::on_next([=](QSize outer, QSize inner, int dimming) {
 		const auto bottom = st::historyPaddingBottom;
 		_blur->move(
 			(outer.width() - inner.width()) / 2,
@@ -562,7 +562,7 @@ void BackgroundPreviewBox::recreateBlurCheckbox() {
 	}, _blur->lifetime());
 
 	_blur->checkedChanges(
-	) | rpl::start_with_next([=](bool checked) {
+	) | rpl::on_next([=](bool checked) {
 		checkBlurAnimationStart();
 		update();
 	}, _blur->lifetime());
@@ -607,7 +607,7 @@ void BackgroundPreviewBox::uploadForPeer(bool both) {
 		document->size);
 
 	session->uploader().documentProgress(
-	) | rpl::start_with_next([=](const FullMsgId &fullId) {
+	) | rpl::on_next([=](const FullMsgId &fullId) {
 		if (fullId != _uploadId) {
 			return;
 		}
@@ -619,7 +619,7 @@ void BackgroundPreviewBox::uploadForPeer(bool both) {
 	}, _uploadLifetime);
 
 	session->uploader().documentReady(
-	) | rpl::start_with_next([=](const Storage::UploadedMedia &data) {
+	) | rpl::on_next([=](const Storage::UploadedMedia &data) {
 		if (data.fullId != _uploadId) {
 			return;
 		}
@@ -742,13 +742,13 @@ void BackgroundPreviewBox::applyForPeer() {
 		object_ptr<Ui::RpWidget>(this));
 	const auto overlay = _forBothOverlay->entity();
 
-	sizeValue() | rpl::start_with_next([=](QSize size) {
+	sizeValue() | rpl::on_next([=](QSize size) {
 		_forBothOverlay->setGeometry({ QPoint(), size });
 		overlay->setGeometry({ QPoint(), size });
 	}, _forBothOverlay->lifetime());
 
 	overlay->paintRequest(
-	) | rpl::start_with_next([=](QRect clip) {
+	) | rpl::on_next([=](QRect clip) {
 		auto p = QPainter(overlay);
 		p.drawImage(0, 0, bg);
 		p.fillRect(clip, QColor(0, 0, 0, 64));
@@ -787,7 +787,7 @@ void BackgroundPreviewBox::applyForPeer() {
 		const auto raw = _forBothOverlay.release();
 		raw->shownValue() | rpl::filter(
 			!rpl::mappers::_1
-		) | rpl::take(1) | rpl::start_with_next(crl::guard(raw, [=] {
+		) | rpl::take(1) | rpl::on_next(crl::guard(raw, [=] {
 			delete raw;
 		}), raw->lifetime());
 		raw->toggle(false, anim::type::normal);
@@ -797,7 +797,7 @@ void BackgroundPreviewBox::applyForPeer() {
 	cancel->setTextTransform(RoundButton::TextTransform::NoTransform);
 
 	overlay->sizeValue(
-	) | rpl::start_with_next([=](QSize size) {
+	) | rpl::on_next([=](QSize size) {
 		const auto padding = st::backgroundConfirmPadding;
 		const auto width = size.width()
 			- padding.left()
@@ -1063,7 +1063,7 @@ void BackgroundPreviewBox::updateServiceBg(const std::vector<QColor> &bg) {
 	}
 
 	_serviceBgLifetime = _paletteServiceBg.value(
-	) | rpl::start_with_next([=](QColor color) {
+	) | rpl::on_next([=](QColor color) {
 		_serviceBg = Ui::ThemeAdjustedColor(
 			color,
 			QColor(red / count, green / count, blue / count));
diff --git a/Telegram/SourceFiles/boxes/choose_filter_box.cpp b/Telegram/SourceFiles/boxes/choose_filter_box.cpp
index 17450b8000..fbefdce76d 100644
--- a/Telegram/SourceFiles/boxes/choose_filter_box.cpp
+++ b/Telegram/SourceFiles/boxes/choose_filter_box.cpp
@@ -345,7 +345,7 @@ void FillChooseFilterMenu(
 	}
 
 	history->owner().chatsFilters().changed(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		menu->hideMenu();
 	}, menu->lifetime());
 }
diff --git a/Telegram/SourceFiles/boxes/connection_box.cpp b/Telegram/SourceFiles/boxes/connection_box.cpp
index 49e134861c..5a954eb0f5 100644
--- a/Telegram/SourceFiles/boxes/connection_box.cpp
+++ b/Telegram/SourceFiles/boxes/connection_box.cpp
@@ -754,7 +754,7 @@ ProxiesBox::ProxiesBox(
 , _settings(settings)
 , _initialWrap(this) {
 	_controller->views(
-	) | rpl::start_with_next([=](View &&view) {
+	) | rpl::on_next([=](View &&view) {
 		applyView(std::move(view));
 	}, lifetime());
 }
@@ -883,17 +883,17 @@ void ProxiesBox::setupContent() {
 		refreshProxyForCalls();
 	});
 	_tryIPv6->checkedChanges(
-	) | rpl::start_with_next([=](bool checked) {
+	) | rpl::on_next([=](bool checked) {
 		_controller->setTryIPv6(checked);
 	}, _tryIPv6->lifetime());
 
 	_controller->proxySettingsValue(
-	) | rpl::start_with_next([=](ProxyData::Settings value) {
+	) | rpl::on_next([=](ProxyData::Settings value) {
 		_proxySettings->setValue(value);
 	}, inner->lifetime());
 
 	_proxyForCalls->entity()->checkedChanges(
-	) | rpl::start_with_next([=](bool checked) {
+	) | rpl::on_next([=](bool checked) {
 		_controller->setProxyForCalls(checked);
 	}, _proxyForCalls->lifetime());
 
@@ -930,7 +930,7 @@ void ProxiesBox::setupContent() {
 				+ 3 * rowHeight()),
 			st::boxMaxListHeight);
 	}) | rpl::distinct_until_changed(
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		setDimensions(st::boxWideWidth, height);
 	}, inner->lifetime());
 }
@@ -1005,7 +1005,7 @@ void ProxiesBox::createNoRowsLabel() {
 		tr::lng_proxy_description(tr::now),
 		st::proxyEmptyListLabel);
 	_noRows->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		label->resizeToWidth(width);
 		label->moveToLeft(0, 0);
 	}, label->lifetime());
@@ -1013,29 +1013,29 @@ void ProxiesBox::createNoRowsLabel() {
 
 void ProxiesBox::setupButtons(int id, not_null<ProxyRow*> button) {
 	button->deleteClicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_controller->deleteItem(id);
 	}, button->lifetime());
 
 	button->restoreClicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_controller->restoreItem(id);
 	}, button->lifetime());
 
 	button->editClicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		getDelegate()->show(_controller->editItemBox(id));
 	}, button->lifetime());
 
 	rpl::merge(
 		button->shareClicks() | rpl::map_to(false),
 		button->showQrClicks() | rpl::map_to(true)
-	) | rpl::start_with_next([=](bool qr) {
+	) | rpl::on_next([=](bool qr) {
 		_controller->shareItem(id, qr);
 	}, button->lifetime());
 
 	button->clicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_controller->applyItem(id);
 	}, button->lifetime());
 }
@@ -1071,7 +1071,7 @@ void ProxyBox::prepare() {
 		});
 	});
 	_port.data()->events(
-	) | rpl::start_with_next([=](not_null<QEvent*> e) {
+	) | rpl::on_next([=](not_null<QEvent*> e) {
 		if (e->type() == QEvent::KeyPress
 			&& (static_cast<QKeyEvent*>(e.get())->key() == Qt::Key_Backspace)
 			&& _port->cursorPosition() == 0) {
@@ -1181,7 +1181,7 @@ void ProxyBox::setupSocketAddress(const ProxyData &data) {
 		data.port ? QString::number(data.port) : QString(),
 		65535);
 	address->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		_port->moveToRight(0, 0);
 		_host->resize(
 			width - _port->width() - st::proxyEditSkip,
@@ -1213,11 +1213,11 @@ void ProxyBox::setupCredentials(const ProxyData &data) {
 		(data.type == Type::Mtproto) ? QString() : data.password);
 	_password->move(0, 0);
 	_password->heightValue(
-	) | rpl::start_with_next([=, wrap = passwordWrap.data()](int height) {
+	) | rpl::on_next([=, wrap = passwordWrap.data()](int height) {
 		wrap->resize(wrap->width(), height);
 	}, _password->lifetime());
 	passwordWrap->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		_password->resize(width, _password->height());
 	}, _password->lifetime());
 	credentials->add(std::move(passwordWrap), st::proxyEditInputPadding);
@@ -1239,11 +1239,11 @@ void ProxyBox::setupMtprotoCredentials(const ProxyData &data) {
 		(data.type == Type::Mtproto) ? data.password : QString());
 	_secret->move(0, 0);
 	_secret->heightValue(
-	) | rpl::start_with_next([=, wrap = secretWrap.data()](int height) {
+	) | rpl::on_next([=, wrap = secretWrap.data()](int height) {
 		wrap->resize(wrap->width(), height);
 	}, _secret->lifetime());
 	secretWrap->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		_secret->resize(width, _secret->height());
 	}, _secret->lifetime());
 	mtproto->add(std::move(secretWrap), st::proxyEditInputPadding);
@@ -1305,7 +1305,7 @@ ProxiesBoxController::ProxiesBoxController(not_null<Main::Account*> account)
 	}) | ranges::to_vector;
 
 	_settings.connectionTypeChanges(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_proxySettingsChanges.fire_copy(_settings.settings());
 		const auto i = findByProxy(_settings.selected());
 		if (i != end(_list)) {
diff --git a/Telegram/SourceFiles/boxes/create_poll_box.cpp b/Telegram/SourceFiles/boxes/create_poll_box.cpp
index 290da2d72e..d885b2ca06 100644
--- a/Telegram/SourceFiles/boxes/create_poll_box.cpp
+++ b/Telegram/SourceFiles/boxes/create_poll_box.cpp
@@ -198,7 +198,7 @@ not_null<Ui::FlatLabel*> CreateWarningLabel(
 		st::createPollWarning);
 	result->setAttribute(Qt::WA_TransparentForMouseEvents);
 	field->changes(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		Ui::PostponeCall(crl::guard(field, [=] {
 			const auto length = field->getLastText().size();
 			const auto value = valueLimit - length;
@@ -251,17 +251,17 @@ Options::Option::Option(
 	_wrap->hide(anim::type::instant);
 
 	_content->widthValue(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateFieldGeometry();
 	}, _field->lifetime());
 
 	_field->heightValue(
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		_content->resize(_content->width(), height);
 	}, _field->lifetime());
 
 	_field->changes(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		Ui::PostponeCall(crl::guard(_field, [=] {
 			if (_hasCorrect) {
 				_correct->toggle(isGood(), anim::type::normal);
@@ -293,7 +293,7 @@ void Options::Option::createShadow() {
 	_shadow.reset(Ui::CreateChild<Ui::PlainShadow>(field().get()));
 	_shadow->show();
 	field()->sizeValue(
-	) | rpl::start_with_next([=](QSize size) {
+	) | rpl::on_next([=](QSize size) {
 		const auto left = st::createPollFieldPadding.left();
 		_shadow->setGeometry(
 			left,
@@ -322,7 +322,7 @@ void Options::Option::createRemove() {
 	_removeAlways = lifetime.make_state<rpl::variable<bool>>(false);
 
 	field->changes(
-	) | rpl::start_with_next([field, toggle] {
+	) | rpl::on_next([field, toggle] {
 		// Don't capture 'this'! Because Option is a value type.
 		*toggle = !field->getLastText().isEmpty();
 	}, field->lifetime());
@@ -331,13 +331,13 @@ void Options::Option::createRemove() {
 		toggle->value(),
 		_removeAlways->value(),
 		_1 || _2
-	) | rpl::start_with_next([=](bool shown) {
+	) | rpl::on_next([=](bool shown) {
 		remove->toggle(shown, anim::type::normal);
 	}, remove->lifetime());
 #endif
 
 	field->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		remove->moveToRight(
 			st::createPollOptionRemovePosition.x(),
 			st::createPollOptionRemovePosition.y(),
@@ -359,7 +359,7 @@ void Options::Option::createWarning() {
 	rpl::combine(
 		field->sizeValue(),
 		warning->sizeValue()
-	) | rpl::start_with_next([=](QSize size, QSize label) {
+	) | rpl::on_next([=](QSize size, QSize label) {
 		warning->moveToLeft(
 			(size.width()
 				- label.width()
@@ -431,7 +431,7 @@ void Options::Option::enableChooseCorrect(
 		button->entity()->height());
 	button->hide(anim::type::instant);
 	_content->sizeValue(
-	) | rpl::start_with_next([=](QSize size) {
+	) | rpl::on_next([=](QSize size) {
 		const auto left = st::createPollFieldPadding.left();
 		button->moveToLeft(
 			left,
@@ -688,19 +688,19 @@ void Options::addEmptyOption() {
 			QPoint(
 				-st::createPollOptionFieldPremium.textMargins.right(),
 				st::createPollOptionEmojiPositionSkip));
-		emojiToggle->shownValue() | rpl::start_with_next([=](bool shown) {
+		emojiToggle->shownValue() | rpl::on_next([=](bool shown) {
 			if (!shown) {
 				return;
 			}
 			_emojiPanelLifetime.destroy();
 			emojiPanel->selector()->emojiChosen(
-			) | rpl::start_with_next([=](ChatHelpers::EmojiChosen data) {
+			) | rpl::on_next([=](ChatHelpers::EmojiChosen data) {
 				if (field->hasFocus()) {
 					Ui::InsertEmojiAtCursor(field->textCursor(), data.emoji);
 				}
 			}, _emojiPanelLifetime);
 			emojiPanel->selector()->customEmojiChosen(
-			) | rpl::start_with_next([=](ChatHelpers::FileChosen data) {
+			) | rpl::on_next([=](ChatHelpers::FileChosen data) {
 				if (field->hasFocus()) {
 					Data::InsertCustomEmoji(field, data.document);
 				}
@@ -708,24 +708,24 @@ void Options::addEmptyOption() {
 		}, emojiToggle->lifetime());
 	}
 	field->submits(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto index = findField(field);
 		if (_list[index]->isGood() && index + 1 < _list.size()) {
 			_list[index + 1]->setFocus();
 		}
 	}, field->lifetime());
 	field->changes(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		Ui::PostponeCall(crl::guard(field, [=] {
 			validateState();
 		}));
 	}, field->lifetime());
 	field->focusedChanges(
-	) | rpl::filter(rpl::mappers::_1) | rpl::start_with_next([=] {
+	) | rpl::filter(rpl::mappers::_1) | rpl::on_next([=] {
 		_scrollToWidget.fire_copy(field);
 	}, field->lifetime());
 	field->tabbed(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto index = findField(field);
 		if (index + 1 < _list.size()) {
 			_list[index + 1]->setFocus();
@@ -753,7 +753,7 @@ void Options::addEmptyOption() {
 	});
 
 	_list.back()->removeClicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		Ui::PostponeCall(crl::guard(field, [=] {
 			Expects(!_list.empty());
 
@@ -891,13 +891,13 @@ not_null<Ui::InputField*> CreatePollBox::setupQuestion(
 			emojiPanel,
 			st::createPollOptionFieldPremiumEmojiPosition);
 		emojiPanel->selector()->emojiChosen(
-		) | rpl::start_with_next([=](ChatHelpers::EmojiChosen data) {
+		) | rpl::on_next([=](ChatHelpers::EmojiChosen data) {
 			if (question->hasFocus()) {
 				Ui::InsertEmojiAtCursor(question->textCursor(), data.emoji);
 			}
 		}, emojiToggle->lifetime());
 		emojiPanel->selector()->customEmojiChosen(
-		) | rpl::start_with_next([=](ChatHelpers::FileChosen data) {
+		) | rpl::on_next([=](ChatHelpers::FileChosen data) {
 			if (question->hasFocus()) {
 				Data::InsertCustomEmoji(question, data.document);
 			}
@@ -912,7 +912,7 @@ not_null<Ui::InputField*> CreatePollBox::setupQuestion(
 	rpl::combine(
 		question->geometryValue(),
 		warning->sizeValue()
-	) | rpl::start_with_next([=](QRect geometry, QSize label) {
+	) | rpl::on_next([=](QRect geometry, QSize label) {
 		warning->moveToLeft(
 			(container->width()
 				- label.width()
@@ -978,7 +978,7 @@ not_null<Ui::InputField*> CreatePollBox::setupSolution(
 	rpl::combine(
 		solution->geometryValue(),
 		warning->sizeValue()
-	) | rpl::start_with_next([=](QRect geometry, QSize label) {
+	) | rpl::on_next([=](QRect geometry, QSize label) {
 		warning->moveToLeft(
 			(inner->width()
 				- label.width()
@@ -1048,7 +1048,7 @@ object_ptr<Ui::RpWidget> CreatePollBox::setupContent() {
 			st::createPollLimitPadding));
 
 	question->tabbed(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		options->focusFirst();
 	}, question->lifetime());
 
@@ -1088,7 +1088,7 @@ object_ptr<Ui::RpWidget> CreatePollBox::setupContent() {
 		rpl::single(quiz->checked()) | rpl::then(quiz->checkedChanges()));
 
 	options->tabbed(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (quiz->checked()) {
 			solution->setFocus();
 		} else {
@@ -1097,7 +1097,7 @@ object_ptr<Ui::RpWidget> CreatePollBox::setupContent() {
 	}, question->lifetime());
 
 	solution->tabbed(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		question->setFocus();
 	}, solution->lifetime());
 
@@ -1109,14 +1109,14 @@ object_ptr<Ui::RpWidget> CreatePollBox::setupContent() {
 		) | rpl::filter([=](not_null<QEvent*> e) {
 			return (e->type() == QEvent::MouseButtonPress)
 				&& quiz->checked();
-		}) | rpl::start_with_next([show = uiShow()] {
+		}) | rpl::on_next([show = uiShow()] {
 			show->showToast(tr::lng_polls_create_one_answer(tr::now));
 		}, multiple->lifetime());
 	}
 
 	using namespace rpl::mappers;
 	quiz->checkedChanges(
-	) | rpl::start_with_next([=](bool checked) {
+	) | rpl::on_next([=](bool checked) {
 		if (multiple) {
 			if (checked && multiple->checked()) {
 				multiple->setChecked(false);
@@ -1132,7 +1132,7 @@ object_ptr<Ui::RpWidget> CreatePollBox::setupContent() {
 		return !text.isEmpty() && (text.size() <= kQuestionLimit);
 	};
 	question->submits(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (isValidQuestion()) {
 			options->focusFirst();
 		}
@@ -1216,12 +1216,12 @@ object_ptr<Ui::RpWidget> CreatePollBox::setupContent() {
 		crl::guard(this, send));
 
 	options->scrollToWidget(
-	) | rpl::start_with_next([=](not_null<QWidget*> widget) {
+	) | rpl::on_next([=](not_null<QWidget*> widget) {
 		scrollToWidget(widget);
 	}, lifetime());
 
 	options->backspaceInFront(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		FocusAtEnd(question);
 	}, lifetime());
 
diff --git a/Telegram/SourceFiles/boxes/delete_messages_box.cpp b/Telegram/SourceFiles/boxes/delete_messages_box.cpp
index 5636cc020a..c4bd9751ef 100644
--- a/Telegram/SourceFiles/boxes/delete_messages_box.cpp
+++ b/Telegram/SourceFiles/boxes/delete_messages_box.cpp
@@ -164,7 +164,7 @@ void DeleteMessagesBox::prepare() {
 			appendDetails(std::move(revoke->description));
 			if (!peer->isUser() && !_wipeHistoryJustClear) {
 				_revoke->checkedValue(
-				) | rpl::start_with_next([=](bool revokeForAll) {
+				) | rpl::on_next([=](bool revokeForAll) {
 					*deleteText = revokeForAll
 						? tr::lng_box_delete()
 						: tr::lng_box_leave();
@@ -251,13 +251,13 @@ void DeleteMessagesBox::prepare() {
 						st::defaultBoxCheckbox));
 				_revokeRemember->hide(anim::type::instant);
 				_revoke->checkedValue(
-				) | rpl::start_with_next([=](bool checked) {
+				) | rpl::on_next([=](bool checked) {
 					_revokeRemember->toggle(
 						checked != revokeByDefault,
 						anim::type::normal);
 				}, _revokeRemember->lifetime());
 				_revokeRemember->heightValue(
-				) | rpl::start_with_next([=](int h) {
+				) | rpl::on_next([=](int h) {
 					setDimensions(st::boxWidth, _fullHeight + h);
 				}, lifetime());
 				appendDetails(std::move(revoke->description));
@@ -320,7 +320,7 @@ void DeleteMessagesBox::prepare() {
 	rpl::combine(
 		widthValue(),
 		_text->naturalWidthValue()
-	) | rpl::start_with_next([=](int full, int) {
+	) | rpl::on_next([=](int full, int) {
 		_text->resizeToNaturalWidth(full - padding.left() - padding.right());
 
 		auto fullHeight = st::boxPadding.top()
diff --git a/Telegram/SourceFiles/boxes/dictionaries_manager.cpp b/Telegram/SourceFiles/boxes/dictionaries_manager.cpp
index 8881449fcb..13fddb7e2b 100644
--- a/Telegram/SourceFiles/boxes/dictionaries_manager.cpp
+++ b/Telegram/SourceFiles/boxes/dictionaries_manager.cpp
@@ -143,7 +143,7 @@ auto AddButtonWithLoader(
 
 	std::move(
 		query
-	) | rpl::start_with_next([=](auto string) {
+	) | rpl::on_next([=](auto string) {
 		wrap->toggle(
 			ranges::any_of(indexList, [&](const QString &s) {
 				return s.startsWith(string, Qt::CaseInsensitive);
@@ -198,7 +198,7 @@ auto AddButtonWithLoader(
 	};
 
 	Spellchecker::GlobalLoaderChanged(
-	) | rpl::start_with_next([=](int langId) {
+	) | rpl::on_next([=](int langId) {
 		if (!langId && rawGlobalLoaderPtr()) {
 			setGlobalLoaderPtr(nullptr);
 		} else if (langId == id) {
@@ -215,14 +215,14 @@ auto AddButtonWithLoader(
 	rpl::combine(
 		button->widthValue(),
 		label->widthValue()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		label->moveToLeft(
 			st::settingsUpdateStatePosition.x(),
 			st::settingsUpdateStatePosition.y());
 	}, label->lifetime());
 
 	buttonState->value(
-	) | rpl::start_with_next([=](const DictState &state) {
+	) | rpl::on_next([=](const DictState &state) {
 		const auto isToggledSet = v::is<Active>(state);
 		const auto toggled = isToggledSet ? 1. : 0.;
 		const auto over = !button->isDisabled()
@@ -279,7 +279,7 @@ auto AddButtonWithLoader(
 	});
 
 	button->toggledValue(
-	) | rpl::start_with_next([=](bool toggled) {
+	) | rpl::on_next([=](bool toggled) {
 		const auto &state = buttonState->current();
 		if (toggled && (v::is<Available>(state) || v::is<Failed>(state))) {
 			const auto weak = base::make_weak(button);
@@ -353,7 +353,7 @@ void Inner::setupContent(
 			ranges::contains(enabledDictionaries, id),
 			queryStream->events());
 		row->toggledValue(
-		) | rpl::start_with_next([=](auto enabled) {
+		) | rpl::on_next([=](auto enabled) {
 			if (enabled) {
 				_enabledRows.push_back(id);
 			} else {
@@ -420,7 +420,7 @@ void ManageDictionariesBox::prepare() {
 	});
 	addButton(tr::lng_close(), [=] { closeBox(); });
 
-	boxClosing() | rpl::start_with_next([=] {
+	boxClosing() | rpl::on_next([=] {
 		Core::App().settings().setDictionariesEnabled(
 			FilterEnabledDict(initialEnabledRows));
 		Core::App().saveSettingsDelayed();
@@ -434,7 +434,7 @@ void ManageDictionariesBox::prepare() {
 		inner->heightValue(),
 		multiSelect->heightValue(),
 		_1 + _2
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		using std::min;
 		accumulate_max(*max, height);
 		setDimensions(st::boxWidth, min(*max, st::boxMaxListHeight), true);
diff --git a/Telegram/SourceFiles/boxes/edit_caption_box.cpp b/Telegram/SourceFiles/boxes/edit_caption_box.cpp
index 24c3ab7d3a..cf4ae2ddcb 100644
--- a/Telegram/SourceFiles/boxes/edit_caption_box.cpp
+++ b/Telegram/SourceFiles/boxes/edit_caption_box.cpp
@@ -262,7 +262,7 @@ EditCaptionBox::EditCaptionBox(
 
 	_controller->session().data().itemRemoved(
 		_historyItem->fullId()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		closeBox();
 	}, lifetime());
 }
@@ -490,7 +490,7 @@ void EditCaptionBox::rebuildPreview() {
 		const auto withCheckbox = _isPhoto && CanBeCompressed(_albumType);
 		if (media && (!withCheckbox || !_asFile)) {
 			media->spoileredChanges(
-			) | rpl::start_with_next([=](bool spoilered) {
+			) | rpl::on_next([=](bool spoilered) {
 				_mediaEditManager.apply({ .type = spoilered
 					? SendMenu::ActionType::SpoilerOn
 					: SendMenu::ActionType::SpoilerOff
@@ -512,7 +512,7 @@ void EditCaptionBox::rebuildPreview() {
 		_footerHeight.value(),
 		rpl::single(st::boxPhotoPadding.top()),
 		rpl::mappers::_1 + rpl::mappers::_2 + rpl::mappers::_3
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		setDimensions(
 			st::boxWideWidth,
 			std::min(st::sendMediaPreviewHeightMax, height),
@@ -525,11 +525,11 @@ void EditCaptionBox::rebuildPreview() {
 	_content->modifyRequests(
 	) | rpl::start_to_stream(_photoEditorOpens, _content->lifetime());
 
-	_content->editCoverRequests() | rpl::start_with_next([=] {
+	_content->editCoverRequests() | rpl::on_next([=] {
 		setupEditCoverHandler();
 	}, _content->lifetime());
 
-	_content->clearCoverRequests() | rpl::start_with_next([=] {
+	_content->clearCoverRequests() | rpl::on_next([=] {
 		setupClearCoverHandler();
 	}, _content->lifetime());
 
@@ -566,13 +566,13 @@ void EditCaptionBox::setupField() {
 	_field->setMaxHeight(st::defaultComposeFiles.caption.heightMax);
 
 	_field->submits(
-	) | rpl::start_with_next([=] { save(); }, _field->lifetime());
+	) | rpl::on_next([=] { save(); }, _field->lifetime());
 	_field->cancelled(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		closeBox();
 	}, _field->lifetime());
 	_field->heightChanges(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		captionResized();
 	}, _field->lifetime());
 	_field->setMimeDataHook([=](
@@ -656,7 +656,7 @@ void EditCaptionBox::setInitialText() {
 		}
 	});
 	_field->changes(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_checkChangedTimer.callOnce(kChangesDebounceTimeout);
 		setCloseByOutsideClick(false);
 	}, _field->lifetime());
@@ -696,7 +696,7 @@ void EditCaptionBox::setupControls() {
 		}),
 		anim::type::instant
 	)->entity()->checkedChanges(
-	) | rpl::start_with_next([&](bool checked) {
+	) | rpl::on_next([&](bool checked) {
 		applyChanges();
 		_asFile = !checked;
 		rebuildPreview();
@@ -707,7 +707,7 @@ void EditCaptionBox::setupControls() {
 
 void EditCaptionBox::setupEditEventHandler() {
 	_editMediaClicks.events(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		ChooseReplacement(_controller, _albumType, crl::guard(this, [=](
 				Ui::PreparedList &&list) {
 			setPreparedList(std::move(list));
@@ -718,7 +718,7 @@ void EditCaptionBox::setupEditEventHandler() {
 void EditCaptionBox::setupPhotoEditorEventHandler() {
 	const auto openedOnce = lifetime().make_state<bool>(false);
 	_photoEditorOpens.events(
-	) | rpl::start_with_next([=, controller = _controller] {
+	) | rpl::on_next([=, controller = _controller] {
 		if (_preparedList.files.empty()
 			&& (!_photoMedia
 				|| !_photoMedia->image(Data::PhotoSize::Large))) {
@@ -880,11 +880,11 @@ void EditCaptionBox::setupEmojiPanel() {
 	_emojiPanel->hide();
 	_emojiPanel->selector()->setCurrentPeer(_historyItem->history()->peer);
 	_emojiPanel->selector()->emojiChosen(
-	) | rpl::start_with_next([=](ChatHelpers::EmojiChosen data) {
+	) | rpl::on_next([=](ChatHelpers::EmojiChosen data) {
 		Ui::InsertEmojiAtCursor(_field->textCursor(), data.emoji);
 	}, lifetime());
 	_emojiPanel->selector()->customEmojiChosen(
-	) | rpl::start_with_next([=](ChatHelpers::FileChosen data) {
+	) | rpl::on_next([=](ChatHelpers::FileChosen data) {
 		const auto info = data.document->sticker();
 		if (info
 			&& info->setType == Data::StickersType::Emoji
diff --git a/Telegram/SourceFiles/boxes/edit_privacy_box.cpp b/Telegram/SourceFiles/boxes/edit_privacy_box.cpp
index 8b004eb6d0..0d88dae9dc 100644
--- a/Telegram/SourceFiles/boxes/edit_privacy_box.cpp
+++ b/Telegram/SourceFiles/boxes/edit_privacy_box.cpp
@@ -111,11 +111,11 @@ void CreateRadiobuttonLock(
 	lock->resize(st::defaultRadio.diameter, st::defaultRadio.diameter);
 
 	widget->sizeValue(
-	) | rpl::start_with_next([=, &st](QSize size) {
+	) | rpl::on_next([=, &st](QSize size) {
 		lock->move(st.checkPosition);
 	}, lock->lifetime());
 
-	lock->paintRequest() | rpl::start_with_next([=] {
+	lock->paintRequest() | rpl::on_next([=] {
 		auto p = QPainter(lock);
 		auto hq = PainterHighQualityEnabler(p);
 		const auto &icon = st::messagePrivacyLock;
@@ -138,7 +138,7 @@ void AddPremiumRequiredRow(
 	const auto row = Ui::CreateChild<Ui::AbstractButton>(widget.get());
 
 	widget->sizeValue(
-	) | rpl::start_with_next([=](const QSize &s) {
+	) | rpl::on_next([=](const QSize &s) {
 		row->resize(s);
 	}, row->lifetime());
 	row->setClickedCallback(std::move(clickedCallback));
@@ -147,7 +147,7 @@ void AddPremiumRequiredRow(
 
 	Data::AmPremiumValue(
 		session
-	) | rpl::start_with_next([=](bool premium) {
+	) | rpl::on_next([=](bool premium) {
 		row->setVisible(!premium);
 		if (!premium) {
 			setDefaultOption();
@@ -382,7 +382,7 @@ auto PrivacyExceptionsBoxController::prepareSpecialRowList(
 		tr::lng_edit_privacy_users_and_groups()));
 
 	controller->specialChanges(
-	) | rpl::start_with_next([=](bool chosen) {
+	) | rpl::on_next([=](bool chosen) {
 		if (type == SpecialRowType::Premiums) {
 			_selected.premiums = chosen;
 		} else {
@@ -391,7 +391,7 @@ auto PrivacyExceptionsBoxController::prepareSpecialRowList(
 	}, lifetime);
 
 	controller->rowSelectionChanges(
-	) | rpl::start_with_next([=](RowSelectionChange update) {
+	) | rpl::on_next([=](RowSelectionChange update) {
 		this->delegate()->peerListSetForeignRowChecked(
 			update.row,
 			update.checked,
@@ -543,7 +543,7 @@ auto PrivacyExceptionsBoxController::createRow(not_null<History*> history)
 		updateByValue(value);
 		valueFinished(value);
 	};
-	style::PaletteChanged() | rpl::start_with_next([=] {
+	style::PaletteChanged() | rpl::on_next([=] {
 		min->setTextColorOverride(st::windowSubTextFg->c);
 		max->setTextColorOverride(st::windowSubTextFg->c);
 	}, raw->lifetime());
@@ -559,7 +559,7 @@ auto PrivacyExceptionsBoxController::createRow(not_null<History*> history)
 		state->indexMin);
 	slider->resize(slider->width(), sliderStyle->seekSize.height());
 
-	raw->widthValue() | rpl::start_with_next([=](int width) {
+	raw->widthValue() | rpl::on_next([=](int width) {
 		labels->resizeToWidth(width);
 		updateByIndex();
 	}, slider->lifetime());
@@ -939,7 +939,7 @@ void EditPrivacyBox::setupContent() {
 		+ st::settingsButtonNoIcon.padding.bottom();
 
 	widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		content->resizeToWidth(width);
 	}, content->lifetime());
 
@@ -947,7 +947,7 @@ void EditPrivacyBox::setupContent() {
 	) | rpl::map([=](int height) {
 		return height - always->height() - never->height() + 2 * linkHeight;
 	}) | rpl::distinct_until_changed(
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		setDimensions(st::boxWideWidth, height);
 	}, content->lifetime());
 }
@@ -1076,7 +1076,7 @@ void EditMessagesPrivacyBox(
 				key
 			) | rpl::take(
 				1
-			) | rpl::start_with_next([=](const Api::UserPrivacy::Rule &value) {
+			) | rpl::on_next([=](const Api::UserPrivacy::Rule &value) {
 				EditNoPaidMessagesExceptions(controller, value);
 			});
 		});
@@ -1233,7 +1233,7 @@ rpl::producer<int> SetupChargeSlider(
 
 	const auto details = container->add(
 		object_ptr<Ui::VerticalLayout>(container));
-	state->stars.value() | rpl::start_with_next([=](int stars) {
+	state->stars.value() | rpl::on_next([=](int stars) {
 		while (details->count()) {
 			delete details->widgetAt(0);
 		}
@@ -1313,7 +1313,7 @@ void EditDirectMessagesPriceBox(
 		savedValue,
 		channel->session().appConfig().paidMessageChannelStarsDefault(),
 		true
-	) | rpl::start_with_next([=](int stars) {
+	) | rpl::on_next([=](int stars) {
 		*result = stars;
 	}, box->lifetime());
 
@@ -1358,7 +1358,7 @@ void EditDirectMessagesPriceBox(
 			label->take(),
 			st::inviteLinkFieldPadding);
 
-		label->clicks() | rpl::start_with_next(copyLink, label->lifetime());
+		label->clicks() | rpl::on_next(copyLink, label->lifetime());
 
 		Ui::AddSkip(inner);
 
diff --git a/Telegram/SourceFiles/boxes/edit_todo_list_box.cpp b/Telegram/SourceFiles/boxes/edit_todo_list_box.cpp
index 886566bba6..acf1f03859 100644
--- a/Telegram/SourceFiles/boxes/edit_todo_list_box.cpp
+++ b/Telegram/SourceFiles/boxes/edit_todo_list_box.cpp
@@ -227,7 +227,7 @@ not_null<Ui::FlatLabel*> CreateWarningLabel(
 		st::createPollWarning);
 	result->setAttribute(Qt::WA_TransparentForMouseEvents);
 	field->changes(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		Ui::PostponeCall(crl::guard(field, [=] {
 			const auto length = field->getLastText().size();
 			const auto value = valueLimit - length;
@@ -310,12 +310,12 @@ Tasks::Task::Task(
 	_wrap->hide(anim::type::instant);
 
 	_content->widthValue(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateFieldGeometry();
 	}, _field->lifetime());
 
 	_field->heightValue(
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		_content->resize(_content->width(), height);
 	}, _field->lifetime());
 
@@ -340,7 +340,7 @@ void Tasks::Task::createShadow() {
 	_shadow.reset(Ui::CreateChild<Ui::PlainShadow>(field().get()));
 	_shadow->show();
 	field()->sizeValue(
-	) | rpl::start_with_next([=](QSize size) {
+	) | rpl::on_next([=](QSize size) {
 		const auto left = st::createPollFieldPadding.left();
 		_shadow->setGeometry(
 			left,
@@ -369,7 +369,7 @@ void Tasks::Task::createRemove() {
 	_removeAlways = lifetime.make_state<rpl::variable<bool>>(false);
 
 	field->changes(
-	) | rpl::start_with_next([field, toggle] {
+	) | rpl::on_next([field, toggle] {
 		// Don't capture 'this'! Because Option is a value type.
 		*toggle = !field->getLastText().isEmpty();
 	}, field->lifetime());
@@ -378,13 +378,13 @@ void Tasks::Task::createRemove() {
 		toggle->value(),
 		_removeAlways->value(),
 		_1 || _2
-	) | rpl::start_with_next([=](bool shown) {
+	) | rpl::on_next([=](bool shown) {
 		remove->toggle(shown, anim::type::normal);
 	}, remove->lifetime());
 #endif
 
 	field->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		remove->moveToRight(
 			st::createPollOptionRemovePosition.x(),
 			st::createPollOptionRemovePosition.y(),
@@ -406,7 +406,7 @@ void Tasks::Task::createWarning() {
 	rpl::combine(
 		field->sizeValue(),
 		warning->sizeValue()
-	) | rpl::start_with_next([=](QSize size, QSize label) {
+	) | rpl::on_next([=](QSize size, QSize label) {
 		warning->moveToLeft(
 			(size.width()
 				- label.width()
@@ -717,19 +717,19 @@ void Tasks::initTaskField(not_null<Task*> task, TextWithEntities text) {
 			QPoint(
 				-st::createPollOptionFieldPremium.textMargins.right(),
 				st::createPollOptionEmojiPositionSkip));
-		emojiToggle->shownValue() | rpl::start_with_next([=](bool shown) {
+		emojiToggle->shownValue() | rpl::on_next([=](bool shown) {
 			if (!shown) {
 				return;
 			}
 			_emojiPanelLifetime.destroy();
 			emojiPanel->selector()->emojiChosen(
-			) | rpl::start_with_next([=](ChatHelpers::EmojiChosen data) {
+			) | rpl::on_next([=](ChatHelpers::EmojiChosen data) {
 				if (field->hasFocus()) {
 					Ui::InsertEmojiAtCursor(field->textCursor(), data.emoji);
 				}
 			}, _emojiPanelLifetime);
 			emojiPanel->selector()->customEmojiChosen(
-			) | rpl::start_with_next([=](ChatHelpers::FileChosen data) {
+			) | rpl::on_next([=](ChatHelpers::FileChosen data) {
 				if (field->hasFocus()) {
 					Data::InsertCustomEmoji(field, data.document);
 				}
@@ -741,14 +741,14 @@ void Tasks::initTaskField(not_null<Task*> task, TextWithEntities text) {
 		TextUtilities::ConvertEntitiesToTextTags(text.entities)
 	});
 	field->submits(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto index = findField(field);
 		if (_list[index]->isGood() && index + 1 < _list.size()) {
 			_list[index + 1]->setFocus();
 		}
 	}, field->lifetime());
 	field->changes(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto list = ParsePastedList(field->getLastText());
 		if (!list.empty()) {
 			field->setText(list.front());
@@ -762,11 +762,11 @@ void Tasks::initTaskField(not_null<Task*> task, TextWithEntities text) {
 		}));
 	}, field->lifetime());
 	field->focusedChanges(
-	) | rpl::filter(rpl::mappers::_1) | rpl::start_with_next([=] {
+	) | rpl::filter(rpl::mappers::_1) | rpl::on_next([=] {
 		_scrollToWidget.fire_copy(field);
 	}, field->lifetime());
 	field->tabbed(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto index = findField(field);
 		if (index + 1 < _list.size()) {
 			_list[index + 1]->setFocus();
@@ -794,7 +794,7 @@ void Tasks::initTaskField(not_null<Task*> task, TextWithEntities text) {
 	});
 
 	task->removeClicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		Ui::PostponeCall(crl::guard(field, [=] {
 			Expects(!_list.empty());
 
@@ -895,7 +895,7 @@ EditTodoListBox::EditTodoListBox(
 , _titleLimit(controller->session().appConfig().todoListTitleLimit()) {
 	_controller->session().changes().messageUpdates(
 		Data::MessageUpdate::Flag::Destroyed
-	) | rpl::start_with_next([=](const Data::MessageUpdate &update) {
+	) | rpl::on_next([=](const Data::MessageUpdate &update) {
 		if (update.item == item) {
 			closeBox();
 		}
@@ -946,13 +946,13 @@ not_null<Ui::InputField*> EditTodoListBox::setupTitle(
 			_emojiPanel.get(),
 			st::createPollOptionFieldPremiumEmojiPosition);
 		_emojiPanel->selector()->emojiChosen(
-		) | rpl::start_with_next([=](ChatHelpers::EmojiChosen data) {
+		) | rpl::on_next([=](ChatHelpers::EmojiChosen data) {
 			if (title->hasFocus()) {
 				Ui::InsertEmojiAtCursor(title->textCursor(), data.emoji);
 			}
 		}, emojiToggle->lifetime());
 		_emojiPanel->selector()->customEmojiChosen(
-		) | rpl::start_with_next([=](ChatHelpers::FileChosen data) {
+		) | rpl::on_next([=](ChatHelpers::FileChosen data) {
 			if (title->hasFocus()) {
 				Data::InsertCustomEmoji(title, data.document);
 			}
@@ -976,7 +976,7 @@ not_null<Ui::InputField*> EditTodoListBox::setupTitle(
 	rpl::combine(
 		title->geometryValue(),
 		warning->sizeValue()
-	) | rpl::start_with_next([=](QRect geometry, QSize label) {
+	) | rpl::on_next([=](QRect geometry, QSize label) {
 		warning->moveToLeft(
 			(container->width()
 				- label.width()
@@ -1044,7 +1044,7 @@ object_ptr<Ui::RpWidget> EditTodoListBox::setupContent() {
 			st::createPollLimitPadding));
 
 	title->tabbed(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		tasks->focusFirst();
 	}, title->lifetime());
 
@@ -1067,7 +1067,7 @@ object_ptr<Ui::RpWidget> EditTodoListBox::setupContent() {
 		st::createPollCheckboxMargin);
 
 	tasks->tabbed(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		title->setFocus();
 	}, title->lifetime());
 
@@ -1076,7 +1076,7 @@ object_ptr<Ui::RpWidget> EditTodoListBox::setupContent() {
 		return !text.isEmpty() && (text.size() <= _titleLimit);
 	};
 	title->submits(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (isValidTitle()) {
 			tasks->focusFirst();
 		}
@@ -1146,12 +1146,12 @@ object_ptr<Ui::RpWidget> EditTodoListBox::setupContent() {
 		crl::guard(this, send));
 
 	tasks->scrollToWidget(
-	) | rpl::start_with_next([=](not_null<QWidget*> widget) {
+	) | rpl::on_next([=](not_null<QWidget*> widget) {
 		scrollToWidget(widget);
 	}, lifetime());
 
 	tasks->backspaceInFront(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		FocusAtEnd(title);
 	}, lifetime());
 
@@ -1201,7 +1201,7 @@ AddTodoListTasksBox::AddTodoListTasksBox(
 , _item(item) {
 	_controller->session().changes().messageUpdates(
 		Data::MessageUpdate::Flag::Destroyed
-	) | rpl::start_with_next([=](const Data::MessageUpdate &update) {
+	) | rpl::on_next([=](const Data::MessageUpdate &update) {
 		if (update.item == item) {
 			closeBox();
 		}
@@ -1266,7 +1266,7 @@ object_ptr<Ui::RpWidget> AddTodoListTasksBox::setupContent() {
 	};
 
 	tasks->scrollToWidget(
-	) | rpl::start_with_next([=](not_null<QWidget*> widget) {
+	) | rpl::on_next([=](not_null<QWidget*> widget) {
 		scrollToWidget(widget);
 	}, lifetime());
 
diff --git a/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp b/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp
index 248c170af6..34d4c04408 100644
--- a/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp
+++ b/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp
@@ -94,7 +94,7 @@ not_null<FilterChatsPreview*> SetupChatsPreview(
 		(rules.*peers)()));
 
 	preview->flagRemoved(
-	) | rpl::start_with_next([=](Flag flag) {
+	) | rpl::on_next([=](Flag flag) {
 		const auto rules = data->current();
 		auto computed = Data::ChatFilter(
 			rules.id(),
@@ -110,7 +110,7 @@ not_null<FilterChatsPreview*> SetupChatsPreview(
 	}, preview->lifetime());
 
 	preview->peerRemoved(
-	) | rpl::start_with_next([=](not_null<History*> history) {
+	) | rpl::on_next([=](not_null<History*> history) {
 		const auto rules = data->current();
 		auto always = rules.always();
 		auto pinned = rules.pinned();
@@ -220,13 +220,13 @@ void CreateIconSelector(
 	data->value(
 	) | rpl::map([=](const Data::ChatFilter &filter) {
 		return Ui::ComputeFilterIcon(filter);
-	}) | rpl::start_with_next([=](Ui::FilterIcon icon) {
+	}) | rpl::on_next([=](Ui::FilterIcon icon) {
 		*type = icon;
 		toggle->update();
 	}, toggle->lifetime());
 
 	input->geometryValue(
-	) | rpl::start_with_next([=](QRect geometry) {
+	) | rpl::on_next([=](QRect geometry) {
 		const auto left = geometry.x() + geometry.width() - toggle->width();
 		const auto position = st::windowFilterIconTogglePosition;
 		toggle->move(
@@ -235,7 +235,7 @@ void CreateIconSelector(
 	}, toggle->lifetime());
 
 	toggle->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(toggle);
 		const auto icons = Ui::LookupFilterIcon(*type);
 		icons.normal->paintInCenter(
@@ -253,7 +253,7 @@ void CreateIconSelector(
 	panel->chosen(
 	) | rpl::filter([=](Ui::FilterIcon icon) {
 		return icon != Ui::ComputeFilterIcon(data->current());
-	}) | rpl::start_with_next([=](Ui::FilterIcon icon) {
+	}) | rpl::on_next([=](Ui::FilterIcon icon) {
 		panel->hideAnimated();
 		const auto rules = data->current();
 		*data = Data::ChatFilter(
@@ -382,7 +382,7 @@ void EditFilterBox(
 	});
 	state->hasLinks.value() | rpl::filter(
 		_1
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		state->chatlist = true;
 	}, box->lifetime());
 
@@ -391,7 +391,7 @@ void EditFilterBox(
 	owner->chatsFilters().isChatlistChanged(
 	) | rpl::filter([=](FilterId id) {
 		return (id == data->current().id());
-	}) | rpl::start_with_next([=](FilterId id) {
+	}) | rpl::on_next([=](FilterId id) {
 		const auto filters = &owner->chatsFilters();
 		const auto &list = filters->list();
 		const auto i = ranges::find(list, id, &Data::ChatFilter::id);
@@ -414,7 +414,7 @@ void EditFilterBox(
 	const auto session = &window->session();
 	Data::AmPremiumValue(
 		session
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		box->closeBox();
 	}, box->lifetime());
 
@@ -458,7 +458,7 @@ void EditFilterBox(
 	staticTitle->setClickedCallback([=] {
 		state->staticTitle = !state->staticTitle.current();
 	});
-	state->staticTitle.value() | rpl::start_with_next([=](bool value) {
+	state->staticTitle.value() | rpl::on_next([=](bool value) {
 		staticTitle->setText(value
 			? tr::lng_filters_enable_animations(tr::now)
 			: tr::lng_filters_disable_animations(tr::now));
@@ -480,7 +480,7 @@ void EditFilterBox(
 	rpl::combine(
 		staticTitle->widthValue(),
 		name->widthValue()
-	) | rpl::start_with_next([=](int inner, int outer) {
+	) | rpl::on_next([=](int inner, int outer) {
 		staticTitle->moveToRight(
 			st::windowFilterStaticTitlePosition.x(),
 			st::windowFilterStaticTitlePosition.y(),
@@ -488,7 +488,7 @@ void EditFilterBox(
 	}, staticTitle->lifetime());
 
 	state->creating.value(
-	) | rpl::filter(!_1) | rpl::start_with_next([=] {
+	) | rpl::filter(!_1) | rpl::on_next([=] {
 		nameEditing->custom = true;
 	}, box->lifetime());
 
@@ -508,11 +508,11 @@ void EditFilterBox(
 	state->emojiPanel->hide();
 	state->emojiPanel->selector()->setCurrentPeer(window->session().user());
 	state->emojiPanel->selector()->emojiChosen(
-	) | rpl::start_with_next([=](ChatHelpers::EmojiChosen data) {
+	) | rpl::on_next([=](ChatHelpers::EmojiChosen data) {
 		Ui::InsertEmojiAtCursor(name->textCursor(), data.emoji);
 	}, name->lifetime());
 	state->emojiPanel->selector()->customEmojiChosen(
-	) | rpl::start_with_next([=](ChatHelpers::FileChosen data) {
+	) | rpl::on_next([=](ChatHelpers::FileChosen data) {
 		const auto info = data.document->sticker();
 		if (info
 			&& info->setType == Data::StickersType::Emoji
@@ -534,7 +534,7 @@ void EditFilterBox(
 	emojiButton->show();
 
 	name->changes(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (!nameEditing->settingDefault) {
 			nameEditing->custom = true;
 		}
@@ -558,7 +558,7 @@ void EditFilterBox(
 	};
 
 	state->title.value(
-	) | rpl::start_with_next([=](const TextWithEntities &value) {
+	) | rpl::on_next([=](const TextWithEntities &value) {
 		staticTitle->setVisible(!value.entities.isEmpty());
 	}, staticTitle->lifetime());
 
@@ -666,7 +666,7 @@ void EditFilterBox(
 		rpl::combine(
 			title->sizeValue(),
 			titleWrap->widthValue()
-		) | rpl::start_with_next([=](const QSize &s, int w) {
+		) | rpl::on_next([=](const QSize &s, int w) {
 			const auto h = st::normalFont->height;
 			const auto left = padding.left()
 				+ s.width()
@@ -687,7 +687,7 @@ void EditFilterBox(
 		const auto tag = preview->lifetime().make_state<TagState>();
 		tag->context.textContext = Core::TextContext({ .session = session });
 		const auto shift = st::settingsFilterTagPreviewSkip / 2;
-		preview->paintRequest() | rpl::start_with_next([=] {
+		preview->paintRequest() | rpl::on_next([=] {
 			auto p = QPainter(preview);
 			p.setOpacity(tag->alpha);
 			const auto size = tag->frame.size() / style::DevicePixelRatio();
@@ -725,7 +725,7 @@ void EditFilterBox(
 			return value;
 		};
 		state->title.changes(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			tag->context.color = palette(state->colorIndex.current())->c;
 			tag->frame = Ui::ChatsFilterTag(
 				upperTitle(),
@@ -785,7 +785,7 @@ void EditFilterBox(
 				});
 			}
 		}
-		line->sizeValue() | rpl::start_with_next([=](const QSize &size) {
+		line->sizeValue() | rpl::on_next([=](const QSize &size) {
 			const auto totalWidth = buttons.size() * side;
 			const auto spacing = (size.width() - totalWidth)
 				/ (buttons.size() - 1);
@@ -799,7 +799,7 @@ void EditFilterBox(
 			const auto last = buttons.back();
 			const auto icon = Ui::CreateChild<Ui::RpWidget>(last);
 			icon->resize(side, side);
-			icon->paintRequest() | rpl::start_with_next([=] {
+			icon->paintRequest() | rpl::on_next([=] {
 				auto p = QPainter(icon);
 				(session->premium()
 					? st::windowFilterSmallRemove.icon
@@ -853,7 +853,7 @@ void EditFilterBox(
 			tr::lng_filters_link_has(),
 			tr::lng_filters_link()));
 
-	state->hasLinks.changes() | rpl::start_with_next([=] {
+	state->hasLinks.changes() | rpl::on_next([=] {
 		content->resizeToWidth(content->widthNoMargins());
 	}, content->lifetime());
 
@@ -886,7 +886,7 @@ void EditFilterBox(
 		addLink->clicks()
 	) | rpl::filter(
 		(rpl::mappers::_1 == Qt::LeftButton)
-	) | rpl::start_with_next([=](Qt::MouseButton button) {
+	) | rpl::on_next([=](Qt::MouseButton button) {
 		const auto result = collect();
 		if (!result || !GoodForExportFilterLink(window, *result)) {
 			return;
diff --git a/Telegram/SourceFiles/boxes/filters/edit_filter_chats_list.cpp b/Telegram/SourceFiles/boxes/filters/edit_filter_chats_list.cpp
index a200bcecb6..0b3c2fe73c 100644
--- a/Telegram/SourceFiles/boxes/filters/edit_filter_chats_list.cpp
+++ b/Telegram/SourceFiles/boxes/filters/edit_filter_chats_list.cpp
@@ -384,7 +384,7 @@ object_ptr<Ui::RpWidget> CreatePeerListSectionSubtitle(
 
 	const auto raw = result.data();
 	raw->paintRequest(
-	) | rpl::start_with_next([=](QRect clip) {
+	) | rpl::on_next([=](QRect clip) {
 		auto p = QPainter(raw);
 		p.fillRect(clip, st::searchedBarBg);
 	}, raw->lifetime());
@@ -394,7 +394,7 @@ object_ptr<Ui::RpWidget> CreatePeerListSectionSubtitle(
 		std::move(text),
 		st::windowFilterChatsSectionSubtitle);
 	raw->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		const auto padding = st::windowFilterChatsSectionSubtitlePadding;
 		const auto available = width - padding.left() - padding.right();
 		label->resizeToNaturalWidth(available);
@@ -533,12 +533,12 @@ object_ptr<Ui::RpWidget> EditFilterChatsListController::prepareTypesList() {
 		tr::lng_filters_edit_chats()));
 
 	controller->selectedChanges(
-	) | rpl::start_with_next([=](Flags selected) {
+	) | rpl::on_next([=](Flags selected) {
 		_selected = selected;
 	}, _lifetime);
 
 	controller->rowSelectionChanges(
-	) | rpl::start_with_next([=](RowSelectionChange update) {
+	) | rpl::on_next([=](RowSelectionChange update) {
 		this->delegate()->peerListSetForeignRowChecked(
 			update.row,
 			update.checked,
diff --git a/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp b/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp
index d420be8351..6a583d8b8c 100644
--- a/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp
+++ b/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp
@@ -531,7 +531,7 @@ void LinkController::addHeader(not_null<Ui::VerticalLayout*> container) {
 		},
 		st::settingsFilterIconPadding);
 	_showFinished.events(
-	) | rpl::start_with_next([animate = std::move(icon.animate)] {
+	) | rpl::on_next([animate = std::move(icon.animate)] {
 		animate(anim::repeat::once);
 	}, verticalLayout->lifetime());
 	verticalLayout->add(std::move(icon.widget));
@@ -558,7 +558,7 @@ void LinkController::addHeader(not_null<Ui::VerticalLayout*> container) {
 		style::al_top)->setTryMakeSimilarLines(true);
 
 	verticalLayout->geometryValue(
-	) | rpl::start_with_next([=](const QRect &r) {
+	) | rpl::on_next([=](const QRect &r) {
 		divider->setGeometry(r);
 	}, divider->lifetime());
 }
@@ -647,7 +647,7 @@ void LinkController::addLinkBlock(not_null<Ui::VerticalLayout*> container) {
 		st::inviteLinkFieldPadding);
 
 	label->clicks(
-	) | rpl::start_with_next(copyLink, label->lifetime());
+	) | rpl::on_next(copyLink, label->lifetime());
 
 	AddCopyShareLinkButtons(container, copyLink, shareLink);
 
@@ -785,7 +785,7 @@ void LinkController::setupAboveWidget() {
 		[=](bool select) { toggleAllSelected(select); });
 
 	// Fix label cutting on text change from smaller to longer.
-	_selected.changes() | rpl::start_with_next([=] {
+	_selected.changes() | rpl::on_next([=] {
 		container->resizeToWidth(container->widthNoMargins());
 	}, container->lifetime());
 
@@ -825,7 +825,7 @@ LinksController::LinksController(
 , _currentFilter(std::move(currentFilter))
 , _rows(std::move(content)) {
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		for (auto &image : _icons) {
 			image = QImage();
 		}
@@ -834,7 +834,7 @@ LinksController::LinksController(
 
 void LinksController::prepare() {
 	_rows.value(
-	) | rpl::start_with_next([=](const std::vector<InviteLinkData> &rows) {
+	) | rpl::on_next([=](const std::vector<InviteLinkData> &rows) {
 		rebuild(rows);
 	}, _lifetime);
 }
@@ -1078,7 +1078,7 @@ object_ptr<Ui::BoxContent> ShowLinkBox(
 
 		const auto saving = std::make_shared<bool>(false);
 		raw->hasChangesValue(
-		) | rpl::start_with_next([=](bool has) {
+		) | rpl::on_next([=](bool has) {
 			box->setCloseByOutsideClick(!has);
 			box->setCloseByEscape(!has);
 			box->clearButtons();
@@ -1182,7 +1182,7 @@ void AddFilterSubtitleWithToggles(
 	const auto canSelect = link->lifetime().make_state<rpl::variable<bool>>(
 		std::move(selectedCount) | rpl::map(_1 < selectableCount));
 	canSelect->value(
-	) | rpl::start_with_next([=](bool can) {
+	) | rpl::on_next([=](bool can) {
 		link->setText(can
 			? tr::lng_filters_by_link_select(tr::now)
 			: tr::lng_filters_by_link_deselect(tr::now));
@@ -1195,7 +1195,7 @@ void AddFilterSubtitleWithToggles(
 		container->widthValue(),
 		title->topValue(),
 		link->widthValue()
-	) | rpl::start_with_next([=](int outer, int y, int width) {
+	) | rpl::on_next([=](int outer, int y, int width) {
 		link->move(outer - st::boxRowPadding.right() - width, y);
 	}, link->lifetime());
 }
diff --git a/Telegram/SourceFiles/boxes/gift_premium_box.cpp b/Telegram/SourceFiles/boxes/gift_premium_box.cpp
index 7de7888ad7..87afacfe8d 100644
--- a/Telegram/SourceFiles/boxes/gift_premium_box.cpp
+++ b/Telegram/SourceFiles/boxes/gift_premium_box.cpp
@@ -151,7 +151,7 @@ using Ui::TableRowTooltipData;
 	auto result = object_ptr<Ui::RpWidget>(parent);
 	const auto raw = result.data();
 
-	raw->paintRequest() | rpl::start_with_next([=] {
+	raw->paintRequest() | rpl::on_next([=] {
 		auto p = QPainter(raw);
 		const auto &icon = st::giveawayGiftCodeLinkCopy;
 		const auto left = (raw->width() - icon.width()) / 2;
@@ -640,7 +640,7 @@ void GiftCodeBox(
 		box->closeBox();
 	});
 	box->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		close->moveToRight(0, 0);
 	}, box->lifetime());
 
@@ -727,7 +727,7 @@ void GiftCodePendingBox(
 			spoiler->update();
 		})->start();
 		linkLabel->sizeValue(
-		) | rpl::start_with_next([=](const QSize &s) {
+		) | rpl::on_next([=](const QSize &s) {
 			spoiler->setGeometry(Rect(s));
 		}, spoiler->lifetime());
 		const auto spoilerCached = Ui::SpoilerMessCached(
@@ -735,7 +735,7 @@ void GiftCodePendingBox(
 			st::giveawayGiftCodeLink.textFg->c);
 		const auto textHeight = st::giveawayGiftCodeLink.style.font->height;
 		spoiler->paintRequest(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			auto p = QPainter(spoiler);
 			const auto rect = spoiler->rect();
 			const auto r = rect
@@ -769,7 +769,7 @@ void GiftCodePendingBox(
 	const auto closeCallback = [=] { box->closeBox(); };
 	close->setClickedCallback(closeCallback);
 	box->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		close->moveToRight(0, 0);
 	}, box->lifetime());
 
@@ -862,7 +862,7 @@ void GiveawayInfoBox(
 				std::move(label),
 				QMargins(0, skip, 0, skip)),
 			style::al_justify);
-		result->paintRequest() | rpl::start_with_next([=] {
+		result->paintRequest() | rpl::on_next([=] {
 			auto p = QPainter(result);
 			p.setPen(Qt::NoPen);
 			p.setBrush(st::boxDividerBg);
@@ -1059,7 +1059,7 @@ void GiveawayInfoBox(
 		const auto bg = wrap->lifetime().make_state<Ui::RoundRect>(
 			st::boxRadius,
 			st::attentionBoxButton.textBgOver);
-		wrap->paintRequest() | rpl::start_with_next([=] {
+		wrap->paintRequest() | rpl::on_next([=] {
 			auto p = QPainter(wrap);
 			bg->paint(p, wrap->rect());
 		}, wrap->lifetime());
@@ -1141,7 +1141,7 @@ struct AddedUniqueDetails {
 	const auto icon = Ui::CreateChild<Ui::IconButton>(
 		raw,
 		st::giveawayGiftMessageRemove);
-	raw->widthValue() | rpl::start_with_next([=](int outer) {
+	raw->widthValue() | rpl::on_next([=](int outer) {
 		label->resizeToWidth(outer - icon->width());
 		const auto height = std::max(label->height(), icon->height());
 
diff --git a/Telegram/SourceFiles/boxes/language_box.cpp b/Telegram/SourceFiles/boxes/language_box.cpp
index 4efbef7503..7a13939ebc 100644
--- a/Telegram/SourceFiles/boxes/language_box.cpp
+++ b/Telegram/SourceFiles/boxes/language_box.cpp
@@ -908,7 +908,7 @@ void Content::setupContent(
 			inner,
 			st::defaultBox.margin.top()));
 
-		rows->isEmpty() | rpl::start_with_next([=](bool empty) {
+		rows->isEmpty() | rpl::on_next([=](bool empty) {
 			wrap->toggle(!empty, anim::type::instant);
 		}, rows->lifetime());
 
@@ -931,7 +931,7 @@ void Content::setupContent(
 		tr::lng_languages_none(),
 		st::membersAbout);
 	empty->entity()->sizeValue(
-	) | rpl::start_with_next([=](QSize size) {
+	) | rpl::on_next([=](QSize size) {
 		label->move(
 			(size.width() - label->width()) / 2,
 			(size.height() - label->height()) / 2);
@@ -951,7 +951,7 @@ void Content::setupContent(
 			main->isEmpty(),
 			other->isEmpty(),
 			_1 || _2
-		) | rpl::start_with_next([=](bool empty) {
+		) | rpl::on_next([=](bool empty) {
 			divider->toggle(!empty, anim::type::instant);
 		}, divider->lifetime());
 
@@ -959,7 +959,7 @@ void Content::setupContent(
 			a->hasSelection(
 			) | rpl::filter(
 				_1
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				b->setSelected(-1);
 			}, a->lifetime());
 		};
@@ -1134,12 +1134,12 @@ void LanguageBox::prepare() {
 		inner->heightValue(),
 		topContainer->heightValue(),
 		_1 + _2
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		accumulate_max(*max, height);
 		setDimensions(st::boxWidth, qMin(*max, st::boxMaxListHeight));
 	}, inner->lifetime());
 	topContainer->heightValue(
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		setInnerTopSkip(height);
 	}, inner->lifetime());
 
@@ -1154,7 +1154,7 @@ void LanguageBox::prepare() {
 	});
 
 	inner->activations(
-	) | rpl::start_with_next([=](const Language &language) {
+	) | rpl::on_next([=](const Language &language) {
 		// "#custom" is applied each time it's passed to switchToLanguage().
 		// So we check that the language really has changed.
 		const auto currentId = [] {
@@ -1190,7 +1190,7 @@ void LanguageBox::setupTop(not_null<Ui::VerticalLayout*> container) {
 	translateEnabled->toggledValue(
 	) | rpl::filter([](bool checked) {
 		return (checked != Core::App().settings().translateButtonEnabled());
-	}) | rpl::start_with_next([=](bool checked) {
+	}) | rpl::on_next([=](bool checked) {
 		Core::App().settings().setTranslateButtonEnabled(checked);
 		Core::App().saveSettingsDelayed();
 	}, translateEnabled->lifetime());
@@ -1207,7 +1207,7 @@ void LanguageBox::setupTop(not_null<Ui::VerticalLayout*> container) {
 			rpl::duplicate(premium),
 			_1 && _2),
 		_translateChatTurnOff.events()));
-	std::move(premium) | rpl::start_with_next([=](bool value) {
+	std::move(premium) | rpl::on_next([=](bool value) {
 		translateChat->setToggleLocked(!value);
 	}, translateChat->lifetime());
 
@@ -1222,7 +1222,7 @@ void LanguageBox::setupTop(not_null<Ui::VerticalLayout*> container) {
 		}
 		return premium
 			&& (checked != Core::App().settings().translateChatEnabled());
-	}) | rpl::start_with_next([=](bool checked) {
+	}) | rpl::on_next([=](bool checked) {
 		Core::App().settings().setTranslateChatEnabled(checked);
 		Core::App().saveSettingsDelayed();
 	}, translateChat->lifetime());
@@ -1300,7 +1300,7 @@ base::binary_guard LanguageBox::Show(Window::SessionController *controller) {
 		manager.languageListChanged(
 		) | rpl::take(
 			1
-		) | rpl::start_with_next([=]() mutable {
+		) | rpl::on_next([=]() mutable {
 			const auto show = guard->alive();
 			if (lifetime) {
 				base::take(lifetime)->destroy();
diff --git a/Telegram/SourceFiles/boxes/local_storage_box.cpp b/Telegram/SourceFiles/boxes/local_storage_box.cpp
index ade6a4ee1c..4432a32349 100644
--- a/Telegram/SourceFiles/boxes/local_storage_box.cpp
+++ b/Telegram/SourceFiles/boxes/local_storage_box.cpp
@@ -288,7 +288,7 @@ void LocalStorageBox::Show(not_null<Window::SessionController*> controller) {
 	rpl::combine(
 		controller->session().data().cache().statsOnMain(),
 		controller->session().data().cacheBigFile().statsOnMain()
-	) | rpl::start_with_next([=](
+	) | rpl::on_next([=](
 			Database::Stats &&stats,
 			Database::Stats &&statsBig) {
 		weak->update(std::move(stats), std::move(statsBig));
@@ -379,7 +379,7 @@ void LocalStorageBox::setupControls() {
 		const auto shown = (data.count && data.totalSize) || !tag;
 		result->toggle(shown, anim::type::instant);
 		result->entity()->clearRequests(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			clearByTag(tag);
 		}, result->lifetime());
 		_rows.emplace(tag, result);
@@ -431,7 +431,7 @@ void LocalStorageBox::setupControls() {
 	);
 	container->resizeToWidth(st::boxWidth);
 	container->heightValue(
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		setDimensions(st::boxWidth, height);
 	}, container->lifetime());
 }
diff --git a/Telegram/SourceFiles/boxes/max_invite_box.cpp b/Telegram/SourceFiles/boxes/max_invite_box.cpp
index 3159285f42..6433501abc 100644
--- a/Telegram/SourceFiles/boxes/max_invite_box.cpp
+++ b/Telegram/SourceFiles/boxes/max_invite_box.cpp
@@ -77,7 +77,7 @@ void MaxInviteBox::prepare() {
 	_channel->session().changes().peerUpdates(
 		_channel,
 		Data::PeerUpdate::Flag::InviteLinks
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		rtlupdate(_invitationLink);
 	}, lifetime());
 }
diff --git a/Telegram/SourceFiles/boxes/moderate_messages_box.cpp b/Telegram/SourceFiles/boxes/moderate_messages_box.cpp
index 6ac54d7f7e..75086cad2b 100644
--- a/Telegram/SourceFiles/boxes/moderate_messages_box.cpp
+++ b/Telegram/SourceFiles/boxes/moderate_messages_box.cpp
@@ -118,7 +118,7 @@ ModerateOptions CalculateModerateOptions(const HistoryItemsList &items) {
 			const auto peer = from[state->index];
 			const auto peerId = peer->id;
 			state->apiLifetime = search->messagesFounds(
-			) | rpl::start_with_next([=](const Api::FoundMessages &found) {
+			) | rpl::on_next([=](const Api::FoundMessages &found) {
 				state->messagesCounts[peerId] = found.total;
 				state->index++;
 				repeat(repeat);
@@ -201,7 +201,7 @@ void CreateModerateMessagesBox(
 			not_null<Ui::Checkbox*> checkbox,
 			not_null<Controller*> controller,
 			Request request) {
-		confirms->events() | rpl::start_with_next([=] {
+		confirms->events() | rpl::on_next([=] {
 			if (checkbox->checked() && controller->collectRequests) {
 				sequentiallyRequest(request, controller->collectRequests());
 			}
@@ -354,7 +354,7 @@ void CreateModerateMessagesBox(
 					}
 					return float64(result);
 				})
-			) | rpl::start_with_next([=](const QString &text) {
+			) | rpl::on_next([=](const QString &text) {
 				title->setText(text);
 				title->resizeToWidth(inner->width()
 					- rect::m::sum::h(st::boxRowPadding));
@@ -432,7 +432,7 @@ void CreateModerateMessagesBox(
 				}
 				wrap->toggle(!wrap->toggled(), anim::type::normal);
 				{
-					inner->heightValue() | rpl::start_with_next([=] {
+					inner->heightValue() | rpl::on_next([=] {
 						if (!wrap->animating()) {
 							scrollLifetime->destroy();
 							Ui::PostponeCall(crl::guard(box, [=] {
@@ -458,7 +458,7 @@ void CreateModerateMessagesBox(
 						rpl::single(toggled ? emojiUp : emojiDown),
 						Ui::Text::WithEntities);
 			}) | rpl::flatten_latest(
-			) | rpl::start_with_next([=](const TextWithEntities &text) {
+			) | rpl::on_next([=](const TextWithEntities &text) {
 				raw->setMarkedText(Ui::Text::Link(text, u"internal:"_q));
 			}, label->lifetime());
 
@@ -509,7 +509,7 @@ void CreateModerateMessagesBox(
 				disabledMessages,
 				{ .isForum = peer->isForum() });
 			computeRestrictions = getRestrictions;
-			std::move(changes) | rpl::start_with_next([=] {
+			std::move(changes) | rpl::on_next([=] {
 				ban->setChecked(true);
 			}, ban->lifetime());
 			Ui::AddSkip(container);
@@ -519,7 +519,7 @@ void CreateModerateMessagesBox(
 		}
 
 		// Handle confirmation manually.
-		confirms->events() | rpl::start_with_next([=] {
+		confirms->events() | rpl::on_next([=] {
 			if (ban->checked() && controller->collectRequests) {
 				const auto kick = !wrap || !wrap->toggled();
 				const auto restrictions = computeRestrictions
diff --git a/Telegram/SourceFiles/boxes/passcode_box.cpp b/Telegram/SourceFiles/boxes/passcode_box.cpp
index a235dc2d7a..6f7a202e1c 100644
--- a/Telegram/SourceFiles/boxes/passcode_box.cpp
+++ b/Telegram/SourceFiles/boxes/passcode_box.cpp
@@ -47,7 +47,7 @@ void SetCloudPassword(
 		not_null<Ui::GenericBox*> box,
 		not_null<Main::Session*> session) {
 	session->api().cloudPassword().state(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		using namespace Settings;
 		const auto weak = base::make_weak(box);
 		if (CheckEditCloudPassword(session)) {
@@ -120,7 +120,7 @@ void StartPendingReset(
 	};
 
 	session->api().cloudPassword().resetPassword(
-	) | rpl::start_with_next_error_done([=](
+	) | rpl::on_next_error_done([=](
 			Api::CloudPassword::ResetRetryDate retryDate) {
 		constexpr auto kMinute = 60;
 		constexpr auto kHour = 3600;
@@ -309,11 +309,11 @@ void PasscodeBox::prepare() {
 	connect(_newPasscode, &Ui::MaskedInputField::changed, [=] { newChanged(); });
 	connect(_reenterPasscode, &Ui::MaskedInputField::changed, [=] { newChanged(); });
 	_passwordHint->changes(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		newChanged();
 	}, _passwordHint->lifetime());
 	_recoverEmail->changes(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (!_emailError.isEmpty()) {
 			_emailError = QString();
 			update();
@@ -325,9 +325,9 @@ void PasscodeBox::prepare() {
 	connect(_newPasscode, &Ui::MaskedInputField::submitted, fieldSubmit);
 	connect(_reenterPasscode, &Ui::MaskedInputField::submitted, fieldSubmit);
 	_passwordHint->submits(
-	) | rpl::start_with_next(fieldSubmit, _passwordHint->lifetime());
+	) | rpl::on_next(fieldSubmit, _passwordHint->lifetime());
 	_recoverEmail->submits(
-	) | rpl::start_with_next(fieldSubmit, _recoverEmail->lifetime());
+	) | rpl::on_next(fieldSubmit, _recoverEmail->lifetime());
 
 	_recover->addClickHandler([=] { recoverByEmail(); });
 
@@ -607,7 +607,7 @@ void PasscodeBox::validateEmail(
 	box->boxClosing(
 	) | rpl::filter([=] {
 		return !*set;
-	}) | start_with_next([=, weak = base::make_weak(this)] {
+	}) | on_next([=, weak = base::make_weak(this)] {
 		if (weak) {
 			weak->_clearUnconfirmedPassword.fire({});
 		}
@@ -1117,7 +1117,7 @@ void PasscodeBox::recover() {
 	) | rpl::start_to_stream(_newPasswordSet, lifetime());
 
 	box->recoveryExpired(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		recoverExpired();
 	}, lifetime());
 
@@ -1207,11 +1207,11 @@ void RecoverBox::prepare() {
 	updateHeight();
 
 	_recoverCode->changes(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		codeChanged();
 	}, _recoverCode->lifetime());
 	_recoverCode->submits(
-	) | rpl::start_with_next([=] { submit(); }, _recoverCode->lifetime());
+	) | rpl::on_next([=] { submit(); }, _recoverCode->lifetime());
 }
 
 void RecoverBox::paintEvent(QPaintEvent *e) {
@@ -1342,7 +1342,7 @@ void RecoverBox::proceedToChange(const QString &code) {
 	auto box = Box<PasscodeBox>(_session, fields);
 
 	box->boxClosing(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto weak = base::make_weak(this);
 		if (const auto onstack = _closeParent) {
 			onstack();
@@ -1353,7 +1353,7 @@ void RecoverBox::proceedToChange(const QString &code) {
 	}, lifetime());
 
 	box->newPasswordSet(
-	) | rpl::start_with_next([=](QByteArray &&password) {
+	) | rpl::on_next([=](QByteArray &&password) {
 		_newPasswordSet.fire(std::move(password));
 	}, lifetime());
 
diff --git a/Telegram/SourceFiles/boxes/peer_list_box.cpp b/Telegram/SourceFiles/boxes/peer_list_box.cpp
index 6cc1b5d05a..3f16259456 100644
--- a/Telegram/SourceFiles/boxes/peer_list_box.cpp
+++ b/Telegram/SourceFiles/boxes/peer_list_box.cpp
@@ -113,7 +113,7 @@ void PeerListBox::createMultiSelect() {
 		tr::lng_participant_filter());
 	_select.create(this, std::move(entity));
 	_select->heightValue(
-	) | rpl::start_with_next(
+	) | rpl::on_next(
 		[this] { updateScrollSkips(); },
 		lifetime());
 	_select->entity()->setSubmittedCallback([=](Qt::KeyboardModifiers) {
@@ -191,7 +191,7 @@ void PeerListBox::prepare() {
 	_controller->setDelegate(this);
 
 	_controller->boxHeightValue(
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		setDimensions(_controller->contentWidth(), height);
 	}, lifetime());
 
@@ -203,7 +203,7 @@ void PeerListBox::prepare() {
 	}
 
 	content()->scrollToRequests(
-	) | rpl::start_with_next([this](Ui::ScrollToRequest request) {
+	) | rpl::on_next([this](Ui::ScrollToRequest request) {
 		scrollToY(request.ymin, request.ymax);
 	}, lifetime());
 
@@ -1002,14 +1002,14 @@ PeerListContent::PeerListContent(
 , _controller(controller)
 , _rowHeight(_st.item.height) {
 	_controller->session().downloaderTaskFinished(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		update();
 	}, lifetime());
 
 	using UpdateFlag = Data::PeerUpdate::Flag;
 	_controller->session().changes().peerUpdates(
 		UpdateFlag::Name | UpdateFlag::Photo | UpdateFlag::EmojiStatus
-	) | rpl::start_with_next([=](const Data::PeerUpdate &update) {
+	) | rpl::on_next([=](const Data::PeerUpdate &update) {
 		if (update.flags & UpdateFlag::Name) {
 			handleNameChanged(update.peer);
 		}
@@ -1019,7 +1019,7 @@ PeerListContent::PeerListContent(
 	}, lifetime());
 
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		invalidatePixmapsCache();
 	}, lifetime());
 
@@ -1387,10 +1387,10 @@ void PeerListContent::initDecorateWidget(Ui::RpWidget *widget) {
 		widget->events(
 		) | rpl::filter([=](not_null<QEvent*> e) {
 			return (e->type() == QEvent::Enter) && widget->isVisible();
-		}) | rpl::start_with_next([=] {
+		}) | rpl::on_next([=] {
 			mouseLeftGeometry();
 		}, widget->lifetime());
-		widget->heightValue() | rpl::skip(1) | rpl::start_with_next([=] {
+		widget->heightValue() | rpl::skip(1) | rpl::on_next([=] {
 			resizeToWidth(width());
 		}, widget->lifetime());
 	}
diff --git a/Telegram/SourceFiles/boxes/peer_list_controllers.cpp b/Telegram/SourceFiles/boxes/peer_list_controllers.cpp
index e6d54fc826..ad9e2becca 100644
--- a/Telegram/SourceFiles/boxes/peer_list_controllers.cpp
+++ b/Telegram/SourceFiles/boxes/peer_list_controllers.cpp
@@ -117,7 +117,7 @@ object_ptr<Ui::BoxContent> PrepareContactsBox(
 		});
 		raw->setSortMode(Mode::Online);
 
-		raw->wheelClicks() | rpl::start_with_next([=](not_null<PeerData*> p) {
+		raw->wheelClicks() | rpl::on_next([=](not_null<PeerData*> p) {
 			sessionController->showInNewWindow(p);
 		}, box->lifetime());
 	};
@@ -385,7 +385,7 @@ void TrackMessageMoneyRestrictionsChanges(
 	rpl::merge(
 		Data::AmPremiumValue(session) | rpl::to_empty,
 		session->api().premium().someMessageMoneyRestrictionsResolved()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto st = &controller->computeListSt().item;
 		const auto delegate = controller->delegate();
 		const auto process = [&](not_null<PeerListRow*> raw) {
@@ -431,18 +431,18 @@ void ChatsListBoxController::prepare() {
 		session().data().chatsListLoadedEvents(
 		) | rpl::filter([=](Data::Folder *folder) {
 			return !folder;
-		}) | rpl::start_with_next([=] {
+		}) | rpl::on_next([=] {
 			checkForEmptyRows();
 		}, lifetime());
 	}
 
 	session().data().chatsListChanges(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		rebuildRows();
 	}, lifetime());
 
 	session().data().contactsLoaded().value(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		rebuildRows();
 	}, lifetime());
 }
@@ -586,14 +586,14 @@ void PeerListStories::prepare(not_null<PeerListDelegate*> delegate) {
 	_delegate = delegate;
 
 	_unreadBrush = PeerListStoriesGradient(_controller->computeListSt());
-	style::PaletteChanged() | rpl::start_with_next([=] {
+	style::PaletteChanged() | rpl::on_next([=] {
 		_unreadBrush = PeerListStoriesGradient(_controller->computeListSt());
 		updateColors();
 	}, _lifetime);
 
 	_session->changes().peerUpdates(
 		Data::PeerUpdate::Flag::StoriesState
-	) | rpl::start_with_next([=](const Data::PeerUpdate &update) {
+	) | rpl::on_next([=](const Data::PeerUpdate &update) {
 		const auto id = update.peer->id.value;
 		if (const auto row = _delegate->peerListFindRow(id)) {
 			process(row);
@@ -601,7 +601,7 @@ void PeerListStories::prepare(not_null<PeerListDelegate*> delegate) {
 	}, _lifetime);
 
 	const auto stories = &_session->data().stories();
-	stories->sourceChanged() | rpl::start_with_next([=](PeerId id) {
+	stories->sourceChanged() | rpl::on_next([=](PeerId id) {
 		const auto source = stories->source(id);
 		const auto info = source
 			? source->info()
@@ -662,7 +662,7 @@ void ContactsBoxController::prepare() {
 	}
 
 	session().data().contactsLoaded().value(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		rebuildRows();
 	}, lifetime());
 }
@@ -724,7 +724,7 @@ void ContactsBoxController::setSortMode(SortMode mode) {
 		) | rpl::filter([=](const Data::PeerUpdate &update) {
 			return !_sortByOnlineTimer.isActive()
 				&& delegate()->peerListFindRow(update.peer->id.value);
-		}) | rpl::start_with_next([=] {
+		}) | rpl::on_next([=] {
 			_sortByOnlineTimer.callOnce(kSortByOnlineThrottle);
 		}, _sortByOnlineLifetime);
 	} else {
@@ -874,7 +874,7 @@ void ChooseRecipientBoxController::rowClicked(not_null<PeerListRow*> row) {
 				});
 
 				forum->destroyed(
-				) | rpl::start_with_next([=] {
+				) | rpl::on_next([=] {
 					box->closeBox();
 				}, box->lifetime());
 			});
@@ -913,7 +913,7 @@ void ChooseRecipientBoxController::rowClicked(not_null<PeerListRow*> row) {
 				});
 
 				monoforum->destroyed(
-				) | rpl::start_with_next([=] {
+				) | rpl::on_next([=] {
 					box->closeBox();
 				}, box->lifetime());
 			});
@@ -1098,12 +1098,12 @@ ChooseTopicBoxController::ChooseTopicBoxController(
 	setStyleOverrides(&st::chooseTopicList);
 
 	_forum->chatsListChanges(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		refreshRows();
 	}, lifetime());
 
 	_forum->topicDestroyed(
-	) | rpl::start_with_next([=](not_null<Data::ForumTopic*> topic) {
+	) | rpl::on_next([=](not_null<Data::ForumTopic*> topic) {
 		const auto id = PeerListRowId(topic->rootId().bare);
 		if (const auto row = delegate()->peerListFindRow(id)) {
 			delegate()->peerListRemoveRow(row);
@@ -1133,7 +1133,7 @@ void ChooseTopicBoxController::prepare() {
 
 	session().changes().entryUpdates(
 		Data::EntryUpdate::Flag::Repaint
-	) | rpl::start_with_next([=](const Data::EntryUpdate &update) {
+	) | rpl::on_next([=](const Data::EntryUpdate &update) {
 		if (const auto topic = update.entry->asTopic()) {
 			if (topic->forum() == _forum) {
 				const auto id = topic->rootId().bare;
@@ -1200,12 +1200,12 @@ ChooseSublistBoxController::ChooseSublistBoxController(
 	setStyleOverrides(&st::chooseTopicList);
 
 	_monoforum->chatsListChanges(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		refreshRows();
 	}, lifetime());
 
 	_monoforum->sublistDestroyed(
-	) | rpl::start_with_next([=](not_null<Data::SavedSublist*> sublist) {
+	) | rpl::on_next([=](not_null<Data::SavedSublist*> sublist) {
 		const auto id = sublist->sublistPeer()->id.value;
 		if (const auto row = delegate()->peerListFindRow(id)) {
 			delegate()->peerListRemoveRow(row);
@@ -1235,7 +1235,7 @@ void ChooseSublistBoxController::prepare() {
 
 	session().changes().entryUpdates(
 		Data::EntryUpdate::Flag::Repaint
-	) | rpl::start_with_next([=](const Data::EntryUpdate &update) {
+	) | rpl::on_next([=](const Data::EntryUpdate &update) {
 		if (const auto sublist = update.entry->asSublist()) {
 			if (sublist->parent() == _monoforum) {
 				const auto id = sublist->sublistPeer()->id.value;
diff --git a/Telegram/SourceFiles/boxes/peer_list_widgets.cpp b/Telegram/SourceFiles/boxes/peer_list_widgets.cpp
index dfa729eb6e..806e30590f 100644
--- a/Telegram/SourceFiles/boxes/peer_list_widgets.cpp
+++ b/Telegram/SourceFiles/boxes/peer_list_widgets.cpp
@@ -25,7 +25,7 @@ PeerListWidgets::PeerListWidgets(
 , _controller(controller)
 , _st(controller->computeListSt()) {
 	_content = base::make_unique_q<Ui::VerticalLayout>(this);
-	parent->sizeValue() | rpl::start_with_next([this](const QSize &size) {
+	parent->sizeValue() | rpl::on_next([this](const QSize &size) {
 		_content->resizeToWidth(size.width());
 		resize(size.width(), _content->height());
 	}, lifetime());
@@ -129,7 +129,7 @@ void PeerListWidgets::appendRow(std::unique_ptr<PeerListRow> row) {
 					st.button.ripple,
 					st.button.textBgOver)));
 		widget->resize(widget->width(), st.height);
-		widget->paintRequest() | rpl::start_with_next([=, this] {
+		widget->paintRequest() | rpl::on_next([=, this] {
 			auto p = Painter(widget);
 			const auto selected = widget->isOver() || widget->isDown();
 			paintRow(p, crl::now(), selected, raw);
diff --git a/Telegram/SourceFiles/boxes/peer_lists_box.cpp b/Telegram/SourceFiles/boxes/peer_lists_box.cpp
index 9929840ab2..8a8a71ec9b 100644
--- a/Telegram/SourceFiles/boxes/peer_lists_box.cpp
+++ b/Telegram/SourceFiles/boxes/peer_lists_box.cpp
@@ -90,7 +90,7 @@ void PeerListsBox::createMultiSelect() {
 		tr::lng_participant_filter());
 	_select.create(this, std::move(entity));
 	_select->heightValue(
-	) | rpl::start_with_next(
+	) | rpl::on_next(
 		[this] { updateScrollSkips(); },
 		lifetime());
 	_select->entity()->setSubmittedCallback([=](Qt::KeyboardModifiers) {
@@ -158,7 +158,7 @@ void PeerListsBox::prepare() {
 		list.controller->setDelegate(list.delegate.get());
 
 		content->scrollToRequests(
-		) | rpl::start_with_next([=](Ui::ScrollToRequest request) {
+		) | rpl::on_next([=](Ui::ScrollToRequest request) {
 			const auto skip = content->y();
 			scrollToY(
 				skip + request.ymin,
@@ -168,7 +168,7 @@ void PeerListsBox::prepare() {
 		content->selectedIndexValue(
 		) | rpl::filter([=](int index) {
 			return (index >= 0);
-		}) | rpl::start_with_next([=] {
+		}) | rpl::on_next([=] {
 			for (const auto &list : _lists) {
 				if (list.content && list.content != content) {
 					list.content->clearSelection();
diff --git a/Telegram/SourceFiles/boxes/peers/add_bot_to_chat_box.cpp b/Telegram/SourceFiles/boxes/peers/add_bot_to_chat_box.cpp
index e3cf2a2dd5..cabefcd950 100644
--- a/Telegram/SourceFiles/boxes/peers/add_bot_to_chat_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/add_bot_to_chat_box.cpp
@@ -65,7 +65,7 @@ Controller::Controller(
 , _callback(std::move(callback)) {
 	std::move(
 		add
-	) | rpl::start_with_next([=](not_null<PeerData*> peer) {
+	) | rpl::on_next([=](not_null<PeerData*> peer) {
 		if (_prepared) {
 			addRow(peer);
 		} else {
@@ -359,7 +359,7 @@ object_ptr<Ui::RpWidget> AddBotToGroupBoxController::prepareAdminnedChats() {
 		delegate->setContent(content);
 		controller->setDelegate(delegate);
 
-		items.events() | rpl::take(1) | rpl::start_with_next([=] {
+		items.events() | rpl::take(1) | rpl::on_next([=] {
 			wrap->show(anim::type::instant);
 		}, inner->lifetime());
 	};
@@ -373,7 +373,7 @@ object_ptr<Ui::RpWidget> AddBotToGroupBoxController::prepareAdminnedChats() {
 	rpl::merge(
 		_groups.events(),
 		_channels.events()
-	) | rpl::take(1) | rpl::start_with_next([=] {
+	) | rpl::take(1) | rpl::on_next([=] {
 		container->add(CreatePeerListSectionSubtitle(
 			container,
 			tr::lng_bot_groups()));
@@ -403,7 +403,7 @@ void AddBotToGroupBoxController::prepareViewHook() {
 	session().data().chatsListLoadedEvents(
 	) | rpl::filter([=](Data::Folder *folder) {
 		return !folder;
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		updateLabels();
 	}, lifetime());
 }
diff --git a/Telegram/SourceFiles/boxes/peers/add_participants_box.cpp b/Telegram/SourceFiles/boxes/peers/add_participants_box.cpp
index 2ece4c18aa..a2c635810d 100644
--- a/Telegram/SourceFiles/boxes/peers/add_participants_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/add_participants_box.cpp
@@ -273,7 +273,7 @@ void SimpleForbiddenBox(
 
 	Data::AmPremiumValue(
 		&peer->session()
-	) | rpl::skip(1) | rpl::start_with_next([=] {
+	) | rpl::skip(1) | rpl::on_next([=] {
 		box->closeBox();
 	}, box->lifetime());
 }
@@ -555,7 +555,7 @@ void InviteForbiddenController::setComplexCover() {
 
 void InviteForbiddenController::prepare() {
 	session().api().premium().someMessageMoneyRestrictionsResolved(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto stars = 0;
 		const auto process = [&](not_null<PeerListRow*> raw) {
 			const auto row = static_cast<ForbiddenRow*>(raw.get());
@@ -667,7 +667,7 @@ void InviteForbiddenController::send(
 	if (!waiting.empty()) {
 		session().changes().peerUpdates(
 			Data::PeerUpdate::Flag::FullInfo
-		) | rpl::start_with_next([=](const Data::PeerUpdate &update) {
+		) | rpl::on_next([=](const Data::PeerUpdate &update) {
 			if (waiting.contains(update.peer)) {
 				withPaymentApproved(alreadyApproved);
 			}
@@ -677,7 +677,7 @@ void InviteForbiddenController::send(
 			session().credits().loadedValue(
 			) | rpl::filter(
 				rpl::mappers::_1
-			) | rpl::take(1) | rpl::start_with_next([=] {
+			) | rpl::take(1) | rpl::on_next([=] {
 				withPaymentApproved(alreadyApproved);
 			}, _paymentCheckLifetime);
 		}
@@ -750,7 +750,7 @@ void InviteForbiddenController::send(
 		_peer->session().changes().peerUpdates(
 			_peer,
 			Data::PeerUpdate::Flag::FullInfo
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			sendForFull();
 		}, lifetime());
 	}
@@ -926,7 +926,7 @@ void AddParticipantsBoxController::addInviteLinkButton() {
 		st::inviteViaLinkIcon,
 		QPoint());
 	button->entity()->heightValue(
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		icon->moveToLeft(
 			st::inviteViaLinkIconPosition.x(),
 			(height - st::inviteViaLinkIcon.height()) / 2);
@@ -938,7 +938,7 @@ void AddParticipantsBoxController::addInviteLinkButton() {
 	button->entity()->events(
 	) | rpl::filter([=](not_null<QEvent*> e) {
 		return (e->type() == QEvent::Enter);
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		delegate()->peerListMouseLeftGeometry();
 	}, button->lifetime());
 	delegate()->peerListSetAboveWidget(std::move(button));
@@ -1062,7 +1062,7 @@ void AddParticipantsBoxController::Start(
 			[=] { box->closeBox(); });
 		if (justCreated) {
 			const auto weak = base::make_weak(parent);
-			box->boxClosing() | rpl::start_with_next([=] {
+			box->boxClosing() | rpl::on_next([=] {
 				auto params = Window::SectionShow();
 				params.activation = anim::activation::background;
 				if (const auto strong = weak.get()) {
@@ -1145,7 +1145,7 @@ bool ChatInviteForbidden(
 		) | rpl::map(
 			rpl::mappers::_1 > 0
 		) | rpl::distinct_until_changed(
-		) | rpl::start_with_next([=](bool has) {
+		) | rpl::on_next([=](bool has) {
 			box->clearButtons();
 			if (has) {
 				const auto send = box->addButton(tr::lng_via_link_send(), [=] {
@@ -1165,7 +1165,7 @@ bool ChatInviteForbidden(
 
 		Data::AmPremiumValue(
 			&peer->session()
-		) | rpl::skip(1) | rpl::start_with_next([=] {
+		) | rpl::skip(1) | rpl::on_next([=] {
 			box->closeBox();
 		}, box->lifetime());
 	};
@@ -1272,7 +1272,7 @@ void AddSpecialBoxController::prepareChatRows(not_null<ChatData*> chat) {
 	chat->session().changes().peerUpdates(
 		chat,
 		UpdateFlag::Members | UpdateFlag::Admins
-	) | rpl::start_with_next([=](const Data::PeerUpdate &update) {
+	) | rpl::on_next([=](const Data::PeerUpdate &update) {
 		_additional.fillFromPeer();
 		if (update.flags & UpdateFlag::Members) {
 			rebuildChatRows(chat);
diff --git a/Telegram/SourceFiles/boxes/peers/choose_peer_box.cpp b/Telegram/SourceFiles/boxes/peers/choose_peer_box.cpp
index f8362cedb7..bf831f0282 100644
--- a/Telegram/SourceFiles/boxes/peers/choose_peer_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/choose_peer_box.cpp
@@ -373,7 +373,7 @@ void ChoosePeerBoxController::prepareRestrictions() {
 			st,
 			QPoint());
 		button->heightValue(
-		) | rpl::start_with_next([=](int height) {
+		) | rpl::on_next([=](int height) {
 			icon->moveToLeft(
 				st::choosePeerCreateIconLeft,
 				(height - st::inviteViaLinkIcon.height()) / 2);
@@ -387,7 +387,7 @@ void ChoosePeerBoxController::prepareRestrictions() {
 		button->events(
 		) | rpl::filter([=](not_null<QEvent*> e) {
 			return (e->type() == QEvent::Enter);
-		}) | rpl::start_with_next([=] {
+		}) | rpl::on_next([=] {
 			delegate()->peerListMouseLeftGeometry();
 		}, button->lifetime());
 		return button;
@@ -522,7 +522,7 @@ void ShowChoosePeerBox(
 		query,
 		std::move(callback));
 	auto initBox = [=, ptr = controller.get()](not_null<PeerListBox*> box) {
-		ptr->selectedCountValue() | rpl::start_with_next([=](int count) {
+		ptr->selectedCountValue() | rpl::on_next([=](int count) {
 			box->clearButtons();
 			if (limit > 1) {
 				box->setAdditionalTitle(rpl::single(u"%1 / %2"_q.arg(count).arg(limit)));
diff --git a/Telegram/SourceFiles/boxes/peers/edit_contact_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_contact_box.cpp
index 7c908edf5c..a435c5ffc9 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_contact_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_contact_box.cpp
@@ -348,8 +348,8 @@ void Controller::initNameFields(
 			_save();
 		}
 	};
-	first->submits() | rpl::start_with_next(submit, first->lifetime());
-	last->submits() | rpl::start_with_next(submit, last->lifetime());
+	first->submits() | rpl::on_next(submit, first->lifetime());
+	last->submits() | rpl::on_next(submit, last->lifetime());
 	first->setMaxLength(Ui::EditPeer::kMaxUserFirstLastName);
 	first->setMaxLength(Ui::EditPeer::kMaxUserFirstLastName);
 }
@@ -418,11 +418,11 @@ void Controller::setupNotesField() {
 	_emojiPanel->hide();
 	_emojiPanel->selector()->setCurrentPeer(_window->session().user());
 	_emojiPanel->selector()->emojiChosen(
-	) | rpl::start_with_next([=](ChatHelpers::EmojiChosen data) {
+	) | rpl::on_next([=](ChatHelpers::EmojiChosen data) {
 		Ui::InsertEmojiAtCursor(_notesField->textCursor(), data.emoji);
 	}, _notesField->lifetime());
 	_emojiPanel->selector()->customEmojiChosen(
-	) | rpl::start_with_next([=](ChatHelpers::FileChosen data) {
+	) | rpl::on_next([=](ChatHelpers::FileChosen data) {
 		const auto info = data.document->sticker();
 		if (info
 			&& info->setType == Data::StickersType::Emoji
@@ -464,7 +464,7 @@ void Controller::setupNotesField() {
 			rpl::combine(
 				limitState->charsLimitation->geometryValue(),
 				_notesField->geometryValue()
-			) | rpl::start_with_next([=](QRect limit, QRect field) {
+			) | rpl::on_next([=](QRect limit, QRect field) {
 				limitState->charsLimitation->setVisible(
 					(w->mapToGlobal(limit.bottomLeft()).y() - border)
 						< w->mapToGlobal(field.bottomLeft()).y());
@@ -474,7 +474,7 @@ void Controller::setupNotesField() {
 		limitState->charsLimitation->setLeft(remove);
 	};
 
-	_notesField->changes() | rpl::start_with_next([=] {
+	_notesField->changes() | rpl::on_next([=] {
 		checkCharsLimitation();
 	}, _notesField->lifetime());
 
@@ -558,7 +558,7 @@ void Controller::setupPhotoButtons() {
 
 	_suggestIconWidget = Ui::CreateChild<Ui::RpWidget>(suggestButton);
 	_suggestIconWidget->resize(iconPlaceholder);
-	_suggestIconWidget->paintRequest() | rpl::start_with_next([=] {
+	_suggestIconWidget->paintRequest() | rpl::on_next([=] {
 		if (_suggestIcon && _suggestIcon->valid()) {
 			auto p = QPainter(_suggestIconWidget);
 			const auto frame = _suggestIcon->frame(st::lightButtonFg->c);
@@ -566,7 +566,7 @@ void Controller::setupPhotoButtons() {
 		}
 	}, _suggestIconWidget->lifetime());
 
-	suggestButton->sizeValue() | rpl::start_with_next([=](QSize size) {
+	suggestButton->sizeValue() | rpl::on_next([=](QSize size) {
 		_suggestIconWidget->move(
 			st::settingsButtonLight.iconLeft - iconPlaceholder.width() / 4,
 			(size.height() - _suggestIconWidget->height()) / 2);
@@ -590,7 +590,7 @@ void Controller::setupPhotoButtons() {
 
 	_cameraIconWidget = Ui::CreateChild<Ui::RpWidget>(setButton);
 	_cameraIconWidget->resize(iconPlaceholder);
-	_cameraIconWidget->paintRequest() | rpl::start_with_next([=] {
+	_cameraIconWidget->paintRequest() | rpl::on_next([=] {
 		if (_cameraIcon && _cameraIcon->valid()) {
 			auto p = QPainter(_cameraIconWidget);
 			const auto frame = _cameraIcon->frame(st::lightButtonFg->c);
@@ -598,7 +598,7 @@ void Controller::setupPhotoButtons() {
 		}
 	}, _cameraIconWidget->lifetime());
 
-	setButton->sizeValue() | rpl::start_with_next([=](QSize size) {
+	setButton->sizeValue() | rpl::on_next([=](QSize size) {
 		_cameraIconWidget->move(
 			st::settingsButtonLight.iconLeft - iconPlaceholder.width() / 4,
 			(size.height() - _cameraIconWidget->height()) / 2);
@@ -635,7 +635,7 @@ void Controller::setupPhotoButtons() {
 	userpicButton->setAttribute(Qt::WA_TransparentForMouseEvents);
 
 	resetButton->sizeValue(
-	) | rpl::start_with_next([=](QSize size) {
+	) | rpl::on_next([=](QSize size) {
 		userpicButton->move(
 			st::settingsButtonLight.iconLeft,
 			(size.height() - userpicButton->height()) / 2);
diff --git a/Telegram/SourceFiles/boxes/peers/edit_discussion_link_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_discussion_link_box.cpp
index 7b9779e5ba..9a2896d52e 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_discussion_link_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_discussion_link_box.cpp
@@ -81,7 +81,7 @@ Controller::Controller(
 		Data::PeerUpdate::Flag::FullInfo
 	) | rpl::filter([=](const Data::PeerUpdate &update) {
 		return (update.peer == _waitForFull);
-	}) | rpl::start_with_next([=](const Data::PeerUpdate &update) {
+	}) | rpl::on_next([=](const Data::PeerUpdate &update) {
 		choose(std::exchange(_waitForFull, nullptr));
 	}, lifetime());
 }
diff --git a/Telegram/SourceFiles/boxes/peers/edit_forum_topic_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_forum_topic_box.cpp
index aee6a5248b..24fe773fca 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_forum_topic_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_forum_topic_box.cpp
@@ -73,7 +73,7 @@ DefaultIconEmoji::DefaultIconEmoji(
 	Fn<void()> repaint,
 	Data::CustomEmojiSizeTag tag)
 : _tag(tag) {
-	std::move(value) | rpl::start_with_next([=](DefaultIcon value) {
+	std::move(value) | rpl::on_next([=](DefaultIcon value) {
 		_icon = value;
 		_image = QImage();
 		if (repaint) {
@@ -164,7 +164,7 @@ bool DefaultIconEmoji::readyInDefaultState() {
 
 	std::move(
 		iconId
-	) | rpl::start_with_next([=](DocumentId id) {
+	) | rpl::on_next([=](DocumentId id) {
 		const auto owner = &controller->session().data();
 		state->icon = id
 			? owner->customEmojiManager().create(
@@ -177,7 +177,7 @@ bool DefaultIconEmoji::readyInDefaultState() {
 
 	std::move(
 		defaultIcon
-	) | rpl::start_with_next([=](DefaultIcon icon) {
+	) | rpl::on_next([=](DefaultIcon icon) {
 		state->defaultIcon = Data::ForumTopicIconFrame(
 			icon.colorId,
 			icon.title,
@@ -189,7 +189,7 @@ bool DefaultIconEmoji::readyInDefaultState() {
 	result->paintRequest(
 	) | rpl::filter([=] {
 		return !paintIconFrame(result);
-	}) | rpl::start_with_next([=](QRect clip) {
+	}) | rpl::on_next([=](QRect clip) {
 		auto args = Ui::Text::CustomEmoji::Context{
 			.textColor = st::windowFg->c,
 			.now = crl::now(),
@@ -222,7 +222,7 @@ bool DefaultIconEmoji::readyInDefaultState() {
 
 	rpl::single(rpl::empty) | rpl::then(
 		style::PaletteChanged()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		state->frame = Data::ForumTopicGeneralIconFrame(
 			st::largeForumTopicIcon.size,
 			st::windowSubTextFg->c);
@@ -231,7 +231,7 @@ bool DefaultIconEmoji::readyInDefaultState() {
 
 	result->resize(size, size);
 	result->paintRequest(
-	) | rpl::start_with_next([=](QRect clip) {
+	) | rpl::on_next([=](QRect clip) {
 		auto p = QPainter(result);
 		const auto skip = (size - st::largeForumTopicIcon.size) / 2;
 		p.drawImage(skip, skip, state->frame);
@@ -300,7 +300,7 @@ struct IconSelector {
 
 	icons->requestDefaultIfUnknown();
 	icons->defaultUpdates(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		selector->provideRecent(DocumentListToRecent(recent()));
 	}, selector->lifetime());
 
@@ -312,14 +312,14 @@ struct IconSelector {
 	rpl::combine(
 		rpl::duplicate(coverHeight),
 		selector->widthValue()
-	) | rpl::start_with_next([=](int top, int width) {
+	) | rpl::on_next([=](int top, int width) {
 		shadow->setGeometry(0, top, width, st::lineWidth);
 	}, shadow->lifetime());
 
 	selector->refreshEmoji();
 
 	selector->scrollToRequests(
-	) | rpl::start_with_next([=](int y) {
+	) | rpl::on_next([=](int y) {
 		box->scrollToY(y);
 		shadow->update();
 	}, selector->lifetime());
@@ -328,7 +328,7 @@ struct IconSelector {
 		box->heightValue(),
 		std::move(coverHeight),
 		rpl::mappers::_1 - rpl::mappers::_2
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		selector->setMinimalHeight(selector->width(), height);
 	}, body->lifetime());
 
@@ -345,7 +345,7 @@ struct IconSelector {
 	};
 
 	selector->customChosen(
-	) | rpl::start_with_next([=](ChatHelpers::FileChosen data) {
+	) | rpl::on_next([=](ChatHelpers::FileChosen data) {
 		const auto owner = &controller->session().data();
 		const auto document = data.document;
 		const auto id = document->id;
@@ -465,14 +465,14 @@ void EditForumTopicBox(
 			paintIconFrame);
 
 	title->geometryValue(
-	) | rpl::start_with_next([=](QRect geometry) {
+	) | rpl::on_next([=](QRect geometry) {
 		icon->move(
 			st::editTopicIconPosition.x(),
 			st::editTopicIconPosition.y());
 	}, icon->lifetime());
 
 	state->iconId.value(
-	) | rpl::start_with_next([=](DocumentId iconId) {
+	) | rpl::on_next([=](DocumentId iconId) {
 		icon->setAttribute(
 			Qt::WA_TransparentForMouseEvents,
 			created || (iconId != 0));
@@ -486,13 +486,13 @@ void EditForumTopicBox(
 		};
 	});
 	title->changes(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		state->defaultIcon = DefaultIcon{
 			title->getLastText().trimmed(),
 			state->defaultIcon.current().colorId,
 		};
 	}, title->lifetime());
-	title->submits() | rpl::start_with_next([box] {
+	title->submits() | rpl::on_next([box] {
 		box->triggerButton(0);
 	}, title->lifetime());
 
@@ -515,7 +515,7 @@ void EditForumTopicBox(
 		state->paintIconFrame = std::move(selector.paintIconFrame);
 		std::move(
 			selector.iconIdValue
-		) | rpl::start_with_next([=](DocumentId iconId) {
+		) | rpl::on_next([=](DocumentId iconId) {
 			state->iconId = (iconId != kDefaultIconId) ? iconId : 0;
 		}, box->lifetime());
 	}
diff --git a/Telegram/SourceFiles/boxes/peers/edit_members_visible.cpp b/Telegram/SourceFiles/boxes/peers/edit_members_visible.cpp
index 216a0431d7..88c720c2d2 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_members_visible.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_members_visible.cpp
@@ -62,7 +62,7 @@ namespace {
 	Ui::AddDividerText(container, tr::lng_profile_hide_participants_about());
 
 	button->toggledValue(
-	) | rpl::start_with_next([=](bool toggled) {
+	) | rpl::on_next([=](bool toggled) {
 		megagroup->session().api().request(
 			MTPchannels_ToggleParticipantsHidden(
 				megagroup->inputChannel,
diff --git a/Telegram/SourceFiles/boxes/peers/edit_participant_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_participant_box.cpp
index 612d438f7e..b00ec51539 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_participant_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_participant_box.cpp
@@ -94,7 +94,7 @@ EditParticipantBox::Inner::Inner(
 , _hasAdminRights(hasAdminRights)
 , _rows(this) {
 	_rows->heightValue(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		resizeToWidth(width());
 	}, lifetime());
 
@@ -282,7 +282,7 @@ void EditAdminBox::prepare() {
 					true)),
 			st::rightsToggleMargin + (st::rightsDividerMargin / 2));
 		_addAsAdmin->checkedChanges(
-		) | rpl::start_with_next([=](bool checked) {
+		) | rpl::on_next([=](bool checked) {
 			_adminControlsWrap->toggle(checked, anim::type::normal);
 			refreshButtons();
 		}, _addAsAdmin->lifetime());
@@ -530,7 +530,7 @@ not_null<Ui::InputField*> EditAdminBox::addRankInput(
 	result->setMaxLength(kAdminRoleLimit);
 	result->setInstantReplaces(Ui::InstantReplaces::TextOnly());
 	result->changes(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto text = result->getLastText();
 		const auto removed = TextUtilities::RemoveEmoji(text);
 		if (removed != text) {
@@ -654,7 +654,7 @@ void EditAdminBox::requestTransferPassword(not_null<ChannelData*> channel) {
 	peer()->session().api().cloudPassword().state(
 	) | rpl::take(
 		1
-	) | rpl::start_with_next([=](const Core::CloudPasswordState &state) {
+	) | rpl::on_next([=](const Core::CloudPasswordState &state) {
 		auto fields = PasscodeBox::CloudFields::From(state);
 		fields.customTitle = tr::lng_rights_transfer_password_title();
 		fields.customDescription
diff --git a/Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp
index 15a5f1aee1..626c3baf8e 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp
@@ -296,7 +296,7 @@ void SubscribeToMigration(
 				return (channel != nullptr);
 			}) | rpl::take(
 				1
-			) | rpl::start_with_next([=](not_null<ChannelData*> channel) {
+			) | rpl::on_next([=](not_null<ChannelData*> channel) {
 				const auto onstack = base::duplicate(migrate);
 				onstack(channel);
 			}, lifetime);
@@ -812,7 +812,7 @@ ParticipantsOnlineSorter::ParticipantsOnlineSorter(
 , _sortByOnlineTimer([=] { sort(); }) {
 	peer->session().changes().peerUpdates(
 		Data::PeerUpdate::Flag::OnlineStatus
-	) | rpl::start_with_next([=](const Data::PeerUpdate &update) {
+	) | rpl::on_next([=](const Data::PeerUpdate &update) {
 		const auto peerId = update.peer->id;
 		if (const auto row = _delegate->peerListFindRow(peerId.value)) {
 			row->refreshStatus();
@@ -910,7 +910,7 @@ void ParticipantsBoxController::setupListChangeViewers() {
 
 	channel->owner().megagroupParticipantAdded(
 		channel
-	) | rpl::start_with_next([=](not_null<UserData*> user) {
+	) | rpl::on_next([=](not_null<UserData*> user) {
 		if (delegate()->peerListFullRowsCount() > 0) {
 			if (delegate()->peerListRowAt(0)->peer() == user) {
 				return;
@@ -935,7 +935,7 @@ void ParticipantsBoxController::setupListChangeViewers() {
 
 	channel->owner().megagroupParticipantRemoved(
 		channel
-	) | rpl::start_with_next([=](not_null<UserData*> user) {
+	) | rpl::on_next([=](not_null<UserData*> user) {
 		if (const auto row = delegate()->peerListFindRow(user->id.value)) {
 			delegate()->peerListRemoveRow(row);
 		}
@@ -1127,13 +1127,13 @@ auto ParticipantsBoxController::saveState() const
 		chat->session().changes().peerUpdates(
 			chat,
 			Data::PeerUpdate::Flag::Members
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			weak->controllerState = nullptr;
 		}, my->lifetime);
 	} else if (const auto channel = _peer->asMegagroup()) {
 		channel->owner().megagroupParticipantAdded(
 			channel
-		) | rpl::start_with_next([=](not_null<UserData*> user) {
+		) | rpl::on_next([=](not_null<UserData*> user) {
 			if (!weak->list.empty()) {
 				if (weak->list[0] == user) {
 					return;
@@ -1150,7 +1150,7 @@ auto ParticipantsBoxController::saveState() const
 
 		channel->owner().megagroupParticipantRemoved(
 			channel
-		) | rpl::start_with_next([=](not_null<UserData*> user) {
+		) | rpl::on_next([=](not_null<UserData*> user) {
 			weak->list.erase(std::remove(
 				weak->list.begin(),
 				weak->list.end(),
@@ -1257,7 +1257,7 @@ void ParticipantsBoxController::prepare() {
 		auto visible = _peer->isMegagroup()
 			? Info::Profile::CanViewParticipantsValue(_peer->asMegagroup())
 			: rpl::single(true);
-		std::move(visible) | rpl::start_with_next([=](bool visible) {
+		std::move(visible) | rpl::on_next([=](bool visible) {
 			if (!visible) {
 				_onlineCountValue = 0;
 				_onlineSorter = nullptr;
@@ -1275,7 +1275,7 @@ void ParticipantsBoxController::prepare() {
 	}
 
 	_peer->session().changes().chatAdminChanges(
-	) | rpl::start_with_next([=](const Data::ChatAdminChange &update) {
+	) | rpl::on_next([=](const Data::ChatAdminChange &update) {
 		if (update.peer != _peer) {
 			return;
 		}
@@ -1347,7 +1347,7 @@ void ParticipantsBoxController::prepareChatRows(not_null<ChatData*> chat) {
 	chat->session().changes().peerUpdates(
 		chat,
 		UpdateFlag::Members | UpdateFlag::Admins
-	) | rpl::start_with_next([=](const Data::PeerUpdate &update) {
+	) | rpl::on_next([=](const Data::PeerUpdate &update) {
 		_additional.fillFromPeer();
 		if ((update.flags & UpdateFlag::Members)
 			|| (_role == Role::Admins)) {
@@ -2201,7 +2201,7 @@ void ParticipantsBoxController::subscribeToCreatorChange(
 		return (change.diff & ChannelDataFlag::Creator);
 	}) | rpl::filter([=] {
 		return (isCreator != channel->amCreator());
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		if (channel->isBroadcast()) {
 			fullListRefresh();
 			return;
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_color_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_color_box.cpp
index 9457279ddf..825430e4af 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_color_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_color_box.cpp
@@ -142,7 +142,7 @@ base::unique_qptr<Ui::RpWidget> CreateEmptyPlaceholder(
 	container->resize(width, totalHeight);
 
 	container->sizeValue(
-	) | rpl::start_with_next([=](QSize size) {
+	) | rpl::on_next([=](QSize size) {
 		const auto totalContentHeight = iconWidget->height()
 			+ st::normalFont->height + emptyLabel->height()
 			+ (emptyNextLabel
@@ -313,17 +313,17 @@ PreviewWrap::PreviewWrap(
 	_style->apply(_theme.get());
 
 	_fake->setName(peer->name(), QString());
-	std::move(colorIndexValue) | rpl::start_with_next([=](uint8 index) {
+	std::move(colorIndexValue) | rpl::on_next([=](uint8 index) {
 		if (index != kUnsetColorIndex) {
 			_fake->changeColorIndex(index);
 			update();
 		}
 	}, lifetime());
-	std::move(backgroundEmojiId) | rpl::start_with_next([=](DocumentId id) {
+	std::move(backgroundEmojiId) | rpl::on_next([=](DocumentId id) {
 		_fake->changeBackgroundEmojiId(id);
 		update();
 	}, lifetime());
-	std::move(colorCollectible) | rpl::start_with_next([=](
+	std::move(colorCollectible) | rpl::on_next([=](
 			std::optional<Ui::ColorCollectible> &&collectible) {
 		if (collectible) {
 			_fake->changeColorCollectible(std::move(*collectible));
@@ -335,7 +335,7 @@ PreviewWrap::PreviewWrap(
 
 	const auto session = &_history->session();
 	session->data().viewRepaintRequest(
-	) | rpl::start_with_next([=](not_null<const Element*> view) {
+	) | rpl::on_next([=](not_null<const Element*> view) {
 		if (view == _element.get()) {
 			update();
 		}
@@ -391,7 +391,7 @@ void PreviewWrap::initElements() {
 	widthValue(
 	) | rpl::filter([=](int width) {
 		return width > st::msgMinWidth;
-	}) | rpl::start_with_next([=](int width) {
+	}) | rpl::on_next([=](int width) {
 		const auto height = _position.y()
 			+ _element->resizeGetHeight(width)
 			+ st::msgMargin.top();
@@ -749,11 +749,11 @@ void Apply(
 	};
 	const auto state = right->lifetime().make_state<State>();
 	state->panel.someCustomChosen(
-	) | rpl::start_with_next([=](EmojiStatusPanel::CustomChosen chosen) {
+	) | rpl::on_next([=](EmojiStatusPanel::CustomChosen chosen) {
 		emojiIdChosen(chosen.id.documentId);
 	}, raw->lifetime());
 
-	std::move(colorIndexValue) | rpl::start_with_next([=](uint8 index) {
+	std::move(colorIndexValue) | rpl::on_next([=](uint8 index) {
 		state->index = index;
 		if (state->emoji) {
 			right->update();
@@ -762,7 +762,7 @@ void Apply(
 
 	const auto session = &show->session();
 	const auto added = st::lineWidth * 2;
-	std::move(emojiIdValue) | rpl::start_with_next([=](DocumentId emojiId) {
+	std::move(emojiIdValue) | rpl::on_next([=](DocumentId emojiId) {
 		state->emojiId = emojiId;
 		state->emoji = emojiId
 			? session->data().customEmojiManager().create(
@@ -778,14 +778,14 @@ void Apply(
 	rpl::combine(
 		raw->sizeValue(),
 		right->widthValue()
-	) | rpl::start_with_next([=](QSize outer, int width) {
+	) | rpl::on_next([=](QSize outer, int width) {
 		right->resize(width, outer.height());
 		const auto skip = st::settingsButton.padding.right();
 		right->moveToRight(skip - button.added, 0, outer.width());
 	}, right->lifetime());
 
 	right->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (state->panel.paintBadgeFrame(right)) {
 			return;
 		}
@@ -893,12 +893,12 @@ void Apply(
 	};
 	const auto state = right->lifetime().make_state<State>();
 	state->panel.someCustomChosen(
-	) | rpl::start_with_next([=](EmojiStatusPanel::CustomChosen chosen) {
+	) | rpl::on_next([=](EmojiStatusPanel::CustomChosen chosen) {
 		statusIdChosen({ chosen.id }, chosen.until);
 	}, raw->lifetime());
 
 	const auto session = &show->session();
-	std::move(statusIdValue) | rpl::start_with_next([=](EmojiStatusId id) {
+	std::move(statusIdValue) | rpl::on_next([=](EmojiStatusId id) {
 		state->statusId = id;
 		state->emoji = id
 			? session->data().customEmojiManager().create(
@@ -914,14 +914,14 @@ void Apply(
 	rpl::combine(
 		raw->sizeValue(),
 		right->widthValue()
-	) | rpl::start_with_next([=](QSize outer, int width) {
+	) | rpl::on_next([=](QSize outer, int width) {
 		right->resize(width, outer.height());
 		const auto skip = st::settingsButton.padding.right();
 		right->moveToRight(skip - button.added, 0, outer.width());
 	}, right->lifetime());
 
 	right->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (state->panel.paintBadgeFrame(right)) {
 			return;
 		}
@@ -1007,7 +1007,7 @@ void Apply(
 	rpl::combine(
 		raw->sizeValue(),
 		right->widthValue()
-	) | rpl::start_with_next([=](QSize outer, int width) {
+	) | rpl::on_next([=](QSize outer, int width) {
 		right->resize(width, outer.height());
 		const auto skip = st::settingsButton.padding.right();
 		right->moveToRight(skip - button.added, 0, outer.width());
@@ -1016,7 +1016,7 @@ void Apply(
 	right->paintRequest(
 	) | rpl::filter([=] {
 		return state->icon != nullptr;
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		auto p = QPainter(right);
 		const auto x = button.added;
 		const auto y = (right->height() - button.emojiWidth) / 2;
@@ -1076,7 +1076,7 @@ void Apply(
 			return wrapLoaded(sets->find(id));
 		}));
 	}) | rpl::flatten_latest(
-	) | rpl::start_with_next([=](DocumentData *icon) {
+	) | rpl::on_next([=](DocumentData *icon) {
 		if (state->icon != icon) {
 			state->icon = icon;
 			state->custom = nullptr;
@@ -1111,7 +1111,7 @@ Fn<void()> AddColorGiftTabs(
 	GiftsStars(
 		session,
 		session->user()
-	) | rpl::start_with_next([=](const std::vector<GiftTypeStars> &list) {
+	) | rpl::on_next([=](const std::vector<GiftTypeStars> &list) {
 		auto filtered = std::vector<Data::StarGift>();
 		for (const auto &gift : list) {
 			if ((profile || gift.info.peerColorAvailable) && gift.resale) {
@@ -1122,7 +1122,7 @@ Fn<void()> AddColorGiftTabs(
 	}, container->lifetime());
 
 	state->list.value(
-	) | rpl::start_with_next([=](const std::vector<Data::StarGift> &list) {
+	) | rpl::on_next([=](const std::vector<Data::StarGift> &list) {
 		auto tabs = std::vector<Ui::SubTabs::Tab>();
 		tabs.push_back({
 			.id = u"my"_q,
@@ -1152,7 +1152,7 @@ Fn<void()> AddColorGiftTabs(
 					context));
 
 			state->tabs->activated(
-			) | rpl::start_with_next([=](const QString &id) {
+			) | rpl::on_next([=](const QString &id) {
 				state->tabs->setActiveTab(id);
 				chosen(id.toULongLong());
 			}, state->tabs->lifetime());
@@ -1228,7 +1228,7 @@ void AddGiftSelector(
 				shownGiftId,
 				{},
 				state->current->offset
-			) | rpl::start_with_next([=](Data::ResaleGiftsDescriptor slice) {
+			) | rpl::on_next([=](Data::ResaleGiftsDescriptor slice) {
 				auto &entry = state->lists[shownGiftId];
 				entry.loading.destroy();
 				entry.offset = slice.offset;
@@ -1254,7 +1254,7 @@ void AddGiftSelector(
 				session,
 				Data::MyUniqueType::OwnedAndHosted,
 				state->current->offset
-			) | rpl::start_with_next([=](Data::MyGiftsDescriptor slice) {
+			) | rpl::on_next([=](Data::MyGiftsDescriptor slice) {
 				auto &entry = state->lists[shownGiftId];
 				entry.loading.destroy();
 				entry.offset = slice.offset;
@@ -1393,7 +1393,7 @@ void AddGiftSelector(
 		};
 
 		state->selected.value(
-		) | rpl::combine_previous() | rpl::start_with_next([=](
+		) | rpl::combine_previous() | rpl::on_next([=](
 				uint64 wasCollectibleId,
 				uint64 nowCollectibleId) {
 			if (wasCollectibleId) {
@@ -1409,7 +1409,7 @@ void AddGiftSelector(
 		}, raw->lifetime());
 
 		state->selectedGiftId.value(
-		) | rpl::combine_previous() | rpl::start_with_next([=](
+		) | rpl::combine_previous() | rpl::on_next([=](
 				uint64 wasGiftId,
 				uint64 nowGiftId) {
 			if (wasGiftId) {
@@ -1465,7 +1465,7 @@ void AddGiftSelector(
 	};
 
 	state->showingGiftId.value(
-	) | rpl::start_with_next([=](uint64 showingId) {
+	) | rpl::on_next([=](uint64 showingId) {
 		state->current = &state->lists[showingId];
 		state->buttons.clear();
 		if (state->emptyPlaceholder) {
@@ -1479,7 +1479,7 @@ void AddGiftSelector(
 
 	state->visibleRange = raw->visibleRange();
 	state->visibleRange.value(
-	) | rpl::start_with_next(state->rebuild, raw->lifetime());
+	) | rpl::on_next(state->rebuild, raw->lifetime());
 }
 
 Fn<void(int)> CreateTabsWidget(
@@ -1544,7 +1544,7 @@ Fn<void(int)> CreateTabsWidget(
 
 	const auto penWidth = st::lineWidth * 2;
 
-	tabsContainer->paintRequest() | rpl::start_with_next([=] {
+	tabsContainer->paintRequest() | rpl::on_next([=] {
 		auto p = QPainter(tabsContainer);
 		auto hq = PainterHighQualityEnabler(p);
 		const auto r = tabsContainer->rect();
@@ -1639,14 +1639,14 @@ void CreateBoostLevelContainer(
 	};
 	const auto state = boostLevelContainer->lifetime().make_state<State>();
 
-	boostLevelContainer->paintRequest() | rpl::start_with_next([=] {
+	boostLevelContainer->paintRequest() | rpl::on_next([=] {
 		auto p = QPainter(boostLevelContainer);
 		const auto bg = state->currentColor.value_or(st::boxDividerBg->c);
 		p.fillRect(boostLevelContainer->rect(), bg);
 		p.fillRect(boostLevelContainer->rect(), st::shadowFg);
 	}, boostLevelContainer->lifetime());
 
-	std::move(colorProducer) | rpl::start_with_next([=](
+	std::move(colorProducer) | rpl::on_next([=](
 			std::optional<QColor> color) {
 		const auto colorChanged = (state->currentColor != color)
 			|| !state->label;
@@ -1672,7 +1672,7 @@ void CreateBoostLevelContainer(
 				style);
 			state->label->show();
 			boostLevelContainer->sizeValue(
-			) | rpl::start_with_next([=](QSize s) {
+			) | rpl::on_next([=](QSize s) {
 				state->label->moveToLeft(
 					(s.width() - state->label->width()) / 2,
 					(s.height() - state->label->height()) / 2);
@@ -1707,7 +1707,7 @@ void AddLevelBadge(
 	rpl::combine(
 		button->sizeValue(),
 		std::move(text)
-	) | rpl::start_with_next([=](const QSize &s, const QString &) {
+	) | rpl::on_next([=](const QSize &s, const QString &) {
 		if (s.isNull()) {
 			return;
 		}
@@ -1771,7 +1771,7 @@ void EditPeerColorSection(
 			state->preview->setPatternEmojiId(
 				state->profileEmojiId.current());
 		}
-		state->statusId.value() | rpl::start_with_next([=](EmojiStatusId id) {
+		state->statusId.value() | rpl::on_next([=](EmojiStatusId id) {
 			state->preview->setLocalEmojiStatusId(std::move(id));
 		}, state->preview->lifetime());
 		const auto peerColors = &peer->session().api().peerColors();
@@ -1835,7 +1835,7 @@ void EditPeerColorSection(
 			true));
 
 		state->profileIndex.value(
-		) | rpl::start_with_next([=](uint8 index) {
+		) | rpl::on_next([=](uint8 index) {
 			selector->updateSelection(index);
 		}, selector->lifetime());
 
@@ -2126,7 +2126,7 @@ void EditPeerColorSection(
 		}));
 	});
 	state->collectible.value(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto buy = state->buyCollectible.get();
 		while (!button->children().isEmpty()) {
 			delete button->children().first();
@@ -2294,7 +2294,7 @@ void EditPeerProfileColorSection(
 	});
 
 	state->index.value(
-	) | rpl::start_with_next([=](uint8 index) {
+	) | rpl::on_next([=](uint8 index) {
 		if (state->selector) {
 			state->selector->updateSelection(index);
 		}
@@ -2386,7 +2386,7 @@ void EditPeerProfileColorSection(
 		}));
 	});
 	state->wearable.value(
-	) | rpl::start_with_next([=](EmojiStatusId id) {
+	) | rpl::on_next([=](EmojiStatusId id) {
 		const auto buy = state->buyCollectible.get();
 		while (!button->children().isEmpty()) {
 			delete button->children().first();
@@ -2469,7 +2469,7 @@ void EditPeerColorBox(
 		buttonContainer->widthValue(),
 		profileButton->sizeValue(),
 		nameButton->sizeValue()
-	) | rpl::start_with_next([=](int w, QSize, QSize) {
+	) | rpl::on_next([=](int w, QSize, QSize) {
 		profileButton->resizeToWidth(w);
 		nameButton->resizeToWidth(w);
 	}, buttonContainer->lifetime());
@@ -2602,7 +2602,7 @@ void SetupPeerColorSample(
 		rpl::duplicate(colorIndexValue),
 		rpl::duplicate(colorProfileIndexValue),
 		rpl::duplicate(emojiStatusIdValue)
-	) | rpl::start_with_next([=](
+	) | rpl::on_next([=](
 			int width,
 			const QString &buttonText,
 			int colorIndex,
@@ -2668,7 +2668,7 @@ void SetupPeerColorSample(
 		rpl::duplicate(colorIndexValue),
 		rpl::duplicate(colorProfileIndexValue),
 		rpl::duplicate(emojiStatusIdValue)
-	) | rpl::start_with_next([=](
+	) | rpl::on_next([=](
 			QSize outer,
 			QSize inner,
 			int colorIndex,
@@ -2746,7 +2746,7 @@ void AddPeerColorButton(
 		rpl::combine(
 			rpl::duplicate(label),
 			button->widthValue()
-		) | rpl::start_with_next([=](
+		) | rpl::on_next([=](
 				const QString &text,
 				int width) {
 			const auto space = st.style.font->spacew;
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_history_visibility_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_history_visibility_box.cpp
index 8883ad0a51..c23347df3e 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_history_visibility_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_history_visibility_box.cpp
@@ -29,7 +29,7 @@ void EditPeerHistoryVisibilityBox(
 			HistoryVisibility v) {
 		const auto button = Ui::CreateChild<Ui::AbstractButton>(inner.get());
 		inner->sizeValue(
-		) | rpl::start_with_next([=](const QSize &s) {
+		) | rpl::on_next([=](const QSize &s) {
 			button->resize(s);
 		}, button->lifetime());
 		button->setClickedCallback([=] { historyVisibility->setValue(v); });
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
index f0f2c92411..4b48cee3c8 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
@@ -610,11 +610,11 @@ object_ptr<Ui::RpWidget> Controller::createPhotoAndTitleEdit() {
 		container,
 		createTitleEdit());
 	photoWrap->heightValue(
-	) | rpl::start_with_next([container](int height) {
+	) | rpl::on_next([container](int height) {
 		container->resize(container->width(), height);
 	}, photoWrap->lifetime());
 	container->widthValue(
-	) | rpl::start_with_next([titleEdit](int width) {
+	) | rpl::on_next([titleEdit](int width) {
 		const auto left = st::editPeerPhotoMargins.left()
 			+ st::defaultUserpicButton.size.width();
 		titleEdit->resizeToWidth(width - left);
@@ -669,7 +669,7 @@ object_ptr<Ui::RpWidget> Controller::createTitleEdit() {
 		&_peer->session());
 
 	result->entity()->submits(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		submitTitle();
 	}, result->entity()->lifetime());
 
@@ -699,7 +699,7 @@ object_ptr<Ui::RpWidget> Controller::createTitleEdit() {
 		emojiPanel->hide();
 		emojiPanel->selector()->setCurrentPeer(_peer);
 		emojiPanel->selector()->emojiChosen(
-		) | rpl::start_with_next([=](ChatHelpers::EmojiChosen data) {
+		) | rpl::on_next([=](ChatHelpers::EmojiChosen data) {
 			Ui::InsertEmojiAtCursor(field->textCursor(), data.emoji);
 			field->setFocus();
 		}, field->lifetime());
@@ -733,7 +733,7 @@ object_ptr<Ui::RpWidget> Controller::createTitleEdit() {
 			});
 		}());
 
-		field->widthValue() | rpl::start_with_next([=](int width) {
+		field->widthValue() | rpl::on_next([=](int width) {
 			const auto &p = st::editPeerTitleEmojiPosition;
 			emojiToggle->moveToRight(p.x(), p.y(), width);
 			updateEmojiPanelGeometry();
@@ -779,7 +779,7 @@ object_ptr<Ui::RpWidget> Controller::createDescriptionEdit() {
 		&_peer->session());
 
 	result->entity()->submits(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		submitDescription();
 	}, result->entity()->lifetime());
 
@@ -893,7 +893,7 @@ void Controller::showEditPeerTypeBox(
 			_typeDataSavedValue,
 			error));
 	box->boxClosing(
-	) | rpl::start_with_next([peer = _peer] {
+	) | rpl::on_next([peer = _peer] {
 		peer->session().api().usernames().requestToCache(peer);
 	}, box->lifetime());
 }
@@ -1242,12 +1242,12 @@ void Controller::fillAutoTranslateButton() {
 		.data = Ui::AskBoostAutotranslate{ .requiredLevel = requiredLevel },
 	};
 
-	state->isLocked.value() | rpl::start_with_next([=](bool locked) {
+	state->isLocked.value() | rpl::on_next([=](bool locked) {
 		autotranslate->setToggleLocked(locked);
 	}, autotranslate->lifetime());
 
 	autotranslate->toggledChanges(
-	) | rpl::start_with_next([=](bool value) {
+	) | rpl::on_next([=](bool value) {
 		if (!state->isLocked.current()) {
 			_autotranslateSavedValue = value;
 		} else if (value) {
@@ -1269,7 +1269,7 @@ void Controller::fillAutoTranslateButton() {
 	}, autotranslate->lifetime());
 
 	autotranslate->toggledValue(
-	) | rpl::start_with_next([=](bool toggled) {
+	) | rpl::on_next([=](bool toggled) {
 		_autotranslateSavedValue = toggled;
 	}, _controls.buttonsLayout->lifetime());
 }
@@ -1306,12 +1306,12 @@ void Controller::fillSignaturesButton() {
 	profiles->entity()->toggleOn(rpl::single(
 		channel->addsSignature() && channel->signatureProfiles()
 	))->toggledValue(
-	) | rpl::start_with_next([=](bool toggled) {
+	) | rpl::on_next([=](bool toggled) {
 		_signatureProfilesSavedValue = toggled;
 	}, profiles->entity()->lifetime());
 
 	signs->toggledValue(
-	) | rpl::start_with_next([=](bool toggled) {
+	) | rpl::on_next([=](bool toggled) {
 		_signaturesSavedValue = toggled;
 		if (!toggled) {
 			_signatureProfilesSavedValue = false;
@@ -1782,7 +1782,7 @@ void Controller::fillPendingRequestsButton() {
 		{ &st::menuIconInvite });
 	std::move(
 		pendingRequestsCount
-	) | rpl::start_with_next([=](int count) {
+	) | rpl::on_next([=](int count) {
 		wrap->toggle(count > 0, anim::type::instant);
 	}, wrap->lifetime());
 }
@@ -1878,7 +1878,7 @@ void Controller::fillBotCurrencyButton() {
 		const auto currencyLoad
 			= button->lifetime().make_state<Api::EarnStatistics>(_peer);
 		currencyLoad->request(
-		) | rpl::start_with_error_done([=](const QString &error) {
+		) | rpl::on_error_done([=](const QString &error) {
 		}, [=] {
 			const auto balance = currencyLoad->data().currentBalance;
 			if (balance) {
@@ -1891,13 +1891,13 @@ void Controller::fillBotCurrencyButton() {
 		const auto icon = Ui::CreateChild<Ui::RpWidget>(button);
 		icon->resize(st::menuIconLinks.size());
 		const auto image = Ui::Earn::MenuIconCurrency(icon->size());
-		icon->paintRequest() | rpl::start_with_next([=] {
+		icon->paintRequest() | rpl::on_next([=] {
 			auto p = QPainter(icon);
 			p.drawImage(0, 0, image);
 		}, icon->lifetime());
 
 		button->sizeValue(
-		) | rpl::start_with_next([=](const QSize &size) {
+		) | rpl::on_next([=](const QSize &size) {
 			icon->moveToLeft(
 				button->st().iconLeft,
 				(size.height() - icon->height()) / 2);
@@ -1947,13 +1947,13 @@ void Controller::fillBotCreditsButton() {
 		const auto icon = Ui::CreateChild<Ui::RpWidget>(button);
 		const auto image = Ui::Earn::MenuIconCredits();
 		icon->resize(image.size() / style::DevicePixelRatio());
-		icon->paintRequest() | rpl::start_with_next([=] {
+		icon->paintRequest() | rpl::on_next([=] {
 			auto p = QPainter(icon);
 			p.drawImage(0, 0, image);
 		}, icon->lifetime());
 
 		button->sizeValue(
-		) | rpl::start_with_next([=](const QSize &size) {
+		) | rpl::on_next([=](const QSize &size) {
 			icon->moveToLeft(
 				button->st().iconLeft,
 				(size.height() - icon->height()) / 2);
@@ -2302,7 +2302,7 @@ void Controller::saveUsernamesOrder() {
 		_peer->session().api().usernames().reorder(
 			_peer,
 			newUsernames
-		) | rpl::start_with_done([=] {
+		) | rpl::on_done([=] {
 			channel->setUsernames(ranges::views::all(
 				newUsernames
 			) | ranges::views::transform([&](QString username) {
@@ -2875,7 +2875,7 @@ void EditPeerInfoBox::prepare() {
 		this,
 		_peer);
 	_focusRequests.events(
-	) | rpl::start_with_next(
+	) | rpl::on_next(
 		[=] { controller->setFocus(); },
 		lifetime());
 	auto content = controller->createContent();
@@ -2939,7 +2939,7 @@ object_ptr<Ui::SettingsButton> EditPeerInfoBox::CreateButton(
 		rpl::duplicate(text),
 		std::move(labelText),
 		button->widthValue()
-	) | rpl::start_with_next([&st, label](
+	) | rpl::on_next([&st, label](
 			const QString &text,
 			const TextWithEntities &labelText,
 			int width) {
@@ -2961,7 +2961,7 @@ object_ptr<Ui::SettingsButton> EditPeerInfoBox::CreateButton(
 			std::move(text),
 			label->widthValue(),
 			button->widthValue()
-		) | rpl::start_with_next([=](
+		) | rpl::on_next([=](
 				const QString &text,
 				int labelWidth,
 				int width) {
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.cpp
index 3058d4c815..67184f0688 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.cpp
@@ -379,11 +379,11 @@ void QrBox(
 	const auto button = Ui::CreateChild<Ui::AbstractButton>(container);
 	button->resize(size, size);
 	button->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		QPainter(button).drawImage(QRect(0, 0, size, size), qr);
 	}, button->lifetime());
 	container->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		button->move((width - size) / 2, st::inviteLinkQrSkip);
 	}, button->lifetime());
 	button->setClickedCallback(copyCallback);
@@ -506,7 +506,7 @@ void Controller::addHeaderBlock(not_null<Ui::VerticalLayout*> container) {
 		st::inviteLinkFieldPadding);
 
 	label->clicks(
-	) | rpl::start_with_next(copyLink, label->lifetime());
+	) | rpl::on_next(copyLink, label->lifetime());
 
 	const auto reactivateWrap = container->add(
 		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
@@ -566,7 +566,7 @@ void Controller::addHeaderBlock(not_null<Ui::VerticalLayout*> container) {
 	Ui::AddSkip(container);
 
 	dataValue(
-	) | rpl::start_with_next([=](const LinkData &data) {
+	) | rpl::on_next([=](const LinkData &data) {
 		const auto now = base::unixtime::now();
 		const auto expired = IsExpiredLink(data, now);
 		reactivateWrap->toggle(
@@ -641,7 +641,7 @@ not_null<Ui::SlideWrap<>*> Controller::addRequestedListBlock(
 	controller->setDelegate(delegate);
 
 	controller->processed(
-	) | rpl::start_with_next([=](Processed processed) {
+	) | rpl::on_next([=](Processed processed) {
 		updateWithProcessed(processed);
 	}, lifetime());
 
@@ -755,7 +755,7 @@ void Controller::setupAboveJoinedWidget() {
 		const auto currency = u"USD"_q;
 		const auto allCredits = current.subscription.credits * current.usage;
 		widget->paintRequest(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			auto p = Painter(widget);
 			p.setBrush(Qt::NoBrush);
 			p.setPen(st.nameFg);
@@ -864,7 +864,7 @@ void Controller::setupAboveJoinedWidget() {
 		std::move(remainingText),
 		st::inviteLinkTitleRight);
 	dataValue(
-	) | rpl::start_with_next([=](const LinkData &data) {
+	) | rpl::on_next([=](const LinkData &data) {
 		remaining->setTextColorOverride(
 			(data.usageLimit && (data.usageLimit <= data.usage)
 				? std::make_optional(st::boxTextFgError->c)
@@ -882,7 +882,7 @@ void Controller::setupAboveJoinedWidget() {
 		listTitle->positionValue(),
 		remaining->widthValue(),
 		listHeader->widthValue()
-	) | rpl::start_with_next([=](
+	) | rpl::on_next([=](
 			QPoint position,
 			int width,
 			int outerWidth) {
@@ -1006,7 +1006,7 @@ void Controller::rowClicked(not_null<PeerListRow*> row) {
 			style::al_top);
 		session->credits().rateValue(
 			channel
-		) | rpl::start_with_next([=, currency = u"USD"_q](float64 rate) {
+		) | rpl::on_next([=, currency = u"USD"_q](float64 rate) {
 			subtitle2->setText(
 				tr::lng_credits_subscriber_subtitle(
 					tr::now,
@@ -1169,7 +1169,7 @@ void SingleRowController::prepare() {
 	if (_status) {
 		std::move(
 			_status
-		) | rpl::start_with_next([=](const QString &status) {
+		) | rpl::on_next([=](const QString &status) {
 			raw->setCustomStatus(status);
 			delegate()->peerListUpdateRow(raw);
 		}, _lifetime);
@@ -1178,7 +1178,7 @@ void SingleRowController::prepare() {
 	delegate()->peerListRefreshRows();
 
 	if (topic) {
-		topic->destroyed() | rpl::start_with_next([=] {
+		topic->destroyed() | rpl::on_next([=] {
 			while (delegate()->peerListFullRowsCount()) {
 				delegate()->peerListRemoveRow(delegate()->peerListRowAt(0));
 			}
@@ -1275,7 +1275,7 @@ void AddPermanentLinkBlock(
 	} else {
 		rpl::duplicate(
 			fromList
-		) | rpl::start_with_next([=](const Api::InviteLink &link) {
+		) | rpl::on_next([=](const Api::InviteLink &link) {
 			*currentLinkFields = link;
 		}, container->lifetime());
 
@@ -1351,7 +1351,7 @@ void AddPermanentLinkBlock(
 		st::inviteLinkFieldPadding);
 
 	label->clicks(
-	) | rpl::start_with_next(copyLink, label->lifetime());
+	) | rpl::on_next(copyLink, label->lifetime());
 
 	AddCopyShareLinkButtons(container, copyLink, shareLink);
 
@@ -1388,7 +1388,7 @@ void AddPermanentLinkBlock(
 			data.link,
 			data.usage);
 	}) | rpl::flatten_latest(
-	) | rpl::start_with_next([=](const Api::JoinedByLinkSlice &slice) {
+	) | rpl::on_next([=](const Api::JoinedByLinkSlice &slice) {
 		auto list = std::vector<HistoryView::UserpicInRow>();
 		list.reserve(slice.users.size());
 		for (const auto &item : slice.users) {
@@ -1410,7 +1410,7 @@ void AddPermanentLinkBlock(
 	peer->session().downloaderTaskFinished(
 	) | rpl::filter([=] {
 		return !state->allUserpicsLoaded;
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		auto pushing = false;
 		state->allUserpicsLoaded = true;
 		for (const auto &element : state->list) {
@@ -1701,7 +1701,7 @@ object_ptr<Ui::BoxContent> ShowInviteLinkBox(
 		not_null<Ui::BoxContent*> box) {
 		rpl::duplicate(
 			data
-		) | rpl::start_with_next([=](const LinkData &link) {
+		) | rpl::on_next([=](const LinkData &link) {
 			if (ClosingLinkBox(link, revoked)) {
 				box->closeBox();
 				return;
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_invite_links.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_invite_links.cpp
index e3f387062d..b0dc66986d 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_invite_links.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_invite_links.cpp
@@ -441,7 +441,7 @@ LinksController::LinksController(
 , _count(count)
 , _updateExpiringTimer([=] { expiringProgressTimer(); }) {
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		for (auto &image : _icons) {
 			image = QImage();
 		}
@@ -450,7 +450,7 @@ LinksController::LinksController(
 	peer->session().api().inviteLinks().updates(
 		peer,
 		admin
-	) | rpl::start_with_next([=](const Api::InviteLinkUpdate &update) {
+	) | rpl::on_next([=](const Api::InviteLinkUpdate &update) {
 		const auto now = base::unixtime::now();
 		if (!update.now || update.now->revoked != _revoked) {
 			if (removeRow(update.was)) {
@@ -472,7 +472,7 @@ LinksController::LinksController(
 		peer->session().api().inviteLinks().allRevokedDestroyed(
 			peer,
 			admin
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			_requesting = false;
 			_allLoaded = true;
 			while (delegate()->peerListFullRowsCount()) {
@@ -961,7 +961,7 @@ void ManageInviteLinksBox(
 	*countValue = controller->fullCountValue();
 
 	controller->permanentFound(
-	) | rpl::start_with_next([=](InviteLinkData &&data) {
+	) | rpl::on_next([=](InviteLinkData &&data) {
 		permanentFromList->fire(std::move(data));
 	}, container->lifetime());
 
@@ -1013,7 +1013,7 @@ void ManageInviteLinksBox(
 	rpl::combine(
 		revokedHeader->topValue(),
 		container->widthValue()
-	) | rpl::start_with_next([=](int top, int outerWidth) {
+	) | rpl::on_next([=](int top, int outerWidth) {
 		deleteAll->moveToRight(
 			st::inviteLinkRevokedTitlePadding.left(),
 			top + st::inviteLinkRevokedTitlePadding.top(),
@@ -1027,7 +1027,7 @@ void ManageInviteLinksBox(
 		list->heightValue(),
 		admins->heightValue(),
 		revoked->heightValue()
-	) | rpl::start_with_next([=](int list, int admins, int revoked) {
+	) | rpl::on_next([=](int list, int admins, int revoked) {
 		if (otherHeader) {
 			otherHeader->toggle(list > 0, anim::type::instant);
 		}
@@ -1058,7 +1058,7 @@ object_ptr<Ui::SettingsButton> MakeCreateLinkButton(
 	icon->resize(size, size);
 
 	raw->heightValue(
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		const auto &st = st::inviteLinkList.item;
 		icon->move(
 			st.photoPosition.x() + (st.photoSize - size) / 2,
@@ -1066,7 +1066,7 @@ object_ptr<Ui::SettingsButton> MakeCreateLinkButton(
 	}, icon->lifetime());
 
 	icon->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(icon);
 		p.setPen(Qt::NoPen);
 		p.setBrush(st::windowBgActive);
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_permissions_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_permissions_box.cpp
index c0e7443375..5a2df335e5 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_permissions_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_permissions_box.cpp
@@ -407,14 +407,14 @@ not_null<Ui::RpWidget*> AddInnerToggle(
 	{
 		const auto separator = Ui::CreateChild<Ui::RpWidget>(container.get());
 		separator->paintRequest(
-		) | rpl::start_with_next([=, bg = st.textBgOver] {
+		) | rpl::on_next([=, bg = st.textBgOver] {
 			auto p = QPainter(separator);
 			p.fillRect(separator->rect(), bg);
 		}, separator->lifetime());
 		const auto separatorHeight = 2 * st.toggle.border
 			+ st.toggle.diameter;
 		button->geometryValue(
-		) | rpl::start_with_next([=](const QRect &r) {
+		) | rpl::on_next([=](const QRect &r) {
 			const auto w = st::rightsButtonToggleWidth;
 			toggleButton->setGeometry(
 				r.x() + r.width() - w,
@@ -431,12 +431,12 @@ not_null<Ui::RpWidget*> AddInnerToggle(
 		const auto checkWidget = Ui::CreateChild<Ui::RpWidget>(toggleButton);
 		checkWidget->resize(checkView->getSize());
 		checkWidget->paintRequest(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			auto p = QPainter(checkWidget);
 			checkView->paint(p, 0, 0, checkWidget->width());
 		}, checkWidget->lifetime());
 		toggleButton->sizeValue(
-		) | rpl::start_with_next([=](const QSize &s) {
+		) | rpl::on_next([=](const QSize &s) {
 			checkWidget->moveToRight(
 				st.toggleSkip,
 				(s.height() - checkWidget->height()) / 2);
@@ -444,7 +444,7 @@ not_null<Ui::RpWidget*> AddInnerToggle(
 	}
 	state->anyChanges.events_starting_with(
 		rpl::empty_value()
-	) | rpl::map(countChecked) | rpl::start_with_next([=](int count) {
+	) | rpl::map(countChecked) | rpl::on_next([=](int count) {
 		checkView->setChecked(count > 0, anim::type::normal);
 	}, toggleButton->lifetime());
 	checkView->setLocked(locked.has_value());
@@ -471,7 +471,7 @@ not_null<Ui::RpWidget*> AddInnerToggle(
 		const auto &icon = st::permissionsExpandIcon;
 		arrow->resize(icon.size());
 		arrow->paintRequest(
-		) | rpl::start_with_next([=, &icon] {
+		) | rpl::on_next([=, &icon] {
 			auto p = QPainter(arrow);
 			const auto center = QPointF(
 				icon.width() / 2.,
@@ -489,7 +489,7 @@ not_null<Ui::RpWidget*> AddInnerToggle(
 		}, arrow->lifetime());
 	}
 	button->sizeValue(
-	) | rpl::start_with_next([=, &st](const QSize &s) {
+	) | rpl::on_next([=, &st](const QSize &s) {
 		const auto labelLeft = st.padding.left();
 		const auto labelRight = s.width() - toggleButton->width();
 
@@ -504,7 +504,7 @@ not_null<Ui::RpWidget*> AddInnerToggle(
 			(s.height() - arrow->height()) / 2);
 	}, button->lifetime());
 	wrap->toggledValue(
-	) | rpl::skip(1) | rpl::start_with_next([=](bool toggled) {
+	) | rpl::skip(1) | rpl::on_next([=](bool toggled) {
 		state->animation.start(
 			[=] { arrow->update(); },
 			toggled ? 0. : 1.,
@@ -521,14 +521,14 @@ not_null<Ui::RpWidget*> AddInnerToggle(
 	};
 
 	button->clicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (!handleLocked()) {
 			wrap->toggle(!wrap->toggled(), anim::type::normal);
 		}
 	}, button->lifetime());
 
 	toggleButton->clicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (!handleLocked()) {
 			const auto checked = !checkView->checked();
 			for (const auto &innerCheck : state->innerChecks) {
@@ -563,7 +563,7 @@ template <typename Flags>
 		});
 
 		state->forceDisabled.value(
-		) | rpl::start_with_next([=](bool disabled) {
+		) | rpl::on_next([=](bool disabled) {
 			if (disabled) {
 				for (const auto &[flags, checkView] : state->checkViews) {
 					checkView->setChecked(false, anim::type::normal);
@@ -629,7 +629,7 @@ template <typename Flags>
 				rpl::combine(
 					verticalLayout->widthValue(),
 					checkbox->geometryValue()
-				) | rpl::start_with_next([=](int w, const QRect &r) {
+				) | rpl::on_next([=](int w, const QRect &r) {
 					button->setGeometry(0, r.y(), w, r.height());
 				}, button->lifetime());
 				checkbox->setAttribute(Qt::WA_TransparentForMouseEvents);
@@ -659,12 +659,12 @@ template <typename Flags>
 					[=] { toggle->update(); });
 				toggle->resize(checkView->getSize());
 				toggle->paintRequest(
-				) | rpl::start_with_next([=] {
+				) | rpl::on_next([=] {
 					auto p = QPainter(toggle);
 					checkView->paint(p, 0, 0, toggle->width());
 				}, toggle->lifetime());
 				button->sizeValue(
-				) | rpl::start_with_next([=](const QSize &s) {
+				) | rpl::on_next([=](const QSize &s) {
 					toggle->moveToRight(
 						st.toggleSkip,
 						(s.height() - toggle->height()) / 2);
@@ -680,7 +680,7 @@ template <typename Flags>
 		}();
 		state->checkViews.emplace(flags, checkView);
 		checkView->checkedChanges(
-		) | rpl::start_with_next([=](bool checked) {
+		) | rpl::on_next([=](bool checked) {
 			if (checked && state->forceDisabled.current()) {
 				if (!state->toast) {
 					state->toast = Ui::Toast::Show(container, {
@@ -742,7 +742,7 @@ template <typename Flags>
 				{ nestedWithLabel.nested.front().icon });
 			container->add(std::move(wrap));
 			container->widthValue(
-			) | rpl::start_with_next([=](int w) {
+			) | rpl::on_next([=](int w) {
 				raw->resizeToWidth(w);
 			}, raw->lifetime());
 		}
@@ -780,7 +780,7 @@ void AddSlowmodeLabels(
 		rpl::combine(
 			labels->widthValue(),
 			label->widthValue()
-		) | rpl::start_with_next([=](int outer, int inner) {
+		) | rpl::on_next([=](int outer, int inner) {
 			const auto skip = st::localStorageLimitMargin;
 			const auto size = st::localStorageLimitSlider.seekSize;
 			const auto available = outer
@@ -903,7 +903,7 @@ void AddBoostsUnrestrictLabels(not_null<Ui::VerticalLayout*> container) {
 		rpl::combine(
 			labels->widthValue(),
 			label->widthValue()
-		) | rpl::start_with_next([=](int outer, int inner) {
+		) | rpl::on_next([=](int outer, int inner) {
 			const auto skip = st::localStorageLimitMargin;
 			const auto size = st::localStorageLimitSlider.seekSize;
 			const auto available = outer
@@ -948,7 +948,7 @@ rpl::producer<int> AddBoostsUnrestrictSlider(
 		tr::lng_rights_boosts_no_restrict(),
 		st::defaultSettingsButton
 	))->toggleOn(rpl::duplicate(enabled))->toggledValue(
-	) | rpl::start_with_next([=](bool toggled) {
+	) | rpl::on_next([=](bool toggled) {
 		if (toggled && !boostsUnrestrict->current()) {
 			*boostsUnrestrict = 1;
 		} else if (!toggled && boostsUnrestrict->current()) {
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_reactions.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_reactions.cpp
index fdc31618f7..cd26e9cf21 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_reactions.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_reactions.cpp
@@ -235,7 +235,7 @@ void SetupOnlyCustomEmojiField(
 	const auto state = field->lifetime().make_state<State>();
 
 	field->changes(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		state->pending = true;
 		if (state->processing) {
 			return;
@@ -420,7 +420,7 @@ object_ptr<Ui::RpWidget> AddReactionsSelector(
 	applyFromState();
 	std::move(
 		args.paid
-	) | rpl::start_with_next([=](bool paid) {
+	) | rpl::on_next([=](bool paid) {
 		const auto id = Data::ReactionId::Paid();
 		if (paid && !ranges::contains(state->reactions, id)) {
 			state->reactions.insert(begin(state->reactions), id);
@@ -440,7 +440,7 @@ object_ptr<Ui::RpWidget> AddReactionsSelector(
 	using SelectorState = ReactionsSelectorState;
 	std::move(
 		args.stateValue
-	) | rpl::start_with_next([=](SelectorState value) {
+	) | rpl::on_next([=](SelectorState value) {
 		switch (value) {
 		case SelectorState::Active:
 			state->overlay = nullptr;
@@ -455,10 +455,10 @@ object_ptr<Ui::RpWidget> AddReactionsSelector(
 		case SelectorState::Disabled:
 			state->overlay = std::make_unique<Ui::RpWidget>(parent);
 			state->overlay->show();
-			raw->geometryValue() | rpl::start_with_next([=](QRect rect) {
+			raw->geometryValue() | rpl::on_next([=](QRect rect) {
 				state->overlay->setGeometry(rect);
 			}, state->overlay->lifetime());
-			state->overlay->paintRequest() | rpl::start_with_next([=](QRect clip) {
+			state->overlay->paintRequest() | rpl::on_next([=](QRect clip) {
 				auto color = st::boxBg->c;
 				color.setAlphaF(0.5);
 				QPainter(state->overlay.get()).fillRect(
@@ -472,7 +472,7 @@ object_ptr<Ui::RpWidget> AddReactionsSelector(
 			}
 			raw->setDisabled(true);
 			raw->focusedChanges(
-			) | rpl::start_with_next([=](bool focused) {
+			) | rpl::on_next([=](bool focused) {
 				if (focused) {
 					raw->parentWidget()->setFocus();
 				}
@@ -503,7 +503,7 @@ object_ptr<Ui::RpWidget> AddReactionsSelector(
 		st::emojiPanMinHeight);
 	panel->hide();
 	panel->selector()->customEmojiChosen(
-	) | rpl::start_with_next([=](ChatHelpers::FileChosen data) {
+	) | rpl::on_next([=](ChatHelpers::FileChosen data) {
 		Data::InsertCustomEmoji(raw, data.document);
 	}, panel->lifetime());
 
@@ -540,7 +540,7 @@ object_ptr<Ui::RpWidget> AddReactionsSelector(
 		panel->toggleAnimated();
 	});
 
-	raw->geometryValue() | rpl::start_with_next([=](QRect geometry) {
+	raw->geometryValue() | rpl::on_next([=](QRect geometry) {
 		toggle->move(
 			geometry.x() + geometry.width() - toggle->width(),
 			geometry.y() + geometry.height() - toggle->height());
@@ -669,7 +669,7 @@ void EditAllowedReactionsBox(
 	if (enabled) {
 		enabled->toggleOn(rpl::single(optionInitial != Option::None));
 		enabled->toggledValue(
-		) | rpl::start_with_next([=](bool value) {
+		) | rpl::on_next([=](bool value) {
 			state->selectorState = value
 				? SelectorState::Active
 				: SelectorState::Disabled;
@@ -836,7 +836,7 @@ void EditAllowedReactionsBox(
 			left->sizeValue(),
 			center->sizeValue(),
 			right->sizeValue()
-		) | rpl::start_with_next([=](
+		) | rpl::on_next([=](
 				const QSize &s,
 				const QSize &leftSize,
 				const QSize &centerSize,
@@ -901,7 +901,7 @@ void EditAllowedReactionsBox(
 			st::manageGroupNoIconButton.button));
 		paid->toggleOn(state->paidEnabled.value());
 		paid->toggledValue(
-		) | rpl::start_with_next([=](bool value) {
+		) | rpl::on_next([=](bool value) {
 			state->paidEnabled = value;
 		}, paid->lifetime());
 		Ui::AddSkip(inner);
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_type_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_type_box.cpp
index 2b3665aac6..4e718520c1 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_type_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_type_box.cpp
@@ -234,7 +234,7 @@ void Controller::createContent() {
 				_controls.joinToWrite->toggleOn(
 					rpl::single(_dataSavedValue->joinToWrite)
 				)->toggledValue(
-				) | rpl::start_with_next([=](bool toggled) {
+				) | rpl::on_next([=](bool toggled) {
 					_dataSavedValue->joinToWrite = toggled;
 				}, wrap->lifetime());
 			} else {
@@ -261,7 +261,7 @@ void Controller::createContent() {
 			_controls.requestToJoin->toggleOn(
 				rpl::single(_dataSavedValue->requestToJoin)
 			)->toggledValue(
-			) | rpl::start_with_next([=](bool toggled) {
+			) | rpl::on_next([=](bool toggled) {
 				_dataSavedValue->requestToJoin = toggled;
 			}, wrap->lifetime());
 
@@ -287,7 +287,7 @@ void Controller::createContent() {
 		_controls.noForwards->toggleOn(
 			rpl::single(_dataSavedValue->noForwards)
 		)->toggledValue(
-		) | rpl::start_with_next([=](bool toggled) {
+		) | rpl::on_next([=](bool toggled) {
 			_dataSavedValue->noForwards = toggled;
 		}, _wrap->lifetime());
 		Ui::AddSkip(_wrap.get());
@@ -441,11 +441,11 @@ object_ptr<Ui::RpWidget> Controller::createUsernameEdit() {
 			username,
 			_peer->session().createInternalLink(QString())));
 	_controls.usernameInput->heightValue(
-	) | rpl::start_with_next([placeholder](int height) {
+	) | rpl::on_next([placeholder](int height) {
 		placeholder->resize(placeholder->width(), height);
 	}, placeholder->lifetime());
 	placeholder->widthValue(
-	) | rpl::start_with_next([this](int width) {
+	) | rpl::on_next([this](int width) {
 		_controls.usernameInput->resize(
 			width,
 			_controls.usernameInput->height());
@@ -739,11 +739,11 @@ void EditPeerTypeBox::prepare() {
 		_useLocationPhrases,
 		_dataSavedValue);
 	controller->scrollToRequests(
-	) | rpl::start_with_next([=, raw = content.data()](int y) {
+	) | rpl::on_next([=, raw = content.data()](int y) {
 		scrollToY(raw->y() + y);
 	}, lifetime());
 	_focusRequests.events(
-	) | rpl::start_with_next(
+	) | rpl::on_next(
 		[=] {
 			controller->setFocusUsername();
 			if (_usernameError.has_value()) {
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_usernames_list.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_usernames_list.cpp
index b520397c9a..af4682511c 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_usernames_list.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_usernames_list.cpp
@@ -131,7 +131,7 @@ UsernamesList::Row::Row(
 
 	_rightAction->setVisible(data.active);
 	sizeValue(
-	) | rpl::start_with_next([=](const QSize &s) {
+	) | rpl::on_next([=](const QSize &s) {
 		_rightAction->moveToLeft(
 			s.width() - _rightAction->width() - st::inviteLinkThreeDotsSkip,
 			(s.height() - _rightAction->height()) / 2);
@@ -219,7 +219,7 @@ UsernamesList::UsernamesList(
 		peer->session().changes().peerFlagsValue(
 			peer,
 			Data::PeerUpdate::Flag::Usernames)
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		load();
 	}, lifetime());
 }
@@ -227,7 +227,7 @@ UsernamesList::UsernamesList(
 void UsernamesList::load() {
 	_loadLifetime = _peer->session().api().usernames().loadUsernames(
 		_peer
-	) | rpl::start_with_next([=](const Data::Usernames &usernames) {
+	) | rpl::on_next([=](const Data::Usernames &usernames) {
 		if (usernames.empty()) {
 			_container = nullptr;
 			resize(0, 0);
@@ -320,13 +320,13 @@ void UsernamesList::rebuild(const Data::Usernames &usernames) {
 					_toggleLifetime = api.usernames().reorder(
 						_peer,
 						order()
-					) | rpl::start_with_done([=] {
+					) | rpl::on_done([=] {
 						auto &api = _peer->session().api();
 						_toggleLifetime = api.usernames().toggle(
 							_peer,
 							username.username,
 							!username.active
-						) | rpl::start_with_error_done([=](
+						) | rpl::on_error_done([=](
 								Api::Usernames::Error error) {
 							if (error == Api::Usernames::Error::TooMuch) {
 								constexpr auto kMaxUsernames = 10.;
@@ -378,7 +378,7 @@ void UsernamesList::rebuild(const Data::Usernames &usernames) {
 	_reorder->start();
 
 	_reorder->updates(
-	) | rpl::start_with_next([=](Ui::VerticalLayoutReorder::Single data) {
+	) | rpl::on_next([=](Ui::VerticalLayoutReorder::Single data) {
 		using State = Ui::VerticalLayoutReorder::State;
 		if (data.state == State::Started) {
 			++_reordering;
diff --git a/Telegram/SourceFiles/boxes/peers/peer_short_info_box.cpp b/Telegram/SourceFiles/boxes/peers/peer_short_info_box.cpp
index 3672b557a1..b76358e454 100644
--- a/Telegram/SourceFiles/boxes/peers/peer_short_info_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/peer_short_info_box.cpp
@@ -115,18 +115,18 @@ PeerShortInfoCover::PeerShortInfoCover(
 
 	std::move(
 		userpic
-	) | rpl::start_with_next([=](PeerShortInfoUserpic &&value) {
+	) | rpl::on_next([=](PeerShortInfoUserpic &&value) {
 		applyUserpic(std::move(value));
 		applyAdditionalStatus(value.additionalStatus);
 	}, lifetime());
 
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		refreshBarImages();
 	}, lifetime());
 
 	_widget->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(_widget.get());
 		paint(p);
 	}, lifetime());
@@ -478,7 +478,7 @@ void PeerShortInfoCover::applyUserpic(PeerShortInfoUserpic &&value) {
 		_videoStartPosition = value.videoStartPosition;
 		_videoInstance->lockPlayer();
 		_videoInstance->player().updates(
-		) | rpl::start_with_next_error([=](Update &&update) {
+		) | rpl::on_next_error([=](Update &&update) {
 			handleStreamingUpdate(std::move(update));
 		}, [=](Error &&error) {
 			handleStreamingError(std::move(error));
@@ -685,7 +685,7 @@ PeerShortInfoBox::PeerShortInfoBox(
 	_rows->add(_cover.takeOwned());
 
 	_scroll->scrolls(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_cover.setScrollTop(_scroll->scrollTop());
 	}, _cover.lifetime());
 }
@@ -720,7 +720,7 @@ void PeerShortInfoBox::prepare() {
 
 	_topRoundBackground->resize(st::shortInfoWidth, st::boxRadius);
 	_topRoundBackground->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (const auto use = fillRoundedTopHeight()) {
 			const auto width = _topRoundBackground->width();
 			const auto top = _topRoundBackground->height() - use;
@@ -763,7 +763,7 @@ void PeerShortInfoBox::prepareRows() {
 		rpl::combine(
 			std::move(label),
 			std::move(text)
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			_rows->resizeToWidth(st::shortInfoWidth);
 		}, _rows->lifetime());
 
diff --git a/Telegram/SourceFiles/boxes/peers/prepare_short_info_box.cpp b/Telegram/SourceFiles/boxes/peers/prepare_short_info_box.cpp
index 8b7898e8c0..91a05d3f0a 100644
--- a/Telegram/SourceFiles/boxes/peers/prepare_short_info_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/prepare_short_info_box.cpp
@@ -410,13 +410,13 @@ bool ProcessCurrent(
 			UpdateFlag::Photo | UpdateFlag::FullInfo
 		) | rpl::filter([=](const Data::PeerUpdate &update) {
 			return (update.flags & UpdateFlag::Photo) || state->waitingFull;
-		}) | rpl::start_with_next([=] {
+		}) | rpl::on_next([=] {
 			push();
 		}, lifetime);
 
 		rpl::duplicate(
 			slices
-		) | rpl::start_with_next([=](UserPhotosSlice &&slice) {
+		) | rpl::on_next([=](UserPhotosSlice &&slice) {
 			state->userSlice = std::move(slice);
 			push();
 		}, lifetime);
@@ -424,7 +424,7 @@ bool ProcessCurrent(
 		moveRequests->events(
 		) | rpl::filter([=] {
 			return (state->current.count > 1);
-		}) | rpl::start_with_next([=](int shift) {
+		}) | rpl::on_next([=](int shift) {
 			state->current.index = std::clamp(
 				((state->current.index + shift + state->current.count)
 					% state->current.count),
@@ -439,7 +439,7 @@ bool ProcessCurrent(
 				&& (state->photoView
 					? (!!state->photoView->image(Data::PhotoSize::Large))
 					: (!Ui::PeerUserpicLoading(state->userpicView)));
-		}) | rpl::start_with_next([=] {
+		}) | rpl::on_next([=] {
 			push();
 		}, lifetime);
 
@@ -472,16 +472,16 @@ object_ptr<Ui::BoxContent> PrepareShortInfoBox(
 
 	if (menuFiller) {
 		result->fillMenuRequests(
-		) | rpl::start_with_next([=](Ui::Menu::MenuCallback callback) {
+		) | rpl::on_next([=](Ui::Menu::MenuCallback callback) {
 			menuFiller(std::move(callback));
 		}, result->lifetime());
 	}
 
 	result->openRequests(
-	) | rpl::start_with_next(open, result->lifetime());
+	) | rpl::on_next(open, result->lifetime());
 
 	result->moveRequests(
-	) | rpl::start_with_next(userpic.move, result->lifetime());
+	) | rpl::on_next(userpic.move, result->lifetime());
 
 	return result;
 }
diff --git a/Telegram/SourceFiles/boxes/peers/replace_boost_box.cpp b/Telegram/SourceFiles/boxes/peers/replace_boost_box.cpp
index 1990af38cd..dd2d8d24dd 100644
--- a/Telegram/SourceFiles/boxes/peers/replace_boost_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/replace_boost_box.cpp
@@ -382,7 +382,7 @@ object_ptr<Ui::BoxContent> ReassignBoostSingleBox(
 
 	result->boxClosing() | rpl::filter([=] {
 		return !*reassigned;
-	}) | rpl::start_with_next(cancel, result->lifetime());
+	}) | rpl::on_next(cancel, result->lifetime());
 
 	return result;
 }
@@ -551,7 +551,7 @@ object_ptr<Ui::BoxContent> ReassignBoostsBox(
 	const auto raw = controller.get();
 	auto initBox = [=](not_null<Ui::BoxContent*> box) {
 		raw->selectedValue(
-		) | rpl::start_with_next([=](std::vector<int> slots) {
+		) | rpl::on_next([=](std::vector<int> slots) {
 			box->clearButtons();
 			if (!slots.empty()) {
 				const auto sources = SourcesCount(to, from, slots);
@@ -567,7 +567,7 @@ object_ptr<Ui::BoxContent> ReassignBoostsBox(
 
 		box->boxClosing() | rpl::filter([=] {
 			return !*reassigned;
-		}) | rpl::start_with_next(cancel, box->lifetime());
+		}) | rpl::on_next(cancel, box->lifetime());
 	};
 	return Box<PeerListBox>(std::move(controller), std::move(initBox));
 }
@@ -597,7 +597,7 @@ object_ptr<Ui::RpWidget> CreateUserpicsTransfer(
 	const auto state = raw->lifetime().make_state<State>();
 	std::move(
 		from
-	) | rpl::start_with_next([=](
+	) | rpl::on_next([=](
 			const std::vector<not_null<PeerData*>> &list) {
 		auto was = base::take(state->from);
 		auto buttons = base::take(state->buttons);
@@ -628,7 +628,7 @@ object_ptr<Ui::RpWidget> CreateUserpicsTransfer(
 	rpl::combine(
 		raw->widthValue(),
 		state->count.value()
-	) | rpl::start_with_next([=](int width, int count) {
+	) | rpl::on_next([=](int width, int count) {
 		const auto skip = st::boostReplaceUserpicsSkip;
 		const auto left = width - 2 * right->width() - skip;
 		const auto shift = std::min(
@@ -651,7 +651,7 @@ object_ptr<Ui::RpWidget> CreateUserpicsTransfer(
 	overlay->paintRequest(
 	) | rpl::filter([=] {
 		return !state->buttons.empty();
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		const auto outerw = overlay->width();
 		const auto ratio = style::DevicePixelRatio();
 		if (state->layer.size() != QSize(outerw, full) * ratio) {
@@ -737,7 +737,7 @@ object_ptr<Ui::RpWidget> CreateUserpicsWithMoreBadge(
 	const auto state = raw->lifetime().make_state<State>();
 	std::move(
 		peers
-	) | rpl::start_with_next([=, &st](
+	) | rpl::on_next([=, &st](
 			const std::vector<not_null<PeerData*>> &list) {
 		auto was = base::take(state->from);
 		auto buttons = base::take(state->buttons);
@@ -774,7 +774,7 @@ object_ptr<Ui::RpWidget> CreateUserpicsWithMoreBadge(
 	rpl::combine(
 		raw->widthValue(),
 		state->count.value()
-	) | rpl::start_with_next([=, &st](int width, int count) {
+	) | rpl::on_next([=, &st](int width, int count) {
 		const auto single = st.button.size.width();
 		const auto left = width - single;
 		const auto used = std::min(count, int(state->buttons.size()));
@@ -793,7 +793,7 @@ object_ptr<Ui::RpWidget> CreateUserpicsWithMoreBadge(
 	overlay->paintRequest(
 	) | rpl::filter([=] {
 		return !state->buttons.empty();
-	}) | rpl::start_with_next([=, &st] {
+	}) | rpl::on_next([=, &st] {
 		const auto outerw = overlay->width();
 		const auto ratio = style::DevicePixelRatio();
 		if (state->layer.size() != QSize(outerw, full) * ratio) {
@@ -986,7 +986,7 @@ object_ptr<Ui::RpWidget> CreateGiftTransfer(
 	overlay->update();
 
 	raw->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		const auto skip = st::boostReplaceUserpicsSkip;
 		const auto total = right->width() + skip + right->width();
 		auto x = (width - total) / 2;
@@ -997,7 +997,7 @@ object_ptr<Ui::RpWidget> CreateGiftTransfer(
 	}, raw->lifetime());
 
 	overlay->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto outerw = overlay->width();
 		const auto ratio = style::DevicePixelRatio();
 		if (state->layer.size() != QSize(outerw, full) * ratio) {
diff --git a/Telegram/SourceFiles/boxes/peers/toggle_topics_box.cpp b/Telegram/SourceFiles/boxes/peers/toggle_topics_box.cpp
index 4d6d5454dd..721d1e191c 100644
--- a/Telegram/SourceFiles/boxes/peers/toggle_topics_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/toggle_topics_box.cpp
@@ -83,7 +83,7 @@ LayoutButton::LayoutButton(
 		group->setValue(type);
 		iconAnimate(anim::repeat::once);
 	});
-	group->value() | rpl::start_with_next([=](LayoutType value) {
+	group->value() | rpl::on_next([=](LayoutType value) {
 		const auto active = (value == type);
 		_text.setTextColorOverride(active
 			? st::windowFgActive->c
@@ -99,7 +99,7 @@ LayoutButton::LayoutButton(
 		}, _active ? 0. : 1., _active ? 0. : 1., st::fadeWrapDuration);
 	}, lifetime());
 
-	_text.paintRequest() | rpl::start_with_next([=](QRect clip) {
+	_text.paintRequest() | rpl::on_next([=](QRect clip) {
 		if (_active) {
 			auto p = QPainter(&_text);
 			auto hq = PainterHighQualityEnabler(p);
@@ -197,7 +197,7 @@ void ToggleTopicsBox(
 		group);
 
 	buttons->resize(container->width(), tabsButton->height());
-	buttons->widthValue() | rpl::start_with_next([=](int outer) {
+	buttons->widthValue() | rpl::on_next([=](int outer) {
 		const auto skip = st::boxRowPadding.left() - st::boxRadius;
 		tabsButton->moveToLeft(skip, 0, outer);
 		listButton->moveToRight(skip, 0, outer);
@@ -209,7 +209,7 @@ void ToggleTopicsBox(
 
 	layoutWrap->toggle(enabled, anim::type::instant);
 	toggle->toggledChanges(
-	) | rpl::start_with_next([=](bool checked) {
+	) | rpl::on_next([=](bool checked) {
 		layoutWrap->toggle(checked, anim::type::normal);
 	}, layoutWrap->lifetime());
 
diff --git a/Telegram/SourceFiles/boxes/peers/verify_peers_box.cpp b/Telegram/SourceFiles/boxes/peers/verify_peers_box.cpp
index 546ef3c979..a3f77c3749 100644
--- a/Telegram/SourceFiles/boxes/peers/verify_peers_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/verify_peers_box.cpp
@@ -183,7 +183,7 @@ void Controller::confirmAdd(not_null<PeerData*> peer) {
 
 		Ui::AddSkip(box->verticalLayout());
 
-		field->changes() | rpl::start_with_next([=] {
+		field->changes() | rpl::on_next([=] {
 			state->description = field->getLastText();
 		}, field->lifetime());
 
diff --git a/Telegram/SourceFiles/boxes/premium_limits_box.cpp b/Telegram/SourceFiles/boxes/premium_limits_box.cpp
index f88a525d9f..88611c63f6 100644
--- a/Telegram/SourceFiles/boxes/premium_limits_box.cpp
+++ b/Telegram/SourceFiles/boxes/premium_limits_box.cpp
@@ -596,12 +596,12 @@ void ChannelsLimitBox(
 
 	using namespace rpl::mappers;
 	controller->countValue(
-	) | rpl::filter(_1 > 0) | rpl::start_with_next([=] {
+	) | rpl::filter(_1 > 0) | rpl::on_next([=] {
 		delete placeholder;
 	}, placeholder->lifetime());
 
 	delegate->selectedCountChanges(
-	) | rpl::start_with_next([=](int count) {
+	) | rpl::on_next([=](int count) {
 		const auto leave = [=](const base::flat_set<PeerListRowId> &ids) {
 			for (const auto rowId : ids) {
 				const auto id = peerToChannel(PeerId(rowId));
@@ -687,7 +687,7 @@ void PublicLinksLimitBox(
 
 	using namespace rpl::mappers;
 	controller->countValue(
-	) | rpl::filter(_1 > 0) | rpl::start_with_next([=] {
+	) | rpl::filter(_1 > 0) | rpl::on_next([=] {
 		delete placeholder;
 	}, placeholder->lifetime());
 }
@@ -1162,7 +1162,7 @@ void AccountsLimitBox(
 			return;
 		}
 		*switchingLifetime = session->domain().activeSessionChanges(
-		) | rpl::start_with_next([=](Main::Session *session) mutable {
+		) | rpl::on_next([=](Main::Session *session) mutable {
 			if (session) {
 				Settings::ShowPremium(session, ref);
 			}
diff --git a/Telegram/SourceFiles/boxes/premium_preview_box.cpp b/Telegram/SourceFiles/boxes/premium_preview_box.cpp
index 58688763b2..b5fc60ce6e 100644
--- a/Telegram/SourceFiles/boxes/premium_preview_box.cpp
+++ b/Telegram/SourceFiles/boxes/premium_preview_box.cpp
@@ -245,7 +245,7 @@ void PreloadSticker(const std::shared_ptr<Data::DocumentMedia> &media) {
 	const auto raw = result.data();
 
 	raw->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(raw);
 		p.drawImage(0, 0, back);
 	}, raw->lifetime());
@@ -269,7 +269,7 @@ void PreloadSticker(const std::shared_ptr<Data::DocumentMedia> &media) {
 	result->show();
 
 	parent->sizeValue(
-	) | rpl::start_with_next([=](QSize size) {
+	) | rpl::on_next([=](QSize size) {
 		result->setGeometry(QRect(
 			QPoint(
 				(size.width() - effectSize.width()) / 2,
@@ -323,8 +323,8 @@ void PreloadSticker(const std::shared_ptr<Data::DocumentMedia> &media) {
 			result->update();
 		};
 		auto &lifetime = result->lifetime();
-		state->lottie->updates() | rpl::start_with_next(update, lifetime);
-		state->effect->updates() | rpl::start_with_next(update, lifetime);
+		state->lottie->updates() | rpl::on_next(update, lifetime);
+		state->effect->updates() | rpl::on_next(update, lifetime);
 	};
 	createLottieIfReady();
 	if (!state->lottie || !state->effect) {
@@ -341,7 +341,7 @@ void PreloadSticker(const std::shared_ptr<Data::DocumentMedia> &media) {
 		rpl::never<>());
 
 	result->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		createLottieIfReady();
 
 		auto p = QPainter(result);
@@ -399,7 +399,7 @@ void PreloadSticker(const std::shared_ptr<Data::DocumentMedia> &media) {
 	result->show();
 
 	parent->sizeValue(
-	) | rpl::start_with_next([=](QSize size) {
+	) | rpl::on_next([=](QSize size) {
 		result->setGeometry(QRect(QPoint(), size));
 	}, result->lifetime());
 	auto &lifetime = result->lifetime();
@@ -425,7 +425,7 @@ void PreloadSticker(const std::shared_ptr<Data::DocumentMedia> &media) {
 		outer->show();
 
 		result->sizeValue(
-		) | rpl::start_with_next([=](QSize size) {
+		) | rpl::on_next([=](QSize size) {
 			outer->resize(size);
 		}, outer->lifetime());
 
@@ -495,7 +495,7 @@ void PreloadSticker(const std::shared_ptr<Data::DocumentMedia> &media) {
 	result->shownValue(
 	) | rpl::filter([=](bool shown) {
 		return shown && state->toggleTimerPending;
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		state->toggleTimerPending = false;
 		state->toggleTimer.callOnce(kToggleStickerTimeout);
 	}, result->lifetime());
@@ -515,7 +515,7 @@ void PreloadSticker(const std::shared_ptr<Data::DocumentMedia> &media) {
 	fill();
 	if (state->medias.empty()) {
 		premium->stickersUpdated(
-		) | rpl::take(1) | rpl::start_with_next(fill, lifetime);
+		) | rpl::take(1) | rpl::on_next(fill, lifetime);
 	}
 
 	return result;
@@ -637,7 +637,7 @@ struct VideoPreviewDocument {
 	result->show();
 
 	parent->sizeValue(
-	) | rpl::start_with_next([=](QSize size) {
+	) | rpl::on_next([=](QSize size) {
 		result->setGeometry(parent->rect());
 	}, result->lifetime());
 	auto &lifetime = result->lifetime();
@@ -707,7 +707,7 @@ struct VideoPreviewDocument {
 		}
 	};
 	state->instance.player().updates(
-	) | rpl::start_with_next_error([=](Media::Streaming::Update &&update) {
+	) | rpl::on_next_error([=](Media::Streaming::Update &&update) {
 		if (v::is<Media::Streaming::Information>(update.data)
 			|| v::is<Media::Streaming::UpdateVideo>(update.data)) {
 			if (!state->readyInvoked && readyCallback) {
@@ -727,7 +727,7 @@ struct VideoPreviewDocument {
 	});
 
 	result->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(result);
 		const auto paintFrame = [&](QColor color, float64 thickness) {
 			auto hq = PainterHighQualityEnabler(p);
@@ -799,7 +799,7 @@ struct VideoPreviewDocument {
 	result->show();
 
 	parent->sizeValue(
-	) | rpl::start_with_next([=](QSize size) {
+	) | rpl::on_next([=](QSize size) {
 		result->setGeometry(QRect(QPoint(), size));
 	}, result->lifetime());
 	auto &lifetime = result->lifetime();
@@ -825,7 +825,7 @@ struct VideoPreviewDocument {
 	create();
 	if (!state->single) {
 		session->api().premium().videosUpdated(
-		) | rpl::take(1) | rpl::start_with_next(create, lifetime);
+		) | rpl::take(1) | rpl::on_next(create, lifetime);
 	}
 
 	return result;
@@ -874,7 +874,7 @@ struct VideoPreviewDocument {
 		const auto section = order[i];
 		const auto button = Ui::CreateChild<Ui::AbstractButton>(raw);
 		parent->widthValue(
-		) | rpl::start_with_next([=](int outer) {
+		) | rpl::on_next([=](int outer) {
 			const auto full = width * count;
 			const auto left = (outer - full) / 2 + (i * width);
 			button->setGeometry(left, 0, width, height);
@@ -883,7 +883,7 @@ struct VideoPreviewDocument {
 			*selected = section;
 		});
 		button->paintRequest(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			auto p = QPainter(button);
 			auto hq = PainterHighQualityEnabler(p);
 			p.setBrush((selected->current() == section)
@@ -896,7 +896,7 @@ struct VideoPreviewDocument {
 				button->rect().marginsRemoved(st::premiumDotPadding));
 		}, button->lifetime());
 		selected->changes(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			button->update();
 		}, button->lifetime());
 	}
@@ -1021,7 +1021,7 @@ void PreviewBox(
 	}
 
 	buttonsParent->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		const auto outerHeight = st::premiumPreviewHeight;
 		close->moveToRight(0, 0, width);
 		if (left) {
@@ -1072,7 +1072,7 @@ void PreviewBox(
 
 	state->selected.value(
 	) | rpl::combine_previous(
-	) | rpl::start_with_next([=](PremiumFeature was, PremiumFeature now) {
+	) | rpl::on_next([=](PremiumFeature was, PremiumFeature now) {
 		const auto animationCallback = [=] {
 			if (!state->animation.animating()) {
 				for (const auto &hiding : base::take(state->hiding)) {
@@ -1235,13 +1235,13 @@ void PreviewBox(
 	if (descriptor.fromSettings) {
 		Data::AmPremiumValue(
 			&show->session()
-		) | rpl::skip(1) | rpl::start_with_next([=] {
+		) | rpl::skip(1) | rpl::on_next([=] {
 			box->closeBox();
 		}, box->lifetime());
 	}
 
 	box->events(
-	) | rpl::start_with_next([=](not_null<QEvent*> e) {
+	) | rpl::on_next([=](not_null<QEvent*> e) {
 		if (e->type() == QEvent::KeyPress) {
 			const auto key = static_cast<QKeyEvent*>(e.get())->key();
 			if (key == Qt::Key_Left) {
@@ -1253,7 +1253,7 @@ void PreviewBox(
 	}, box->lifetime());
 
 	if (const auto &hidden = descriptor.hiddenCallback) {
-		box->boxClosing() | rpl::start_with_next(hidden, box->lifetime());
+		box->boxClosing() | rpl::on_next(hidden, box->lifetime());
 	}
 }
 
@@ -1299,13 +1299,13 @@ void DecorateListPromoBox(
 	if (!descriptor.hideSubscriptionButton) {
 		Data::AmPremiumValue(
 			session
-		) | rpl::skip(1) | rpl::start_with_next([=] {
+		) | rpl::skip(1) | rpl::on_next([=] {
 			box->closeBox();
 		}, box->lifetime());
 	}
 
 	if (const auto &hidden = descriptor.hiddenCallback) {
-		box->boxClosing() | rpl::start_with_next(hidden, box->lifetime());
+		box->boxClosing() | rpl::on_next(hidden, box->lifetime());
 	}
 
 	if (session->premium() || descriptor.hideSubscriptionButton) {
@@ -1325,7 +1325,7 @@ void DecorateListPromoBox(
 
 		box->setStyle(st::premiumPreviewDoubledLimitsBox);
 		box->widthValue(
-		) | rpl::start_with_next([=](int width) {
+		) | rpl::on_next([=](int width) {
 			const auto &padding
 				= st::premiumPreviewDoubledLimitsBox.buttonPadding;
 			button->resizeToWidth(width
@@ -1764,7 +1764,7 @@ object_ptr<Ui::GradientButton> CreateUnlockButton(
 	rpl::combine(
 		result->widthValue(),
 		label->widthValue()
-	) | rpl::start_with_next([=](int outer, int width) {
+	) | rpl::on_next([=](int outer, int width) {
 		label->moveToLeft(
 			(outer - width) / 2,
 			st::premiumPreviewBox.button.textTop,
diff --git a/Telegram/SourceFiles/boxes/reactions_settings_box.cpp b/Telegram/SourceFiles/boxes/reactions_settings_box.cpp
index 8a71e395b8..4454c29926 100644
--- a/Telegram/SourceFiles/boxes/reactions_settings_box.cpp
+++ b/Telegram/SourceFiles/boxes/reactions_settings_box.cpp
@@ -118,7 +118,7 @@ void AddMessage(
 	widget->widthValue(
 	) | rpl::filter(
 		rpl::mappers::_1 >= (st::historyMinimalWidth / 2)
-	) | rpl::start_with_next(updateWidgetSize, widget->lifetime());
+	) | rpl::on_next(updateWidgetSize, widget->lifetime());
 	updateWidgetSize(width);
 
 	const auto rightSize = st::settingsReactionCornerSize;
@@ -135,7 +135,7 @@ void AddMessage(
 	};
 
 	widget->paintRequest(
-	) | rpl::start_with_next([=](const QRect &rect) {
+	) | rpl::on_next([=](const QRect &rect) {
 		Window::SectionWidget::PaintBackground(
 			controller,
 			controller->defaultChatTheme().get(), // #TODO themes
@@ -173,7 +173,7 @@ void AddMessage(
 	auto selectedId = rpl::duplicate(idValue);
 	std::move(
 		selectedId
-	) | rpl::start_with_next([
+	) | rpl::on_next([
 		=,
 		idValue = std::move(idValue),
 		iconSize = st::settingsReactionMessageSize
@@ -242,14 +242,14 @@ not_null<Ui::RpWidget*> AddReactionIconWrap(
 
 	std::move(
 		iconPositionValue
-	) | rpl::start_with_next([=](const QPoint &point) {
+	) | rpl::on_next([=](const QPoint &point) {
 		widget->moveToLeft(point.x(), point.y());
 	}, widget->lifetime());
 
 	const auto update = crl::guard(widget, [=] { widget->update(); });
 
 	widget->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(widget);
 
 		if (state->finalAnimation.animating()) {
@@ -269,7 +269,7 @@ not_null<Ui::RpWidget*> AddReactionIconWrap(
 
 	std::move(
 		destroys
-	) | rpl::take(1) | rpl::start_with_next([=, from = 0., to = 1.] {
+	) | rpl::take(1) | rpl::on_next([=, from = 0., to = 1.] {
 		state->finalAnimation.start(
 			[=](float64 value) {
 				update();
@@ -316,7 +316,7 @@ void AddReactionAnimatedIcon(
 	state->select.media->checkStickerLarge();
 	rpl::single() | rpl::then(
 		reaction.appearAnimation->session().downloaderTaskFinished()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto check = [&](State::Entry &entry) {
 			if (!entry.media) {
 				return true;
@@ -367,7 +367,7 @@ void AddReactionAnimatedIcon(
 
 	std::move(
 		selects
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto select = state->select.icon.get();
 		if (select && !select->animating()) {
 			select->animate(crl::guard(widget, [=] { widget->update(); }));
@@ -445,7 +445,7 @@ void ReactionsSettingsBox(
 	check->resize(st::settingsReactionCornerSize);
 	check->setAttribute(Qt::WA_TransparentForMouseEvents);
 	check->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		Painter p(check);
 		st::mediaPlayerMenuCheck.paintInCenter(p, check->rect());
 	}, check->lifetime());
@@ -510,7 +510,7 @@ void ReactionsSettingsBox(
 		firstCheckedButton->geometryValue(
 		) | rpl::filter([=](const QRect &r) {
 			return r.isValid();
-		}) | rpl::take(1) | rpl::start_with_next([=] {
+		}) | rpl::take(1) | rpl::on_next([=] {
 			checkButton(firstCheckedButton);
 		}, firstCheckedButton->lifetime());
 	}
diff --git a/Telegram/SourceFiles/boxes/report_messages_box.cpp b/Telegram/SourceFiles/boxes/report_messages_box.cpp
index 8855cd581e..c66609f07c 100644
--- a/Telegram/SourceFiles/boxes/report_messages_box.cpp
+++ b/Telegram/SourceFiles/boxes/report_messages_box.cpp
@@ -162,7 +162,7 @@ void ShowReportMessageBox(
 									RectPart::Top | RectPart::Bottom);
 							background->lower();
 							widget->sizeValue(
-							) | rpl::start_with_next([=](const QSize &s) {
+							) | rpl::on_next([=](const QSize &s) {
 								background->resize(s);
 							}, background->lifetime());
 						}
@@ -183,7 +183,7 @@ void ShowReportMessageBox(
 							repeatRequest(repeatRequest, std::move(copy));
 						};
 						details->submits(
-						) | rpl::start_with_next(submit, details->lifetime());
+						) | rpl::on_next(submit, details->lifetime());
 						box->addButton(tr::lng_report_button(), submit);
 					} else {
 						box->addButton(
diff --git a/Telegram/SourceFiles/boxes/ringtones_box.cpp b/Telegram/SourceFiles/boxes/ringtones_box.cpp
index ef945ba793..364cc1245a 100644
--- a/Telegram/SourceFiles/boxes/ringtones_box.cpp
+++ b/Telegram/SourceFiles/boxes/ringtones_box.cpp
@@ -72,7 +72,7 @@ AudioCreator::AudioCreator()
 	});
 	base::timer_each(
 		kNoDetachTimeout
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		Media::Audio::StopDetachIfNotUsedSafe();
 	}, _lifetime);
 }
@@ -210,7 +210,7 @@ void RingtonesBox(
 	};
 
 	session->api().ringtones().uploadFails(
-	) | rpl::start_with_next([=](const QString &error) {
+	) | rpl::on_next([=](const QString &error) {
 		if ((error == u"RINGTONE_DURATION_TOO_LONG"_q)) {
 			box->getDelegate()->show(Ui::MakeInformBox(
 				tr::lng_ringtones_error_max_duration(
@@ -274,10 +274,10 @@ void RingtonesBox(
 	};
 
 	session->api().ringtones().listUpdates(
-	) | rpl::start_with_next(rebuild, container->lifetime());
+	) | rpl::on_next(rebuild, container->lifetime());
 
 	session->api().ringtones().uploadDones(
-	) | rpl::start_with_next([=](DocumentId id) {
+	) | rpl::on_next([=](DocumentId id) {
 		state->chosen = Data::NotifySound{ .id = id };
 		rebuild();
 	}, container->lifetime());
diff --git a/Telegram/SourceFiles/boxes/self_destruction_box.cpp b/Telegram/SourceFiles/boxes/self_destruction_box.cpp
index e9946c9f5a..d8eb129717 100644
--- a/Telegram/SourceFiles/boxes/self_destruction_box.cpp
+++ b/Telegram/SourceFiles/boxes/self_destruction_box.cpp
@@ -48,7 +48,7 @@ void AddDeleteAccount(
 		session->api().cloudPassword().state(
 		) | rpl::take(
 			1
-		) | rpl::start_with_next([=](const Core::CloudPasswordState &state) {
+		) | rpl::on_next([=](const Core::CloudPasswordState &state) {
 			auto fields = PasscodeBox::CloudFields::From(state);
 			fields.customTitle = tr::lng_settings_destroy_title();
 			fields.customDescription = tr::lng_context_mark_read_all_sure_2(
@@ -117,7 +117,7 @@ SelfDestructionBox::SelfDestructionBox(
 		preloaded
 	) | rpl::take(
 		1
-	) | rpl::start_with_next([=](int days) {
+	) | rpl::on_next([=](int days) {
 		gotCurrent(days);
 	}, lifetime());
 }
diff --git a/Telegram/SourceFiles/boxes/send_credits_box.cpp b/Telegram/SourceFiles/boxes/send_credits_box.cpp
index 8cfcdc1deb..b108ef1aa2 100644
--- a/Telegram/SourceFiles/boxes/send_credits_box.cpp
+++ b/Telegram/SourceFiles/boxes/send_credits_box.cpp
@@ -125,7 +125,7 @@ void AddTerms(
 		.shadowIgnoreTopSkip = stBox.shadowIgnoreTopSkip,
 		.shadowIgnoreBottomSkip = stBox.shadowIgnoreBottomSkip,
 	});
-	button->geometryValue() | rpl::start_with_next([=](const QRect &rect) {
+	button->geometryValue() | rpl::on_next([=](const QRect &rect) {
 		terms->resizeToWidth(box->width()
 			- rect::m::sum::h(st::boxRowPadding));
 		terms->moveToLeft(
@@ -266,7 +266,7 @@ void AddTerms(
 	const auto radius = smaller.height() / 2.;
 	widget->resize(size);
 
-	widget->paintRequest() | rpl::start_with_next([=] {
+	widget->paintRequest() | rpl::on_next([=] {
 		auto p = QPainter(widget);
 		auto hq = PainterHighQualityEnabler(p);
 		p.setPen(QPen(st::premiumButtonFg, st::chatGiveawayBadgeStroke * 1.));
@@ -331,13 +331,13 @@ void SendCreditsBox(
 		ministars->setColorOverride(Ui::Premium::CreditsIconGradientStops());
 
 		ministarsContainer->paintRequest(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			auto p = QPainter(ministarsContainer);
 			ministars->paint(p);
 		}, ministarsContainer->lifetime());
 
 		box->widthValue(
-		) | rpl::start_with_next([=](int width) {
+		) | rpl::on_next([=](int width) {
 			ministarsContainer->resize(width, fullHeight);
 			const auto w = fullHeight / 3 * 2;
 			ministars->setCenter(QRect(
@@ -354,7 +354,7 @@ void SendCreditsBox(
 	thumb->setAttribute(Qt::WA_TransparentForMouseEvents);
 	if (form->invoice.subscriptionPeriod) {
 		const auto badge = SendCreditsBadge(content, form->invoice.amount);
-		thumb->geometryValue() | rpl::start_with_next([=](const QRect &r) {
+		thumb->geometryValue() | rpl::on_next([=](const QRect &r) {
 			badge->moveToLeft(
 				r.x() + (r.width() - badge->width()) / 2,
 				rect::bottom(r) - badge->height() / 2);
@@ -420,7 +420,7 @@ void SendCreditsBox(
 			if (id == u"BOT_PRECHECKOUT_FAILED"_q) {
 				auto error = ::Ui::MakeInformBox(
 					tr::lng_payments_precheckout_stars_failed(tr::now));
-				error->boxClosing() | rpl::start_with_next([=] {
+				error->boxClosing() | rpl::on_next([=] {
 					if (const auto paybox = weak.get()) {
 						paybox->closeBox();
 					}
@@ -469,7 +469,7 @@ void SendCreditsBox(
 			content,
 			st::boxTitleClose);
 		close->setClickedCallback([=] { box->closeBox(); });
-		content->widthValue() | rpl::start_with_next([=](int) {
+		content->widthValue() | rpl::on_next([=](int) {
 			close->moveToRight(0, 0);
 		}, close->lifetime());
 	}
@@ -484,7 +484,7 @@ void SendCreditsBox(
 		rpl::combine(
 			balance->sizeValue(),
 			content->sizeValue()
-		) | rpl::start_with_next([=](const QSize &, const QSize &) {
+		) | rpl::on_next([=](const QSize &, const QSize &) {
 			balance->moveToLeft(
 				st::creditsHistoryRightSkip * 2,
 				st::creditsHistoryRightSkip);
@@ -520,17 +520,17 @@ not_null<FlatLabel*> SetButtonMarkedLabel(
 		text
 	) | rpl::filter([=](const TextWithEntities &text) {
 		return !text.text.isEmpty();
-	}) | rpl::start_with_next([=](const TextWithEntities &text) {
+	}) | rpl::on_next([=](const TextWithEntities &text) {
 		buttonLabel->setMarkedText(text, context);
 	}, buttonLabel->lifetime());
 	if (textFg) {
 		buttonLabel->setTextColorOverride((*textFg)->c);
-		style::PaletteChanged() | rpl::start_with_next([=] {
+		style::PaletteChanged() | rpl::on_next([=] {
 			buttonLabel->setTextColorOverride((*textFg)->c);
 		}, buttonLabel->lifetime());
 	}
 	button->sizeValue(
-	) | rpl::start_with_next([=](const QSize &size) {
+	) | rpl::on_next([=](const QSize &size) {
 		buttonLabel->moveToLeft(
 			(size.width() - buttonLabel->width()) / 2,
 			(size.height() - buttonLabel->height()) / 2);
diff --git a/Telegram/SourceFiles/boxes/send_files_box.cpp b/Telegram/SourceFiles/boxes/send_files_box.cpp
index 3f4c770a9d..63042cb800 100644
--- a/Telegram/SourceFiles/boxes/send_files_box.cpp
+++ b/Telegram/SourceFiles/boxes/send_files_box.cpp
@@ -140,12 +140,12 @@ void EditPriceBox(
 		price ? QString::number(price) : QString(),
 		limit);
 	const auto field = owned.data();
-	wrap->widthValue() | rpl::start_with_next([=](int width) {
+	wrap->widthValue() | rpl::on_next([=](int width) {
 		field->move(0, 0);
 		field->resize(width, field->height());
 		wrap->resize(width, field->height());
 	}, wrap->lifetime());
-	field->paintRequest() | rpl::start_with_next([=](QRect clip) {
+	field->paintRequest() | rpl::on_next([=](QRect clip) {
 		auto p = QPainter(field);
 		st::paidStarIcon.paint(p, 0, st::paidStarIconTop, field->width());
 	}, field->lifetime());
@@ -574,7 +574,7 @@ void SendFilesBox::initPreview() {
 		_footerHeight.value(),
 		_titleHeight.value(),
 		_1 + _2 + _3
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		setDimensions(
 			st::boxWideWidth,
 			std::min(st::sendMediaPreviewHeightMax, height),
@@ -619,7 +619,7 @@ void SendFilesBox::prepare() {
 	SetupShadowsToScrollContent(this, _scroll, _inner->heightValue());
 	setCloseByOutsideClick(false);
 
-	boxClosing() | rpl::start_with_next([=] {
+	boxClosing() | rpl::on_next([=] {
 		if (!_confirmed && _cancelledCallback) {
 			_cancelledCallback();
 		}
@@ -838,7 +838,7 @@ void SendFilesBox::refreshPriceTag() {
 		const auto raw = _priceTag.get();
 
 		raw->show();
-		raw->paintRequest() | rpl::start_with_next([=] {
+		raw->paintRequest() | rpl::on_next([=] {
 			if (_priceTagBg.isNull()) {
 				_priceTagBg = preparePriceTagBg(raw->size());
 			}
@@ -860,17 +860,17 @@ void SendFilesBox::refreshPriceTag() {
 			st::paidTagLabel);
 		std::move(
 			text
-		) | rpl::start_with_next([=](const TextWithEntities &text) {
+		) | rpl::on_next([=](const TextWithEntities &text) {
 			label->setMarkedText(text);
 		}, label->lifetime());
 		label->show();
-		label->sizeValue() | rpl::start_with_next([=](QSize size) {
+		label->sizeValue() | rpl::on_next([=](QSize size) {
 			const auto inner = QRect(QPoint(), size);
 			const auto rect = inner.marginsAdded(st::paidTagPadding);
 			raw->resize(rect.size());
 			label->move(-rect.topLeft());
 		}, label->lifetime());
-		_inner->sizeValue() | rpl::start_with_next([=](QSize size) {
+		_inner->sizeValue() | rpl::on_next([=](QSize size) {
 			raw->move(
 				(size.width() - raw->width()) / 2,
 				(size.height() - raw->height()) / 2);
@@ -966,7 +966,7 @@ void SendFilesBox::initSendWay() {
 		return result;
 	}();
 	_sendWay.changes(
-	) | rpl::start_with_next([=](SendFilesWay value) {
+	) | rpl::on_next([=](SendFilesWay value) {
 		const auto hidden = [&] {
 			return !_caption || _caption->isHidden();
 		};
@@ -1082,7 +1082,7 @@ void SendFilesBox::pushBlock(int from, int till) {
 	block.itemDeleteRequest(
 	) | rpl::filter([=] {
 		return !_removingIndex;
-	}) | rpl::start_with_next([=](int index) {
+	}) | rpl::on_next([=](int index) {
 		applyBlockChanges();
 
 		_removingIndex = index;
@@ -1104,7 +1104,7 @@ void SendFilesBox::pushBlock(int from, int till) {
 
 	const auto show = uiShow();
 	block.itemReplaceRequest(
-	) | rpl::start_with_next([=](int index) {
+	) | rpl::on_next([=](int index) {
 		applyBlockChanges();
 
 		const auto replace = [=](Ui::PreparedList list) {
@@ -1181,7 +1181,7 @@ void SendFilesBox::pushBlock(int from, int till) {
 
 	const auto openedOnce = widget->lifetime().make_state<bool>(false);
 	block.itemModifyRequest(
-	) | rpl::start_with_next([=, show = _show](int index) {
+	) | rpl::on_next([=, show = _show](int index) {
 		applyBlockChanges();
 
 		if (!(*openedOnce)) {
@@ -1198,7 +1198,7 @@ void SendFilesBox::pushBlock(int from, int till) {
 	}, widget->lifetime());
 
 	block.itemEditCoverRequest(
-	) | rpl::start_with_next([=, show = _show](int index) {
+	) | rpl::on_next([=, show = _show](int index) {
 		applyBlockChanges();
 
 		const auto replace = [=](Ui::PreparedList list) {
@@ -1261,7 +1261,7 @@ void SendFilesBox::pushBlock(int from, int till) {
 	}, widget->lifetime());
 
 	block.itemClearCoverRequest(
-	) | rpl::start_with_next([=](int index) {
+	) | rpl::on_next([=](int index) {
 		applyBlockChanges();
 		refreshAllAfterChanges(from, [&] {
 			auto &entry = _list.files[index];
@@ -1269,7 +1269,7 @@ void SendFilesBox::pushBlock(int from, int till) {
 		});
 	}, widget->lifetime());
 
-	block.orderUpdated() | rpl::start_with_next([=]{
+	block.orderUpdated() | rpl::on_next([=]{
 		if (_priceTag) {
 			_priceTagBg = QImage();
 			_priceTag->update();
@@ -1302,13 +1302,13 @@ void SendFilesBox::setupSendWayControls() {
 		_st.files.check);
 
 	_sendWay.changes(
-	) | rpl::start_with_next([=](SendFilesWay value) {
+	) | rpl::on_next([=](SendFilesWay value) {
 		_groupFiles->setChecked(value.groupFiles());
 		_sendImagesAsPhotos->setChecked(value.sendImagesAsPhotos());
 	}, lifetime());
 
 	_groupFiles->checkedChanges(
-	) | rpl::start_with_next([=](bool checked) {
+	) | rpl::on_next([=](bool checked) {
 		auto sendWay = _sendWay.current();
 		if (sendWay.groupFiles() == checked) {
 			return;
@@ -1324,7 +1324,7 @@ void SendFilesBox::setupSendWayControls() {
 	}, lifetime());
 
 	_sendImagesAsPhotos->checkedChanges(
-	) | rpl::start_with_next([=](bool checked) {
+	) | rpl::on_next([=](bool checked) {
 		auto sendWay = _sendWay.current();
 		if (sendWay.sendImagesAsPhotos() == checked) {
 			return;
@@ -1349,7 +1349,7 @@ void SendFilesBox::setupSendWayControls() {
 	rpl::combine(
 		_groupFiles->checkedValue(),
 		_sendImagesAsPhotos->checkedValue()
-	) | rpl::start_with_next([=](bool groupFiles, bool asPhoto) {
+	) | rpl::on_next([=](bool groupFiles, bool asPhoto) {
 		_wayRemember->setVisible(
 			(groupFiles != groupFilesFirst) || (asPhoto != asPhotosFirst));
 		captionResized();
@@ -1439,18 +1439,18 @@ void SendFilesBox::setupCaption() {
 	_caption->setMaxLength(kMaxMessageLength);
 
 	_caption->heightChanges(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		captionResized();
 	}, _caption->lifetime());
 	_caption->submits(
-	) | rpl::start_with_next([=](Qt::KeyboardModifiers modifiers) {
+	) | rpl::on_next([=](Qt::KeyboardModifiers modifiers) {
 		const auto ctrlShiftEnter = modifiers.testFlag(Qt::ShiftModifier)
 			&& (modifiers.testFlag(Qt::ControlModifier)
 				|| modifiers.testFlag(Qt::MetaModifier));
 		send({}, ctrlShiftEnter);
 	}, _caption->lifetime());
 	_caption->cancelled(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		closeBox();
 	}, _caption->lifetime());
 	_caption->setMimeDataHook([=](
@@ -1469,7 +1469,7 @@ void SendFilesBox::setupCaption() {
 
 	rpl::single(rpl::empty_value()) | rpl::then(
 		_caption->changes()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		checkCharsLimitation();
 		refreshMessagesCount();
 	}, _caption->lifetime());
@@ -1543,7 +1543,7 @@ void SendFilesBox::checkCharsLimitation() {
 			_charsLimitation->show();
 			Data::AmPremiumValue(
 				&_show->session()
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				checkCharsLimitation();
 			}, _charsLimitation->lifetime());
 		}
@@ -1585,11 +1585,11 @@ void SendFilesBox::setupEmojiPanel() {
 	_emojiPanel->selector()->setAllowEmojiWithoutPremium(
 		_limits & SendFilesAllow::EmojiWithoutPremium);
 	_emojiPanel->selector()->emojiChosen(
-	) | rpl::start_with_next([=](ChatHelpers::EmojiChosen data) {
+	) | rpl::on_next([=](ChatHelpers::EmojiChosen data) {
 		Ui::InsertEmojiAtCursor(_caption->textCursor(), data.emoji);
 	}, lifetime());
 	_emojiPanel->selector()->customEmojiChosen(
-	) | rpl::start_with_next([=](ChatHelpers::FileChosen data) {
+	) | rpl::on_next([=](ChatHelpers::FileChosen data) {
 		const auto info = data.document->sticker();
 		if (info
 			&& info->setType == Data::StickersType::Emoji
diff --git a/Telegram/SourceFiles/boxes/send_gif_with_caption_box.cpp b/Telegram/SourceFiles/boxes/send_gif_with_caption_box.cpp
index 4e83fd7e72..e7f779c05e 100644
--- a/Telegram/SourceFiles/boxes/send_gif_with_caption_box.cpp
+++ b/Telegram/SourceFiles/boxes/send_gif_with_caption_box.cpp
@@ -76,7 +76,7 @@ namespace {
 				Qt::KeepAspectRatio).height()),
 		st::boxRowPadding);
 	widget->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(widget);
 		if (state->gif && state->gif->started()) {
 			p.drawImage(
@@ -122,7 +122,7 @@ namespace {
 	};
 	if (!updateThumbnail()) {
 		document->session().downloaderTaskFinished(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			if (updateThumbnail()) {
 				state->loadingLifetime.destroy();
 				widget->update();
@@ -175,11 +175,11 @@ namespace {
 		emojiPanel->hide();
 		emojiPanel->selector()->setCurrentPeer(controller->session().user());
 		emojiPanel->selector()->emojiChosen(
-		) | rpl::start_with_next([=](ChatHelpers::EmojiChosen data) {
+		) | rpl::on_next([=](ChatHelpers::EmojiChosen data) {
 			Ui::InsertEmojiAtCursor(input->textCursor(), data.emoji);
 		}, input->lifetime());
 		emojiPanel->selector()->customEmojiChosen(
-		) | rpl::start_with_next([=](ChatHelpers::FileChosen data) {
+		) | rpl::on_next([=](ChatHelpers::FileChosen data) {
 			const auto info = data.document->sticker();
 			if (info
 				&& info->setType == Data::StickersType::Emoji
@@ -212,7 +212,7 @@ namespace {
 					emojiButton,
 					style::al_top);
 				state->charsLimitation->show();
-				Data::AmPremiumValue(session) | rpl::start_with_next([=] {
+				Data::AmPremiumValue(session) | rpl::on_next([=] {
 					repeat(repeat);
 				}, state->charsLimitation->lifetime());
 			}
@@ -223,7 +223,7 @@ namespace {
 		}
 	};
 
-	input->changes() | rpl::start_with_next([=] {
+	input->changes() | rpl::on_next([=] {
 		checkCharsLimitation(checkCharsLimitation);
 	}, input->lifetime());
 
@@ -342,7 +342,7 @@ void CaptionBox(
 		box->closeBox();
 	});
 	input->submits(
-	) | rpl::start_with_next([=] { send({}); }, input->lifetime());
+	) | rpl::on_next([=] { send({}); }, input->lifetime());
 }
 
 } // namespace
@@ -378,7 +378,7 @@ void EditCaptionBox(
 	state->fullId = view->data()->fullId();
 
 	data->itemIdChanged(
-	) | rpl::start_with_next([=](Data::Session::IdChange event) {
+	) | rpl::on_next([=](Data::Session::IdChange event) {
 		if (event.oldId == state->fullId.msg) {
 			state->fullId = event.newId;
 		}
diff --git a/Telegram/SourceFiles/boxes/share_box.cpp b/Telegram/SourceFiles/boxes/share_box.cpp
index 00568e0616..75226faea0 100644
--- a/Telegram/SourceFiles/boxes/share_box.cpp
+++ b/Telegram/SourceFiles/boxes/share_box.cpp
@@ -239,7 +239,7 @@ void ShareBox::prepareCommentField() {
 		(_bottomWidget
 			? _bottomWidget->heightValue()
 			: (rpl::single(0) | rpl::type_erased))
-	) | rpl::start_with_next([=](int height, int comment, int bottom) {
+	) | rpl::on_next([=](int height, int comment, int bottom) {
 		_comment->moveToLeft(0, height - bottom - comment);
 		if (_bottomWidget) {
 			_bottomWidget->moveToLeft(0, height - bottom);
@@ -249,7 +249,7 @@ void ShareBox::prepareCommentField() {
 	const auto field = _comment->entity();
 
 	field->submits(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		submit({});
 	}, field->lifetime());
 
@@ -263,7 +263,7 @@ void ShareBox::prepareCommentField() {
 	}
 	field->setSubmitSettings(Core::App().settings().sendSubmitWay());
 
-	field->changes() | rpl::start_with_next([=] {
+	field->changes() | rpl::on_next([=] {
 		if (!field->getLastText().isEmpty()) {
 			setCloseByOutsideClick(false);
 		} else if (_inner->selected().empty()) {
@@ -324,17 +324,17 @@ void ShareBox::prepare() {
 		(_bottomWidget
 			? _bottomWidget->heightValue()
 			: rpl::single(0) | rpl::type_erased)
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateScrollSkips();
 	}, _comment->lifetime());
 
 	_inner->searchRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		needSearchByUsername();
 	}, _inner->lifetime());
 
 	_inner->scrollToRequests(
-	) | rpl::start_with_next([=](const Ui::ScrollToRequest &request) {
+	) | rpl::on_next([=](const Ui::ScrollToRequest &request) {
 		scrollTo(request);
 	}, _inner->lifetime());
 
@@ -368,11 +368,11 @@ void ShareBox::prepare() {
 			},
 			Window::GifPauseReason::Layer);
 		chatsFilters->lower();
-		chatsFilters->heightValue() | rpl::start_with_next([this](int h) {
+		chatsFilters->heightValue() | rpl::on_next([this](int h) {
 			updateScrollSkips();
 			scrollToY(0);
 		}, lifetime());
-		_select->heightValue() | rpl::start_with_next([=](int h) {
+		_select->heightValue() | rpl::on_next([=](int h) {
 			chatsFilters->moveToLeft(0, h);
 		}, chatsFilters->lifetime());
 		_chatsFilters = chatsFilters;
@@ -557,7 +557,7 @@ void ShareBox::showMenu(not_null<Ui::RpWidget*> parent) {
 				nullptr);
 			std::move(
 				text
-			) | rpl::start_with_next([action = item->action()](QString text) {
+			) | rpl::on_next([action = item->action()](QString text) {
 				action->setText(text);
 			}, item->lifetime());
 			item->init(checked);
@@ -620,7 +620,7 @@ void ShareBox::createButtons() {
 
 		send->setAcceptBoth();
 		send->clicks(
-		) | rpl::start_with_next([=](Qt::MouseButton button) {
+		) | rpl::on_next([=](Qt::MouseButton button) {
 			if (button == Qt::RightButton) {
 				showMenu(send);
 			}
@@ -708,7 +708,7 @@ void ShareBox::submit(Api::SendOptions options) {
 		if (!waiting.empty()) {
 			_descriptor.session->changes().peerUpdates(
 				Data::PeerUpdate::Flag::FullInfo
-			) | rpl::start_with_next([=](const Data::PeerUpdate &update) {
+			) | rpl::on_next([=](const Data::PeerUpdate &update) {
 				if (waiting.contains(update.peer)) {
 					withPaymentApproved(alreadyApproved);
 				}
@@ -718,7 +718,7 @@ void ShareBox::submit(Api::SendOptions options) {
 				_descriptor.session->credits().loadedValue(
 				) | rpl::filter(
 					rpl::mappers::_1
-				) | rpl::take(1) | rpl::start_with_next([=] {
+				) | rpl::take(1) | rpl::on_next([=] {
 					withPaymentApproved(alreadyApproved);
 				}, _submitLifetime);
 			}
@@ -830,7 +830,7 @@ ShareBox::Inner::Inner(
 		rpl::merge(
 			Data::AmPremiumValue(session) | rpl::to_empty,
 			session->api().premium().someMessageMoneyRestrictionsResolved()
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			refreshRestrictedRows();
 		}, lifetime());
 	}
@@ -863,24 +863,24 @@ ShareBox::Inner::Inner(
 
 	_descriptor.session->changes().peerUpdates(
 		Data::PeerUpdate::Flag::Photo
-	) | rpl::start_with_next([=](const Data::PeerUpdate &update) {
+	) | rpl::on_next([=](const Data::PeerUpdate &update) {
 		updateChat(update.peer);
 	}, lifetime());
 
 	_descriptor.session->changes().realtimeNameUpdates(
-	) | rpl::start_with_next([=](const Data::NameUpdate &update) {
+	) | rpl::on_next([=](const Data::NameUpdate &update) {
 		_defaultChatsIndexed->peerNameChanged(
 			update.peer,
 			update.oldFirstLetters);
 	}, lifetime());
 
 	_descriptor.session->downloaderTaskFinished(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		update();
 	}, lifetime());
 
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		invalidateCache();
 	}, lifetime());
 }
@@ -1388,7 +1388,7 @@ void ShareBox::Inner::chooseForumTopic(not_null<Data::Forum*> forum) {
 		Assert(!chat->topic);
 		chat->topic = topic;
 		chat->topic->destroyed(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			changePeerCheckState(chat, false);
 		}, chat->topicLifetime);
 		updateChatName(chat);
@@ -1400,7 +1400,7 @@ void ShareBox::Inner::chooseForumTopic(not_null<Data::Forum*> forum) {
 		});
 
 		forum->destroyed(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			box->closeBox();
 		}, box->lifetime());
 	};
@@ -1436,7 +1436,7 @@ void ShareBox::Inner::chooseMonoforumSublist(
 		Assert(!chat->sublist);
 		chat->sublist = sublist;
 		chat->sublist->destroyed(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			changePeerCheckState(chat, false);
 		}, chat->sublistLifetime);
 		updateChatName(chat);
@@ -1448,7 +1448,7 @@ void ShareBox::Inner::chooseMonoforumSublist(
 		});
 
 		monoforum->destroyed(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			box->closeBox();
 		}, box->lifetime());
 	};
diff --git a/Telegram/SourceFiles/boxes/star_gift_auction_box.cpp b/Telegram/SourceFiles/boxes/star_gift_auction_box.cpp
index 88b6cf3eb8..a89e6c484d 100644
--- a/Telegram/SourceFiles/boxes/star_gift_auction_box.cpp
+++ b/Telegram/SourceFiles/boxes/star_gift_auction_box.cpp
@@ -248,7 +248,7 @@ struct BidSliderValues {
 	const auto kHuge = u"99999"_q;
 	const auto userpicLeft = st::auctionBidPlace.style.font->width(kHuge);
 
-	std::move(data) | rpl::start_with_next([=](BidRowData bid) {
+	std::move(data) | rpl::on_next([=](BidRowData bid) {
 		state->place->setTextColorOverride(
 			BidColorOverride(bid.position, bid.winners));
 		if (state->user != bid.user) {
@@ -274,7 +274,7 @@ struct BidSliderValues {
 	rpl::combine(
 		raw->widthValue(),
 		state->stars->widthValue()
-	) | rpl::start_with_next([=](int outer, int stars) {
+	) | rpl::on_next([=](int outer, int stars) {
 		const auto userpicSize = st::auctionBidUserpic.size;
 		const auto top = (userpicSize.height() - st::normalFont->height) / 2;
 		state->place->moveToLeft(0, top, outer);
@@ -478,7 +478,7 @@ void AddBidPlaces(
 
 	rpl::duplicate(
 		value
-	) | rpl::start_with_next([=](const Data::GiftAuctionState &value) {
+	) | rpl::on_next([=](const Data::GiftAuctionState &value) {
 		auto cache = std::vector<Ui::PeerUserpicView>();
 		cache.reserve(value.topBidders.size());
 		for (const auto &user : value.topBidders) {
@@ -557,7 +557,7 @@ void AddBidPlaces(
 	const auto myLabel = AddSubsectionTitle(
 		box->verticalLayout(),
 		std::move(myLabelText));
-	state->my.value() | rpl::start_with_next([=](My my) {
+	state->my.value() | rpl::on_next([=](My my) {
 		myLabel->setTextColorOverride(
 			BidColorOverride(my.position, state->winners));
 	}, myLabel->lifetime());
@@ -707,7 +707,7 @@ void AuctionBidBox(not_null<GenericBox*> box, AuctionBidBoxArgs &&args) {
 	});
 
 	args.peer->owner().giftAuctionGots(
-	) | rpl::start_with_next([=](const Data::GiftAuctionGot &update) {
+	) | rpl::on_next([=](const Data::GiftAuctionGot &update) {
 		if (update.giftId == giftId) {
 			box->closeBox();
 
@@ -741,7 +741,7 @@ void AuctionBidBox(not_null<GenericBox*> box, AuctionBidBoxArgs &&args) {
 	const auto sliderWrap = content->add(
 		object_ptr<VerticalLayout>(content));
 	state->sliderValues.value(
-	) | rpl::start_with_next([=](const BidSliderValues &values) {
+	) | rpl::on_next([=](const BidSliderValues &values) {
 		const auto initial = !sliderWrap->count();
 		if (!initial) {
 			while (sliderWrap->count()) {
@@ -772,7 +772,7 @@ void AuctionBidBox(not_null<GenericBox*> box, AuctionBidBoxArgs &&args) {
 			activeFgOverride);
 		bubble->setAttribute(Qt::WA_TransparentForMouseEvents, false);
 		bubble->setClickedCallback(setCustom);
-		state->subtext.value() | rpl::start_with_next([=](QString &&text) {
+		state->subtext.value() | rpl::on_next([=](QString &&text) {
 			bubble->setSubtext(std::move(text));
 		}, bubble->lifetime());
 
@@ -789,7 +789,7 @@ void AuctionBidBox(not_null<GenericBox*> box, AuctionBidBoxArgs &&args) {
 		sliderWrap->resizeToWidth(st::boxWideWidth);
 
 		const auto custom = CreateChild<AbstractButton>(sliderWrap);
-		state->chosen.changes() | rpl::start_with_next([=] {
+		state->chosen.changes() | rpl::on_next([=] {
 			custom->update();
 		}, custom->lifetime());
 		custom->show();
@@ -805,7 +805,7 @@ void AuctionBidBox(not_null<GenericBox*> box, AuctionBidBoxArgs &&args) {
 			p.fillRect(rem, rem + sub, inner, stroke, color);
 			p.fillRect(rem + sub, rem + inner - sub, stroke, sub, color);
 		});
-		sliderWrap->sizeValue() | rpl::start_with_next([=](QSize size) {
+		sliderWrap->sizeValue() | rpl::on_next([=](QSize size) {
 			custom->move(
 				size.width() - st::boxRowPadding.right() - custom->width(),
 				size.height() - custom->height());
@@ -1124,7 +1124,7 @@ void AuctionBidBox(not_null<GenericBox*> box, AuctionBidBoxArgs &&args) {
 			rpl::mappers::_1 != 0
 		) | rpl::take(
 			1
-		) | rpl::start_with_next([=](int64 price) {
+		) | rpl::on_next([=](int64 price) {
 			delete round;
 
 			raw->insertRow(
@@ -1311,7 +1311,7 @@ void AuctionGotGiftsBox(
 			put();
 			base::timer_each(
 				kSwitchPreviewCoverInterval / 3
-			) | rpl::start_with_next(put, lifetime);
+			) | rpl::on_next(put, lifetime);
 
 			return lifetime;
 		};
@@ -1445,7 +1445,7 @@ void AuctionInfoBox(
 			return !list.models.empty();
 		}) | rpl::take(
 			1
-		) | rpl::start_with_next([=](const UniqueGiftAttributes &list) {
+		) | rpl::on_next([=](const UniqueGiftAttributes &list) {
 			auto emoji = tr::marked();
 			const auto indices = RandomIndicesSubset(list.models.size(), 3);
 			for (const auto index : indices) {
@@ -1488,7 +1488,7 @@ void AuctionInfoBox(
 			GiftTypeStars{ .info = *state->value.current().gift },
 			state->value.value()));
 		sendBox->boxClosing(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			box->closeBox();
 		}, box->lifetime());
 	});
@@ -1539,7 +1539,7 @@ base::weak_qptr<BoxContent> ChooseAndShowAuctionBox(
 				},
 				state->value()));
 			sendBox->boxClosing(
-			) | rpl::start_with_next(close, sendBox->lifetime());
+			) | rpl::on_next(close, sendBox->lifetime());
 		};
 		const auto from = current.my.to;
 		const auto text = (from->isSelf()
@@ -1591,7 +1591,7 @@ base::weak_qptr<BoxContent> ChooseAndShowAuctionBox(
 	}
 	if (const auto strong = box.get()) {
 		strong->boxClosing(
-		) | rpl::start_with_next(boxClosed, strong->lifetime());
+		) | rpl::on_next(boxClosed, strong->lifetime());
 	} else {
 		boxClosed();
 	}
@@ -1615,7 +1615,7 @@ rpl::lifetime ShowStarGiftAuction(
 	const auto state = std::make_shared<State>();
 	auto result = session->giftAuctions().state(
 		slug
-	) | rpl::start_with_next([=](Data::GiftAuctionState &&value) {
+	) | rpl::on_next([=](Data::GiftAuctionState &&value) {
 		if (const auto onstack = finishRequesting) {
 			onstack();
 		}
@@ -1952,7 +1952,7 @@ object_ptr<Ui::RpWidget> MakeActiveAuctionRow(
 			tag));
 
 	raw->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto q = QPainter(raw);
 		sticker->paint(q, {
 			.textColor = st::windowFg->c,
@@ -1989,7 +1989,7 @@ object_ptr<Ui::RpWidget> MakeActiveAuctionRow(
 			st::defaultPopupMenu,
 			helper.context()),
 		st::auctionListTextPadding);
-	rpl::duplicate(value) | rpl::start_with_next([=](const Single &fields) {
+	rpl::duplicate(value) | rpl::on_next([=](const Single &fields) {
 		const auto outbid = (fields.position > fields.winning);
 		subtitle->setTextColorOverride(outbid
 			? st::attentionButtonFg->c
@@ -2022,7 +2022,7 @@ object_ptr<Ui::RpWidget> MakeActiveAuctionRow(
 		window->showStarGiftAuction(slug);
 	});
 	button->setFullRadius(true);
-	raw->widthValue() | rpl::start_with_next([=](int width) {
+	raw->widthValue() | rpl::on_next([=](int width) {
 		button->setFullWidth(width);
 	}, button->lifetime());
 
@@ -2093,7 +2093,7 @@ Fn<void()> ActiveAuctionsCallback(
 
 				auctions->state(
 					now.slug
-				) | rpl::start_with_next([=](const GiftAuctionState &state) {
+				) | rpl::on_next([=](const GiftAuctionState &state) {
 					if (!state.my.bid) {
 						delete row;
 						if (const auto now = rows->current(); now > 1) {
diff --git a/Telegram/SourceFiles/boxes/star_gift_box.cpp b/Telegram/SourceFiles/boxes/star_gift_box.cpp
index a89d309530..0858f03f09 100644
--- a/Telegram/SourceFiles/boxes/star_gift_box.cpp
+++ b/Telegram/SourceFiles/boxes/star_gift_box.cpp
@@ -578,13 +578,13 @@ PreviewWrap::PreviewWrap(
 
 	using namespace HistoryView;
 	_history->owner().viewRepaintRequest(
-	) | rpl::start_with_next([=](not_null<const Element*> view) {
+	) | rpl::on_next([=](not_null<const Element*> view) {
 		if (view == _item.get()) {
 			update();
 		}
 	}, lifetime());
 
-	_history->session().downloaderTaskFinished() | rpl::start_with_next([=] {
+	_history->session().downloaderTaskFinished() | rpl::on_next([=] {
 		update();
 	}, lifetime());
 
@@ -654,7 +654,7 @@ void ShowSentToast(
 		Lottie::Quality::Default);
 
 	preview->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (!player->ready()) {
 			return;
 		}
@@ -668,7 +668,7 @@ void ShowSentToast(
 	}, preview->lifetime());
 
 	player->updates(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		preview->update();
 	}, preview->lifetime());
 }
@@ -678,7 +678,7 @@ PreviewWrap::~PreviewWrap() {
 }
 
 void PreviewWrap::prepare(rpl::producer<GiftSendDetails> details) {
-	std::move(details) | rpl::start_with_next([=](GiftSendDetails details) {
+	std::move(details) | rpl::on_next([=](GiftSendDetails details) {
 		const auto &descriptor = details.descriptor;
 		const auto cost = v::match(descriptor, [&](GiftTypePremium data) {
 			const auto stars = (details.byStars && data.stars)
@@ -742,12 +742,12 @@ void PreviewWrap::prepare(rpl::producer<GiftSendDetails> details) {
 	widthValue(
 	) | rpl::filter([=](int width) {
 		return width >= st::msgMinWidth;
-	}) | rpl::start_with_next([=](int width) {
+	}) | rpl::on_next([=](int width) {
 		resizeTo(width);
 	}, lifetime());
 
 	_history->owner().itemResizeRequest(
-	) | rpl::start_with_next([=](not_null<const HistoryItem*> item) {
+	) | rpl::on_next([=](not_null<const HistoryItem*> item) {
 		if (_item && item == _item->data() && width() >= st::msgMinWidth) {
 			resizeTo(width());
 		}
@@ -807,7 +807,7 @@ void PreviewWrap::paintEvent(QPaintEvent *e) {
 
 		using namespace Api;
 		const auto api = std::make_shared<PremiumGiftCodeOptions>(peer);
-		api->request() | rpl::start_with_error_done([=](QString error) {
+		api->request() | rpl::on_error_done([=](QString error) {
 			consumer.put_next({});
 		}, [=] {
 			const auto &options = api->optionsForPeer();
@@ -975,7 +975,7 @@ struct GiftPriceTabs {
 	};
 
 	state->prices.value(
-	) | rpl::start_with_next([=](const std::vector<int> &prices) {
+	) | rpl::on_next([=](const std::vector<int> &prices) {
 		auto x = st::giftBoxTabsMargin.left();
 		auto y = st::giftBoxTabsMargin.top();
 
@@ -1019,13 +1019,13 @@ struct GiftPriceTabs {
 	rpl::combine(
 		raw->widthValue(),
 		state->fullWidth.value()
-	) | rpl::start_with_next([=](int outer, int inner) {
+	) | rpl::on_next([=](int outer, int inner) {
 		state->scrollMax = std::max(0, inner - outer);
 		state->tabsShift = (outer - inner) / 2;
 	}, raw->lifetime());
 
 	raw->setMouseTracking(true);
-	raw->events() | rpl::start_with_next([=](not_null<QEvent*> e) {
+	raw->events() | rpl::on_next([=](not_null<QEvent*> e) {
 		const auto type = e->type();
 		switch (type) {
 		case QEvent::Leave: setSelected(-1); break;
@@ -1084,7 +1084,7 @@ struct GiftPriceTabs {
 		}
 	}, raw->lifetime());
 
-	raw->paintRequest() | rpl::start_with_next([=] {
+	raw->paintRequest() | rpl::on_next([=] {
 		auto p = QPainter(raw);
 		auto hq = PainterHighQualityEnabler(p);
 		const auto padding = st::giftBoxTabPadding;
@@ -1159,7 +1159,7 @@ struct GiftPriceTabs {
 		container,
 		st::defaultComposeFiles.emoji);
 	toggle->show();
-	field->geometryValue() | rpl::start_with_next([=](QRect r) {
+	field->geometryValue() | rpl::on_next([=](QRect r) {
 		toggle->move(
 			r.x() + r.width() - toggle->width(),
 			r.y() - st::giftBoxEmojiToggleTop);
@@ -1181,11 +1181,11 @@ struct GiftPriceTabs {
 	panel->hide();
 	panel->selector()->setAllowEmojiWithoutPremium(true);
 	panel->selector()->emojiChosen(
-	) | rpl::start_with_next([=](ChatHelpers::EmojiChosen data) {
+	) | rpl::on_next([=](ChatHelpers::EmojiChosen data) {
 		InsertEmojiAtCursor(field->textCursor(), data.emoji);
 	}, field->lifetime());
 	panel->selector()->customEmojiChosen(
-	) | rpl::start_with_next([=](ChatHelpers::FileChosen data) {
+	) | rpl::on_next([=](ChatHelpers::FileChosen data) {
 		Data::InsertCustomEmoji(field, data.document);
 	}, field->lifetime());
 
@@ -1467,7 +1467,7 @@ void AddUpgradeButton(
 			rpl::single(QString()),
 			st::settingsButtonNoIcon));
 	button->toggleOn(rpl::single(false))->toggledValue(
-	) | rpl::start_with_next(toggled, button->lifetime());
+	) | rpl::on_next(toggled, button->lifetime());
 
 	auto helper = Ui::Text::CustomEmojiHelper();
 	auto star = helper.paletteDependent(Ui::Earn::IconCreditsEmoji());
@@ -1484,7 +1484,7 @@ void AddUpgradeButton(
 		helper.context());
 	label->show();
 	label->setAttribute(Qt::WA_TransparentForMouseEvents);
-	button->widthValue() | rpl::start_with_next([=](int outer) {
+	button->widthValue() | rpl::on_next([=](int outer) {
 		const auto padding = st::settingsButtonNoIcon.padding;
 		const auto inner = outer
 			- padding.left()
@@ -1542,7 +1542,7 @@ void AddSoldLeftSlider(
 	state->height = st::giftLimitedPadding.top()
 		+ st::semiboldFont->height
 		+ st::giftLimitedPadding.bottom();
-	above->geometryValue() | rpl::start_with_next([=](QRect geometry) {
+	above->geometryValue() | rpl::on_next([=](QRect geometry) {
 		const auto space = st::giftLimitedBox.buttonPadding.top();
 		const auto skip = (space - state->height) / 2;
 		slider->setGeometry(
@@ -1551,7 +1551,7 @@ void AddSoldLeftSlider(
 			geometry.width() - added.left() - added.right(),
 			state->height);
 	}, slider->lifetime());
-	slider->paintRequest() | rpl::start_with_next([=] {
+	slider->paintRequest() | rpl::on_next([=] {
 		const auto &padding = st::giftLimitedPadding;
 		const auto left = (padding.left() * 2) + state->still.maxWidth();
 		const auto right = (padding.right() * 2) + state->sold.maxWidth();
@@ -1618,7 +1618,7 @@ void CheckMaybeGiftLocked(
 	auto result = object_ptr<VisibleRangeWidget>((QWidget*)nullptr);
 	const auto raw = result.data();
 
-	Data::AmPremiumValue(&window->session()) | rpl::start_with_next([=] {
+	Data::AmPremiumValue(&window->session()) | rpl::on_next([=] {
 		raw->update();
 	}, raw->lifetime());
 
@@ -1644,7 +1644,7 @@ void CheckMaybeGiftLocked(
 	const auto extend = shadow.extend;
 
 	auto &packs = window->session().giftBoxStickersPacks();
-	packs.updated() | rpl::start_with_next([=] {
+	packs.updated() | rpl::on_next([=] {
 		for (const auto &button : state->buttons) {
 			if (const auto raw = button.get()) {
 				raw->update();
@@ -1876,11 +1876,11 @@ void CheckMaybeGiftLocked(
 
 	state->visibleRange = raw->visibleRange();
 	state->visibleRange.value(
-	) | rpl::start_with_next(rebuild, raw->lifetime());
+	) | rpl::on_next(rebuild, raw->lifetime());
 
 	std::move(
 		gifts
-	) | rpl::start_with_next([=](const GiftsDescriptor &gifts) {
+	) | rpl::on_next([=](const GiftsDescriptor &gifts) {
 		const auto width = st::boxWideWidth;
 		const auto padding = st::giftBoxPadding;
 		const auto available = width - padding.left() - padding.right();
@@ -1915,7 +1915,7 @@ void CheckMaybeGiftLocked(
 }
 
 void FillBg(not_null<RpWidget*> box) {
-	box->paintRequest() | rpl::start_with_next([=] {
+	box->paintRequest() | rpl::on_next([=] {
 		auto p = QPainter(box);
 		auto hq = PainterHighQualityEnabler(p);
 
@@ -2003,7 +2003,7 @@ void AddBlock(
 		state->gifts.value(),
 		!state->my.list.empty() && !peer->isSelf());
 	state->priceTab = std::move(tabs.priceTab);
-	state->priceTab.changes() | rpl::start_with_next([=](int tab) {
+	state->priceTab.changes() | rpl::on_next([=](int tab) {
 		tabSelected(tab);
 	}, tabs.widget->lifetime());
 	result->add(std::move(tabs.widget));
@@ -2061,7 +2061,7 @@ void AddBlock(
 				&peer->session(),
 				Data::MyUniqueType::OnlyOwned,
 				state->my.offset
-			) | rpl::start_with_next([=](MyGiftsDescriptor &&descriptor) {
+			) | rpl::on_next([=](MyGiftsDescriptor &&descriptor) {
 				state->myLoading.destroy();
 				state->my.offset = descriptor.list.empty()
 					? QString()
@@ -2593,7 +2593,7 @@ void ChooseStarGiftRecipient(
 			box->setTitle(tr::lng_gift_premium_or_stars());
 			box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
 
-			box->noSearchSubmits() | rpl::start_with_next([=] {
+			box->noSearchSubmits() | rpl::on_next([=] {
 				controllerRaw->noSearchSubmit();
 			}, box->lifetime());
 		};
@@ -2679,7 +2679,7 @@ void ShowStarGiftBox(
 		GiftsPremium(
 			session,
 			peer
-		) | rpl::start_with_next([=](PremiumGiftsDescriptor &&gifts) {
+		) | rpl::on_next([=](PremiumGiftsDescriptor &&gifts) {
 			auto &entry = Map[session];
 			entry.premiumGiftsReady = true;
 			entry.hasPremium = !gifts.list.empty();
@@ -2697,7 +2697,7 @@ void ShowStarGiftBox(
 		peer->session().changes().peerUpdates(
 			peer,
 			Data::PeerUpdate::Flag::FullInfo
-		) | rpl::take(1) | rpl::start_with_next([=] {
+		) | rpl::take(1) | rpl::on_next([=] {
 			auto &entry = Map[session];
 			entry.fullReady = true;
 			checkReady();
@@ -2707,7 +2707,7 @@ void ShowStarGiftBox(
 	GiftsStars(
 		session,
 		peer
-	) | rpl::start_with_next([=](std::vector<GiftTypeStars> &&gifts) {
+	) | rpl::on_next([=](std::vector<GiftTypeStars> &&gifts) {
 		auto &entry = Map[session];
 		entry.starsGiftsReady = true;
 		for (const auto &gift : gifts) {
@@ -2726,7 +2726,7 @@ void ShowStarGiftBox(
 	Data::MyUniqueGiftsSlice(
 		session,
 		Data::MyUniqueType::OnlyOwned
-	) | rpl::start_with_next([=](MyGiftsDescriptor &&gifts) {
+	) | rpl::on_next([=](MyGiftsDescriptor &&gifts) {
 		auto &entry = Map[session];
 		entry.my = std::move(gifts);
 		entry.myReady = true;
@@ -2750,7 +2750,7 @@ void SetupResalePriceButton(
 		QString(),
 		st::uniqueGiftResalePrice);
 	text->setAttribute(Qt::WA_TransparentForMouseEvents);
-	text->sizeValue() | rpl::start_with_next([=](QSize size) {
+	text->sizeValue() | rpl::on_next([=](QSize size) {
 		const auto padding = st::uniqueGiftResalePadding;
 		const auto margin = st::uniqueGiftResaleMargin;
 		button->resize(size.grownBy(padding + margin));
@@ -2758,7 +2758,7 @@ void SetupResalePriceButton(
 	}, button->lifetime());
 	text->setTextColorOverride(QColor(255, 255, 255, 255));
 
-	std::move(price) | rpl::start_with_next([=](CreditsAmount value) {
+	std::move(price) | rpl::on_next([=](CreditsAmount value) {
 		if (value) {
 			text->setMarkedText(value.ton()
 				? Ui::Text::IconEmoji(&st::tonIconEmoji).append(
@@ -2774,7 +2774,7 @@ void SetupResalePriceButton(
 
 	const auto bg = button->lifetime().make_state<rpl::variable<QColor>>(
 		std::move(background));
-	button->paintRequest() | rpl::start_with_next([=] {
+	button->paintRequest() | rpl::on_next([=] {
 		auto p = QPainter(button);
 		auto hq = PainterHighQualityEnabler(p);
 
@@ -2785,7 +2785,7 @@ void SetupResalePriceButton(
 		p.setBrush(bg->current());
 		p.drawRoundedRect(inner, radius, radius);
 	}, button->lifetime());
-	bg->changes() | rpl::start_with_next([=] {
+	bg->changes() | rpl::on_next([=] {
 		button->update();
 	}, button->lifetime());
 
@@ -2850,7 +2850,7 @@ void AddUniqueGiftCover(
 			{ 0., anim::with_alpha(white, .3) },
 			{ 1., white },
 		});
-		pretitle->geometryValue() | rpl::start_with_next([=](QRect rect) {
+		pretitle->geometryValue() | rpl::on_next([=](QRect rect) {
 			const auto half = rect.height() / 2;
 			released->stars->setCenter(rect - QMargins(half, 0, half, 0));
 		}, pretitle->lifetime());
@@ -2918,11 +2918,11 @@ void AddUniqueGiftCover(
 			GiftReleasedByHandler(released->by);
 		});
 		subtitle->geometryValue(
-		) | rpl::start_with_next([=](QRect geometry) {
+		) | rpl::on_next([=](QRect geometry) {
 			button->setGeometry(
 				geometry.marginsAdded(st::giftBoxReleasedByMargin));
 		}, button->lifetime());
-		button->paintRequest() | rpl::start_with_next([=] {
+		button->paintRequest() | rpl::on_next([=] {
 			auto p = QPainter(button);
 			auto hq = PainterHighQualityEnabler(p);
 			const auto use = subtitle->textMaxWidth();
@@ -2986,7 +2986,7 @@ void AddUniqueGiftCover(
 	};
 	rpl::duplicate(
 		data
-	) | rpl::start_with_next([=](const UniqueGiftCover &now) {
+	) | rpl::on_next([=](const UniqueGiftCover &now) {
 		const auto setup = [&](GiftView &to) {
 			to.gift = now.values;
 			to.forced = now.force;
@@ -2997,7 +2997,7 @@ void AddUniqueGiftCover(
 				document->session().downloaderTaskFinished()
 			) | rpl::filter([&to] {
 				return to.media->loaded();
-			}) | rpl::start_with_next([=, &to] {
+			}) | rpl::on_next([=, &to] {
 				const auto lottieSize = st::creditsHistoryEntryStarGiftSize;
 				to.lottie = ChatHelpers::LottiePlayerFromDocument(
 					to.media.get(),
@@ -3007,7 +3007,7 @@ void AddUniqueGiftCover(
 
 				to.lifetime.destroy();
 				const auto lottie = to.lottie.get();
-				lottie->updates() | rpl::start_with_next([=] {
+				lottie->updates() | rpl::on_next([=] {
 					if (state->now.lottie.get() == lottie
 						|| state->crossfade.animating()) {
 						cover->update();
@@ -3141,7 +3141,7 @@ void AddUniqueGiftCover(
 	}
 	updateAttrs(*state->now.gift);
 
-	cover->widthValue() | rpl::start_with_next([=](int width) {
+	cover->widthValue() | rpl::on_next([=](int width) {
 		const auto skip = st::uniqueGiftBottom;
 		if (width <= 3 * skip) {
 			return;
@@ -3181,7 +3181,7 @@ void AddUniqueGiftCover(
 		cover->resize(width, top);
 	}, cover->lifetime());
 
-	cover->paintRequest() | rpl::start_with_next([=] {
+	cover->paintRequest() | rpl::on_next([=] {
 		auto p = QPainter(cover);
 
 		auto progress = state->crossfade.value(state->animating ? 1. : 0.);
@@ -3304,7 +3304,7 @@ void AddWearGiftCover(
 		[=] { cover->update(); },
 		Data::CustomEmojiSizeTag::Large);
 
-	cover->widthValue() | rpl::start_with_next([=](int width) {
+	cover->widthValue() | rpl::on_next([=](int width) {
 		const auto skip = st::uniqueGiftBottom;
 		if (width <= 3 * skip) {
 			return;
@@ -3319,7 +3319,7 @@ void AddWearGiftCover(
 		cover->resize(width, subtitle->y() + subtitle->height() + skip);
 	}, cover->lifetime());
 
-	cover->paintRequest() | rpl::start_with_next([=] {
+	cover->paintRequest() | rpl::on_next([=] {
 		auto p = Painter(cover);
 
 		const auto width = cover->width();
@@ -3508,7 +3508,7 @@ void PreloadUniqueGiftResellPrices(not_null<Main::Session*> session) {
 		}
 	};
 	entry->requestLifetime = entry->api->requestStarGifts(
-	) | rpl::start_with_error_done(finish, [=] {
+	) | rpl::on_error_done(finish, [=] {
 		const auto &gifts = entry->api->starGifts();
 		entry->prices.reserve(gifts.size());
 		for (auto &gift : gifts) {
@@ -3736,7 +3736,7 @@ void UniqueGiftSellBox(
 			st::boxDividerLabel));
 	Ui::AddSkip(container);
 
-	rpl::duplicate(goods) | rpl::start_with_next([=](bool good) {
+	rpl::duplicate(goods) | rpl::on_next([=](bool good) {
 		details->setTextColorOverride(
 			good ? st::windowSubTextFg->c : st::boxTextFgError->c);
 	}, details->lifetime());
@@ -3752,7 +3752,7 @@ void UniqueGiftSellBox(
 	};
 	std::move(
 		priceInput.submits
-	) | rpl::start_with_next(submit, details->lifetime());
+	) | rpl::on_next(submit, details->lifetime());
 	auto submitText = priceNow
 		? tr::lng_gift_sell_update()
 		: tr::lng_gift_sell_put();
@@ -4005,7 +4005,7 @@ struct UpgradeArgs : StarGiftUpgradeArgs {
 		put();
 		base::timer_each(
 			kSwitchUpgradeCoverInterval / 3
-		) | rpl::start_with_next(put, lifetime);
+		) | rpl::on_next(put, lifetime);
 
 		return lifetime;
 	};
@@ -4399,7 +4399,7 @@ void UpgradeBox(
 				args.addDetailsDefault),
 			st::defaultCheckbox.margin,
 			style::al_top);
-		checkbox->checkedChanges() | rpl::start_with_next([=](bool checked) {
+		checkbox->checkedChanges() | rpl::on_next([=](bool checked) {
 			state->preserveDetails = checked;
 		}, checkbox->lifetime());
 	}
@@ -4489,7 +4489,7 @@ void UpgradeBox(
 			st::resaleButtonSubtitle);
 		state->cost->tillNextValue() | rpl::filter([=](TimeId left) {
 			return !left;
-		}) | rpl::take(1) | rpl::start_with_next([=] {
+		}) | rpl::take(1) | rpl::on_next([=] {
 			while (!button->children().isEmpty()) {
 				delete button->children()[0];
 			}
@@ -4505,7 +4505,7 @@ void UpgradeBox(
 				[](QString text) { return Ui::Text::Link(text); }),
 			st::resalePriceTableLink);
 		link->setTryMakeSimilarLines(true);
-		button->geometryValue() | rpl::start_with_next([=](QRect geometry) {
+		button->geometryValue() | rpl::on_next([=](QRect geometry) {
 			const auto outer = button->parentWidget()->height();
 			const auto top = geometry.y() + geometry.height();
 			const auto available = outer - top - st::boxRadius;
@@ -4577,7 +4577,7 @@ void AddUniqueCloseButton(
 		menu->show();
 		menu->raise();
 	}
-	box->widthValue() | rpl::start_with_next([=](int width) {
+	box->widthValue() | rpl::on_next([=](int width) {
 		close->moveToRight(0, 0, width);
 		close->raise();
 		if (menu) {
@@ -4647,7 +4647,7 @@ void SubmitTonForm(
 	const auto session = &show->session();
 	session->credits().tonLoad();
 	session->credits().tonLoadedValue(
-	) | rpl::filter(rpl::mappers::_1) | rpl::start_with_next([=] {
+	) | rpl::filter(rpl::mappers::_1) | rpl::on_next([=] {
 		state->lifetime.destroy();
 
 		if (session->credits().tonBalance() < ton) {
@@ -4915,7 +4915,7 @@ void SendGiftBox(
 		tr::lng_gift_send_message(),
 		QString(),
 		limit);
-	text->changes() | rpl::start_with_next([=] {
+	text->changes() | rpl::on_next([=] {
 		auto now = state->details.current();
 		auto textWithTags = text->getTextWithAppliedMarkdown();
 		now.text = TextWithEntities{
@@ -4987,7 +4987,7 @@ void SendGiftBox(
 				tr::lng_gift_send_anonymous(),
 				st::settingsButtonNoIcon)
 		)->toggleOn(rpl::single(peer->isSelf()))->toggledValue(
-		) | rpl::start_with_next([=](bool toggled) {
+		) | rpl::on_next([=](bool toggled) {
 			auto now = state->details.current();
 			now.anonymous = toggled;
 			state->details = std::move(now);
@@ -5011,7 +5011,7 @@ void SendGiftBox(
 						Ui::Text::WithEntities),
 						st::settingsButtonNoIcon)
 			)->toggleOn(rpl::single(false))->toggledValue(
-			) | rpl::start_with_next([=](bool toggled) {
+			) | rpl::on_next([=](bool toggled) {
 				auto now = state->details.current();
 				now.byStars = toggled;
 				state->details = std::move(now);
@@ -5081,7 +5081,7 @@ void SendGiftBox(
 				.details = std::make_unique<GiftSendDetails>(details),
 			}));
 			bidBox->boxClosing(
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				box->closeBox();
 			}, box->lifetime());
 			return;
diff --git a/Telegram/SourceFiles/boxes/star_gift_preview_box.cpp b/Telegram/SourceFiles/boxes/star_gift_preview_box.cpp
index 5ab6771c50..f3711624ec 100644
--- a/Telegram/SourceFiles/boxes/star_gift_preview_box.cpp
+++ b/Telegram/SourceFiles/boxes/star_gift_preview_box.cpp
@@ -367,7 +367,7 @@ void AttributeButton::setDocument(not_null<DocumentData*> document) {
 		document->session().downloaderTaskFinished()
 	) | rpl::filter([=] {
 		return media->loaded();
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		_mediaLifetime.destroy();
 
 		auto result = std::unique_ptr<HistoryView::StickerPlayer>();
@@ -709,7 +709,7 @@ void Delegate::update(
 			document->session().downloaderTaskFinished()
 		) | rpl::filter([=] {
 			return media->loaded();
-		}) | rpl::start_with_next([=, &model] {
+		}) | rpl::on_next([=, &model] {
 			model.mediaLifetime.destroy();
 
 			auto result = std::unique_ptr<HistoryView::StickerPlayer>();
@@ -963,7 +963,7 @@ AttributesList::AttributesList(
 	fill();
 
 	_tab.value(
-	) | rpl::start_with_next([=](Tab tab) {
+	) | rpl::on_next([=](Tab tab) {
 		_entries = [&] {
 			switch (tab) {
 			case Tab::Model: return &_models;
@@ -977,7 +977,7 @@ AttributesList::AttributesList(
 		refreshAbout();
 	}, lifetime());
 
-	_selected.value() | rpl::combine_previous() | rpl::start_with_next([=](
+	_selected.value() | rpl::combine_previous() | rpl::on_next([=](
 			Selection was,
 			Selection now) {
 		const auto tab = _tab.current();
@@ -1356,7 +1356,7 @@ void StarGiftPreviewBox(
 		&state->attributes,
 		state->tab.value()));
 	state->list->selected(
-	) | rpl::start_with_next([=](Selection value) {
+	) | rpl::on_next([=](Selection value) {
 		state->fixed = value;
 		state->paused = (value.model >= 0)
 			|| (value.pattern >= 0)
@@ -1381,7 +1381,7 @@ void StarGiftPreviewBox(
 			state->tab = tab;
 		});
 		const auto icon = &active;
-		state->tab.value() | rpl::start_with_next([=](Tab now) {
+		state->tab.value() | rpl::on_next([=](Tab now) {
 			raw->setTextFgOverride((now == tab)
 				? st::defaultActiveButton.textFg->c
 				: std::optional<QColor>());
@@ -1408,7 +1408,7 @@ void StarGiftPreviewBox(
 		st::uniqueAttributeModelActive,
 		Tab::Model);
 
-	state->paused.value() | rpl::start_with_next([=](bool paused) {
+	state->paused.value() | rpl::on_next([=](bool paused) {
 		if (paused) {
 			state->pushNextTimer.cancel();
 		} else {
diff --git a/Telegram/SourceFiles/boxes/star_gift_resale_box.cpp b/Telegram/SourceFiles/boxes/star_gift_resale_box.cpp
index 3a21ec0543..49bceb8186 100644
--- a/Telegram/SourceFiles/boxes/star_gift_resale_box.cpp
+++ b/Telegram/SourceFiles/boxes/star_gift_resale_box.cpp
@@ -302,7 +302,7 @@ struct ResaleTabs {
 	};
 
 	state->filter.value(
-	) | rpl::start_with_next([=](const ResaleGiftsFilter &fields) {
+	) | rpl::on_next([=](const ResaleGiftsFilter &fields) {
 		auto x = st::giftBoxResaleTabsMargin.left();
 		auto y = st::giftBoxResaleTabsMargin.top();
 
@@ -356,12 +356,12 @@ struct ResaleTabs {
 	rpl::combine(
 		raw->widthValue(),
 		state->fullWidth.value()
-	) | rpl::start_with_next([=](int outer, int inner) {
+	) | rpl::on_next([=](int outer, int inner) {
 		state->scrollMax = std::max(0, inner - outer);
 	}, raw->lifetime());
 
 	raw->setMouseTracking(true);
-	raw->events() | rpl::start_with_next([=](not_null<QEvent*> e) {
+	raw->events() | rpl::on_next([=](not_null<QEvent*> e) {
 		const auto type = e->type();
 		switch (type) {
 		case QEvent::Leave: setSelected(-1); break;
@@ -420,7 +420,7 @@ struct ResaleTabs {
 		}
 	}, raw->lifetime());
 
-	raw->paintRequest() | rpl::start_with_next([=] {
+	raw->paintRequest() | rpl::on_next([=] {
 		auto p = QPainter(raw);
 		auto hq = PainterHighQualityEnabler(p);
 		const auto padding = st::giftBoxTabPadding;
@@ -501,7 +501,7 @@ void GiftResaleBox(
 	countLabel->setTextColorOverride(st::windowSubTextFg->c);
 
 	const auto content = box->verticalLayout();
-	content->paintRequest() | rpl::start_with_next([=](QRect clip) {
+	content->paintRequest() | rpl::on_next([=](QRect clip) {
 		QPainter(content).fillRect(clip, st::boxDividerBg);
 	}, content->lifetime());
 
@@ -529,7 +529,7 @@ void GiftResaleBox(
 		tr::lng_gift_resale_switch_to_ton()));
 #endif
 
-	box->heightValue() | rpl::start_with_next([=](int height) {
+	box->heightValue() | rpl::on_next([=](int height) {
 		if (height > state->lastMinHeight) {
 			state->lastMinHeight = height;
 			box->setMinHeight(height);
@@ -544,14 +544,14 @@ void GiftResaleBox(
 	state->filter = std::move(tabs.filter);
 	content->add(std::move(tabs.widget));
 
-	state->filter.changes() | rpl::start_with_next([=](ResaleGiftsFilter value) {
+	state->filter.changes() | rpl::on_next([=](ResaleGiftsFilter value) {
 		state->data.offset = QString();
 		state->loading = ResaleGiftsSlice(
 			&peer->session(),
 			state->data.giftId,
 			value,
 			QString()
-		) | rpl::start_with_next([=](ResaleGiftsDescriptor &&slice) {
+		) | rpl::on_next([=](ResaleGiftsDescriptor &&slice) {
 			state->loading.destroy();
 			state->data.offset = slice.list.empty()
 				? QString()
@@ -562,7 +562,7 @@ void GiftResaleBox(
 	}, content->lifetime());
 
 	peer->owner().giftUpdates(
-	) | rpl::start_with_next([=](const Data::GiftUpdate &update) {
+	) | rpl::on_next([=](const Data::GiftUpdate &update) {
 		using Action = Data::GiftUpdate::Action;
 		const auto action = update.action;
 		if (action != Action::Transfer && action != Action::ResaleChange) {
@@ -608,7 +608,7 @@ void GiftResaleBox(
 				state->data.giftId,
 				state->filter.current(),
 				state->data.offset
-			) | rpl::start_with_next([=](ResaleGiftsDescriptor &&slice) {
+			) | rpl::on_next([=](ResaleGiftsDescriptor &&slice) {
 				state->loading.destroy();
 				state->data.offset = slice.list.empty()
 					? QString()
@@ -656,7 +656,7 @@ rpl::lifetime ShowStarGiftResale(
 	return Data::ResaleGiftsSlice(
 		session,
 		giftId
-	) | rpl::start_with_next([=](ResaleGiftsDescriptor &&info) {
+	) | rpl::on_next([=](ResaleGiftsDescriptor &&info) {
 		if (const auto onstack = finishRequesting) {
 			onstack();
 		}
diff --git a/Telegram/SourceFiles/boxes/sticker_set_box.cpp b/Telegram/SourceFiles/boxes/sticker_set_box.cpp
index 6d405550fb..5c8c267871 100644
--- a/Telegram/SourceFiles/boxes/sticker_set_box.cpp
+++ b/Telegram/SourceFiles/boxes/sticker_set_box.cpp
@@ -220,14 +220,14 @@ StickerPremiumMark::StickerPremiumMark(
 : _lockIcon(lockIcon)
 , _part(part) {
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_lockGray = QImage();
 		_star = QImage();
 	}, _lifetime);
 
 	Data::AmPremiumValue(
 		session
-	) | rpl::start_with_next([=](bool premium) {
+	) | rpl::on_next([=](bool premium) {
 		_premium = premium;
 	}, _lifetime);
 }
@@ -519,7 +519,7 @@ void StickerSetBox::prepare() {
 		st::stickersScroll);
 	_session->data().stickers().updated(
 		_type
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateButtons();
 	}, lifetime());
 
@@ -532,12 +532,12 @@ void StickerSetBox::prepare() {
 	updateTitleAndButtons();
 
 	_inner->updateControls(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateTitleAndButtons();
 	}, lifetime());
 
 	_inner->setInstalled(
-	) | rpl::start_with_next([=](uint64 setId) {
+	) | rpl::on_next([=](uint64 setId) {
 		if (_inner->setType() == Data::StickersType::Masks) {
 			showToast(tr::lng_masks_installed(tr::now));
 		} else if (_inner->setType() == Data::StickersType::Emoji) {
@@ -551,12 +551,12 @@ void StickerSetBox::prepare() {
 	}, lifetime());
 
 	_inner->errors(
-	) | rpl::start_with_next([=](Error error) {
+	) | rpl::on_next([=](Error error) {
 		handleError(error);
 	}, lifetime());
 
 	_inner->setArchived(
-	) | rpl::start_with_next([=](uint64 setId) {
+	) | rpl::on_next([=](uint64 setId) {
 		const auto type = _inner->setType();
 		if (type == Data::StickersType::Emoji) {
 			return;
@@ -906,7 +906,7 @@ StickerSetBox::Inner::Inner(
 	_session->api().updateStickers();
 
 	_session->downloaderTaskFinished(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateItems();
 	}, lifetime());
 
@@ -1501,7 +1501,7 @@ void StickerSetBox::Inner::fillDeleteStickerBox(
 		animation->start();
 	}
 	sticker->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = Painter(sticker);
 		if ([[maybe_unused]] const auto strong = weak.get()) {
 			const auto paused = On(PowerSaving::kStickersPanel)
@@ -1517,7 +1517,7 @@ void StickerSetBox::Inner::fillDeleteStickerBox(
 		tr::lng_stickers_context_delete(),
 		box->getDelegate()->style().title);
 	line->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		sticker->moveToLeft(st::boxRowPadding.left(), 0);
 		const auto skip = st::defaultBoxCheckbox.textPosition.x();
 		label->resizeToWidth(width
@@ -1656,7 +1656,7 @@ not_null<Lottie::MultiPlayer*> StickerSetBox::Inner::getLottiePlayer() {
 			Lottie::Quality::Default,
 			Lottie::MakeFrameRenderer());
 		_lottiePlayer->updates(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			updateItems();
 		}, lifetime());
 	}
diff --git a/Telegram/SourceFiles/boxes/stickers_box.cpp b/Telegram/SourceFiles/boxes/stickers_box.cpp
index 65d3c400bb..4e59808196 100644
--- a/Telegram/SourceFiles/boxes/stickers_box.cpp
+++ b/Telegram/SourceFiles/boxes/stickers_box.cpp
@@ -355,7 +355,7 @@ StickersBox::CounterWidget::CounterWidget(
 
 	std::move(
 		count
-	) | rpl::start_with_next([=](int count) {
+	) | rpl::on_next([=](int count) {
 		setCounter(count);
 		update();
 	}, lifetime());
@@ -447,7 +447,7 @@ StickersBox::StickersBox(
 , _installed(0, this, _show, megagroup, isEmoji)
 , _megagroupSet(megagroup) {
 	_installed.widget()->scrollsToY(
-	) | rpl::start_with_next([=](int y) {
+	) | rpl::on_next([=](int y) {
 		scrollToY(y);
 	}, lifetime());
 }
@@ -607,7 +607,7 @@ void StickersBox::prepare() {
 		_tabs->sectionActivated(
 		) | rpl::filter([=] {
 			return !_ignoreTabActivation;
-		}) | rpl::start_with_next(
+		}) | rpl::on_next(
 			[this] { switchTab(); },
 			lifetime());
 		refreshTabs();
@@ -700,7 +700,7 @@ void StickersBox::prepare() {
 		: _isMasks
 		? Data::StickersType::Masks
 		: Data::StickersType::Stickers
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		handleStickersUpdated();
 	}, lifetime());
 
@@ -715,13 +715,13 @@ void StickersBox::prepare() {
 	for (const auto &widget : { _installed.widget(), _masks.widget() }) {
 		if (widget) {
 			widget->draggingScrollDelta(
-			) | rpl::start_with_next([=](int delta) {
+			) | rpl::on_next([=](int delta) {
 				scrollByDraggingDelta(delta);
 			}, widget->lifetime());
 		}
 	}
 	if (!_megagroupSet) {
-		boxClosing() | rpl::start_with_next([=] {
+		boxClosing() | rpl::on_next([=] {
 			saveChanges();
 		}, lifetime());
 	}
@@ -1305,7 +1305,7 @@ Main::Session &StickersBox::Inner::session() const {
 
 void StickersBox::Inner::setup() {
 	session().downloaderTaskFinished(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		update();
 		readVisibleSets();
 	}, lifetime());
@@ -1580,7 +1580,7 @@ void StickersBox::Inner::validateLottieAnimation(not_null<Row*> row) {
 	}
 	row->lottie = std::move(player);
 	row->lottie->updates(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateRowThumbnail(row);
 	}, lifetime());
 }
diff --git a/Telegram/SourceFiles/boxes/transfer_gift_box.cpp b/Telegram/SourceFiles/boxes/transfer_gift_box.cpp
index ee1add5ea8..ec5adf5727 100644
--- a/Telegram/SourceFiles/boxes/transfer_gift_box.cpp
+++ b/Telegram/SourceFiles/boxes/transfer_gift_box.cpp
@@ -148,7 +148,7 @@ void ExportOnBlockchain(
 		state->lifetime = session->api().cloudPassword().state(
 		) | rpl::take(
 			1
-		) | rpl::start_with_next([=](const Core::CloudPasswordState &pass) {
+		) | rpl::on_next([=](const Core::CloudPasswordState &pass) {
 			state->lifetime.destroy();
 
 			auto fields = PasscodeBox::CloudFields::From(pass);
@@ -703,7 +703,7 @@ void ShowTransferGiftBox(
 
 		box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
 
-		box->noSearchSubmits() | rpl::start_with_next([=] {
+		box->noSearchSubmits() | rpl::on_next([=] {
 			controllerRaw->noSearchSubmit();
 		}, box->lifetime());
 	};
@@ -1019,7 +1019,7 @@ void ShowBuyResaleGiftBox(
 						},
 					}),
 				st::boxRowPadding + st::resaleConfirmTonOnlyMargin);
-			tabs->activated() | rpl::start_with_next([=](QString id) {
+			tabs->activated() | rpl::on_next([=](QString id) {
 				tabs->setActiveTab(id);
 				state->ton = (id == u"ton"_q);
 			}, tabs->lifetime());
diff --git a/Telegram/SourceFiles/boxes/translate_box.cpp b/Telegram/SourceFiles/boxes/translate_box.cpp
index e805793b96..09c3b4636f 100644
--- a/Telegram/SourceFiles/boxes/translate_box.cpp
+++ b/Telegram/SourceFiles/boxes/translate_box.cpp
@@ -61,7 +61,7 @@ ShowButton::ShowButton(not_null<Ui::RpWidget*> parent)
 : RpWidget(parent)
 , _button(this, tr::lng_usernames_activate_confirm(tr::now)) {
 	_button.sizeValue(
-	) | rpl::start_with_next([=](const QSize &s) {
+	) | rpl::on_next([=](const QSize &s) {
 		resize(
 			s.width() + st::defaultEmojiSuggestions.fadeRight.width(),
 			s.height());
@@ -161,7 +161,7 @@ void TranslateBox(
 		rpl::combine(
 			container->widthValue(),
 			original->geometryValue()
-		) | rpl::start_with_next([=](int width, const QRect &rect) {
+		) | rpl::on_next([=](int width, const QRect &rect) {
 			show->moveToLeft(
 				width - show->width() - st::boxRowPadding.right(),
 				rect.y() + std::abs(lineHeight - show->height()) / 2);
@@ -169,7 +169,7 @@ void TranslateBox(
 		original->entity()->heightValue(
 		) | rpl::filter([](int height) {
 			return height > 0;
-		}) | rpl::take(1) | rpl::start_with_next([=](int height) {
+		}) | rpl::take(1) | rpl::on_next([=](int height) {
 			if (height > lineHeight) {
 				show->show(anim::type::instant);
 			}
@@ -189,7 +189,7 @@ void TranslateBox(
 			state->to.value() | rpl::map(LanguageName));
 
 		// Workaround.
-		state->to.value() | rpl::start_with_next([=] {
+		state->to.value() | rpl::on_next([=] {
 			subtitle->resizeToWidth(container->width()
 				- padding.left()
 				- padding.right());
@@ -257,7 +257,7 @@ void TranslateBox(
 				Ui::Text::Italic(tr::lng_translate_box_error(tr::now)));
 		}).send();
 	};
-	state->to.value() | rpl::start_with_next(send, box->lifetime());
+	state->to.value() | rpl::on_next(send, box->lifetime());
 
 	box->addLeftButton(tr::lng_settings_language(), [=] {
 		if (loading->toggled()) {
diff --git a/Telegram/SourceFiles/boxes/url_auth_box.cpp b/Telegram/SourceFiles/boxes/url_auth_box.cpp
index 3047bbb771..8316b248ed 100644
--- a/Telegram/SourceFiles/boxes/url_auth_box.cpp
+++ b/Telegram/SourceFiles/boxes/url_auth_box.cpp
@@ -292,7 +292,7 @@ not_null<Ui::RpWidget*> UrlAuthBox::setupContent(
 			auth->checked()
 		) | rpl::then(
 			auth->checkedChanges()
-		) | rpl::start_with_next([=](bool checked) {
+		) | rpl::on_next([=](bool checked) {
 			if (!checked) {
 				allow->setChecked(false);
 			}
diff --git a/Telegram/SourceFiles/boxes/username_box.cpp b/Telegram/SourceFiles/boxes/username_box.cpp
index 24635f9074..4f1fd483d8 100644
--- a/Telegram/SourceFiles/boxes/username_box.cpp
+++ b/Telegram/SourceFiles/boxes/username_box.cpp
@@ -370,15 +370,15 @@ void UsernamesBox(
 
 	const auto finish = [=] {
 		list->save(
-		) | rpl::start_with_done([=] {
+		) | rpl::on_done([=] {
 			editor->save(
-			) | rpl::start_with_done([=] {
+			) | rpl::on_done([=] {
 				box->closeBox();
 			}, box->lifetime());
 		}, box->lifetime());
 	};
 	editor->submitted(
-	) | rpl::start_with_next(finish, editor->lifetime());
+	) | rpl::on_next(finish, editor->lifetime());
 
 	if (isBot) {
 		box->addButton(tr::lng_close(), [=] { box->closeBox(); });
@@ -410,7 +410,7 @@ void AddUsernameCheckLabel(
 	rpl::combine(
 		std::move(checkInfo),
 		container->widthValue()
-	) | rpl::start_with_next([=](const UsernameCheckInfo &info, int w) {
+	) | rpl::on_next([=](const UsernameCheckInfo &info, int w) {
 		using Type = UsernameCheckInfo::Type;
 		label->setMarkedText(info.text);
 		const auto &color = (info.type == Type::Good)
diff --git a/Telegram/SourceFiles/calls/calls_box_controller.cpp b/Telegram/SourceFiles/calls/calls_box_controller.cpp
index 794291dc28..167dda11ae 100644
--- a/Telegram/SourceFiles/calls/calls_box_controller.cpp
+++ b/Telegram/SourceFiles/calls/calls_box_controller.cpp
@@ -207,7 +207,7 @@ void ListController::prepare() {
 
 	session().changes().peerUpdates(
 		Data::PeerUpdate::Flag::GroupCall
-	) | rpl::start_with_next([=](const Data::PeerUpdate &update) {
+	) | rpl::on_next([=](const Data::PeerUpdate &update) {
 		processPeer(update.peer);
 		finishProcess();
 	}, lifetime());
@@ -493,7 +493,7 @@ Main::Session &BoxController::session() const {
 
 void BoxController::prepare() {
 	session().data().itemRemoved(
-	) | rpl::start_with_next([=](not_null<const HistoryItem*> item) {
+	) | rpl::on_next([=](not_null<const HistoryItem*> item) {
 		if (const auto row = rowForItem(item)) {
 			row->itemRemoved(item);
 			if (!row->hasItems()) {
@@ -511,7 +511,7 @@ void BoxController::prepare() {
 	) | rpl::filter([=](const Data::MessageUpdate &update) {
 		const auto media = update.item->media();
 		return (media != nullptr) && (media->call() != nullptr);
-	}) | rpl::start_with_next([=](const Data::MessageUpdate &update) {
+	}) | rpl::on_next([=](const Data::MessageUpdate &update) {
 		insertRow(update.item, InsertWay::Prepend);
 	}, lifetime());
 
@@ -790,7 +790,7 @@ void ClearCallsBox(
 		st::inviteViaLinkIcon,
 		QPoint());
 	result->heightValue(
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		icon->moveToLeft(
 			st::inviteViaLinkIconPosition.x(),
 			(height - st::inviteViaLinkIcon.height()) / 2);
@@ -846,7 +846,7 @@ void ShowCallsBox(not_null<::Window::SessionController*> window) {
 		button->events(
 		) | rpl::filter([=](not_null<QEvent*> e) {
 			return (e->type() == QEvent::Enter);
-		}) | rpl::start_with_next([=] {
+		}) | rpl::on_next([=] {
 			state->callsDelegate.peerListMouseLeftGeometry();
 		}, button->lifetime());
 
@@ -858,7 +858,7 @@ void ShowCallsBox(not_null<::Window::SessionController*> window) {
 
 		box->setWidth(state->callsController.contentWidth());
 		state->callsController.boxHeightValue(
-		) | rpl::start_with_next([=](int height) {
+		) | rpl::on_next([=](int height) {
 			box->setMinHeight(height);
 		}, box->lifetime());
 		box->setTitle(tr::lng_call_box_title());
diff --git a/Telegram/SourceFiles/calls/calls_call.cpp b/Telegram/SourceFiles/calls/calls_call.cpp
index 8e862fd76e..4eef6ee22f 100644
--- a/Telegram/SourceFiles/calls/calls_call.cpp
+++ b/Telegram/SourceFiles/calls/calls_call.cpp
@@ -530,7 +530,7 @@ void Call::setupMediaDevices() {
 
 	_playbackDeviceId.changes() | rpl::filter([=] {
 		return _instance && _setDeviceIdCallback;
-	}) | rpl::start_with_next([=](const Webrtc::DeviceResolvedId &deviceId) {
+	}) | rpl::on_next([=](const Webrtc::DeviceResolvedId &deviceId) {
 		_setDeviceIdCallback(deviceId);
 
 		// Value doesn't matter here, just trigger reading of the new value.
@@ -539,7 +539,7 @@ void Call::setupMediaDevices() {
 
 	_captureDeviceId.changes() | rpl::filter([=] {
 		return _instance && _setDeviceIdCallback;
-	}) | rpl::start_with_next([=](const Webrtc::DeviceResolvedId &deviceId) {
+	}) | rpl::on_next([=](const Webrtc::DeviceResolvedId &deviceId) {
 		_setDeviceIdCallback(deviceId);
 
 		// Value doesn't matter here, just trigger reading of the new value.
@@ -557,7 +557,7 @@ void Call::setupOutgoingVideo() {
 		_videoOutgoing->setState(Webrtc::VideoState::Inactive);
 	}
 	_videoOutgoing->stateValue(
-	) | rpl::start_with_next([=](Webrtc::VideoState state) {
+	) | rpl::on_next([=](Webrtc::VideoState state) {
 		if (state != Webrtc::VideoState::Inactive
 			&& cameraId().isEmpty()
 			&& !_videoCaptureIsScreencast) {
@@ -598,7 +598,7 @@ void Call::setupOutgoingVideo() {
 	_cameraDeviceId.changes(
 	) | rpl::filter([=] {
 		return !_videoCaptureIsScreencast;
-	}) | rpl::start_with_next([=](Webrtc::DeviceResolvedId deviceId) {
+	}) | rpl::on_next([=](Webrtc::DeviceResolvedId deviceId) {
 		const auto &id = deviceId.value;
 		_videoCaptureDeviceId = id;
 		if (_videoCapture) {
@@ -822,7 +822,7 @@ bool Call::handleUpdate(const MTPPhoneCall &call) {
 			box->sends(
 			) | rpl::take(
 				1 // Instead of keeping requestId.
-			) | rpl::start_with_next([=](const Ui::RateCallBox::Result &r) {
+			) | rpl::on_next([=](const Ui::RateCallBox::Result &r) {
 				sender->request(MTPphone_SetCallRating(
 					MTP_flags(0),
 					MTP_inputPhoneCall(
@@ -1196,7 +1196,7 @@ void Call::createAndStartController(const MTPDphoneCall &call) {
 	raw->setIncomingVideoOutput(_videoIncoming->sink());
 	raw->setAudioOutputDuckingEnabled(settings.callAudioDuckingEnabled());
 
-	_state.value() | rpl::start_with_next([=](State state) {
+	_state.value() | rpl::on_next([=](State state) {
 		const auto track = (state != State::FailedHangingUp)
 			&& (state != State::Failed)
 			&& (state != State::HangingUp)
@@ -1207,13 +1207,13 @@ void Call::createAndStartController(const MTPDphoneCall &call) {
 		Core::App().mediaDevices().setCaptureMuteTracker(this, track);
 	}, _instanceLifetime);
 
-	_muted.value() | rpl::start_with_next([=](bool muted) {
+	_muted.value() | rpl::on_next([=](bool muted) {
 		Core::App().mediaDevices().setCaptureMuted(muted);
 	}, _instanceLifetime);
 
 #if 0
 	Core::App().batterySaving().value(
-	) | rpl::start_with_next([=](bool isSaving) {
+	) | rpl::on_next([=](bool isSaving) {
 		crl::on_main(weak, [=] {
 			if (_instance) {
 				_instance->setIsLowBatteryLevel(isSaving);
diff --git a/Telegram/SourceFiles/calls/calls_controller_webrtc.cpp b/Telegram/SourceFiles/calls/calls_controller_webrtc.cpp
index 6df83c2d5b..1b10e6044e 100644
--- a/Telegram/SourceFiles/calls/calls_controller_webrtc.cpp
+++ b/Telegram/SourceFiles/calls/calls_controller_webrtc.cpp
@@ -150,7 +150,7 @@ void WebrtcController::setOnStateUpdated(
 		Fn<void(TgVoipState)> onStateUpdated) {
 	_stateUpdatedLifetime.destroy();
 	_impl->state().changes(
-	) | rpl::start_with_next([=](CallState state) {
+	) | rpl::on_next([=](CallState state) {
 		onStateUpdated([&] {
 			switch (state) {
 			case CallState::Initializing: return TgVoipState::WaitInit;
diff --git a/Telegram/SourceFiles/calls/calls_emoji_fingerprint.cpp b/Telegram/SourceFiles/calls/calls_emoji_fingerprint.cpp
index df927a123f..6cdc5f4ae4 100644
--- a/Telegram/SourceFiles/calls/calls_emoji_fingerprint.cpp
+++ b/Telegram/SourceFiles/calls/calls_emoji_fingerprint.cpp
@@ -205,7 +205,7 @@ base::unique_qptr<Ui::RpWidget> CreateFingerprintAndSignalBars(
 			call->user()->name()));
 	raw->setMouseTracking(true);
 	raw->events(
-	) | rpl::start_with_next([=](not_null<QEvent*> e) {
+	) | rpl::on_next([=](not_null<QEvent*> e) {
 		if (e->type() == QEvent::MouseMove) {
 			Ui::Tooltip::Show(kTooltipShowTimeoutMs, shower);
 		} else if (e->type() == QEvent::Leave) {
@@ -254,7 +254,7 @@ base::unique_qptr<Ui::RpWidget> CreateFingerprintAndSignalBars(
 		rpl::single(rpl::empty),
 		Ui::Emoji::Updated(),
 		style::PaletteChanged()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		background->fill(Qt::transparent);
 
 		// Prepare.
@@ -300,7 +300,7 @@ base::unique_qptr<Ui::RpWidget> CreateFingerprintAndSignalBars(
 	}, raw->lifetime());
 
 	raw->paintRequest(
-	) | rpl::start_with_next([=](QRect clip) {
+	) | rpl::on_next([=](QRect clip) {
 		QPainter(raw).drawImage(raw->rect(), *background);
 	}, raw->lifetime());
 
@@ -522,7 +522,7 @@ FingerprintBadge SetupFingerprintBadge(
 
 	std::move(
 		fingerprint
-	) | rpl::start_with_next([=](const QByteArray &fingerprint) {
+	) | rpl::on_next([=](const QByteArray &fingerprint) {
 		auto buffered = base::BufferedRandom<uint32>(
 			kEmojiInCarousel * kEmojiInFingerprint);
 		const auto now = crl::now();
@@ -615,7 +615,7 @@ void SetupFingerprintTooltip(not_null<Ui::RpWidget*> widget) {
 		raw->toggleAnimated(true);
 	};
 
-	widget->events() | rpl::start_with_next([=](not_null<QEvent*> e) {
+	widget->events() | rpl::on_next([=](not_null<QEvent*> e) {
 		const auto type = e->type();
 		if (type == QEvent::Enter) {
 			// Enter events may come from widget destructors,
@@ -681,7 +681,7 @@ void SetupFingerprintBadgeWidget(
 	const auto ratio = style::DevicePixelRatio();
 	const auto esize = Ui::Emoji::GetSizeNormal();
 	const auto size = esize / ratio;
-	widget->widthValue() | rpl::start_with_next([=](int width) {
+	widget->widthValue() | rpl::on_next([=](int width) {
 		static_assert(!(kEmojiInFingerprint % 2));
 
 		const auto available = width
@@ -729,7 +729,7 @@ void SetupFingerprintBadgeWidget(
 	}, lifetime);
 
 	const auto cache = lifetime.make_state<FingerprintBadgeCache>();
-	button->paintRequest() | rpl::start_with_next([=] {
+	button->paintRequest() | rpl::on_next([=] {
 		auto p = QPainter(button);
 
 		const auto outer = button->rect();
@@ -770,7 +770,7 @@ void SetupFingerprintBadgeWidget(
 		}
 	}, lifetime);
 
-	std::move(repaints) | rpl::start_with_next([=] {
+	std::move(repaints) | rpl::on_next([=] {
 		button->update();
 	}, lifetime);
 
diff --git a/Telegram/SourceFiles/calls/calls_instance.cpp b/Telegram/SourceFiles/calls/calls_instance.cpp
index 8fb6a81f93..6af96a3012 100644
--- a/Telegram/SourceFiles/calls/calls_instance.cpp
+++ b/Telegram/SourceFiles/calls/calls_instance.cpp
@@ -259,7 +259,7 @@ void Instance::startOrJoinConferenceCall(StartConferenceInfo args) {
 	const auto raw = call.get();
 
 	session->account().sessionChanges(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		destroyGroupCall(raw);
 	}, raw->lifetime());
 
@@ -432,7 +432,7 @@ void Instance::createCall(
 		const auto raw = call.get();
 
 		user->session().account().sessionChanges(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			destroyCall(raw);
 		}, raw->lifetime());
 
@@ -446,7 +446,7 @@ void Instance::createCall(
 		}
 		if (raw->state() == Call::State::WaitingUserConfirmation) {
 			_currentCallPanel->startOutgoingRequests(
-			) | rpl::start_with_next([=](bool video) {
+			) | rpl::on_next([=](bool video) {
 				repeater.callback(video, true, repeater);
 			}, raw->lifetime());
 		} else {
@@ -488,7 +488,7 @@ void Instance::createGroupCall(
 	const auto raw = call.get();
 
 	info.peer->session().account().sessionChanges(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		destroyGroupCall(raw);
 	}, raw->lifetime());
 
@@ -1182,7 +1182,7 @@ void Instance::showConferenceInvite(
 		const auto raw = call.get();
 
 		user->session().account().sessionChanges(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			destroyCall(raw);
 		}, raw->lifetime());
 
diff --git a/Telegram/SourceFiles/calls/calls_panel.cpp b/Telegram/SourceFiles/calls/calls_panel.cpp
index 6293307ecd..b01c1f1d80 100644
--- a/Telegram/SourceFiles/calls/calls_panel.cpp
+++ b/Telegram/SourceFiles/calls/calls_panel.cpp
@@ -273,7 +273,7 @@ void Panel::initWindow() {
 			: Flag::None;
 	});
 
-	_window->maximizeRequests() | rpl::start_with_next([=](bool maximized) {
+	_window->maximizeRequests() | rpl::on_next([=](bool maximized) {
 		toggleFullScreen(maximized);
 	}, lifetime());
 	// Don't do that, it looks awful :(
@@ -307,12 +307,12 @@ void Panel::initWidget() {
 	widget()->setMouseTracking(true);
 
 	widget()->paintRequest(
-	) | rpl::start_with_next([=](QRect clip) {
+	) | rpl::on_next([=](QRect clip) {
 		paint(clip);
 	}, lifetime());
 
 	widget()->sizeValue(
-	) | rpl::skip(1) | rpl::start_with_next([=] {
+	) | rpl::skip(1) | rpl::on_next([=] {
 		updateControlsGeometry();
 	}, lifetime());
 }
@@ -467,7 +467,7 @@ void Panel::initConferenceInvite() {
 		+ padding.right();
 	const auto height = add + userpics->height() + add;
 
-	_status->geometryValue() | rpl::start_with_next([=] {
+	_status->geometryValue() | rpl::on_next([=] {
 		const auto top = _bodyTop + _bodySt->participantsTop;
 		const auto left = (widget()->width() - width) / 2;
 		raw->setGeometry(left, top, width, height);
@@ -475,7 +475,7 @@ void Panel::initConferenceInvite() {
 		label->move(add + userpics->width() + padding.left(), padding.top());
 	}, raw->lifetime());
 
-	raw->paintRequest() | rpl::start_with_next([=] {
+	raw->paintRequest() | rpl::on_next([=] {
 		auto p = QPainter(raw);
 		auto hq = PainterHighQualityEnabler(p);
 		const auto radius = raw->height() / 2.;
@@ -579,7 +579,7 @@ void Panel::reinitWithCall(Call *call) {
 		});
 
 	_call->confereceSupportedValue(
-	) | rpl::start_with_next([=](bool supported) {
+	) | rpl::on_next([=](bool supported) {
 		_conferenceSupported = supported;
 		_addPeople->toggle(_conferenceSupported
 			&& (_call->state() != State::WaitingUserConfirmation),
@@ -592,7 +592,7 @@ void Panel::reinitWithCall(Call *call) {
 	) | rpl::map(rpl::mappers::_1 == Call::RemoteAudioState::Muted);
 	rpl::duplicate(
 		remoteMuted
-	) | rpl::start_with_next([=](bool muted) {
+	) | rpl::on_next([=](bool muted) {
 		if (muted) {
 			createRemoteAudioMute();
 		} else {
@@ -601,7 +601,7 @@ void Panel::reinitWithCall(Call *call) {
 		}
 	}, _callLifetime);
 	_call->remoteBatteryStateValue(
-	) | rpl::start_with_next([=](Call::RemoteBatteryState state) {
+	) | rpl::on_next([=](Call::RemoteBatteryState state) {
 		if (state == Call::RemoteBatteryState::Low) {
 			createRemoteLowBattery();
 		} else {
@@ -621,13 +621,13 @@ void Panel::reinitWithCall(Call *call) {
 		_window->backend());
 	_incoming->widget()->hide();
 
-	_incoming->rp()->shownValue() | rpl::start_with_next([=] {
+	_incoming->rp()->shownValue() | rpl::on_next([=] {
 		updateControlsShown();
 	}, _incoming->rp()->lifetime());
 
 	_hideControlsFilter = nullptr;
 	_fullScreenOrMaximized.value(
-	) | rpl::start_with_next([=](bool fullScreenOrMaximized) {
+	) | rpl::on_next([=](bool fullScreenOrMaximized) {
 		if (fullScreenOrMaximized) {
 			class Filter final : public QObject {
 			public:
@@ -667,7 +667,7 @@ void Panel::reinitWithCall(Call *call) {
 	}, _incoming->rp()->lifetime());
 
 	_call->mutedValue(
-	) | rpl::start_with_next([=](bool mute) {
+	) | rpl::on_next([=](bool mute) {
 		_mute->entity()->setProgress(mute ? 1. : 0.);
 		_mute->entity()->setText(mute
 			? tr::lng_call_unmute_audio()
@@ -675,7 +675,7 @@ void Panel::reinitWithCall(Call *call) {
 	}, _callLifetime);
 
 	_call->videoOutgoing()->stateValue(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		{
 			const auto active = _call->isSharingCamera();
 			_camera->setProgress(active ? 0. : 1.);
@@ -692,12 +692,12 @@ void Panel::reinitWithCall(Call *call) {
 	}, _callLifetime);
 
 	_call->stateValue(
-	) | rpl::start_with_next([=](State state) {
+	) | rpl::on_next([=](State state) {
 		stateChanged(state);
 	}, _callLifetime);
 
 	_call->videoIncoming()->renderNextFrame(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto track = _call->videoIncoming();
 		setIncomingSize(track->state() == Webrtc::VideoState::Active
 			? track->frameSize()
@@ -714,14 +714,14 @@ void Panel::reinitWithCall(Call *call) {
 	}, _callLifetime);
 
 	_call->videoIncoming()->stateValue(
-	) | rpl::start_with_next([=](Webrtc::VideoState state) {
+	) | rpl::on_next([=](Webrtc::VideoState state) {
 		setIncomingSize((state == Webrtc::VideoState::Active)
 			? _call->videoIncoming()->frameSize()
 			: QSize());
 	}, _callLifetime);
 
 	_call->videoOutgoing()->renderNextFrame(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto incoming = incomingFrameGeometry();
 		const auto outgoing = outgoingFrameGeometry();
 		widget()->update(outgoing);
@@ -735,7 +735,7 @@ void Panel::reinitWithCall(Call *call) {
 		rpl::single(
 			rpl::empty_value()
 		) | rpl::then(_call->videoOutgoing()->renderNextFrame())
-	) | rpl::start_with_next([=](State state, auto) {
+	) | rpl::on_next([=](State state, auto) {
 		if (state != State::Ended
 			&& state != State::EndedByOtherDevice
 			&& state != State::Failed
@@ -747,7 +747,7 @@ void Panel::reinitWithCall(Call *call) {
 	}, _callLifetime);
 
 	_call->errors(
-	) | rpl::start_with_next([=](Error error) {
+	) | rpl::on_next([=](Error error) {
 		const auto text = [=] {
 			switch (error.type) {
 			case ErrorType::NoCamera:
@@ -802,7 +802,7 @@ void Panel::createRemoteAudioMute() {
 	_remoteAudioMute->setAttribute(Qt::WA_TransparentForMouseEvents);
 
 	_remoteAudioMute->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(_remoteAudioMute);
 		const auto r = _remoteAudioMute->rect();
 
@@ -839,7 +839,7 @@ void Panel::createRemoteLowBattery() {
 	_remoteLowBattery->setAttribute(Qt::WA_TransparentForMouseEvents);
 
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_remoteLowBattery = nullptr;
 		createRemoteLowBattery();
 	}, _remoteLowBattery->lifetime());
@@ -865,7 +865,7 @@ void Panel::createRemoteLowBattery() {
 	}();
 
 	_remoteLowBattery->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(_remoteLowBattery);
 		const auto r = _remoteLowBattery->rect();
 
@@ -905,7 +905,7 @@ void Panel::initLayout() {
 	) | rpl::filter([=](const Data::PeerUpdate &update) {
 		// _user may change for the same Panel.
 		return (_call != nullptr) && (update.peer == _user);
-	}) | rpl::start_with_next([=](const Data::PeerUpdate &update) {
+	}) | rpl::on_next([=](const Data::PeerUpdate &update) {
 		_name->setText(_call->user()->name());
 		updateControlsGeometry();
 	}, lifetime());
diff --git a/Telegram/SourceFiles/calls/calls_panel_background.cpp b/Telegram/SourceFiles/calls/calls_panel_background.cpp
index a98ab14105..709b14c331 100644
--- a/Telegram/SourceFiles/calls/calls_panel_background.cpp
+++ b/Telegram/SourceFiles/calls/calls_panel_background.cpp
@@ -34,7 +34,7 @@ PanelBackground::PanelBackground(
 		_peer,
 		Data::PeerUpdate::Flag::ColorProfile
 			| Data::PeerUpdate::Flag::EmojiStatus
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateColors();
 		_brushSize = QSize();
 		if (_updateCallback) {
@@ -46,7 +46,7 @@ PanelBackground::PanelBackground(
 		_peer,
 		Data::PeerUpdate::Flag::BackgroundEmoji
 			| Data::PeerUpdate::Flag::EmojiStatus
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateEmojiId();
 		if (_updateCallback) {
 			_updateCallback();
diff --git a/Telegram/SourceFiles/calls/calls_signal_bars.cpp b/Telegram/SourceFiles/calls/calls_signal_bars.cpp
index 9d2f3c8703..94d2072670 100644
--- a/Telegram/SourceFiles/calls/calls_signal_bars.cpp
+++ b/Telegram/SourceFiles/calls/calls_signal_bars.cpp
@@ -24,7 +24,7 @@ SignalBars::SignalBars(
 		_st.width + (_st.width + _st.skip) * (Call::kSignalBarCount - 1),
 		_st.max);
 	call->signalBarCountValue(
-	) | rpl::start_with_next([=](int count) {
+	) | rpl::on_next([=](int count) {
 		changed(count);
 	}, lifetime());
 }
diff --git a/Telegram/SourceFiles/calls/calls_top_bar.cpp b/Telegram/SourceFiles/calls/calls_top_bar.cpp
index 74baba438f..3e3252fa9a 100644
--- a/Telegram/SourceFiles/calls/calls_top_bar.cpp
+++ b/Telegram/SourceFiles/calls/calls_top_bar.cpp
@@ -186,7 +186,7 @@ public:
 		installEventFilter(this);
 
 		style::PaletteChanged(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			_crossLineMuteAnimation.invalidate();
 		}, lifetime());
 	}
@@ -339,7 +339,7 @@ void TopBar::initControls() {
 		muted
 	) | rpl::map(
 		BarStateFromMuteState
-	) | rpl::start_with_next([=](BarState state) {
+	) | rpl::on_next([=](BarState state) {
 		_isGroupConnecting = (state == BarState::Connecting);
 		setMuted(state != BarState::Active);
 		update();
@@ -387,7 +387,7 @@ void TopBar::initControls() {
 		subscribeToMembersChanges(group);
 
 		_isGroupConnecting.value(
-		) | rpl::start_with_next([=](bool isConnecting) {
+		) | rpl::on_next([=](bool isConnecting) {
 			_mute->setAttribute(
 				Qt::WA_TransparentForMouseEvents,
 				isConnecting);
@@ -401,7 +401,7 @@ void TopBar::initControls() {
 		) | rpl::filter([=](const Data::PeerUpdate &update) {
 			// _user may change for the same Panel.
 			return (_call != nullptr) && (update.peer == _call->user());
-		}) | rpl::start_with_next([=] {
+		}) | rpl::on_next([=] {
 			updateInfoLabels();
 		}, lifetime());
 	}
@@ -491,7 +491,7 @@ void TopBar::initBlobsUnder(
 	});
 
 	group->stateValue(
-	) | rpl::start_with_next([=](Calls::GroupCall::State state) {
+	) | rpl::on_next([=](Calls::GroupCall::State state) {
 		if (state == Calls::GroupCall::State::HangingUp) {
 			_blobs->hide();
 		}
@@ -507,7 +507,7 @@ void TopBar::initBlobsUnder(
 	std::move(
 		hideBlobs
 	) | rpl::distinct_until_changed(
-	) | rpl::start_with_next([=](bool hide) {
+	) | rpl::on_next([=](bool hide) {
 		if (hide) {
 			state->paint.setLevel(0.);
 		}
@@ -530,7 +530,7 @@ void TopBar::initBlobsUnder(
 
 	std::move(
 		barGeometry
-	) | rpl::start_with_next([=](QRect rect) {
+	) | rpl::on_next([=](QRect rect) {
 		_blobs->resize(
 			rect.width(),
 			(int)state->paint.maxRadius());
@@ -538,12 +538,12 @@ void TopBar::initBlobsUnder(
 	}, lifetime());
 
 	shownValue(
-	) | rpl::start_with_next([=](bool shown) {
+	) | rpl::on_next([=](bool shown) {
 		_blobs->setVisible(shown);
 	}, lifetime());
 
 	_blobs->paintRequest(
-	) | rpl::start_with_next([=](QRect clip) {
+	) | rpl::on_next([=](QRect clip) {
 		const auto hidden = state->hideAnimation.value(
 			state->hideLastTime ? 1. : 0.);
 		if (hidden == 1.) {
@@ -563,7 +563,7 @@ void TopBar::initBlobsUnder(
 	group->levelUpdates(
 	) | rpl::filter([=](const LevelUpdate &update) {
 		return !state->hideLastTime && (update.value > state->lastLevel);
-	}) | rpl::start_with_next([=](const LevelUpdate &update) {
+	}) | rpl::on_next([=](const LevelUpdate &update) {
 		if (state->lastLevel == 0.) {
 			state->levelTimer.callEach(kBlobUpdateInterval);
 		}
@@ -597,7 +597,7 @@ void TopBar::subscribeToMembersChanges(not_null<GroupCall*> call) {
 	std::move(
 		realValue
 	) | rpl::before_next([=](not_null<Data::GroupCall*> real) {
-		real->titleValue() | rpl::start_with_next([=] {
+		real->titleValue() | rpl::on_next([=] {
 			updateInfoLabels();
 		}, lifetime());
 	}) | rpl::map([=](not_null<Data::GroupCall*> real) {
@@ -617,7 +617,7 @@ void TopBar::subscribeToMembersChanges(not_null<GroupCall*> call) {
 			}
 		}
 		return false;
-	}) | rpl::start_with_next([=](const Ui::GroupCallBarContent &content) {
+	}) | rpl::on_next([=](const Ui::GroupCallBarContent &content) {
 		_users = content.users;
 		_usersCount = content.count;
 		for (auto &user : _users) {
@@ -630,7 +630,7 @@ void TopBar::subscribeToMembersChanges(not_null<GroupCall*> call) {
 	}, lifetime());
 
 	_userpics->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		_userpicsWidth = width;
 		updateControlsGeometry();
 	}, lifetime());
@@ -641,7 +641,7 @@ void TopBar::subscribeToMembersChanges(not_null<GroupCall*> call) {
 		// _peer may change for the same Panel.
 		const auto call = _groupCall.get();
 		return (call != nullptr) && (update.peer == call->peer());
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		updateInfoLabels();
 	}, lifetime());
 }
diff --git a/Telegram/SourceFiles/calls/calls_userpic.cpp b/Telegram/SourceFiles/calls/calls_userpic.cpp
index a57b6ff19b..e1f55025df 100644
--- a/Telegram/SourceFiles/calls/calls_userpic.cpp
+++ b/Telegram/SourceFiles/calls/calls_userpic.cpp
@@ -58,25 +58,25 @@ void Userpic::setup(rpl::producer<bool> muted) {
 	_content.setAttribute(Qt::WA_TransparentForMouseEvents);
 
 	_content.paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		paint();
 	}, lifetime());
 
 	std::move(
 		muted
-	) | rpl::start_with_next([=](bool muted) {
+	) | rpl::on_next([=](bool muted) {
 		setMuted(muted);
 	}, lifetime());
 
 	_peer->session().changes().peerFlagsValue(
 		_peer,
 		Data::PeerUpdate::Flag::Photo
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		processPhoto();
 	}, lifetime());
 
 	_peer->session().downloaderTaskFinished(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		refreshPhoto();
 	}, lifetime());
 
diff --git a/Telegram/SourceFiles/calls/calls_video_bubble.cpp b/Telegram/SourceFiles/calls/calls_video_bubble.cpp
index b6866e9fd4..733aad2814 100644
--- a/Telegram/SourceFiles/calls/calls_video_bubble.cpp
+++ b/Telegram/SourceFiles/calls/calls_video_bubble.cpp
@@ -30,17 +30,17 @@ void VideoBubble::setup() {
 	applyDragMode(_dragMode);
 
 	_content.paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		paint();
 	}, lifetime());
 
 	_track->stateValue(
-	) | rpl::start_with_next([=](Webrtc::VideoState state) {
+	) | rpl::on_next([=](Webrtc::VideoState state) {
 		setState(state);
 	}, lifetime());
 
 	_track->renderNextFrame(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (_track->frameSize().isEmpty()) {
 			_track->markFrameShown();
 		} else {
diff --git a/Telegram/SourceFiles/calls/calls_video_incoming.cpp b/Telegram/SourceFiles/calls/calls_video_incoming.cpp
index 5020e0cf9d..1c562bb005 100644
--- a/Telegram/SourceFiles/calls/calls_video_incoming.cpp
+++ b/Telegram/SourceFiles/calls/calls_video_incoming.cpp
@@ -114,7 +114,7 @@ private:
 Panel::Incoming::RendererGL::RendererGL(not_null<Incoming*> owner)
 : _owner(owner) {
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_controlsShadowImage.invalidate();
 	}, _lifetime);
 }
diff --git a/Telegram/SourceFiles/calls/group/calls_choose_join_as.cpp b/Telegram/SourceFiles/calls/group/calls_choose_join_as.cpp
index ca3ed26b13..a71b00bc84 100644
--- a/Telegram/SourceFiles/calls/group/calls_choose_join_as.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_choose_join_as.cpp
@@ -352,7 +352,7 @@ void ChooseJoinAsProcess::start(
 
 	createRequest();
 	session->account().sessionChanges(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_request = nullptr;
 	}, _request->lifetime);
 
@@ -476,7 +476,7 @@ void ChooseJoinAsProcess::processList(
 			.labelFilter = filter,
 		});
 		box->boxClosing(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			_request = nullptr;
 		}, _request->lifetime);
 
@@ -490,7 +490,7 @@ void ChooseJoinAsProcess::processList(
 		std::move(info),
 		crl::guard(&_request->guard, [=](auto info) { finish(info); }));
 	box->boxClosing(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_request = nullptr;
 	}, _request->lifetime);
 
diff --git a/Telegram/SourceFiles/calls/group/calls_cover_item.cpp b/Telegram/SourceFiles/calls/group/calls_cover_item.cpp
index dc77bbe289..103ac7f64e 100644
--- a/Telegram/SourceFiles/calls/group/calls_cover_item.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_cover_item.cpp
@@ -38,7 +38,7 @@ CoverItem::CoverItem(
 
 	_cover.widget()->move(0, 0);
 	_cover.moveRequests(
-	) | rpl::start_with_next(userpic.move, lifetime());
+	) | rpl::on_next(userpic.move, lifetime());
 }
 
 not_null<QAction*> CoverItem::action() const {
diff --git a/Telegram/SourceFiles/calls/group/calls_group_call.cpp b/Telegram/SourceFiles/calls/group/calls_group_call.cpp
index 7f9cbdaf51..e2a5be2ab7 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_call.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_group_call.cpp
@@ -635,7 +635,7 @@ GroupCall::GroupCall(
 
 	_muted.value(
 	) | rpl::combine_previous(
-	) | rpl::start_with_next([=](MuteState previous, MuteState state) {
+	) | rpl::on_next([=](MuteState previous, MuteState state) {
 		if (_instance) {
 			updateInstanceMuteState();
 		}
@@ -649,7 +649,7 @@ GroupCall::GroupCall(
 	_instanceState.value(
 	) | rpl::filter([=] {
 		return _hadJoinedState;
-	}) | rpl::start_with_next([=](InstanceState state) {
+	}) | rpl::on_next([=](InstanceState state) {
 		if (state == InstanceState::Disconnected) {
 			playConnectingSound();
 		} else {
@@ -676,7 +676,7 @@ GroupCall::GroupCall(
 			return not_null{ real };
 		}) | rpl::take(
 			1
-		) | rpl::start_with_next([=](not_null<Data::GroupCall*> real) {
+		) | rpl::on_next([=](not_null<Data::GroupCall*> real) {
 			subscribeToReal(real);
 			_realChanges.fire_copy(real);
 		}, _lifetime);
@@ -769,16 +769,16 @@ void GroupCall::initConferenceE2E() {
 	_e2e = std::make_unique<TdE2E::Call>(tde2eUserId);
 
 	_e2e->subchainRequests(
-	) | rpl::start_with_next([=](TdE2E::Call::SubchainRequest request) {
+	) | rpl::on_next([=](TdE2E::Call::SubchainRequest request) {
 		requestSubchainBlocks(request.subchain, request.height);
 	}, _e2e->lifetime());
 
 	_e2e->sendOutboundBlock(
-	) | rpl::start_with_next([=](QByteArray &&block) {
+	) | rpl::on_next([=](QByteArray &&block) {
 		sendOutboundBlock(std::move(block));
 	}, _e2e->lifetime());
 
-	_e2e->failures() | rpl::start_with_next([=] {
+	_e2e->failures() | rpl::on_next([=] {
 		LOG(("TdE2E: Got failure, scheduling rejoin!"));
 		crl::on_main(this, [=] { startRejoin(); });
 	}, _e2e->lifetime());
@@ -792,7 +792,7 @@ void GroupCall::setupConferenceCall() {
 	Expects(_sharedCall != nullptr);
 
 	_sharedCall->staleParticipantIds(
-	) | rpl::start_with_next([=](const base::flat_set<UserId> &staleIds) {
+	) | rpl::on_next([=](const base::flat_set<UserId> &staleIds) {
 		removeConferenceParticipants(staleIds, true);
 	}, _lifetime);
 }
@@ -803,7 +803,7 @@ void GroupCall::trackParticipantsWithAccess() {
 	}
 
 	_e2e->participantsSetValue(
-	) | rpl::start_with_next([=](const TdE2E::ParticipantsSet &set) {
+	) | rpl::on_next([=](const TdE2E::ParticipantsSet &set) {
 		auto users = base::flat_set<UserId>();
 		users.reserve(set.list.size());
 		for (const auto &id : set.list) {
@@ -967,12 +967,12 @@ void GroupCall::subscribeToReal(not_null<Data::GroupCall*> real) {
 	_listenersHidden = real->listenersHidden();
 
 	real->scheduleDateValue(
-	) | rpl::start_with_next([=](TimeId date) {
+	) | rpl::on_next([=](TimeId date) {
 		setScheduledDate(date);
 	}, _lifetime);
 
 	real->messagesEnabledValue(
-	) | rpl::start_with_next([=](bool enabled) {
+	) | rpl::on_next([=](bool enabled) {
 		setMessagesEnabled(enabled);
 	}, _lifetime);
 
@@ -981,7 +981,7 @@ void GroupCall::subscribeToReal(not_null<Data::GroupCall*> real) {
 	Ui::PostponeCall(this, [=] {
 		if (const auto real = lookupReal()) {
 			real->participantsReloaded(
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				fillActiveVideoEndpoints();
 			}, _lifetime);
 			fillActiveVideoEndpoints();
@@ -990,7 +990,7 @@ void GroupCall::subscribeToReal(not_null<Data::GroupCall*> real) {
 
 	using Update = Data::GroupCall::ParticipantUpdate;
 	real->participantUpdated(
-	) | rpl::start_with_next([=](const Update &data) {
+	) | rpl::on_next([=](const Update &data) {
 		const auto regularEndpoint = [&](const std::string &endpoint)
 		-> const std::string & {
 			return (endpoint.empty()
@@ -1067,7 +1067,7 @@ void GroupCall::subscribeToReal(not_null<Data::GroupCall*> real) {
 	}, _lifetime);
 
 	real->participantsResolved(
-	) | rpl::start_with_next([=](
+	) | rpl::on_next([=](
 		not_null<const base::flat_map<
 			uint32,
 			Data::LastSpokeTimes>*> ssrcs) {
@@ -1079,7 +1079,7 @@ void GroupCall::subscribeToReal(not_null<Data::GroupCall*> real) {
 	real->participantSpeaking(
 	) | rpl::filter([=] {
 		return _videoEndpointLarge.current();
-	}) | rpl::start_with_next([=](not_null<Data::GroupCallParticipant*> p) {
+	}) | rpl::on_next([=](not_null<Data::GroupCallParticipant*> p) {
 		const auto now = crl::now();
 		if (_videoEndpointLarge.current().peer == p->peer) {
 			_videoLargeTillTime = std::max(
@@ -1350,7 +1350,7 @@ void GroupCall::initialJoinRequested() {
 	real->participantUpdated(
 	) | rpl::filter([=](const Update &update) {
 		return (_instance != nullptr);
-	}) | rpl::start_with_next([=](const Update &update) {
+	}) | rpl::on_next([=](const Update &update) {
 		if (!update.now) {
 			_instance->removeSsrcs({
 				update.was->ssrc,
@@ -1472,7 +1472,7 @@ void GroupCall::markEndpointActive(
 		const auto track = &i->second->track;
 
 		track->renderNextFrame(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			const auto activeTrack = _activeVideoTracks[endpoint].get();
 			const auto size = track->frameSize();
 			if (size.isEmpty()) {
@@ -1494,7 +1494,7 @@ void GroupCall::markEndpointActive(
 			) | rpl::filter([=](Webrtc::VideoState state) {
 				return (state == Webrtc::VideoState::Paused)
 					&& !_activeVideoTracks[endpoint]->shown;
-			}) | rpl::start_with_next([=] {
+			}) | rpl::on_next([=] {
 				_activeVideoTracks[endpoint]->shown = true;
 				markTrackShown(endpoint, true);
 			}, i->second->lifetime);
@@ -2671,7 +2671,7 @@ void GroupCall::applyOtherParticipantUpdate(
 void GroupCall::setupMediaDevices() {
 	_playbackDeviceId.changes() | rpl::filter([=] {
 		return _instance && _setDeviceIdCallback;
-	}) | rpl::start_with_next([=](const Webrtc::DeviceResolvedId &deviceId) {
+	}) | rpl::on_next([=](const Webrtc::DeviceResolvedId &deviceId) {
 		_setDeviceIdCallback(deviceId);
 
 		// Value doesn't matter here, just trigger reading of the new value.
@@ -2680,7 +2680,7 @@ void GroupCall::setupMediaDevices() {
 
 	_captureDeviceId.changes() | rpl::filter([=] {
 		return _instance && _setDeviceIdCallback;
-	}) | rpl::start_with_next([=](const Webrtc::DeviceResolvedId &deviceId) {
+	}) | rpl::on_next([=](const Webrtc::DeviceResolvedId &deviceId) {
 		_setDeviceIdCallback(deviceId);
 
 		// Value doesn't matter here, just trigger reading of the new value.
@@ -2689,12 +2689,12 @@ void GroupCall::setupMediaDevices() {
 
 	_cameraDeviceId.changes() | rpl::filter([=] {
 		return _cameraCapture != nullptr;
-	}) | rpl::start_with_next([=](const Webrtc::DeviceResolvedId &deviceId) {
+	}) | rpl::on_next([=](const Webrtc::DeviceResolvedId &deviceId) {
 		_cameraCapture->switchToDevice(deviceId.value.toStdString(), false);
 	}, _lifetime);
 
 	if (!_rtmp) {
-		_muted.value() | rpl::start_with_next([=](MuteState state) {
+		_muted.value() | rpl::on_next([=](MuteState state) {
 			const auto devices = &Core::App().mediaDevices();
 			const auto muted = (state != MuteState::Active)
 				&& (state != MuteState::PushToTalk);
@@ -2804,7 +2804,7 @@ void GroupCall::setupOutgoingVideo() {
 	) | rpl::filter([=](VideoState previous, VideoState state) {
 		// Recursive entrance may happen if error happens when activating.
 		return (previous != state);
-	}) | rpl::start_with_next([=](VideoState previous, VideoState state) {
+	}) | rpl::on_next([=](VideoState previous, VideoState state) {
 		const auto wasActive = (previous != VideoState::Inactive);
 		const auto nowPaused = (state == VideoState::Paused);
 		const auto nowActive = (state != VideoState::Inactive);
@@ -2860,7 +2860,7 @@ void GroupCall::setupOutgoingVideo() {
 	) | rpl::filter([=](VideoState previous, VideoState state) {
 		// Recursive entrance may happen if error happens when activating.
 		return (previous != state);
-	}) | rpl::start_with_next([=](VideoState previous, VideoState state) {
+	}) | rpl::on_next([=](VideoState previous, VideoState state) {
 		const auto wasActive = (previous != VideoState::Inactive);
 		const auto nowPaused = (state == VideoState::Paused);
 		const auto nowActive = (state != VideoState::Inactive);
diff --git a/Telegram/SourceFiles/calls/group/calls_group_common.cpp b/Telegram/SourceFiles/calls/group/calls_group_common.cpp
index d473d2ec1a..1a44fff548 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_common.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_group_common.cpp
@@ -86,7 +86,7 @@ object_ptr<Ui::RpWidget> MakeRoundActiveLogo(
 	auto result = object_ptr<Ui::RpWidget>(parent);
 	const auto logo = result.data();
 	logo->resize(logo->width(), logoOuter.height());
-	logo->paintRequest() | rpl::start_with_next([=, &icon] {
+	logo->paintRequest() | rpl::on_next([=, &icon] {
 		if (logo->width() < logoOuter.width()) {
 			return;
 		}
@@ -156,7 +156,7 @@ void ConferenceCallJoinConfirm(
 			object_ptr<Ui::RpWidget>(box),
 			st::boxRowPadding + st::confcallJoinSepPadding);
 		sep->resize(sep->width(), st::normalFont->height);
-		sep->paintRequest() | rpl::start_with_next([=] {
+		sep->paintRequest() | rpl::on_next([=] {
 			auto p = QPainter(sep);
 			const auto line = st::lineWidth;
 			const auto top = st::confcallLinkFooterOrLineTop;
@@ -323,7 +323,7 @@ void ShowConferenceCallLinkBox(
 			});
 
 			close->geometryValue(
-			) | rpl::start_with_next([=](QRect geometry) {
+			) | rpl::on_next([=](QRect geometry) {
 				toggle->moveToLeft(
 					geometry.x() - toggle->width(),
 					geometry.y());
@@ -380,7 +380,7 @@ void ShowConferenceCallLinkBox(
 			box->widthValue(),
 			copy->widthValue(),
 			share->widthValue()
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			const auto width = st::boxWideWidth;
 			const auto padding = st::confcallLinkBox.buttonPadding;
 			const auto available = width - 2 * padding.right();
@@ -399,7 +399,7 @@ void ShowConferenceCallLinkBox(
 			copy->parentWidget(),
 			tr::lng_confcall_link_or(),
 			st::confcallLinkFooterOr);
-		sep->paintRequest() | rpl::start_with_next([=] {
+		sep->paintRequest() | rpl::on_next([=] {
 			auto p = QPainter(sep);
 			const auto text = sep->textMaxWidth();
 			const auto white = (sep->width() - 2 * text) / 2;
@@ -433,7 +433,7 @@ void ShowConferenceCallLinkBox(
 			}
 			return false;
 		});
-		copy->geometryValue() | rpl::start_with_next([=](QRect geometry) {
+		copy->geometryValue() | rpl::on_next([=](QRect geometry) {
 			const auto width = st::boxWideWidth
 				- st::boxRowPadding.left()
 				- st::boxRowPadding.right();
diff --git a/Telegram/SourceFiles/calls/group/calls_group_invite_controller.cpp b/Telegram/SourceFiles/calls/group/calls_group_invite_controller.cpp
index 46fa70f933..bc4645e069 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_invite_controller.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_group_invite_controller.cpp
@@ -51,7 +51,7 @@ namespace {
 
 	const auto raw = result.data();
 	raw->paintRequest(
-	) | rpl::start_with_next([=](QRect clip) {
+	) | rpl::on_next([=](QRect clip) {
 		auto p = QPainter(raw);
 		p.fillRect(clip, st::groupCallMembersBgOver);
 	}, raw->lifetime());
@@ -61,7 +61,7 @@ namespace {
 		std::move(text),
 		st::groupCallBoxLabel);
 	raw->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		const auto padding = st::groupCallInviteDividerPadding;
 		const auto available = width - padding.left() - padding.right();
 		label->resizeToNaturalWidth(available);
@@ -412,7 +412,7 @@ void ConfInviteRow::elementsPaint(
 	const auto activate = [=] {
 		content->submitted();
 	};
-	content->noSearchSubmits() | rpl::start_with_next([=] {
+	content->noSearchSubmits() | rpl::on_next([=] {
 		controller->toggleFirst();
 	}, content->lifetime());
 
@@ -676,7 +676,7 @@ void ConfInviteController::addShareLinkButton() {
 			: st::createCallInviteLinkIcon),
 		QPoint());
 	button->entity()->heightValue(
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		icon->moveToLeft(
 			st::createCallInviteLinkIconPosition.x(),
 			(height - st::groupCallInviteLinkIcon.height()) / 2);
@@ -686,7 +686,7 @@ void ConfInviteController::addShareLinkButton() {
 	button->entity()->events(
 	) | rpl::filter([=](not_null<QEvent*> e) {
 		return (e->type() == QEvent::Enter);
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		delegate()->peerListMouseLeftGeometry();
 	}, button->lifetime());
 	delegate()->peerListSetAboveWidget(std::move(button));
@@ -787,7 +787,7 @@ void InviteContactsController::prepareViewHook() {
 
 	std::move(
 		_discoveredInGroup
-	) | rpl::start_with_next([=](not_null<UserData*> user) {
+	) | rpl::on_next([=](not_null<UserData*> user) {
 		if (auto row = delegate()->peerListFindRow(user->id.value)) {
 			delegate()->peerListRemoveRow(row);
 		}
@@ -846,7 +846,7 @@ object_ptr<Ui::BoxContent> PrepareInviteBox(
 			&st::groupCallMultiSelect);
 		auto initBox = [=](not_null<PeerListBox*> box) {
 			box->setTitle(tr::lng_group_call_invite_conf());
-			raw->hasSelectedValue() | rpl::start_with_next([=](bool has) {
+			raw->hasSelectedValue() | rpl::on_next([=](bool has) {
 				box->clearButtons();
 				if (has) {
 					box->addButton(tr::lng_group_call_confcall_add(), [=] {
@@ -1018,7 +1018,7 @@ object_ptr<Ui::BoxContent> PrepareInviteBox(
 		&st::groupCallMultiSelect);
 	auto initBox = [=](not_null<PeerListBox*> box) {
 		box->setTitle(tr::lng_group_call_invite_conf());
-		raw->hasSelectedValue() | rpl::start_with_next([=](bool has) {
+		raw->hasSelectedValue() | rpl::on_next([=](bool has) {
 			box->clearButtons();
 			if (has) {
 				box->addButton(tr::lng_group_call_invite_button(), [=] {
@@ -1067,7 +1067,7 @@ void InitReActivate(not_null<PeerListBox*> box) {
 
 	const auto header = CreateReActivateHeader(box);
 	header->resizeToWidth(st::boxWideWidth);
-	header->heightValue() | rpl::start_with_next([=](int height) {
+	header->heightValue() | rpl::on_next([=](int height) {
 		box->setAddedTopScrollSkip(height, true);
 	}, header->lifetime());
 	header->moveToLeft(0, 0);
@@ -1088,12 +1088,12 @@ object_ptr<Ui::BoxContent> PrepareInviteToEmptyBox(
 	const auto initBox = [=](not_null<PeerListBox*> box) {
 		InitReActivate(box);
 
-		box->noSearchSubmits() | rpl::start_with_next([=] {
+		box->noSearchSubmits() | rpl::on_next([=] {
 			raw->noSearchSubmit();
 		}, box->lifetime());
 
 		raw->prioritizeScrollRequests(
-		) | rpl::start_with_next([=](Ui::ScrollToRequest request) {
+		) | rpl::on_next([=](Ui::ScrollToRequest request) {
 			box->scrollTo(request);
 		}, box->lifetime());
 
@@ -1171,12 +1171,12 @@ object_ptr<Ui::BoxContent> PrepareCreateCallBox(
 			box->setTitle(tr::lng_confcall_create_title());
 		}
 
-		box->noSearchSubmits() | rpl::start_with_next([=] {
+		box->noSearchSubmits() | rpl::on_next([=] {
 			raw->noSearchSubmit();
 		}, box->lifetime());
 
 		raw->prioritizeScrollRequests(
-		) | rpl::start_with_next([=](Ui::ScrollToRequest request) {
+		) | rpl::on_next([=](Ui::ScrollToRequest request) {
 			box->scrollTo(request);
 		}, box->lifetime());
 
diff --git a/Telegram/SourceFiles/calls/group/calls_group_members.cpp b/Telegram/SourceFiles/calls/group/calls_group_members.cpp
index 7a04d1a7b9..c3e4328e90 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_members.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_group_members.cpp
@@ -241,7 +241,7 @@ Members::Controller::Controller(
 	st::groupCallMembersBgOver)
 , _narrowRoundRect(ImageRoundRadius::Large, st::groupCallMembersBg) {
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_inactiveCrossLine.invalidate();
 		_coloredCrossLine.invalidate();
 		_inactiveNarrowCrossLine.invalidate();
@@ -251,7 +251,7 @@ Members::Controller::Controller(
 	rpl::combine(
 		PowerSaving::OnValue(PowerSaving::kCalls),
 		Core::App().appDeactivatedValue()
-	) | rpl::start_with_next([=](bool disabled, bool deactivated) {
+	) | rpl::on_next([=](bool disabled, bool deactivated) {
 		const auto hide = disabled || deactivated;
 
 		if (!(hide && _soundingAnimationHideLastTime)) {
@@ -284,7 +284,7 @@ Members::Controller::Controller(
 
 	_peer->session().changes().peerUpdates(
 		Data::PeerUpdate::Flag::About
-	) | rpl::start_with_next([=](const Data::PeerUpdate &update) {
+	) | rpl::on_next([=](const Data::PeerUpdate &update) {
 		if (const auto row = findRow(update.peer)) {
 			row->setAbout(update.peer->about());
 		}
@@ -297,12 +297,12 @@ Members::Controller::~Controller() {
 
 void Members::Controller::setupListChangeViewers() {
 	_call->real(
-	) | rpl::start_with_next([=](not_null<Data::GroupCall*> real) {
+	) | rpl::on_next([=](not_null<Data::GroupCall*> real) {
 		subscribeToChanges(real);
 	}, _lifetime);
 
 	_call->levelUpdates(
-	) | rpl::start_with_next([=](const LevelUpdate &update) {
+	) | rpl::on_next([=](const LevelUpdate &update) {
 		const auto i = _soundingRowBySsrc.find(update.ssrc);
 		if (i != end(_soundingRowBySsrc)) {
 			updateRowLevel(i->second, update.value);
@@ -310,7 +310,7 @@ void Members::Controller::setupListChangeViewers() {
 	}, _lifetime);
 
 	_call->videoEndpointLargeValue(
-	) | rpl::start_with_next([=](const VideoEndpoint &large) {
+	) | rpl::on_next([=](const VideoEndpoint &large) {
 		if (large) {
 			hideRowsWithVideoExcept(large);
 		} else {
@@ -322,7 +322,7 @@ void Members::Controller::setupListChangeViewers() {
 	) | rpl::filter([=](const VideoStateToggle &update) {
 		const auto &large = _call->videoEndpointLarge();
 		return large && (update.endpoint != large);
-	}) | rpl::start_with_next([=](const VideoStateToggle &update) {
+	}) | rpl::on_next([=](const VideoStateToggle &update) {
 		if (update.value) {
 			hideRowWithVideo(update.endpoint);
 		} else {
@@ -331,7 +331,7 @@ void Members::Controller::setupListChangeViewers() {
 	}, _lifetime);
 
 	_call->rejoinEvents(
-	) | rpl::start_with_next([=](const Group::RejoinEvent &event) {
+	) | rpl::on_next([=](const Group::RejoinEvent &event) {
 		const auto guard = gsl::finally([&] {
 			delegate()->peerListRefreshRows();
 		});
@@ -411,13 +411,13 @@ void Members::Controller::subscribeToChanges(not_null<Data::GroupCall*> real) {
 	_fullCount = real->fullCountValue();
 
 	real->participantsReloaded(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		prepareRows(real);
 	}, _lifetime);
 
 	using Update = Data::GroupCall::ParticipantUpdate;
 	real->participantUpdated(
-	) | rpl::start_with_next([=](const Update &update) {
+	) | rpl::on_next([=](const Update &update) {
 		Expects(update.was.has_value() || update.now.has_value());
 
 		const auto participantPeer = update.was
@@ -444,7 +444,7 @@ void Members::Controller::subscribeToChanges(not_null<Data::GroupCall*> real) {
 		toggleVideoEndpointActive(endpoint, true);
 	}
 	_call->videoStreamActiveUpdates(
-	) | rpl::start_with_next([=](const VideoStateToggle &update) {
+	) | rpl::on_next([=](const VideoStateToggle &update) {
 		toggleVideoEndpointActive(update.endpoint, update.value);
 	}, _lifetime);
 }
@@ -516,7 +516,7 @@ void Members::Controller::setupInvitedUsers() {
 	_peer->owner().invitesToCalls(
 	) | rpl::filter([=](const Invite &invite) {
 		return (invite.id == _call->id());
-	}) | rpl::start_with_next([=](const Invite &invite) {
+	}) | rpl::on_next([=](const Invite &invite) {
 		const auto user = invite.user;
 		if (invite.removed) {
 			if (const auto row = findRow(user)) {
@@ -550,7 +550,7 @@ void Members::Controller::setupWithAccessUsers() {
 		return;
 	}
 	conference->participantsWithAccessValue(
-	) | rpl::start_with_next([=](base::flat_set<UserId> &&nowIds) {
+	) | rpl::on_next([=](base::flat_set<UserId> &&nowIds) {
 		for (auto i = begin(_withAccess); i != end(_withAccess);) {
 			const auto oldId = *i;
 			if (nowIds.remove(oldId)) {
@@ -1610,7 +1610,7 @@ void Members::Controller::addMuteActionsToContextMenu(
 		mutesFromVolume = volumeItem->toggleMuteRequests();
 
 		volumeItem->toggleMuteRequests(
-		) | rpl::start_with_next([=](bool muted) {
+		) | rpl::on_next([=](bool muted) {
 			if (muted) {
 				// Slider value is changed after the callback is called.
 				// To capture good state inside the slider frame we postpone.
@@ -1622,19 +1622,19 @@ void Members::Controller::addMuteActionsToContextMenu(
 		}, volumeItem->lifetime());
 
 		volumeItem->toggleMuteLocallyRequests(
-		) | rpl::start_with_next([=](bool muted) {
+		) | rpl::on_next([=](bool muted) {
 			if (!isMe(participantPeer)) {
 				toggleMute(muted, true);
 			}
 		}, volumeItem->lifetime());
 
 		volumeItem->changeVolumeRequests(
-		) | rpl::start_with_next([=](int volume) {
+		) | rpl::on_next([=](int volume) {
 			changeVolume(volume, false);
 		}, volumeItem->lifetime());
 
 		volumeItem->changeVolumeLocallyRequests(
-		) | rpl::start_with_next([=](int volume) {
+		) | rpl::on_next([=](int volume) {
 			if (!isMe(participantPeer)) {
 				changeVolume(volume, true);
 			}
@@ -1680,7 +1680,7 @@ void Members::Controller::addMuteActionsToContextMenu(
 	if (muteAction) {
 		std::move(
 			mutesFromVolume
-		) | rpl::start_with_next([=](bool mutedFromVolume) {
+		) | rpl::on_next([=](bool mutedFromVolume) {
 			const auto state = _call->canManage()
 				? (mutedFromVolume
 					? (row->raisedHandRating()
@@ -1869,7 +1869,7 @@ void Members::setupAddMember(not_null<GroupCall*> call) {
 		_canAddMembers.value(),
 		_canInviteByLink.value(),
 		_mode.value()
-	) | rpl::start_with_next([=](bool add, bool invite, PanelMode mode) {
+	) | rpl::on_next([=](bool add, bool invite, PanelMode mode) {
 		if (!add && !invite) {
 			if (const auto old = _addMemberButton.current()) {
 				delete old;
@@ -1962,7 +1962,7 @@ void Members::setupList() {
 				_layout.get(),
 				st::groupCallMembersTopSkip));
 		result->paintRequest(
-		) | rpl::start_with_next([=](QRect clip) {
+		) | rpl::on_next([=](QRect clip) {
 			QPainter(result).fillRect(clip, st::groupCallMembersBg);
 		}, result->lifetime());
 		return result;
@@ -1979,7 +1979,7 @@ void Members::setupList() {
 		_list->heightValue() | rpl::map(_1 > 0),
 		_addMemberButton.value() | rpl::map(_1 != nullptr)
 	) | rpl::distinct_until_changed(
-	) | rpl::start_with_next([=](bool hasList, bool hasAddMembers) {
+	) | rpl::on_next([=](bool hasList, bool hasAddMembers) {
 		_topSkip->resize(
 			_topSkip->width(),
 			hasList ? st::groupCallMembersTopSkip : 0);
@@ -1990,7 +1990,7 @@ void Members::setupList() {
 
 	const auto skip = _layout->add(object_ptr<Ui::RpWidget>(_layout.get()));
 	_mode.value(
-	) | rpl::start_with_next([=](PanelMode mode) {
+	) | rpl::on_next([=](PanelMode mode) {
 		skip->resize(skip->width(), (mode == PanelMode::Default)
 			? st::groupCallMembersBottomSkip
 			: 0);
@@ -1999,14 +1999,14 @@ void Members::setupList() {
 	rpl::combine(
 		_mode.value(),
 		_layout->heightValue()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		resizeToList();
 	}, _layout->lifetime());
 
 	rpl::combine(
 		_scroll->scrollTopValue(),
 		_scroll->heightValue()
-	) | rpl::start_with_next([=](int scrollTop, int scrollHeight) {
+	) | rpl::on_next([=](int scrollTop, int scrollHeight) {
 		_layout->setVisibleTopBottom(scrollTop, scrollTop + scrollHeight);
 	}, _scroll->lifetime());
 }
@@ -2030,7 +2030,7 @@ void Members::setupFingerprint() {
 
 void Members::trackViewportGeometry() {
 	_call->videoEndpointLargeValue(
-	) | rpl::start_with_next([=](const VideoEndpoint &large) {
+	) | rpl::on_next([=](const VideoEndpoint &large) {
 		_viewport->showLarge(large);
 	}, _viewport->lifetime());
 
@@ -2053,19 +2053,19 @@ void Members::trackViewportGeometry() {
 			std::min(_scroll->height(), _viewport->fullHeight()));
 	};
 	_layout->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		_viewport->resizeToWidth(width);
 		resize();
 	}, _viewport->lifetime());
 
 	_scroll->heightValue(
-	) | rpl::skip(1) | rpl::start_with_next(resize, _viewport->lifetime());
+	) | rpl::skip(1) | rpl::on_next(resize, _viewport->lifetime());
 
 	_scroll->scrollTopValue(
-	) | rpl::skip(1) | rpl::start_with_next(move, _viewport->lifetime());
+	) | rpl::skip(1) | rpl::on_next(move, _viewport->lifetime());
 
 	_viewport->fullHeightValue(
-	) | rpl::start_with_next([=](int viewport) {
+	) | rpl::on_next([=](int viewport) {
 		_videoWrap->resize(_videoWrap->width(), viewport);
 		if (viewport > 0) {
 			move();
@@ -2124,7 +2124,7 @@ void Members::setupFakeRoundCorners() {
 		result->resize(size, size);
 		result->setAttribute(Qt::WA_TransparentForMouseEvents);
 		result->paintRequest(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			QPainter(result).drawImage(
 				result->rect(),
 				*image,
@@ -2154,7 +2154,7 @@ void Members::setupFakeRoundCorners() {
 		_shareLinkButton.value() | rpl::map(
 			heightValue
 		) | rpl::flatten_latest()
-	) | rpl::start_with_next([=](QRect list, int addMembers, int shareLink) {
+	) | rpl::on_next([=](QRect list, int addMembers, int shareLink) {
 		const auto left = list.x();
 		const auto top = list.y() - _topSkip->height();
 		const auto right = left + list.width() - topright->width();
@@ -2173,7 +2173,7 @@ void Members::setupFakeRoundCorners() {
 
 	refreshImage();
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		refreshImage();
 		topleft->update();
 		topright->update();
diff --git a/Telegram/SourceFiles/calls/group/calls_group_members_row.cpp b/Telegram/SourceFiles/calls/group/calls_group_members_row.cpp
index 0c5e6ca5c5..977d547ee1 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_members_row.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_group_members_row.cpp
@@ -106,7 +106,7 @@ MembersRow::BlobsAnimation::BlobsAnimation(
 	float maxLevel)
 : blobs(std::move(blobDatas), levelDuration, maxLevel) {
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		userpicCache = QImage();
 	}, lifetime);
 }
@@ -215,7 +215,7 @@ void MembersRow::setSpeaking(bool speaking) {
 		_statusIcon->arcs.setStrokeRatio(kArcsStrokeRatio);
 		_statusIcon->arcsWidth = _statusIcon->arcs.finishedWidth();
 		_statusIcon->arcs.startUpdateRequests(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			if (!_statusIcon->arcsAnimation.animating()) {
 				_statusIcon->wasArcsWidth = _statusIcon->arcsWidth;
 			}
diff --git a/Telegram/SourceFiles/calls/group/calls_group_menu.cpp b/Telegram/SourceFiles/calls/group/calls_group_menu.cpp
index b0f0d4af14..f9df5b7803 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_menu.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_group_menu.cpp
@@ -132,7 +132,7 @@ JoinAsAction::JoinAsAction(
 	setClickedCallback(std::move(callback));
 
 	paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		Painter p(this);
 		paint(p);
 	}, lifetime());
@@ -182,7 +182,7 @@ void JoinAsAction::prepare() {
 	rpl::combine(
 		tr::lng_group_call_display_as_header(),
 		Info::Profile::NameValue(_peer)
-	) | rpl::start_with_next([=](QString text, QString name) {
+	) | rpl::on_next([=](QString text, QString name) {
 		const auto &padding = st::groupCallJoinAsPadding;
 		_text.setMarkedText(_st.itemStyle, { text }, MenuTextOptions);
 		_name.setMarkedText(_st.itemStyle, { name }, MenuTextOptions);
@@ -253,7 +253,7 @@ RecordingAction::RecordingAction(
 	+ st::groupCallRecordingTimerPadding.bottom()) {
 	std::move(
 		startAtValues
-	) | rpl::start_with_next([=](TimeId startAt) {
+	) | rpl::on_next([=](TimeId startAt) {
 		_startAt = startAt;
 		_startedAt = crl::now();
 		_refreshTimer.cancel();
@@ -266,7 +266,7 @@ RecordingAction::RecordingAction(
 	setClickedCallback(std::move(callback));
 
 	paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		Painter p(this);
 		paint(p);
 	}, lifetime());
@@ -344,7 +344,7 @@ void RecordingAction::prepare(rpl::producer<QString> text) {
 		_st.widthMax);
 	setMinWidth(w);
 
-	std::move(text) | rpl::start_with_next([=](QString text) {
+	std::move(text) | rpl::on_next([=](QString text) {
 		const auto &padding = _st.itemPadding;
 		_text.setMarkedText(_st.itemStyle, { text }, MenuTextOptions);
 		_textWidth = w - padding.left() - padding.right();
diff --git a/Telegram/SourceFiles/calls/group/calls_group_message_field.cpp b/Telegram/SourceFiles/calls/group/calls_group_message_field.cpp
index 5f26db6de9..a517de5a59 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_message_field.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_group_message_field.cpp
@@ -167,7 +167,7 @@ void ReactionPanel::create() {
 	_parent = std::make_unique<Ui::RpWidget>(_outer);
 	_parent->show();
 
-	_parent->events() | rpl::start_with_next([=](not_null<QEvent*> e) {
+	_parent->events() | rpl::on_next([=](not_null<QEvent*> e) {
 		if (e->type() == QEvent::MouseButtonPress) {
 			const auto event = static_cast<QMouseEvent*>(e.get());
 			if (event->button() == Qt::LeftButton) {
@@ -191,7 +191,7 @@ void ReactionPanel::create() {
 		true);
 
 	_selector->chosen(
-	) | rpl::start_with_next([=](Chosen reaction) {
+	) | rpl::on_next([=](Chosen reaction) {
 		if (reaction.id.custom() && !_show->session().premium()) {
 			ShowPremiumPreviewBox(
 				_show,
@@ -215,7 +215,7 @@ void ReactionPanel::create() {
 		_fieldGeometry.value(),
 		_shownValue.value(),
 		_expanded.value()
-	) | rpl::start_with_next([=](QRect field, float64 shown, bool expanded) {
+	) | rpl::on_next([=](QRect field, float64 shown, bool expanded) {
 		const auto width = margins.left()
 			+ _selector->countAppearedWidth(shown)
 			+ margins.right();
@@ -241,7 +241,7 @@ void ReactionPanel::create() {
 	}, _selector->lifetime());
 
 	_selector->willExpand(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_expanded = true;
 
 		const auto raw = _parent.get();
@@ -260,7 +260,7 @@ void ReactionPanel::create() {
 		});
 	}, _selector->lifetime());
 
-	_selector->escapes() | rpl::start_with_next([=] {
+	_selector->escapes() | rpl::on_next([=] {
 		collapse();
 	}, _selector->lifetime());
 }
@@ -276,7 +276,7 @@ void ReactionPanel::fadeOutSelector() {
 	raw->widget.setGeometry(geometry);
 	raw->widget.show();
 	raw->widget.paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (const auto opacity = raw->animation.value(0.)) {
 			auto p = QPainter(&raw->widget);
 			p.setOpacity(opacity);
@@ -349,7 +349,7 @@ void MessageField::createControls(PeerData *peer) {
 	rpl::combine(
 		_fieldFocused.value(),
 		_fieldEmpty.value()
-	) | rpl::start_with_next([=](bool focused, bool empty) {
+	) | rpl::on_next([=](bool focused, bool empty) {
 		if (!focused) {
 			_reactionPanel->hideIfCollapsed();
 		} else if (empty) {
@@ -360,7 +360,7 @@ void MessageField::createControls(PeerData *peer) {
 	}, _field->lifetime());
 
 	_reactionPanel->chosen(
-	) | rpl::start_with_next([=](Chosen reaction) {
+	) | rpl::on_next([=](Chosen reaction) {
 		if (const auto customId = reaction.id.custom()) {
 			const auto document = _show->session().data().document(customId);
 			if (const auto sticker = document->sticker()) {
@@ -439,11 +439,11 @@ void MessageField::createControls(PeerData *peer) {
 	panel->hide();
 	panel->selector()->setCurrentPeer(peer);
 	panel->selector()->emojiChosen(
-	) | rpl::start_with_next([=](ChatHelpers::EmojiChosen data) {
+	) | rpl::on_next([=](ChatHelpers::EmojiChosen data) {
 		Ui::InsertEmojiAtCursor(_field->textCursor(), data.emoji);
 	}, lifetime());
 	panel->selector()->customEmojiChosen(
-	) | rpl::start_with_next([=](ChatHelpers::FileChosen data) {
+	) | rpl::on_next([=](ChatHelpers::FileChosen data) {
 		const auto info = data.document->sticker();
 		if (info
 			&& info->setType == Data::StickersType::Emoji
@@ -467,7 +467,7 @@ void MessageField::createControls(PeerData *peer) {
 	_width.value(
 	) | rpl::filter(
 		rpl::mappers::_1 > 0
-	) | rpl::start_with_next([=](int newWidth) {
+	) | rpl::on_next([=](int newWidth) {
 		const auto fieldWidth = newWidth
 			- st::historySendPadding
 			- _emojiToggle->width()
@@ -483,7 +483,7 @@ void MessageField::createControls(PeerData *peer) {
 	rpl::combine(
 		_width.value(),
 		_field->heightValue()
-	) | rpl::start_with_next([=](int width, int height) {
+	) | rpl::on_next([=](int width, int height) {
 		if (width <= 0) {
 			return;
 		}
@@ -494,7 +494,7 @@ void MessageField::createControls(PeerData *peer) {
 		updateWrapSize();
 	}, _lifetime);
 
-	_field->cancelled() | rpl::start_with_next([=] {
+	_field->cancelled() | rpl::on_next([=] {
 		_closeRequests.fire({});
 	}, _lifetime);
 
@@ -510,7 +510,7 @@ void MessageField::createControls(PeerData *peer) {
 	rpl::merge(
 		_field->submits() | rpl::to_empty,
 		_send->clicks() | rpl::to_empty
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto text = _field->getTextWithTags();
 		if (text.text.size() <= _limit) {
 			_submitted.fire(std::move(text));
@@ -527,7 +527,7 @@ void MessageField::updateEmojiPanelGeometry() {
 }
 
 void MessageField::setupBackground() {
-	_wrap->paintRequest() | rpl::start_with_next([=] {
+	_wrap->paintRequest() | rpl::on_next([=] {
 		const auto radius = st::historySendSize.height() / 2.;
 		auto p = QPainter(_wrap.get());
 		auto hq = PainterHighQualityEnabler(p);
@@ -568,7 +568,7 @@ void MessageField::toggle(bool shown) {
 			auto image = Ui::GrabWidgetToImage(_wrap.get());
 			_cache = std::make_unique<Ui::RpWidget>(_parent);
 			const auto raw = _cache.get();
-			raw->paintRequest() | rpl::start_with_next([=] {
+			raw->paintRequest() | rpl::on_next([=] {
 				auto p = QPainter(raw);
 				auto hq = PainterHighQualityEnabler(p);
 				const auto scale = raw->height() / float64(_wrap->height());
diff --git a/Telegram/SourceFiles/calls/group/calls_group_messages.cpp b/Telegram/SourceFiles/calls/group/calls_group_messages.cpp
index 9f35bc988f..41e3c3df0a 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_messages.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_group_messages.cpp
@@ -80,7 +80,7 @@ Messages::Messages(not_null<GroupCall*> call, not_null<MTP::Sender*> api)
 , _starsStatsTimer([=] { requestStarsStats(); }) {
 	Ui::PostponeCall(_call, [=] {
 		_call->real(
-		) | rpl::start_with_next([=](not_null<Data::GroupCall*> call) {
+		) | rpl::on_next([=](not_null<Data::GroupCall*> call) {
 			_real = call;
 			if (ready()) {
 				sendPending();
diff --git a/Telegram/SourceFiles/calls/group/calls_group_messages_ui.cpp b/Telegram/SourceFiles/calls/group/calls_group_messages_ui.cpp
index 0fac740cfc..2821870e2a 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_messages_ui.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_group_messages_ui.cpp
@@ -392,7 +392,7 @@ void MessagesUi::setupBadges() {
 	_adminBadge.setText(st::messageTextStyle, tr::lng_admin_badge(tr::now));
 
 	_topDonors.value(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		for (auto &entry : _views) {
 			const auto place = donorPlace(entry.from);
 			if (entry.place != place) {
@@ -419,7 +419,7 @@ void MessagesUi::setupList(
 	rpl::combine(
 		std::move(messages),
 		std::move(shown)
-	) | rpl::start_with_next([=](std::vector<Message> &&list, bool shown) {
+	) | rpl::on_next([=](std::vector<Message> &&list, bool shown) {
 		if (shown) {
 			_hidden = std::nullopt;
 		} else {
@@ -500,7 +500,7 @@ void MessagesUi::showList(const std::vector<Message> &list) {
 void MessagesUi::handleIdUpdates(rpl::producer<MessageIdUpdate> idUpdates) {
 	std::move(
 		idUpdates
-	) | rpl::start_with_next([=](MessageIdUpdate update) {
+	) | rpl::on_next([=](MessageIdUpdate update) {
 		const auto i = ranges::find(
 			_views,
 			update.localId,
@@ -1008,7 +1008,7 @@ void MessagesUi::startReactionAnimation(MessageView &entry) {
 		rpl::combine(
 			_scroll->scrollTopValue(),
 			_scroll->RpWidget::positionValue()
-		) | rpl::start_with_next([=](int yshift, QPoint point) {
+		) | rpl::on_next([=](int yshift, QPoint point) {
 			_reactionBasePosition = point - QPoint(0, yshift);
 			for (auto &view : _views) {
 				updateReactionPosition(view);
@@ -1029,7 +1029,7 @@ void MessagesUi::startReactionAnimation(MessageView &entry) {
 	const auto effectSize = st::reactionInlineImage * 2;
 	const auto animation = entry.reactionAnimation.get();
 	raw->resize(effectSize, effectSize);
-	raw->paintRequest() | rpl::start_with_next([=] {
+	raw->paintRequest() | rpl::on_next([=] {
 		if (animation->finished()) {
 			crl::on_main(raw, [=] {
 				removeReaction(raw);
@@ -1166,7 +1166,7 @@ void MessagesUi::setupMessagesWidget() {
 		scroll->scrollTopValue(),
 		scroll->heightValue(),
 		_messages->heightValue()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateTopFade();
 		updateBottomFade();
 	}, scroll->lifetime());
@@ -1177,7 +1177,7 @@ void MessagesUi::setupMessagesWidget() {
 		receiveAllMouseEvents();
 	}
 
-	_messages->paintRequest() | rpl::start_with_next([=](QRect clip) {
+	_messages->paintRequest() | rpl::on_next([=](QRect clip) {
 		const auto start = scroll->scrollTop();
 		const auto end = start + scroll->height();
 		const auto ratio = style::DevicePixelRatio();
@@ -1429,7 +1429,7 @@ void MessagesUi::receiveSomeMouseEvents() {
 }
 
 void MessagesUi::receiveAllMouseEvents() {
-	_messages->events() | rpl::start_with_next([=](not_null<QEvent*> e) {
+	_messages->events() | rpl::on_next([=](not_null<QEvent*> e) {
 		const auto type = e->type();
 		if (type != QEvent::MouseButtonPress) {
 			return;
@@ -1529,7 +1529,7 @@ void MessagesUi::setupPinnedWidget() {
 		scroll->scrollLeftValue(),
 		scroll->widthValue(),
 		_pinned->widthValue()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateLeftFade();
 		updateRightFade();
 	}, scroll->lifetime());
@@ -1570,7 +1570,7 @@ void MessagesUi::setupPinnedWidget() {
 	});
 	animation->seconds.callEach(crl::time(1000));
 
-	_pinned->paintRequest() | rpl::start_with_next([=](QRect clip) {
+	_pinned->paintRequest() | rpl::on_next([=](QRect clip) {
 		const auto session = &_show->session();
 		const auto &colorings = session->appConfig().groupCallColorings();
 		const auto start = scroll->scrollLeft();
@@ -1713,7 +1713,7 @@ void MessagesUi::setupPinnedWidget() {
 		}
 		return MsgId();
 	};
-	_pinned->events() | rpl::start_with_next([=](not_null<QEvent*> e) {
+	_pinned->events() | rpl::on_next([=](not_null<QEvent*> e) {
 		const auto type = e->type();
 		if (type == QEvent::MouseButtonPress) {
 			const auto pos = static_cast<QMouseEvent*>(e.get())->pos();
diff --git a/Telegram/SourceFiles/calls/group/calls_group_panel.cpp b/Telegram/SourceFiles/calls/group/calls_group_panel.cpp
index a38f6dc14f..6a26012a5d 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_panel.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_group_panel.cpp
@@ -279,7 +279,7 @@ Panel::~Panel() {
 
 void Panel::setupRealCallViewers() {
 	_call->real(
-	) | rpl::start_with_next([=](not_null<Data::GroupCall*> real) {
+	) | rpl::on_next([=](not_null<Data::GroupCall*> real) {
 		subscribeToChanges(real);
 	}, lifetime());
 }
@@ -338,7 +338,7 @@ void Panel::migrate(not_null<ChannelData*> channel) {
 void Panel::subscribeToPeerChanges() {
 	Info::Profile::NameValue(
 		_peer
-	) | rpl::start_with_next([=](const QString &name) {
+	) | rpl::on_next([=](const QString &name) {
 		window()->setTitle(name);
 	}, _peerLifetime);
 }
@@ -383,7 +383,7 @@ void Panel::initWindow() {
 	window()->setTitleStyle(st::groupCallTitle);
 
 	if (_call->conference()) {
-		titleText() | rpl::start_with_next([=](const QString &text) {
+		titleText() | rpl::on_next([=](const QString &text) {
 			window()->setTitle(text);
 		}, lifetime());
 	} else {
@@ -448,11 +448,11 @@ void Panel::initWindow() {
 	});
 
 	_call->hasVideoWithFramesValue(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateMode();
 	}, lifetime());
 
-	_window->maximizeRequests() | rpl::start_with_next([=](bool maximized) {
+	_window->maximizeRequests() | rpl::on_next([=](bool maximized) {
 		if (_call->rtmp()) {
 			toggleFullScreen(maximized);
 		} else {
@@ -462,7 +462,7 @@ void Panel::initWindow() {
 		}
 	}, lifetime());
 
-	_window->showingLayer() | rpl::start_with_next([=] {
+	_window->showingLayer() | rpl::on_next([=] {
 		hideStickedTooltip(StickedTooltipHide::Unavailable);
 	}, lifetime());
 
@@ -476,12 +476,12 @@ void Panel::initWidget() {
 	widget()->setMouseTracking(true);
 
 	widget()->paintRequest(
-	) | rpl::start_with_next([=](QRect clip) {
+	) | rpl::on_next([=](QRect clip) {
 		paint(clip);
 	}, lifetime());
 
 	widget()->sizeValue(
-	) | rpl::skip(1) | rpl::start_with_next([=](QSize size) {
+	) | rpl::skip(1) | rpl::on_next([=](QSize size) {
 		if (!updateMode()) {
 			updateControlsGeometry();
 		}
@@ -506,7 +506,7 @@ void Panel::toggleMessageTyping() {
 		_messageField->toggle(true);
 
 		_messageField->submitted(
-		) | rpl::start_with_next([=](TextWithTags text) {
+		) | rpl::on_next([=](TextWithTags text) {
 			_call->sendMessage(std::move(text));
 
 			_messageField->toggle(false);
@@ -514,17 +514,17 @@ void Panel::toggleMessageTyping() {
 			updateWideControlsVisibility();
 		}, _messageField->lifetime());
 
-		_messageField->heightValue() | rpl::start_with_next([=] {
+		_messageField->heightValue() | rpl::on_next([=] {
 			updateButtonsGeometry();
 		}, _messageField->lifetime());
 
-		_messageField->closeRequests() | rpl::start_with_next([=] {
+		_messageField->closeRequests() | rpl::on_next([=] {
 			if (_messageTyping.current()) {
 				toggleMessageTyping();
 			}
 		}, _messageField->lifetime());
 
-		_messageField->closed() | rpl::start_with_next([=] {
+		_messageField->closed() | rpl::on_next([=] {
 			_messageField = nullptr;
 			updateButtonsGeometry();
 		}, _messageField->lifetime());
@@ -576,7 +576,7 @@ void Panel::initControls() {
 	_mute->clicks(
 	) | rpl::filter([=](Qt::MouseButton button) {
 		return (button == Qt::LeftButton);
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		if (_call->scheduleDate()) {
 			if (_call->canManage()) {
 				startScheduledNow();
@@ -611,7 +611,7 @@ void Panel::initControls() {
 	rpl::combine(
 		_mode.value(),
 		_call->canManageValue()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		refreshTopButton();
 	}, lifetime());
 
@@ -638,12 +638,12 @@ void Panel::initControls() {
 				_peer,
 				Data::PeerUpdate::Flag::Username
 			) | rpl::skip(1) | rpl::to_empty
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			refreshLeftButton();
 			updateControlsGeometry();
 		}, _callLifetime);
 
-		std::move(started) | rpl::start_with_next([=] {
+		std::move(started) | rpl::on_next([=] {
 			refreshVideoButtons();
 			updateButtonsStyles();
 			setupMembers();
@@ -658,19 +658,19 @@ void Panel::initControls() {
 			|| (state == State::Ended)
 			|| (state == State::FailedHangingUp)
 			|| (state == State::Failed);
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		closeBeforeDestroy();
 	}, _callLifetime);
 
 	_call->levelUpdates(
 	) | rpl::filter([=](const LevelUpdate &update) {
 		return update.me;
-	}) | rpl::start_with_next([=](const LevelUpdate &update) {
+	}) | rpl::on_next([=](const LevelUpdate &update) {
 		_mute->setLevel(update.value);
 	}, _callLifetime);
 
 	_call->real(
-	) | rpl::start_with_next([=](not_null<Data::GroupCall*> real) {
+	) | rpl::on_next([=](not_null<Data::GroupCall*> real) {
 		setupRealMuteButtonState(real);
 	}, _callLifetime);
 
@@ -757,7 +757,7 @@ void Panel::refreshVideoButtons(std::optional<bool> overrideWideMode) {
 		_video->setColorOverrides(
 			toggleableOverrides(_call->isSharingCameraValue()));
 		_call->isSharingCameraValue(
-		) | rpl::start_with_next([=](bool sharing) {
+		) | rpl::on_next([=](bool sharing) {
 			if (sharing) {
 				hideStickedTooltip(
 					StickedTooltip::Camera,
@@ -775,7 +775,7 @@ void Panel::refreshVideoButtons(std::optional<bool> overrideWideMode) {
 		_screenShare->setColorOverrides(
 			toggleableOverrides(_call->isSharingScreenValue()));
 		_call->isSharingScreenValue(
-		) | rpl::start_with_next([=](bool sharing) {
+		) | rpl::on_next([=](bool sharing) {
 			_screenShare->setProgress(sharing ? 1. : 0.);
 		}, _screenShare->lifetime());
 	}
@@ -869,7 +869,7 @@ void Panel::setupRealMuteButtonState(not_null<Data::GroupCall*> real) {
 	) | rpl::distinct_until_changed(
 	) | rpl::filter(
 		_2 != GroupCall::InstanceState::TransitionToRtc
-	) | rpl::start_with_next([=](
+	) | rpl::on_next([=](
 			MuteState mute,
 			GroupCall::InstanceState state,
 			TimeId scheduleDate,
@@ -969,7 +969,7 @@ void Panel::setupScheduledLabels(rpl::producer<TimeId> date) {
 	rpl::combine(
 		widget()->sizeValue(),
 		_startsIn->widthValue()
-	) | rpl::start_with_next([=](QSize size, int width) {
+	) | rpl::on_next([=](QSize size, int width) {
 		_startsIn->move(
 			(size.width() - width) / 2,
 			top() + st::groupCallStartsInTop);
@@ -978,7 +978,7 @@ void Panel::setupScheduledLabels(rpl::producer<TimeId> date) {
 	rpl::combine(
 		widget()->sizeValue(),
 		_startsWhen->widthValue()
-	) | rpl::start_with_next([=](QSize size, int width) {
+	) | rpl::on_next([=](QSize size, int width) {
 		_startsWhen->move(
 			(size.width() - width) / 2,
 			top() + st::groupCallStartsWhenTop);
@@ -987,7 +987,7 @@ void Panel::setupScheduledLabels(rpl::producer<TimeId> date) {
 	rpl::combine(
 		widget()->sizeValue(),
 		_countdown->widthValue()
-	) | rpl::start_with_next([=](QSize size, int width) {
+	) | rpl::on_next([=](QSize size, int width) {
 		_countdown->move(
 			(size.width() - width) / 2,
 			top() + st::groupCallCountdownTop);
@@ -1014,7 +1014,7 @@ void Panel::setupMembers() {
 	_viewport->mouseInsideValue(
 	) | rpl::filter([=] {
 		return !_rtmpFull;
-	}) | rpl::start_with_next([=](bool inside) {
+	}) | rpl::on_next([=](bool inside) {
 		toggleWideControls(inside);
 	}, _viewport->lifetime());
 
@@ -1025,27 +1025,27 @@ void Panel::setupMembers() {
 	raiseControls();
 
 	_members->desiredHeightValue(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateMembersGeometry();
 	}, _members->lifetime());
 
 	_members->toggleMuteRequests(
-	) | rpl::start_with_next([=](MuteRequest request) {
+	) | rpl::on_next([=](MuteRequest request) {
 		_call->toggleMute(request);
 	}, _callLifetime);
 
 	_members->changeVolumeRequests(
-	) | rpl::start_with_next([=](VolumeRequest request) {
+	) | rpl::on_next([=](VolumeRequest request) {
 		_call->changeVolume(request);
 	}, _callLifetime);
 
 	_members->kickParticipantRequests(
-	) | rpl::start_with_next([=](not_null<PeerData*> participantPeer) {
+	) | rpl::on_next([=](not_null<PeerData*> participantPeer) {
 		kickParticipant(participantPeer);
 	}, _callLifetime);
 
 	_members->addMembersRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (_call->conference()) {
 			addMembers();
 		} else if (!_peer->isBroadcast()
@@ -1060,10 +1060,10 @@ void Panel::setupMembers() {
 	}, _callLifetime);
 
 	_members->shareLinkRequests(
-	) | rpl::start_with_next(shareConferenceLinkCallback(), _callLifetime);
+	) | rpl::on_next(shareConferenceLinkCallback(), _callLifetime);
 
 	_call->videoEndpointLargeValue(
-	) | rpl::start_with_next([=](const VideoEndpoint &large) {
+	) | rpl::on_next([=](const VideoEndpoint &large) {
 		if (large && mode() != PanelMode::Wide) {
 			enlargeVideo();
 		}
@@ -1214,7 +1214,7 @@ void Panel::setupVideo(not_null<Viewport*> viewport) {
 		setupTile(endpoint, track);
 	}
 	_call->videoStreamActiveUpdates(
-	) | rpl::start_with_next([=](const VideoStateToggle &update) {
+	) | rpl::on_next([=](const VideoStateToggle &update) {
 		if (update.value) {
 			// Add async (=> the participant row is definitely in Members).
 			const auto endpoint = update.endpoint;
@@ -1232,14 +1232,14 @@ void Panel::setupVideo(not_null<Viewport*> viewport) {
 	}, viewport->lifetime());
 
 	viewport->pinToggled(
-	) | rpl::start_with_next([=](bool pinned) {
+	) | rpl::on_next([=](bool pinned) {
 		_call->pinVideoEndpoint(pinned
 			? _call->videoEndpointLarge()
 			: VideoEndpoint{});
 	}, viewport->lifetime());
 
 	viewport->clicks(
-	) | rpl::start_with_next([=](VideoEndpoint &&endpoint) {
+	) | rpl::on_next([=](VideoEndpoint &&endpoint) {
 		if (_call->videoEndpointLarge() == endpoint) {
 			_call->showVideoEndpointLarge({});
 		} else if (_call->videoEndpointPinned()) {
@@ -1250,7 +1250,7 @@ void Panel::setupVideo(not_null<Viewport*> viewport) {
 	}, viewport->lifetime());
 
 	viewport->qualityRequests(
-	) | rpl::start_with_next([=](const VideoQualityRequest &request) {
+	) | rpl::on_next([=](const VideoQualityRequest &request) {
 		_call->requestVideoQuality(request.endpoint, request.quality);
 	}, viewport->lifetime());
 }
@@ -1319,7 +1319,7 @@ void Panel::subscribeToChanges(not_null<Data::GroupCall*> real) {
 			animate();
 
 			_recordingMark->paintRequest(
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				auto p = QPainter(_recordingMark.data());
 				auto hq = PainterHighQualityEnabler(p);
 				p.setPen(Qt::NoPen);
@@ -1338,7 +1338,7 @@ void Panel::subscribeToChanges(not_null<Data::GroupCall*> real) {
 	) | rpl::map(
 		_1 != 0
 	) | rpl::distinct_until_changed(
-	) | rpl::start_with_next([=](bool recorded) {
+	) | rpl::on_next([=](bool recorded) {
 		const auto livestream = _call->peer()->isBroadcast();
 		const auto isVideo = real->recordVideo();
 		if (recorded) {
@@ -1367,12 +1367,12 @@ void Panel::subscribeToChanges(not_null<Data::GroupCall*> real) {
 	rpl::combine(
 		_call->videoIsWorkingValue(),
 		_call->isSharingCameraValue()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		refreshVideoButtons();
 		showStickedTooltip();
 	}, lifetime());
 
-	_call->messagesEnabledValue() | rpl::start_with_next([=] {
+	_call->messagesEnabledValue() | rpl::on_next([=] {
 		updateButtonsGeometry();
 		raiseControls();
 	}, lifetime());
@@ -1380,12 +1380,12 @@ void Panel::subscribeToChanges(not_null<Data::GroupCall*> real) {
 	rpl::combine(
 		_call->videoIsWorkingValue(),
 		_call->isSharingScreenValue()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		refreshTopButton();
 	}, lifetime());
 
 	_call->mutedValue(
-	) | rpl::skip(1) | rpl::start_with_next([=](MuteState state) {
+	) | rpl::skip(1) | rpl::on_next([=](MuteState state) {
 		updateButtonsGeometry();
 		if (state == MuteState::Active
 			|| state == MuteState::PushToTalk) {
@@ -1419,7 +1419,7 @@ void Panel::createPinOnTop() {
 		}
 	};
 	_fullScreenOrMaximized.value(
-	) | rpl::start_with_next([=](bool fullScreenOrMaximized) {
+	) | rpl::on_next([=](bool fullScreenOrMaximized) {
 		_window->setControlsStyle(fullScreenOrMaximized
 			? st::callTitle
 			: st::groupCallTitle);
@@ -1436,7 +1436,7 @@ void Panel::createPinOnTop() {
 			_viewport->rp()->events(
 			) | rpl::filter([](not_null<QEvent*> event) {
 				return (event->type() == QEvent::MouseMove);
-			}) | rpl::start_with_next([=] {
+			}) | rpl::on_next([=] {
 				_hideControlsTimer.callOnce(kHideControlsTimeout);
 				toggleWideControls(true);
 			}, _hideControlsTimerLifetime);
@@ -1491,7 +1491,7 @@ void Panel::refreshTopButton() {
 		) | rpl::then(_call->rejoinEvents(
 		) | rpl::map([](const RejoinEvent &event) {
 			return event.nowJoinAs;
-		})) | rpl::start_with_next([=](not_null<PeerData*> joinAs) {
+		})) | rpl::on_next([=](not_null<PeerData*> joinAs) {
 			auto joinAsToggle = object_ptr<Ui::UserpicButton>(
 				widget(),
 				joinAs,
@@ -1739,7 +1739,7 @@ void Panel::initLayout(ConferencePanelMigration info) {
 	_window->raiseControls();
 
 	_window->controlsLayoutChanges(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		// _menuToggle geometry depends on _controls arrangement.
 		crl::on_main(this, [=] { updateControlsGeometry(); });
 	}, lifetime());
@@ -1893,7 +1893,7 @@ void Panel::updateButtonsStyles() {
 
 void Panel::setupEmptyRtmp() {
 	_call->emptyRtmpValue(
-	) | rpl::start_with_next([=](bool empty) {
+	) | rpl::on_next([=](bool empty) {
 		if (!empty) {
 			_emptyRtmp.destroy();
 			return;
@@ -1924,13 +1924,13 @@ void Panel::setupEmptyRtmp() {
 		_emptyRtmp->setAttribute(Qt::WA_TransparentForMouseEvents);
 		_emptyRtmp->show();
 		_emptyRtmp->paintRequest(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			auto p = QPainter(_emptyRtmp.data());
 			label->corners.paint(p, _emptyRtmp->rect());
 		}, _emptyRtmp->lifetime());
 
 		widget()->sizeValue(
-		) | rpl::start_with_next([=](QSize size) {
+		) | rpl::on_next([=](QSize size) {
 			const auto padding = st::groupCallWidth / 30;
 			const auto width = std::min(
 				size.width() - padding * 4,
@@ -1987,7 +1987,7 @@ void Panel::refreshTitleBackground() {
 		st::roundRadiusLarge,
 		_controlsBackgroundColor.color());
 	_titleBackground->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(_titleBackground.data());
 		corners->paintSomeRounded(
 			p,
@@ -2014,7 +2014,7 @@ void Panel::setupControlsBackgroundNarrow() {
 		QImage::Format_ARGB32_Premultiplied);
 	rpl::single(rpl::empty) | rpl::then(
 		style::PaletteChanged()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		full->fill(Qt::transparent);
 
 		auto p = QPainter(full);
@@ -2055,7 +2055,7 @@ void Panel::setupControlsBackgroundNarrow() {
 			- st::groupCallMembersMargin.right()),
 		height);
 	_controlsBackgroundNarrow->shadow.paintRequest(
-	) | rpl::start_with_next([=](QRect clip) {
+	) | rpl::on_next([=](QRect clip) {
 		auto p = QPainter(&_controlsBackgroundNarrow->shadow);
 		clip = clip.intersected(_controlsBackgroundNarrow->shadow.rect());
 		const auto inner = _members->getInnerGeometry().translated(
@@ -2097,7 +2097,7 @@ void Panel::setupControlsBackgroundWide() {
 		st::groupCallControlsBackRadius,
 		_controlsBackgroundColor.color());
 	_controlsBackgroundWide->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(_controlsBackgroundWide.data());
 		corners->paint(p, _controlsBackgroundWide->rect());
 	}, lifetime);
@@ -2111,7 +2111,7 @@ void Panel::trackControl(Ui::RpWidget *widget, rpl::lifetime &lifetime) {
 	}
 	const auto over = std::make_shared<bool>();
 	widget->events(
-	) | rpl::start_with_next([=](not_null<QEvent*> e) {
+	) | rpl::on_next([=](not_null<QEvent*> e) {
 		const auto type = e->type();
 		if (type == QEvent::Enter) {
 			// Enter events may come from widget destructors,
@@ -2254,7 +2254,7 @@ void Panel::showNiceTooltip(
 		rpl::combine(
 			label->sizeValue(),
 			button->sizeValue()
-		) | rpl::start_with_next([=](QSize text, QSize close) {
+		) | rpl::on_next([=](QSize text, QSize close) {
 			const auto height = std::max(text.height(), close.height());
 			container->resize(text.width() + close.width(), height);
 			label->move(0, (height - text.height()) / 2);
@@ -2285,7 +2285,7 @@ void Panel::showNiceTooltip(
 	base::qt_signal_producer(
 		control.get(),
 		&QObject::destroyed
-	) | rpl::start_with_next(destroy, tooltip->lifetime());
+	) | rpl::on_next(destroy, tooltip->lifetime());
 
 	_niceTooltipControl = control;
 	updateTooltipGeometry();
@@ -2765,7 +2765,7 @@ void Panel::refreshTitle() {
 
 		refreshTitleColors();
 		style::PaletteChanged(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			refreshTitleColors();
 		}, _title->lifetime());
 	}
diff --git a/Telegram/SourceFiles/calls/group/calls_group_rtmp.cpp b/Telegram/SourceFiles/calls/group/calls_group_rtmp.cpp
index 0812608c17..a6ad667d06 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_rtmp.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_group_rtmp.cpp
@@ -140,7 +140,7 @@ void StartRtmpProcess::start(
 			.done = std::move(done),
 		});
 	session->account().sessionChanges(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_request = nullptr;
 	}, _request->lifetime);
 
@@ -214,7 +214,7 @@ void StartRtmpProcess::createBox() {
 		_request->show,
 		_request->data.value());
 	object->boxClosing(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_request = nullptr;
 	}, _request->lifetime);
 	_request->box = base::make_weak(object.data());
@@ -272,7 +272,7 @@ void StartRtmpProcess::FillRtmpRows(
 		const auto weak = container->add(std::move(wrap), rowPadding);
 		Ui::AddSkip(container, st::groupCallRtmpCopyButtonBottomSkip);
 		button->heightValue(
-		) | rpl::start_with_next([=](int height) {
+		) | rpl::on_next([=](int height) {
 			weak->resize(weak->width(), height);
 		}, container->lifetime());
 		return weak;
diff --git a/Telegram/SourceFiles/calls/group/calls_group_settings.cpp b/Telegram/SourceFiles/calls/group/calls_group_settings.cpp
index 9f73004af9..aca8a90798 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_settings.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_group_settings.cpp
@@ -377,7 +377,7 @@ void SettingsBox(
 		))->toggleOn(rpl::single(
 			settings.groupCallNoiseSuppression()
 		))->toggledChanges(
-		) | rpl::start_with_next([=](bool enabled) {
+		) | rpl::on_next([=](bool enabled) {
 			Core::App().settings().setGroupCallNoiseSuppression(enabled);
 			call->setNoiseSuppression(enabled);
 			Core::App().saveSettingsDelayed();
@@ -482,7 +482,7 @@ void SettingsBox(
 							kCheckAccessibilityInterval
 						) | rpl::filter([] {
 							return base::GlobalShortcutsAllowed();
-						}) | rpl::start_with_next([=] {
+						}) | rpl::on_next([=] {
 							box->closeBox();
 						}, box->lifetime());
 					}
@@ -579,7 +579,7 @@ void SettingsBox(
 				settings.groupCallPushToTalk(),
 				anim::type::instant);
 			pushToTalk->toggledChanges(
-			) | rpl::start_with_next([=](bool toggled) {
+			) | rpl::on_next([=](bool toggled) {
 				if (!toggled) {
 					stopRecording();
 				} else if (!ensureManager()) {
@@ -801,12 +801,12 @@ void SettingsBox(
 		});
 
 		volumeItem->toggleMuteLocallyRequests(
-		) | rpl::start_with_next([=](bool muted) {
+		) | rpl::on_next([=](bool muted) {
 			toggleMute(muted, true);
 		}, volumeItem->lifetime());
 
 		volumeItem->changeVolumeLocallyRequests(
-		) | rpl::start_with_next([=](int volume) {
+		) | rpl::on_next([=](int volume) {
 			changeVolume(volume, true);
 		}, volumeItem->lifetime());
 	}
@@ -849,7 +849,7 @@ void SettingsBox(
 
 	box->setTitle(tr::lng_group_call_settings_title());
 	box->boxClosing(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (canChangeJoinMuted
 			&& muteJoined
 			&& muteJoined->toggled() != joinMuted) {
diff --git a/Telegram/SourceFiles/calls/group/calls_group_toasts.cpp b/Telegram/SourceFiles/calls/group/calls_group_toasts.cpp
index 67b6167805..7c9222ef94 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_toasts.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_group_toasts.cpp
@@ -50,7 +50,7 @@ void Toasts::setupJoinAsChanged() {
 		return _call->stateValue() | rpl::filter([](State state) {
 			return (state == State::Joined);
 		}) | rpl::take(1);
-	}) | rpl::flatten_latest() | rpl::start_with_next([=] {
+	}) | rpl::flatten_latest() | rpl::on_next([=] {
 		_panel->uiShow()->showToast((_call->peer()->isBroadcast()
 			? tr::lng_group_call_join_as_changed_channel
 			: tr::lng_group_call_join_as_changed)(
@@ -70,7 +70,7 @@ void Toasts::setupTitleChanged() {
 		return peer->groupCall()->title().isEmpty()
 			? peer->name()
 			: peer->groupCall()->title();
-	}) | rpl::start_with_next([=](const QString &title) {
+	}) | rpl::on_next([=](const QString &title) {
 		_panel->uiShow()->showToast((_call->peer()->isBroadcast()
 			? tr::lng_group_call_title_changed_channel
 			: tr::lng_group_call_title_changed)(
@@ -83,7 +83,7 @@ void Toasts::setupTitleChanged() {
 
 void Toasts::setupAllowedToSpeak() {
 	_call->allowedToSpeakNotifications(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (_panel->isActive()) {
 			_panel->uiShow()->showToast(
 				tr::lng_group_call_can_speak_here(tr::now));
@@ -112,7 +112,7 @@ void Toasts::setupPinnedVideo() {
 	}) | rpl::flatten_latest(
 	) | rpl::filter([=] {
 		return (_call->shownVideoTracks().size() > 1);
-	}) | rpl::start_with_next([=](const VideoEndpoint &endpoint) {
+	}) | rpl::on_next([=](const VideoEndpoint &endpoint) {
 		const auto pinned = _call->videoEndpointPinned();
 		const auto peer = endpoint.peer;
 		if (!peer) {
@@ -147,7 +147,7 @@ void Toasts::setupPinnedVideo() {
 void Toasts::setupRequestedToSpeak() {
 	_call->mutedValue(
 	) | rpl::combine_previous(
-	) | rpl::start_with_next([=](MuteState was, MuteState now) {
+	) | rpl::on_next([=](MuteState was, MuteState now) {
 		if (was == MuteState::ForceMuted && now == MuteState::RaisedHand) {
 			_panel->uiShow()->showToast(
 				tr::lng_group_call_tooltip_raised_hand(tr::now));
@@ -157,7 +157,7 @@ void Toasts::setupRequestedToSpeak() {
 
 void Toasts::setupError() {
 	_call->errors(
-	) | rpl::start_with_next([=](Error error) {
+	) | rpl::on_next([=](Error error) {
 		const auto key = [&] {
 			switch (error) {
 			case Error::NoCamera: return tr::lng_call_error_no_camera;
diff --git a/Telegram/SourceFiles/calls/group/calls_group_viewport.cpp b/Telegram/SourceFiles/calls/group/calls_group_viewport.cpp
index 7fa5a3c8ad..1db9eaf97a 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_viewport.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_group_viewport.cpp
@@ -102,12 +102,12 @@ void Viewport::setup() {
 	_content->sizeValue(
 	) | rpl::filter([=] {
 		return wide() || videoStream();
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		updateTilesGeometry();
 	}, lifetime());
 
 	_content->events(
-	) | rpl::start_with_next([=](not_null<QEvent*> e) {
+	) | rpl::on_next([=](not_null<QEvent*> e) {
 		const auto type = e->type();
 		if (type == QEvent::Enter) {
 			Ui::Integration::Instance().registerLeaveSubscription(raw);
@@ -299,12 +299,12 @@ void Viewport::add(
 	_tiles.back()->trackSizeValue(
 	) | rpl::filter([](QSize size) {
 		return !size.isEmpty();
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		updateTilesGeometry();
 	}, _tiles.back()->lifetime());
 
 	_tiles.back()->track()->stateValue(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateTilesGeometry();
 	}, _tiles.back()->lifetime());
 }
diff --git a/Telegram/SourceFiles/calls/group/calls_group_viewport_opengl.cpp b/Telegram/SourceFiles/calls/group/calls_group_viewport_opengl.cpp
index 7bf31ba2ab..94ce5cded8 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_viewport_opengl.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_group_viewport_opengl.cpp
@@ -308,7 +308,7 @@ Viewport::RendererGL::RendererGL(not_null<Viewport*> owner)
 	st::radialBg) {
 
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_buttons.invalidate();
 	}, _lifetime);
 }
diff --git a/Telegram/SourceFiles/calls/group/calls_group_viewport_tile.cpp b/Telegram/SourceFiles/calls/group/calls_group_viewport_tile.cpp
index 03dff5674e..6e1f2cb29a 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_viewport_tile.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_group_viewport_tile.cpp
@@ -44,7 +44,7 @@ Viewport::VideoTile::VideoTile(
 	_track.track->stateValue(
 	) | rpl::filter(
 		_1 == Webrtc::VideoState::Paused
-	) | rpl::take(1) | rpl::start_with_next([=] {
+	) | rpl::take(1) | rpl::on_next([=] {
 		_wasPaused = true;
 	}, _lifetime);
 
@@ -260,7 +260,7 @@ void Viewport::VideoTile::setup(rpl::producer<bool> pinned) {
 		pinned
 	) | rpl::filter([=](bool pinned) {
 		return (_pinned != pinned);
-	}) | rpl::start_with_next([=](bool pinned) {
+	}) | rpl::on_next([=](bool pinned) {
 		_pinned = pinned;
 		updateTopControlsSize();
 		if (!_hidden) {
@@ -270,7 +270,7 @@ void Viewport::VideoTile::setup(rpl::producer<bool> pinned) {
 	}, _lifetime);
 
 	_track.track->renderNextFrame(
-	) | rpl::start_with_next(_update, _lifetime);
+	) | rpl::on_next(_update, _lifetime);
 
 	updateTopControlsSize();
 }
diff --git a/Telegram/SourceFiles/calls/group/calls_volume_item.cpp b/Telegram/SourceFiles/calls/group/calls_volume_item.cpp
index cf80b20c5c..90dd3aaa07 100644
--- a/Telegram/SourceFiles/calls/group/calls_volume_item.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_volume_item.cpp
@@ -72,7 +72,7 @@ MenuVolumeItem::MenuVolumeItem(
 	_slider->setAlwaysDisplayMarker(true);
 
 	sizeValue(
-	) | rpl::start_with_next([=](const QSize &size) {
+	) | rpl::on_next([=](const QSize &size) {
 		const auto geometry = QRect(QPoint(), size);
 		_itemRect = geometry - _padding;
 		_speakerRect = QRect(_itemRect.topLeft(), _stCross.icon.size());
@@ -90,7 +90,7 @@ MenuVolumeItem::MenuVolumeItem(
 	setCloudVolume(startVolume);
 
 	paintRequest(
-	) | rpl::start_with_next([=](const QRect &clip) {
+	) | rpl::on_next([=](const QRect &clip) {
 		auto p = QPainter(this);
 
 		const auto volume = _localMuted
@@ -167,7 +167,7 @@ MenuVolumeItem::MenuVolumeItem(
 
 	std::move(
 		participantState
-	) | rpl::start_with_next([=](const Group::ParticipantState &state) {
+	) | rpl::on_next([=](const Group::ParticipantState &state) {
 		const auto newMuted = state.mutedByMe;
 		const auto newVolume = state.volume.value_or(0);
 
@@ -210,7 +210,7 @@ void MenuVolumeItem::initArcsAnimation() {
 	});
 
 	_arcs->startUpdateRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (!_arcsAnimation.animating()) {
 			*lastTime = crl::now();
 			_arcsAnimation.start();
@@ -218,7 +218,7 @@ void MenuVolumeItem::initArcsAnimation() {
 	}, lifetime());
 
 	_arcs->stopUpdateRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_arcsAnimation.stop();
 	}, lifetime());
 }
diff --git a/Telegram/SourceFiles/calls/group/ui/calls_group_recording_box.cpp b/Telegram/SourceFiles/calls/group/ui/calls_group_recording_box.cpp
index 6ee3bda246..90702ad6b7 100644
--- a/Telegram/SourceFiles/calls/group/ui/calls_group_recording_box.cpp
+++ b/Telegram/SourceFiles/calls/group/ui/calls_group_recording_box.cpp
@@ -121,7 +121,7 @@ RecordingInfo::RecordingInfo(not_null<Ui::RpWidget*> parent)
 : RpWidget(parent)
 , _container(this) {
 	sizeValue(
-	) | rpl::start_with_next([=](const QSize &size) {
+	) | rpl::on_next([=](const QSize &size) {
 		_container->resizeToWidth(size.width());
 	}, _container->lifetime());
 }
@@ -140,7 +140,7 @@ void RecordingInfo::prepareAudio() {
 	audioIcon->setAttribute(Qt::WA_TransparentForMouseEvents);
 
 	sizeValue(
-	) | rpl::start_with_next([=](const QSize &size) {
+	) | rpl::on_next([=](const QSize &size) {
 		audioIcon->moveToLeft((size.width() - audioIcon->width()) / 2, 0);
 	}, lifetime());
 }
@@ -175,7 +175,7 @@ void RecordingInfo::prepareVideo() {
 	};
 	for (const auto icon : icons) {
 		icon->clicks(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			for (const auto &i : icons) {
 				i->setToggled(icon == i);
 			}
@@ -184,7 +184,7 @@ void RecordingInfo::prepareVideo() {
 	}
 
 	wrap->sizeValue(
-	) | rpl::start_with_next([=](const QSize &size) {
+	) | rpl::on_next([=](const QSize &size) {
 		const auto wHalf = size.width() / icons.size();
 		for (auto i = 0; i < icons.size(); i++) {
 			const auto &icon = icons[i];
@@ -230,7 +230,7 @@ Switcher::Switcher(
 	};
 
 	sizeValue(
-	) | rpl::start_with_next([=](const QSize &size) {
+	) | rpl::on_next([=](const QSize &size) {
 		_audio->resize(size.width(), size.height());
 		_video->resize(size.width(), size.height());
 
@@ -242,7 +242,7 @@ Switcher::Switcher(
 
 	std::move(
 		toggled
-	) | rpl::start_with_next([=](bool toggled) {
+	) | rpl::on_next([=](bool toggled) {
 		_toggled = toggled;
 		_animation.start(
 			updatePositions,
@@ -281,7 +281,7 @@ void EditGroupCallTitleBox(
 		box->closeBox();
 		done(result);
 	};
-	input->submits() | rpl::start_with_next(submit, input->lifetime());
+	input->submits() | rpl::on_next(submit, input->lifetime());
 	box->addButton(tr::lng_settings_save(), submit);
 	box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
 }
@@ -340,7 +340,7 @@ void AddTitleGroupCallRecordingBox(
 		box->closeBox();
 		done(result);
 	};
-	input->submits() | rpl::start_with_next(submit, input->lifetime());
+	input->submits() | rpl::on_next(submit, input->lifetime());
 	box->addButton(tr::lng_group_call_recording_start_button(), submit);
 	box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
 }
diff --git a/Telegram/SourceFiles/calls/group/ui/calls_group_scheduled_labels.cpp b/Telegram/SourceFiles/calls/group/ui/calls_group_scheduled_labels.cpp
index 3398089b62..ecdde9856f 100644
--- a/Telegram/SourceFiles/calls/group/ui/calls_group_scheduled_labels.cpp
+++ b/Telegram/SourceFiles/calls/group/ui/calls_group_scheduled_labels.cpp
@@ -99,7 +99,7 @@ object_ptr<Ui::RpWidget> CreateGradientLabel(
 
 	std::move(
 		text
-	) | rpl::start_with_next([=](const QString &text) {
+	) | rpl::on_next([=](const QString &text) {
 		state->path = QPainterPath();
 		const auto &font = st::groupCallCountdownFont;
 		state->path.addText(0, font->ascent, font->f, text);
@@ -116,7 +116,7 @@ object_ptr<Ui::RpWidget> CreateGradientLabel(
 	}, raw->lifetime());
 
 	raw->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(raw);
 		auto hq = PainterHighQualityEnabler(p);
 		const auto skip = st::groupCallWidth / 20;
diff --git a/Telegram/SourceFiles/calls/group/ui/desktop_capture_choose_source.cpp b/Telegram/SourceFiles/calls/group/ui/desktop_capture_choose_source.cpp
index 40712391b8..3dfc1fa526 100644
--- a/Telegram/SourceFiles/calls/group/ui/desktop_capture_choose_source.cpp
+++ b/Telegram/SourceFiles/calls/group/ui/desktop_capture_choose_source.cpp
@@ -147,14 +147,14 @@ Source::Source(
 , _activeRect(ImageRoundRadius::Large, st::groupCallMuted1)
 , _source(source) {
 	_widget.paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		paint();
 	}, _widget.lifetime());
 
 	_label.setAttribute(Qt::WA_TransparentForMouseEvents);
 
 	_widget.sizeValue(
-	) | rpl::start_with_next([=](QSize size) {
+	) | rpl::on_next([=](QSize size) {
 		const auto padding = st::desktopCapturePadding;
 		_label.resizeToNaturalWidth(
 			size.width() - padding.left() - padding.right());
@@ -237,7 +237,7 @@ void Source::paint() {
 void Source::setupPreview() {
 	_preview = std::make_unique<Preview>(_source);
 	_preview->track.renderNextFrame(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (_preview->track.frameSize().isEmpty()) {
 			_preview->track.markFrameShown();
 		}
@@ -341,7 +341,7 @@ void ChooseSourceProcess::setupPanel() {
 	_window->setStaysOnTop(true);
 
 	_window->body()->paintRequest(
-	) | rpl::start_with_next([=](QRect clip) {
+	) | rpl::on_next([=](QRect clip) {
 		QPainter(_window->body()).fillRect(clip, st::groupCallMembersBg);
 	}, _window->lifetime());
 
@@ -380,7 +380,7 @@ void ChooseSourceProcess::setupPanel() {
 		_finish->widthValue(),
 		_finish->shownValue(),
 		cancel->widthValue()
-	) | rpl::start_with_next([=](
+	) | rpl::on_next([=](
 			int submitWidth,
 			bool submitShown,
 			int finishWidth,
@@ -394,14 +394,14 @@ void ChooseSourceProcess::setupPanel() {
 	}, _bottom->lifetime());
 
 	_withAudio->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		const auto top = (bottomHeight - _withAudio->heightNoMargins()) / 2;
 		_withAudio->moveToLeft(bottomSkip, top);
 	}, _withAudio->lifetime());
 
 	_withAudio->setChecked(_delegate->chooseSourceActiveWithAudio());
 	_withAudio->checkedChanges(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateButtonsVisibility();
 	}, _withAudio->lifetime());
 
@@ -410,7 +410,7 @@ void ChooseSourceProcess::setupPanel() {
 	_submit->setVisible(!sharing);
 
 	_window->body()->sizeValue(
-	) | rpl::start_with_next([=](QSize size) {
+	) | rpl::on_next([=](QSize size) {
 		_scroll->setGeometry(
 			0,
 			0,
@@ -419,7 +419,7 @@ void ChooseSourceProcess::setupPanel() {
 	}, _scroll->lifetime());
 
 	_scroll->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		const auto rows = int(std::ceil(_sources.size() / float(kColumns)));
 		const auto innerHeight = margins.top()
 			+ rows * st::desktopCaptureSourceSize.height()
@@ -435,7 +435,7 @@ void ChooseSourceProcess::setupPanel() {
 	_window->events(
 	) | rpl::filter([=](not_null<QEvent*> e) {
 		return e->type() == QEvent::Close;
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		destroy();
 	}, _window->lifetime());
 }
@@ -481,7 +481,7 @@ void ChooseSourceProcess::fillSources() {
 		_sources.back()->activations(
 		) | rpl::filter([=] {
 			return (_selected != raw);
-		}) | rpl::start_with_next([=]{
+		}) | rpl::on_next([=]{
 			if (_selected) {
 				_selected->setActive(false);
 			}
@@ -524,7 +524,7 @@ void ChooseSourceProcess::setupSourcesGeometry() {
 		return;
 	}
 	_inner->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		const auto rows = int(std::ceil(_sources.size() / float(kColumns)));
 		const auto margins = st::desktopCaptureMargins;
 		const auto skips = st::desktopCaptureSourceSkips;
@@ -554,7 +554,7 @@ void ChooseSourceProcess::setupSourcesGeometry() {
 	rpl::combine(
 		_scroll->scrollTopValue(),
 		_scroll->heightValue()
-	) | rpl::start_with_next([=](int scrollTop, int scrollHeight) {
+	) | rpl::on_next([=](int scrollTop, int scrollHeight) {
 		const auto rows = int(std::ceil(_sources.size() / float(kColumns)));
 		const auto margins = st::desktopCaptureMargins;
 		const auto skips = st::desktopCaptureSourceSkips;
diff --git a/Telegram/SourceFiles/calls/ui/calls_device_menu.cpp b/Telegram/SourceFiles/calls/ui/calls_device_menu.cpp
index 1db1941c0e..bcbb91918f 100644
--- a/Telegram/SourceFiles/calls/ui/calls_device_menu.cpp
+++ b/Telegram/SourceFiles/calls/ui/calls_device_menu.cpp
@@ -116,7 +116,7 @@ Selector::Selector(
 	const auto group = std::make_shared<Ui::RadiobuttonGroup>();
 	std::move(
 		chosen
-	) | rpl::start_with_next([=](Webrtc::DeviceResolvedId id) {
+	) | rpl::on_next([=](Webrtc::DeviceResolvedId id) {
 		const auto value = id.isDefault() ? 0 : registerId(id.value);
 		if (!group->hasValue() || group->current() != value) {
 			group->setValue(value);
@@ -138,7 +138,7 @@ Selector::Selector(
 
 	std::move(
 		devices
-	) | rpl::start_with_next([=](const std::vector<Webrtc::DeviceInfo> &v) {
+	) | rpl::on_next([=](const std::vector<Webrtc::DeviceInfo> &v) {
 		while (_list->count()) {
 			delete _list->widgetAt(0);
 		}
diff --git a/Telegram/SourceFiles/chat_helpers/emoji_interactions.cpp b/Telegram/SourceFiles/chat_helpers/emoji_interactions.cpp
index 9f7fe7bb28..bd2c21bffc 100644
--- a/Telegram/SourceFiles/chat_helpers/emoji_interactions.cpp
+++ b/Telegram/SourceFiles/chat_helpers/emoji_interactions.cpp
@@ -53,7 +53,7 @@ EmojiInteractions::EmojiInteractions(not_null<Main::Session*> session)
 	_session->changes().messageUpdates(
 		Data::MessageUpdate::Flag::Destroyed
 		| Data::MessageUpdate::Flag::Edited
-	) | rpl::start_with_next([=](const Data::MessageUpdate &update) {
+	) | rpl::on_next([=](const Data::MessageUpdate &update) {
 		if (update.flags & Data::MessageUpdate::Flag::Destroyed) {
 			_outgoing.remove(update.item);
 			_incoming.remove(update.item);
@@ -408,7 +408,7 @@ void EmojiInteractions::setWaitingForDownload(bool waiting) {
 	_waitingForDownload = waiting;
 	if (_waitingForDownload) {
 		_session->downloaderTaskFinished(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			check();
 		}, _downloadCheckLifetime);
 	} else {
diff --git a/Telegram/SourceFiles/chat_helpers/emoji_keywords.cpp b/Telegram/SourceFiles/chat_helpers/emoji_keywords.cpp
index 500de20b6c..3382489d5c 100644
--- a/Telegram/SourceFiles/chat_helpers/emoji_keywords.cpp
+++ b/Telegram/SourceFiles/chat_helpers/emoji_keywords.cpp
@@ -523,7 +523,7 @@ void EmojiKeywords::handleSessionChanges() {
 	Core::App().domain().activeSessionValue( // #TODO multi someSessionValue
 	) | rpl::map([](Main::Session *session) {
 		return session ? &session->api() : nullptr;
-	}) | rpl::start_with_next([=](ApiWrap *api) {
+	}) | rpl::on_next([=](ApiWrap *api) {
 		apiChanged(api);
 	}, _lifetime);
 }
@@ -536,7 +536,7 @@ void EmojiKeywords::apiChanged(ApiWrap *api) {
 			) | rpl::filter([=] {
 				// Refresh with the suggested language if we already were asked.
 				return !_data.empty();
-			}) | rpl::start_with_next([=] {
+			}) | rpl::on_next([=] {
 				refresh();
 			}, _suggestedChangeLifetime);
 		}));
diff --git a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp
index 7c3a3a2744..ea360807ed 100644
--- a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp
@@ -518,7 +518,7 @@ EmojiListWidget::EmojiListWidget(
 	if (_mode == Mode::ChannelStatus) {
 		session().api().peerPhoto().emojiListValue(
 			Api::PeerPhoto::EmojiListType::NoChannelStatus
-		) | rpl::start_with_next([=](const std::vector<DocumentId> &list) {
+		) | rpl::on_next([=](const std::vector<DocumentId> &list) {
 			_restrictedCustomList = { begin(list), end(list) };
 			if (!_custom.empty()) {
 				refreshCustom();
@@ -526,7 +526,7 @@ EmojiListWidget::EmojiListWidget(
 		}, lifetime());
 	} else if (_mode == Mode::EmojiStatus && _features.collectibleStatus) {
 		session().data().emojiStatuses().collectiblesUpdates(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			refreshCustom();
 		}, lifetime());
 	}
@@ -543,12 +543,12 @@ EmojiListWidget::EmojiListWidget(
 	}
 
 	_picker->chosen(
-	) | rpl::start_with_next([=](EmojiChosen data) {
+	) | rpl::on_next([=](EmojiChosen data) {
 		colorChosen(data);
 	}, lifetime());
 
 	_picker->hidden(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		pickerHidden();
 	}, lifetime());
 
@@ -556,14 +556,14 @@ EmojiListWidget::EmojiListWidget(
 		Data::PeerUpdate::Flag::EmojiSet
 	) | rpl::filter([=](const Data::PeerUpdate &update) {
 		return (update.peer.get() == _megagroupSet);
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		refreshCustom();
 		resizeToWidth(width());
 	}, lifetime());
 
 	session().data().stickers().updated(
 		Data::StickersType::Emoji
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		refreshCustom();
 		resizeToWidth(width());
 	}, lifetime());
@@ -571,7 +571,7 @@ EmojiListWidget::EmojiListWidget(
 	rpl::combine(
 		Data::AmPremiumValue(&session()),
 		session().premiumPossibleValue()
-	) | rpl::skip(1) | rpl::start_with_next([=] {
+	) | rpl::skip(1) | rpl::on_next([=] {
 		refreshCustom();
 		resizeToWidth(width());
 	}, lifetime());
@@ -580,7 +580,7 @@ EmojiListWidget::EmojiListWidget(
 		rpl::empty
 	) | rpl::then(
 		style::PaletteChanged()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		initButton(_add, tr::lng_stickers_featured_add(tr::now), false);
 		initButton(_unlock, tr::lng_emoji_featured_unlock(tr::now), true);
 		initButton(_restore, tr::lng_emoji_premium_restore(tr::now), true);
@@ -942,7 +942,7 @@ object_ptr<TabbedSelector::InnerFooter> EmojiListWidget::createFooter() {
 	_footer = result;
 
 	_footer->setChosen(
-	) | rpl::start_with_next([=](uint64 setId) {
+	) | rpl::on_next([=](uint64 setId) {
 		showSet(setId);
 	}, _footer->lifetime());
 
@@ -1063,7 +1063,7 @@ void EmojiListWidget::setColorAllForceRippled(bool force) {
 		_colorAllRippleForcedLifetime = style::PaletteChanged(
 		) | rpl::filter([=] {
 			return _colorAllRipple != nullptr;
-		}) | rpl::start_with_next([=] {
+		}) | rpl::on_next([=] {
 			_colorAllRipple->forceRepaint();
 		});
 		if (!_colorAllRipple) {
diff --git a/Telegram/SourceFiles/chat_helpers/emoji_sets_manager.cpp b/Telegram/SourceFiles/chat_helpers/emoji_sets_manager.cpp
index 70868b7b5f..924b3b60fb 100644
--- a/Telegram/SourceFiles/chat_helpers/emoji_sets_manager.cpp
+++ b/Telegram/SourceFiles/chat_helpers/emoji_sets_manager.cpp
@@ -391,7 +391,7 @@ void Row::setupHandler() {
 		const auto &state = _state.current();
 		return !_switching && (v::is<Ready>(state)
 			|| v::is<Available>(state));
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		if (v::is<Available>(_state.current())) {
 			load();
 			return;
@@ -410,7 +410,7 @@ void Row::setupHandler() {
 	_state.value(
 	) | rpl::map([=](const SetState &state) {
 		return v::is<Ready>(state) || v::is<Available>(state);
-	}) | rpl::start_with_next([=](bool active) {
+	}) | rpl::on_next([=](bool active) {
 		setDisabled(!active);
 		setPointerCursor(active);
 	}, lifetime());
@@ -435,7 +435,7 @@ void Row::setupLabels(const Set &set) {
 	_status->setAttribute(Qt::WA_TransparentForMouseEvents);
 
 	sizeValue(
-	) | rpl::start_with_next([=](QSize size) {
+	) | rpl::on_next([=](QSize size) {
 		const auto left = st::manageEmojiPreviewPadding.left()
 			+ st::manageEmojiPreviewWidth
 			+ st::manageEmojiPreviewPadding.right();
@@ -487,7 +487,7 @@ void Row::setupAnimation() {
 	using namespace rpl::mappers;
 
 	_state.value(
-	) | rpl::start_with_next([=](const SetState &state) {
+	) | rpl::on_next([=](const SetState &state) {
 		update();
 	}, lifetime());
 
@@ -495,7 +495,7 @@ void Row::setupAnimation() {
 	) | rpl::map(
 		_1 == SetState{ Active() }
 	) | rpl::distinct_until_changed(
-	) | rpl::start_with_next([=](bool toggled) {
+	) | rpl::on_next([=](bool toggled) {
 		_toggled.start(
 			[=] { updateStatusColorOverride(); update(); },
 			toggled ? 0. : 1.,
@@ -507,7 +507,7 @@ void Row::setupAnimation() {
 	) | rpl::map([](const SetState &state) {
 		return v::is<Loading>(state) || v::is<Active>(state);
 	}) | rpl::distinct_until_changed(
-	) | rpl::start_with_next([=](bool active) {
+	) | rpl::on_next([=](bool active) {
 		_active.start(
 			[=] { update(); },
 			active ? 0. : 1.,
@@ -519,7 +519,7 @@ void Row::setupAnimation() {
 	) | rpl::map([](const SetState &state) {
 		return std::get_if<Loading>(&state);
 	}) | rpl::distinct_until_changed(
-	) | rpl::start_with_next([=](const Loading *loading) {
+	) | rpl::on_next([=](const Loading *loading) {
 		if (loading && !_loading) {
 			_loading = std::make_unique<Ui::RadialAnimation>(
 				[=](crl::time now) { radialAnimationCallback(now); });
diff --git a/Telegram/SourceFiles/chat_helpers/emoji_suggestions_widget.cpp b/Telegram/SourceFiles/chat_helpers/emoji_suggestions_widget.cpp
index 49791a045e..00e0c0e243 100644
--- a/Telegram/SourceFiles/chat_helpers/emoji_suggestions_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/emoji_suggestions_widget.cpp
@@ -763,15 +763,15 @@ SuggestionsController::SuggestionsController(
 		[=] { handleCursorPositionChange(); });
 
 	_suggestions->toggleAnimated(
-	) | rpl::start_with_next([=](bool visible) {
+	) | rpl::on_next([=](bool visible) {
 		suggestionsUpdated(visible);
 	}, _lifetime);
 	_suggestions->triggered(
-	) | rpl::start_with_next([=](const SuggestionsWidget::Chosen &chosen) {
+	) | rpl::on_next([=](const SuggestionsWidget::Chosen &chosen) {
 		replaceCurrent(chosen.emoji, chosen.customData);
 	}, _lifetime);
 	Core::App().emojiKeywords().refreshed(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_keywordsRefreshed = true;
 		if (!_showExactTimer.isActive()) {
 			showWithQuery(_lastShownQuery);
@@ -783,7 +783,7 @@ SuggestionsController::SuggestionsController(
 	_container->shownValue(
 	) | rpl::filter([=](bool shown) {
 		return shown && !_shown;
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		_container->hide();
 	}, _container->lifetime());
 
diff --git a/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp b/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp
index 209dab9f52..eceea7ee3e 100644
--- a/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp
+++ b/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp
@@ -228,7 +228,7 @@ FieldAutocomplete::FieldAutocomplete(
 	_inner->setGeometry(rect());
 
 	_inner->scrollToRequested(
-	) | rpl::start_with_next([=](Inner::ScrollTo data) {
+	) | rpl::on_next([=](Inner::ScrollTo data) {
 		_scroll->scrollToY(data.top, data.bottom);
 	}, lifetime());
 
@@ -238,7 +238,7 @@ FieldAutocomplete::FieldAutocomplete(
 	hide();
 
 	_scroll->geometryChanged(
-	) | rpl::start_with_next(crl::guard(_inner, [=] {
+	) | rpl::on_next(crl::guard(_inner, [=] {
 		_inner->onParentGeometryChanged();
 	}), lifetime());
 }
@@ -910,12 +910,12 @@ FieldAutocomplete::Inner::Inner(
 , _premiumMark(_session, st::stickersPremiumLock)
 , _previewTimer([=] { showPreview(); }) {
 	_session->downloaderTaskFinished(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		update();
 	}, lifetime());
 
 	_show->adjustShadowLeft(
-	) | rpl::start_with_next([=](bool adjust) {
+	) | rpl::on_next([=](bool adjust) {
 		_adjustShadowLeft = adjust;
 		update();
 	}, lifetime());
@@ -1488,7 +1488,7 @@ void FieldAutocomplete::Inner::setupLottie(StickerSuggestion &suggestion) {
 		getLottieRenderer());
 
 	suggestion.lottie->updates(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		repaintSticker(document);
 	}, _stickersLifetime);
 }
@@ -1665,7 +1665,7 @@ void InitFieldAutocomplete(
 	field->customTab(true);
 
 	raw->mentionChosen(
-	) | rpl::start_with_next([=](FieldAutocomplete::MentionChosen data) {
+	) | rpl::on_next([=](FieldAutocomplete::MentionChosen data) {
 		const auto user = data.user;
 		if (data.mention.isEmpty()) {
 			field->insertTag(
@@ -1680,7 +1680,7 @@ void InitFieldAutocomplete(
 	const auto setText = descriptor.setText;
 
 	raw->hashtagChosen(
-	) | rpl::start_with_next([=](FieldAutocomplete::HashtagChosen data) {
+	) | rpl::on_next([=](FieldAutocomplete::HashtagChosen data) {
 		field->insertTag(data.hashtag);
 	}, raw->lifetime());
 
@@ -1691,7 +1691,7 @@ void InitFieldAutocomplete(
 		? &peer->owner().shortcutMessages()
 		: nullptr;
 	raw->botCommandChosen(
-	) | rpl::start_with_next([=](FieldAutocomplete::BotCommandChosen data) {
+	) | rpl::on_next([=](FieldAutocomplete::BotCommandChosen data) {
 		if (!features().autocompleteCommands) {
 			return;
 		}
@@ -1715,7 +1715,7 @@ void InitFieldAutocomplete(
 
 	if (const auto stickerChoosing = descriptor.stickerChoosing) {
 		raw->choosingProcesses(
-		) | rpl::start_with_next([=](FieldAutocomplete::Type type) {
+		) | rpl::on_next([=](FieldAutocomplete::Type type) {
 			if (type == FieldAutocomplete::Type::Stickers) {
 				stickerChoosing();
 			}
@@ -1723,11 +1723,11 @@ void InitFieldAutocomplete(
 	}
 	if (const auto chosen = descriptor.stickerChosen) {
 		raw->stickerChosen(
-		) | rpl::start_with_next(chosen, raw->lifetime());
+		) | rpl::on_next(chosen, raw->lifetime());
 	}
 
 	field->tabbed(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (!raw->isHidden()) {
 			raw->chooseSelected(FieldAutocomplete::ChooseMethod::ByTab);
 		}
@@ -1772,15 +1772,15 @@ void InitFieldAutocomplete(
 	};
 
 	raw->refreshRequests(
-	) | rpl::start_with_next(check, raw->lifetime());
+	) | rpl::on_next(check, raw->lifetime());
 
 	raw->stickersUpdateRequests(
-	) | rpl::start_with_next(updateStickersByEmoji, raw->lifetime());
+	) | rpl::on_next(updateStickersByEmoji, raw->lifetime());
 
 	peer->owner().botCommandsChanges(
 	) | rpl::filter([=](not_null<PeerData*> changed) {
 		return (peer == changed);
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		if (raw->clearFilteredBotCommands()) {
 			check();
 		}
@@ -1788,7 +1788,7 @@ void InitFieldAutocomplete(
 
 	peer->owner().stickers().updated(
 		Data::StickersType::Stickers
-	) | rpl::start_with_next(updateStickersByEmoji, raw->lifetime());
+	) | rpl::on_next(updateStickersByEmoji, raw->lifetime());
 
 	QObject::connect(
 		field->rawTextEdit(),
@@ -1797,7 +1797,7 @@ void InitFieldAutocomplete(
 		check,
 		Qt::QueuedConnection);
 
-	field->changes() | rpl::start_with_next(
+	field->changes() | rpl::on_next(
 		updateStickersByEmoji,
 		raw->lifetime());
 
@@ -1805,11 +1805,11 @@ void InitFieldAutocomplete(
 		Data::PeerUpdate::Flag::Rights
 	) | rpl::filter([=](const Data::PeerUpdate &update) {
 		return (update.peer == peer);
-	}) | rpl::start_with_next(updateStickersByEmoji, raw->lifetime());
+	}) | rpl::on_next(updateStickersByEmoji, raw->lifetime());
 
 	if (shortcutMessages) {
 		shortcutMessages->shortcutsChanged(
-		) | rpl::start_with_next(check, raw->lifetime());
+		) | rpl::on_next(check, raw->lifetime());
 	}
 
 	raw->setSendMenuDetails(std::move(descriptor.sendMenuDetails));
diff --git a/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp
index ba0a303b7f..3f153c3dc1 100644
--- a/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp
@@ -126,24 +126,24 @@ GifsListWidget::GifsListWidget(
 		[=] { sendInlineRequest(); });
 
 	session().data().stickers().savedGifsUpdated(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		refreshSavedGifs();
 	}, lifetime());
 
 	session().downloaderTaskFinished(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateInlineItems();
 	}, lifetime());
 
 	_show->pauseChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (!paused()) {
 			updateInlineItems();
 		}
 	}, lifetime());
 
 	sizeValue(
-	) | rpl::start_with_next([=](const QSize &s) {
+	) | rpl::on_next([=](const QSize &s) {
 		_mosaic.setFullWidth(s.width());
 	}, lifetime());
 
@@ -181,13 +181,13 @@ object_ptr<TabbedSelector::InnerFooter> GifsListWidget::createFooter() {
 
 	GifSectionsValue(
 		&session()
-	) | rpl::start_with_next([=](std::vector<GifSection> &&list) {
+	) | rpl::on_next([=](std::vector<GifSection> &&list) {
 		_sections = std::move(list);
 		refreshIcons();
 	}, _footer->lifetime());
 
 	_footer->setChosen(
-	) | rpl::start_with_next([=](uint64 setId) {
+	) | rpl::on_next([=](uint64 setId) {
 		if (_search) {
 			_search->cancel();
 		}
diff --git a/Telegram/SourceFiles/chat_helpers/message_field.cpp b/Telegram/SourceFiles/chat_helpers/message_field.cpp
index ce3f4f6054..2f36bd5e17 100644
--- a/Telegram/SourceFiles/chat_helpers/message_field.cpp
+++ b/Telegram/SourceFiles/chat_helpers/message_field.cpp
@@ -183,11 +183,11 @@ void EditLinkBox(
 			tr::lng_formatting_link_url(),
 			link));
 	url->heightValue(
-	) | rpl::start_with_next([placeholder](int height) {
+	) | rpl::on_next([placeholder](int height) {
 		placeholder->resize(placeholder->width(), height);
 	}, placeholder->lifetime());
 	placeholder->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		url->resize(width, url->height());
 	}, placeholder->lifetime());
 	url->move(placeholder->pos());
@@ -210,11 +210,11 @@ void EditLinkBox(
 	};
 
 	text->submits(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		url->setFocusFast();
 	}, text->lifetime());
 	url->submits(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (text->getLastText().isEmpty()) {
 			text->setFocusFast();
 		} else {
@@ -262,12 +262,12 @@ void EditLinkBox(
 	};
 
 	url->tabbed(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		clearFullSelection(url);
 		text->setFocus();
 	}, url->lifetime());
 	text->tabbed(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (!url->empty()) {
 			url->selectAll();
 		}
@@ -314,7 +314,7 @@ void EditCodeLanguageBox(
 		}
 	};
 	field->submits(
-	) | rpl::start_with_next(callback, field->lifetime());
+	) | rpl::on_next(callback, field->lifetime());
 	box->addButton(tr::lng_settings_save(), callback);
 	box->addButton(tr::lng_cancel(), [=] {
 		box->closeBox();
@@ -686,12 +686,12 @@ void InitMessageFieldFade(
 	};
 	generateFade();
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		generateFade();
 	}, topFade->lifetime());
 
 	field->sizeValue(
-	) | rpl::start_with_next_done([=](const QSize &size) {
+	) | rpl::on_next_done([=](const QSize &size) {
 		topFade->resizeToWidth(size.width());
 		bottomFade->resizeToWidth(size.width());
 		bottomFade->move(
@@ -707,7 +707,7 @@ void InitMessageFieldFade(
 		field->changes(),
 		field->scrollTop().changes() | rpl::to_empty,
 		field->sizeValue() | rpl::to_empty
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		// InputField::changes fires before the auto-resize is being applied,
 		// so for the scroll values to be accurate we enqueue the check.
 		InvokeQueued(field, [=] {
@@ -879,7 +879,7 @@ MessageLinksParser::MessageLinksParser(not_null<Ui::InputField*> field)
 : _field(field)
 , _timer([=] { parse(); }) {
 	_lifetime = _field->changes(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto length = _field->getTextWithTags().text.size();
 		if (!length) {
 			_lastLength = 0;
@@ -1133,14 +1133,14 @@ base::unique_qptr<Ui::RpWidget> CreateDisabledFieldView(
 			+ customFontMarginTop, 0, 0);
 
 	raw->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		const auto available = width - margins.left() - margins.right();
 		const auto skip = st::historySendDisabledIconSkip;
 		label->resizeToWidth(available - skip);
 		label->moveToLeft(margins.left() + skip, margins.top(), width);
 	}, label->lifetime());
 	raw->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(raw);
 		const auto &icon = st::historySendDisabledIcon;
 		icon.paint(
@@ -1208,11 +1208,11 @@ std::unique_ptr<Ui::RpWidget> TextErrorSendRestriction(
 		text,
 		st::historySendPremiumRequired);
 	label->setAttribute(Qt::WA_TransparentForMouseEvents);
-	raw->paintRequest() | rpl::start_with_next([=](QRect clip) {
+	raw->paintRequest() | rpl::on_next([=](QRect clip) {
 		QPainter(raw).fillRect(clip, st::windowBg);
 	}, raw->lifetime());
 	raw->sizeValue(
-	) | rpl::start_with_next([=](QSize size) {
+	) | rpl::on_next([=](QSize size) {
 		const auto &st = st::historyComposeField;
 		const auto width = size.width();
 		const auto margins = (st.textMargins + st.placeholderMargins);
@@ -1243,11 +1243,11 @@ std::unique_ptr<Ui::RpWidget> PremiumRequiredSendRestriction(
 	const auto link = CreateChild<Ui::LinkButton>(
 		result.get(),
 		tr::lng_restricted_send_non_premium_more(tr::now));
-	raw->paintRequest() | rpl::start_with_next([=](QRect clip) {
+	raw->paintRequest() | rpl::on_next([=](QRect clip) {
 		QPainter(raw).fillRect(clip, st::windowBg);
 	}, raw->lifetime());
 	raw->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		const auto &st = st::historyComposeField;
 		const auto margins = (st.textMargins + st.placeholderMargins);
 		const auto available = width - margins.left() - margins.right();
@@ -1317,14 +1317,14 @@ std::unique_ptr<Ui::AbstractButton> FrozenWriteRestriction(
 	const auto shadow = bar ? CreateChild<PlainShadow>(raw) : nullptr;
 	const auto icon = bar ? CreateChild<RpWidget>(raw) : nullptr;
 	if (icon) {
-		icon->paintRequest() | rpl::start_with_next([=] {
+		icon->paintRequest() | rpl::on_next([=] {
 			auto p = QPainter(icon);
 			st::menuIconDisableAttention.paintInCenter(p, icon->rect());
 		}, icon->lifetime());
 		icon->show();
 	}
 
-	raw->sizeValue() | rpl::start_with_next([=](QSize size) {
+	raw->sizeValue() | rpl::on_next([=](QSize size) {
 		if (bar) {
 			const auto toggle = [&](auto &&widget, bool shown) {
 				if (widget->isHidden() == shown) {
@@ -1500,7 +1500,7 @@ void FrozenInfoBox(
 		- buttonPadding.right();
 	button->widthValue() | rpl::filter([=] {
 		return (button->widthNoMargins() != buttonWidth);
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		button->resizeToWidth(buttonWidth);
 	}, button->lifetime());
 }
diff --git a/Telegram/SourceFiles/chat_helpers/spellchecker_common.cpp b/Telegram/SourceFiles/chat_helpers/spellchecker_common.cpp
index 42b980f936..67e2e79542 100644
--- a/Telegram/SourceFiles/chat_helpers/spellchecker_common.cpp
+++ b/Telegram/SourceFiles/chat_helpers/spellchecker_common.cpp
@@ -389,23 +389,23 @@ void Start(not_null<Main::Session*> session) {
 	if (Platform::Spellchecker::IsSystemSpellchecker()) {
 		Spellchecker::SupportedScriptsChanged()
 		| rpl::take(1)
-		| rpl::start_with_next(AddExceptions, lifetime);
+		| rpl::on_next(AddExceptions, lifetime);
 
 		return;
 	}
 
 	Spellchecker::SupportedScriptsChanged(
-	) | rpl::start_with_next(AddExceptions, lifetime);
+	) | rpl::on_next(AddExceptions, lifetime);
 
 	Spellchecker::SetWorkingDirPath(DictionariesPath());
 
 	settings->dictionariesEnabledChanges(
-	) | rpl::start_with_next([](auto dictionaries) {
+	) | rpl::on_next([](auto dictionaries) {
 		Platform::Spellchecker::UpdateLanguages(dictionaries);
 	}, lifetime);
 
 	settings->spellcheckerEnabledChanges(
-	) | rpl::start_with_next(onEnabled, lifetime);
+	) | rpl::on_next(onEnabled, lifetime);
 
 	const auto method = QGuiApplication::inputMethod();
 
@@ -433,7 +433,7 @@ void Start(not_null<Main::Session*> session) {
 
 	if (settings->autoDownloadDictionaries()) {
 		session->data().contactsLoaded().changes(
-		) | rpl::start_with_next([=](bool loaded) {
+		) | rpl::on_next([=](bool loaded) {
 			if (!loaded) {
 				return;
 			}
@@ -466,7 +466,7 @@ void Start(not_null<Main::Session*> session) {
 	rpl::combine(
 		settings->spellcheckerEnabledValue(),
 		settings->autoDownloadDictionariesValue()
-	) | rpl::start_with_next([=](bool spell, bool download) {
+	) | rpl::on_next([=](bool spell, bool download) {
 		if (spell && download) {
 			connectInput();
 			return;
diff --git a/Telegram/SourceFiles/chat_helpers/stickers_emoji_pack.cpp b/Telegram/SourceFiles/chat_helpers/stickers_emoji_pack.cpp
index af07736a48..96ddbf0204 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers_emoji_pack.cpp
+++ b/Telegram/SourceFiles/chat_helpers/stickers_emoji_pack.cpp
@@ -103,17 +103,17 @@ EmojiPack::EmojiPack(not_null<Main::Session*> session)
 	session->data().viewRemoved(
 	) | rpl::filter([](not_null<const ViewElement*> view) {
 		return view->isIsolatedEmoji() || view->isOnlyCustomEmoji();
-	}) | rpl::start_with_next([=](not_null<const ViewElement*> item) {
+	}) | rpl::on_next([=](not_null<const ViewElement*> item) {
 		remove(item);
 	}, _lifetime);
 
 	Core::App().settings().largeEmojiChanges(
-	) | rpl::start_with_next([=](bool large) {
+	) | rpl::on_next([=](bool large) {
 		refreshAll();
 	}, _lifetime);
 
 	Ui::Emoji::Updated(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_images.clear();
 		refreshAll();
 	}, _lifetime);
diff --git a/Telegram/SourceFiles/chat_helpers/stickers_list_footer.cpp b/Telegram/SourceFiles/chat_helpers/stickers_list_footer.cpp
index 6ea61e00f7..a0394d1ade 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers_list_footer.cpp
+++ b/Telegram/SourceFiles/chat_helpers/stickers_list_footer.cpp
@@ -248,7 +248,7 @@ bool StickersListFooter::ScrollState::animationCallback(crl::time now) {
 
 GradientPremiumStar::GradientPremiumStar() {
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_image = QImage();
 	}, _lifetime);
 }
@@ -302,7 +302,7 @@ StickersListFooter::StickersListFooter(Descriptor &&descriptor)
 	_iconsRight = st().iconSkip;
 
 	_session->downloaderTaskFinished(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		update();
 	}, lifetime());
 }
@@ -1199,7 +1199,7 @@ void StickersListFooter::validateIconLottieAnimation(
 
 	const auto id = icon.setId;
 	icon.lottie->updates(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateSetIcon(id);
 	}, icon.lifetime);
 }
diff --git a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
index 28761178a3..ce15597c63 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
@@ -248,7 +248,7 @@ StickersListWidget::StickersListWidget(
 	});
 
 	session().downloaderTaskFinished(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (isVisible()) {
 			updateItems();
 			readVisibleFeatured(getVisibleTop(), getVisibleBottom());
@@ -259,7 +259,7 @@ StickersListWidget::StickersListWidget(
 		Data::PeerUpdate::Flag::StickersSet
 	) | rpl::filter([=](const Data::PeerUpdate &update) {
 		return (update.peer.get() == _megagroupSet);
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		refreshStickers();
 	}, lifetime());
 
@@ -267,7 +267,7 @@ StickersListWidget::StickersListWidget(
 		session().data().stickers().recentUpdated(_isMasks
 			? Data::StickersType::Masks
 			: Data::StickersType::Stickers
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			refreshRecent();
 		}, lifetime());
 	}
@@ -283,7 +283,7 @@ StickersListWidget::StickersListWidget(
 		rpl::merge(
 			Data::AmPremiumValue(&session()) | rpl::to_empty,
 			session().api().premium().cloudSetUpdated()
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			refreshStickers();
 		}, lifetime());
 	}
@@ -320,12 +320,12 @@ object_ptr<TabbedSelector::InnerFooter> StickersListWidget::createFooter() {
 	_footer = result;
 
 	_footer->setChosen(
-	) | rpl::start_with_next([=](uint64 setId) {
+	) | rpl::on_next([=](uint64 setId) {
 		showStickerSet(setId);
 	}, _footer->lifetime());
 
 	_footer->openSettingsRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto onlyFeatured = !_isMasks && _mySets.empty();
 		_show->showBox(Box<StickersBox>(
 			_show,
@@ -1255,7 +1255,7 @@ void StickersListWidget::ensureLottiePlayer(Set &set) {
 	const auto raw = set.lottiePlayer.get();
 
 	raw->updates(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto &sets = shownSets();
 		enumerateSections([&](const SectionInfo &info) {
 			if (sets[info.section].lottiePlayer.get() != raw) {
@@ -1736,7 +1736,7 @@ void StickersListWidget::showStickerSetBox(
 			base::timer_once(kTimeout),
 			document->owner().stickers().updated(
 				Data::StickersType::Stickers)
-		) | rpl::start_with_next([=, weak = base::make_weak(this)] {
+		) | rpl::on_next([=, weak = base::make_weak(this)] {
 			if (weak.get()) {
 				showStickerSetBox(document, setId);
 			}
diff --git a/Telegram/SourceFiles/chat_helpers/tabbed_panel.cpp b/Telegram/SourceFiles/chat_helpers/tabbed_panel.cpp
index a3d8ba3968..c39a9951f6 100644
--- a/Telegram/SourceFiles/chat_helpers/tabbed_panel.cpp
+++ b/Telegram/SourceFiles/chat_helpers/tabbed_panel.cpp
@@ -86,7 +86,7 @@ TabbedPanel::TabbedPanel(
 		_pauseAnimations.fire(false);
 	});
 	_selector->showRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		showFromSelector();
 	}, lifetime());
 
@@ -103,19 +103,19 @@ TabbedPanel::TabbedPanel(
 	_hideTimer.setCallback([this] { hideByTimerOrLeave(); });
 
 	_selector->checkForHide(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (!rect().contains(mapFromGlobal(QCursor::pos()))) {
 			_hideTimer.callOnce(kDelayedHideTimeoutMs);
 		}
 	}, lifetime());
 
 	_selector->cancelled(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		hideAnimated();
 	}, lifetime());
 
 	_selector->slideFinished(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		InvokeQueued(this, [=] {
 			if (_hideAfterSlide) {
 				startOpacityAnimation(true);
@@ -126,7 +126,7 @@ TabbedPanel::TabbedPanel(
 	macWindowDeactivateEvents(
 	) | rpl::filter([=] {
 		return !isHidden() && !preventAutoHide();
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		hideAnimated();
 	}, lifetime());
 
diff --git a/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp b/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp
index a576c6f040..fe56330372 100644
--- a/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp
+++ b/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp
@@ -345,7 +345,7 @@ std::unique_ptr<Ui::TabbedSearch> MakeSearch(
 	});
 
 	result->queryValue(
-	) | rpl::skip(1) | rpl::start_with_next(
+	) | rpl::skip(1) | rpl::on_next(
 		std::move(callback),
 		parent->lifetime());
 
@@ -439,7 +439,7 @@ TabbedSelector::TabbedSelector(
 		const auto widget = tab.widget();
 
 		widget->scrollToRequests(
-		) | rpl::start_with_next([=, tab = &tab](int y) {
+		) | rpl::on_next([=, tab = &tab](int y) {
 			if (tab == currentTab()) {
 				scrollToY(y);
 			} else {
@@ -448,7 +448,7 @@ TabbedSelector::TabbedSelector(
 		}, widget->lifetime());
 
 		widget->disableScrollRequests(
-		) | rpl::start_with_next([=, tab = &tab](bool disabled) {
+		) | rpl::on_next([=, tab = &tab](bool disabled) {
 			if (tab == currentTab()) {
 				_scroll->disableScroll(disabled);
 			}
@@ -460,7 +460,7 @@ TabbedSelector::TabbedSelector(
 			? stickers()->scrollUpdated() | rpl::map_to(0)
 			: rpl::never<int>() | rpl::type_erased),
 		_scroll->scrollTopChanges()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		handleScroll();
 	}, lifetime());
 
@@ -479,14 +479,14 @@ TabbedSelector::TabbedSelector(
 			Data::PeerUpdate::Flag::Rights
 		) | rpl::filter([=](const Data::PeerUpdate &update) {
 			return (update.peer.get() == _currentPeer);
-		}) | rpl::start_with_next([=] {
+		}) | rpl::on_next([=] {
 			checkRestrictedPeer();
 		}, lifetime());
 	}
 
 	if (hasStickersTab()) {
 		session().data().stickers().stickerSetInstalled(
-		) | rpl::start_with_next([=](uint64 setId) {
+		) | rpl::on_next([=](uint64 setId) {
 			_tabsSlider->setActiveSection(indexByType(SelectorTab::Stickers));
 			stickers()->showStickerSet(setId);
 			if (_currentPeer
@@ -502,13 +502,13 @@ TabbedSelector::TabbedSelector(
 			session().data().stickers().updated(hasMasksTab()
 				? Data::StickersType::Masks
 				: Data::StickersType::Stickers)
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			refreshStickers();
 		}, lifetime());
 	}
 
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_panelRounding = Ui::PrepareCornerPixmaps(
 			st::emojiPanRadius,
 			_st.bg);
@@ -519,7 +519,7 @@ TabbedSelector::TabbedSelector(
 
 	if (hasEmojiTab() && _mode == Mode::Full) {
 		session().data().stickers().emojiSetInstalled(
-		) | rpl::start_with_next([=](uint64 setId) {
+		) | rpl::on_next([=](uint64 setId) {
 			_tabsSlider->setActiveSection(indexByType(SelectorTab::Emoji));
 			emoji()->showSet(setId);
 			if (_currentPeer && Data::CanSendTexts(_currentPeer)) {
@@ -1211,7 +1211,7 @@ void TabbedSelector::createTabsSlider() {
 
 	_tabsSlider->setActiveSectionFast(indexByType(_currentTabType));
 	_tabsSlider->sectionActivated(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		switchTab();
 	}, lifetime());
 }
diff --git a/Telegram/SourceFiles/chat_helpers/ttl_media_layer_widget.cpp b/Telegram/SourceFiles/chat_helpers/ttl_media_layer_widget.cpp
index 65940c6b00..6130741d30 100644
--- a/Telegram/SourceFiles/chat_helpers/ttl_media_layer_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/ttl_media_layer_widget.cpp
@@ -143,7 +143,7 @@ PreviewWrap::PreviewWrap(
 	const auto closeCallback = [=] { _closeRequests.fire({}); };
 	HistoryView::TTLVoiceStops(
 		item->fullId()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_lastFrameCache = Ui::GrabWidgetToImage(this, _elementGeometry);
 		closeCallback();
 	}, lifetime());
@@ -155,20 +155,20 @@ PreviewWrap::PreviewWrap(
 
 	std::move(
 		theme
-	) | rpl::start_with_next([=](std::shared_ptr<Ui::ChatTheme> theme) {
+	) | rpl::on_next([=](std::shared_ptr<Ui::ChatTheme> theme) {
 		_theme = std::move(theme);
 		_style->apply(_theme.get());
 	}, lifetime());
 
 	const auto session = &_item->history()->session();
 	session->data().viewRepaintRequest(
-	) | rpl::start_with_next([=](not_null<const HistoryView::Element*> view) {
+	) | rpl::on_next([=](not_null<const HistoryView::Element*> view) {
 		if (view == _element.get()) {
 			update(_elementGeometry);
 		}
 	}, lifetime());
 	session->data().itemViewRefreshRequest(
-	) | rpl::start_with_next([=](not_null<const HistoryItem*> item) {
+	) | rpl::on_next([=](not_null<const HistoryItem*> item) {
 		if (item == _item) {
 			if (goodItem()) {
 				createView();
@@ -180,13 +180,13 @@ PreviewWrap::PreviewWrap(
 		}
 	}, lifetime());
 	session->data().itemDataChanges(
-	) | rpl::start_with_next([=](not_null<HistoryItem*> item) {
+	) | rpl::on_next([=](not_null<HistoryItem*> item) {
 		if (item == _item) {
 			_element->itemDataChanged();
 		}
 	}, lifetime());
 	session->data().itemRemoved(
-	) | rpl::start_with_next([=](not_null<const HistoryItem*> item) {
+	) | rpl::on_next([=](not_null<const HistoryItem*> item) {
 		if (item == _item) {
 			_closeRequests.fire({});
 		}
@@ -206,7 +206,7 @@ PreviewWrap::PreviewWrap(
 		rpl::combine(
 			sizeValue(),
 			_elementInner.value()
-		) | rpl::start_with_next([=](QSize size, QRect inner) {
+		) | rpl::on_next([=](QSize size, QRect inner) {
 			close->moveToLeft(
 				inner.x() + (inner.width() - close->width()) / 2,
 				(size.height()
@@ -246,7 +246,7 @@ PreviewWrap::PreviewWrap(
 		_elementInner.value(
 		) | rpl::filter([](const QRect &inner) {
 			return !inner.isEmpty();
-		}) | rpl::start_with_next([=](const QRect &inner) {
+		}) | rpl::on_next([=](const QRect &inner) {
 			tooltip->pointAt(inner, RectPart::Top, [=](QSize size) {
 				return QPoint{
 					inner.x() + (inner.width() - size.width()) / 2,
@@ -281,7 +281,7 @@ void PreviewWrap::createView() {
 	rpl::combine(
 		sizeValue(),
 		_globalViewport.value()
-	) | rpl::start_with_next([=](QSize outer, QRect globalViewport) {
+	) | rpl::on_next([=](QSize outer, QRect globalViewport) {
 		_viewport = globalViewport.isEmpty()
 			? rect()
 			: mapFromGlobal(globalViewport);
@@ -371,7 +371,7 @@ void ShowTTLMediaLayerWidget(
 			controller,
 			item->history()->peer));
 	preview->closeRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		show->hideLayer();
 	}, preview->lifetime());
 	auto layer = std::make_unique<Editor::LayerWidget>(
diff --git a/Telegram/SourceFiles/core/application.cpp b/Telegram/SourceFiles/core/application.cpp
index 0f831c5b5c..4fa011d973 100644
--- a/Telegram/SourceFiles/core/application.cpp
+++ b/Telegram/SourceFiles/core/application.cpp
@@ -176,7 +176,7 @@ Application::Application()
 	_platformIntegration->init();
 
 	passcodeLockChanges(
-	) | rpl::start_with_next([=](bool locked) {
+	) | rpl::on_next([=](bool locked) {
 		_shouldLockAt = 0;
 		if (locked) {
 			closeAdditionalWindows();
@@ -184,18 +184,18 @@ Application::Application()
 	}, _lifetime);
 
 	passcodeLockChanges(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_notifications->updateAll();
 		updateWindowTitles();
 	}, _lifetime);
 
 	settings().windowTitleContentChanges(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateWindowTitles();
 	}, _lifetime);
 
 	_domain->activeSessionChanges(
-	) | rpl::start_with_next([=](Main::Session *session) {
+	) | rpl::on_next([=](Main::Session *session) {
 		if (session && !UpdaterDisabled()) { // #TODO multi someSessionValue
 			UpdateChecker().setMtproto(session);
 		}
@@ -305,12 +305,12 @@ void Application::run() {
 	rpl::combine(
 		_batterySaving->value(),
 		settings().ignoreBatterySavingValue()
-	) | rpl::start_with_next([=](bool saving, bool ignore) {
+	) | rpl::on_next([=](bool saving, bool ignore) {
 		PowerSaving::SetForceAll(saving && !ignore);
 	}, _lifetime);
 
 	style::ShortAnimationPlaying(
-	) | rpl::start_with_next([=](bool playing) {
+	) | rpl::on_next([=](bool playing) {
 		if (playing) {
 			MTP::details::pause();
 		} else {
@@ -335,7 +335,7 @@ void Application::run() {
 	_windowInSettings = _lastActivePrimaryWindow = _lastActiveWindow;
 
 	_domain->activeChanges(
-	) | rpl::start_with_next([=](not_null<Main::Account*> account) {
+	) | rpl::on_next([=](not_null<Main::Account*> account) {
 		showAccount(account);
 	}, _lifetime);
 
@@ -351,7 +351,7 @@ void Application::run() {
 			? _domain->activeChanges()
 			: rpl::never<not_null<Main::Account*>>();
 	}) | rpl::flatten_latest(
-	) | rpl::start_with_next([=](not_null<Main::Account*> account) {
+	) | rpl::on_next([=](not_null<Main::Account*> account) {
 		const auto ordered = _domain->orderedAccounts();
 		const auto it = ranges::find(ordered, account);
 		if (_lastActivePrimaryWindow && it != end(ordered)) {
@@ -367,7 +367,7 @@ void Application::run() {
 	QCoreApplication::instance()->installEventFilter(this);
 
 	appDeactivatedValue(
-	) | rpl::start_with_next([=](bool deactivated) {
+	) | rpl::on_next([=](bool deactivated) {
 		if (deactivated) {
 			handleAppDeactivated();
 		} else {
@@ -403,7 +403,7 @@ void Application::run() {
 	}
 
 	_openInMediaViewRequests.events(
-	) | rpl::start_with_next([=](Media::View::OpenRequest &&request) {
+	) | rpl::on_next([=](Media::View::OpenRequest &&request) {
 		if (_mediaView) {
 			_mediaView->show(std::move(request));
 		}
@@ -509,7 +509,7 @@ void Application::startSystemDarkModeViewer() {
 	rpl::merge(
 		settings().systemDarkModeChanges() | rpl::to_empty,
 		settings().systemDarkModeEnabledChanges() | rpl::to_empty
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		checkSystemDarkMode();
 	}, _lifetime);
 }
@@ -564,18 +564,18 @@ void Application::createTray() {
 	using WindowRaw = not_null<Window::Controller*>;
 	_tray->create();
 	_tray->aboutToShowRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		enumerateWindows([&](WindowRaw w) { w->updateIsActive(); });
 		_tray->updateMenuText();
 	}, _lifetime);
 
 	_tray->showFromTrayRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		activate();
 	}, _lifetime);
 
 	_tray->hideToTrayRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		enumerateWindows([&](WindowRaw w) {
 			w->widget()->minimizeToTray();
 		});
@@ -813,7 +813,7 @@ void Application::badMtprotoConfigurationError() {
 		_badProxyDisableBox = Ui::show(
 			Ui::MakeInformBox(Lang::Hard::ProxyConfigError()));
 		_badProxyDisableBox->boxClosing(
-		) | rpl::start_with_next(
+		) | rpl::on_next(
 			disableCallback,
 			_badProxyDisableBox->lifetime());
 	}
@@ -823,7 +823,7 @@ void Application::startLocalStorage() {
 	Ui::GL::DetectLastCheckCrash();
 	Local::start();
 	_saveSettingsTimer.emplace([=] { saveSettings(); });
-	settings().saveDelayedRequests() | rpl::start_with_next([=] {
+	settings().saveDelayedRequests() | rpl::on_next([=] {
 		saveSettingsDelayed();
 	}, _lifetime);
 }
@@ -837,7 +837,7 @@ void Application::startEmojiImageLoader() {
 	});
 
 	settings().largeEmojiChanges(
-	) | rpl::start_with_next([=](bool large) {
+	) | rpl::on_next([=](bool large) {
 		if (large) {
 			_clearEmojiImageLoaderTimer.cancel();
 		} else {
@@ -847,7 +847,7 @@ void Application::startEmojiImageLoader() {
 	}, _lifetime);
 
 	Ui::Emoji::Updated(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_emojiImageLoader.with([
 			source = prepareEmojiSourceImages()
 		](Stickers::EmojiImageLoader &loader) mutable {
@@ -1485,7 +1485,7 @@ void Application::setLastActiveWindow(Window::Controller *window) {
 		return;
 	}
 	window->floatPlayerDelegateValue(
-	) | rpl::start_with_next([=](Media::Player::FloatDelegate *value) {
+	) | rpl::on_next([=](Media::Player::FloatDelegate *value) {
 		if (!value) {
 			_floatPlayers = nullptr;
 		} else if (_floatPlayers) {
@@ -1812,12 +1812,12 @@ void Application::startShortcuts() {
 	Shortcuts::Start();
 
 	_domain->activeSessionChanges(
-	) | rpl::start_with_next([=](Main::Session *session) {
+	) | rpl::on_next([=](Main::Session *session) {
 		refreshApplicationIcon(session);
 	}, _lifetime);
 
 	Shortcuts::Requests(
-	) | rpl::start_with_next([=](not_null<Shortcuts::Request*> request) {
+	) | rpl::on_next([=](not_null<Shortcuts::Request*> request) {
 		using Command = Shortcuts::Command;
 		request->check(Command::Quit) && request->handle([] {
 			Quit();
diff --git a/Telegram/SourceFiles/core/changelogs.cpp b/Telegram/SourceFiles/core/changelogs.cpp
index ddb5b8a93f..b0a9a66eb2 100644
--- a/Telegram/SourceFiles/core/changelogs.cpp
+++ b/Telegram/SourceFiles/core/changelogs.cpp
@@ -51,7 +51,7 @@ Changelogs::Changelogs(not_null<Main::Session*> session, int oldVersion)
 	_session->data().chatsListChanges(
 	) | rpl::filter([](Data::Folder *folder) {
 		return !folder;
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		requestCloudLogs();
 	}, _chatsSubscription);
 }
diff --git a/Telegram/SourceFiles/core/crash_report_window.cpp b/Telegram/SourceFiles/core/crash_report_window.cpp
index b73c12aedc..71dee2eaf0 100644
--- a/Telegram/SourceFiles/core/crash_report_window.cpp
+++ b/Telegram/SourceFiles/core/crash_report_window.cpp
@@ -362,21 +362,21 @@ LastCrashedWindow::LastCrashedWindow(
 		Core::UpdateChecker checker;
 		using Progress = Core::UpdateChecker::Progress;
 		checker.checking(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			Assert(_updaterData != nullptr);
 
 			setUpdatingState(UpdatingCheck);
 		}, _lifetime);
 
 		checker.isLatest(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			Assert(_updaterData != nullptr);
 
 			setUpdatingState(UpdatingLatest);
 		}, _lifetime);
 
 		checker.progress(
-		) | rpl::start_with_next([=](const Progress &result) {
+		) | rpl::on_next([=](const Progress &result) {
 			Assert(_updaterData != nullptr);
 
 			setUpdatingState(UpdatingDownload);
@@ -384,14 +384,14 @@ LastCrashedWindow::LastCrashedWindow(
 		}, _lifetime);
 
 		checker.failed(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			Assert(_updaterData != nullptr);
 
 			setUpdatingState(UpdatingFail);
 		}, _lifetime);
 
 		checker.ready(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			Assert(_updaterData != nullptr);
 
 			setUpdatingState(UpdatingReady);
@@ -880,7 +880,7 @@ void LastCrashedWindow::networkSettings() {
 		proxy.user,
 		proxy.password);
 	box->saveRequests(
-	) | rpl::start_with_next([=](MTP::ProxyData &&data) {
+	) | rpl::on_next([=](MTP::ProxyData &&data) {
 		Assert(data.host.isEmpty() || data.port != 0);
 		_proxyChanges.fire(std::move(data));
 		proxyUpdated();
diff --git a/Telegram/SourceFiles/core/local_url_handlers.cpp b/Telegram/SourceFiles/core/local_url_handlers.cpp
index 939bf86837..8a01f2cd9d 100644
--- a/Telegram/SourceFiles/core/local_url_handlers.cpp
+++ b/Telegram/SourceFiles/core/local_url_handlers.cpp
@@ -322,7 +322,7 @@ void ShowPhonePrivacyBox(Window::SessionController *controller) {
 		key
 	) | rpl::take(
 		1
-	) | rpl::start_with_next([=](const Privacy::Rule &value) mutable {
+	) | rpl::on_next([=](const Privacy::Rule &value) mutable {
 		using namespace ::Settings;
 		const auto show = shared->alive();
 		if (lifetime) {
@@ -1111,7 +1111,7 @@ bool ShowEditBirthdayPrivacy(
 		Api::UserPrivacy::Key::Birthday
 	) | rpl::take(
 		1
-	) | rpl::start_with_next([=](const Api::UserPrivacy::Rule &value) {
+	) | rpl::on_next([=](const Api::UserPrivacy::Rule &value) {
 		if (isFromBox) {
 			using namespace ::Settings;
 			class Controller final : public BirthdayPrivacyController {
@@ -1162,7 +1162,7 @@ bool ShowEditPersonalChannel(
 		};
 
 		rawController->chosen(
-		) | rpl::start_with_next([=](not_null<ChannelData*> channel) {
+		) | rpl::on_next([=](not_null<ChannelData*> channel) {
 			save(channel);
 		}, box->lifetime());
 
diff --git a/Telegram/SourceFiles/core/phone_click_handler.cpp b/Telegram/SourceFiles/core/phone_click_handler.cpp
index 167aec1653..7c09b6ec10 100644
--- a/Telegram/SourceFiles/core/phone_click_handler.cpp
+++ b/Telegram/SourceFiles/core/phone_click_handler.cpp
@@ -125,7 +125,7 @@ ResolvePhoneAction::ResolvePhoneAction(
 	}
 
 	paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		Painter p(this);
 		paint(p);
 	}, lifetime());
@@ -213,7 +213,7 @@ void ResolvePhoneAction::prepare() {
 				? rpl::single(QString())
 				: tr::lng_contacts_loading();
 		}) | rpl::flatten_latest()
-	) | rpl::start_with_next([=](
+	) | rpl::on_next([=](
 			QString text,
 			QString name,
 			QString no,
diff --git a/Telegram/SourceFiles/core/sandbox.cpp b/Telegram/SourceFiles/core/sandbox.cpp
index b7ac2a5d10..4f8c65e98f 100644
--- a/Telegram/SourceFiles/core/sandbox.cpp
+++ b/Telegram/SourceFiles/core/sandbox.cpp
@@ -359,7 +359,7 @@ void Sandbox::singleInstanceChecked() {
 			_lastCrashDump,
 			[=] { launchApplication(); });
 		window->proxyChanges(
-		) | rpl::start_with_next([=](MTP::ProxyData &&proxy) {
+		) | rpl::on_next([=](MTP::ProxyData &&proxy) {
 			_sandboxProxy = std::move(proxy);
 			refreshGlobalProxy();
 		}, window->lifetime());
diff --git a/Telegram/SourceFiles/core/update_checker.cpp b/Telegram/SourceFiles/core/update_checker.cpp
index 777dde80c4..9f9913147c 100644
--- a/Telegram/SourceFiles/core/update_checker.cpp
+++ b/Telegram/SourceFiles/core/update_checker.cpp
@@ -1134,19 +1134,19 @@ private:
 Updater::Updater()
 : _timer([=] { check(); })
 , _retryTimer([=] { handleTimeout(); }) {
-	checking() | rpl::start_with_next([=] {
+	checking() | rpl::on_next([=] {
 		handleChecking();
 	}, _lifetime);
-	progress() | rpl::start_with_next([=] {
+	progress() | rpl::on_next([=] {
 		handleProgress();
 	}, _lifetime);
-	failed() | rpl::start_with_next([=] {
+	failed() | rpl::on_next([=] {
 		handleFailed();
 	}, _lifetime);
-	ready() | rpl::start_with_next([=] {
+	ready() | rpl::on_next([=] {
 		handleReady();
 	}, _lifetime);
-	isLatest() | rpl::start_with_next([=] {
+	isLatest() | rpl::on_next([=] {
 		handleLatest();
 	}, _lifetime);
 }
@@ -1299,11 +1299,11 @@ void Updater::startImplementation(
 	}
 
 	checker->ready(
-	) | rpl::start_with_next([=](std::shared_ptr<Loader> &&loader) {
+	) | rpl::on_next([=](std::shared_ptr<Loader> &&loader) {
 		checkerDone(which, std::move(loader));
 	}, checker->lifetime());
 	checker->failed(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		checkerFail(which);
 	}, checker->lifetime());
 
@@ -1373,11 +1373,11 @@ bool Updater::tryLoaders() {
 			loader->progress(
 			) | rpl::start_to_stream(_progress, loader->lifetime());
 			loader->ready(
-			) | rpl::start_with_next([=](QString &&filepath) {
+			) | rpl::on_next([=](QString &&filepath) {
 				finalize(std::move(filepath));
 			}, loader->lifetime());
 			loader->failed(
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				_failed.fire({});
 			}, loader->lifetime());
 
diff --git a/Telegram/SourceFiles/countries/countries_manager.cpp b/Telegram/SourceFiles/countries/countries_manager.cpp
index 5b8c30c99b..ac59fcabed 100644
--- a/Telegram/SourceFiles/countries/countries_manager.cpp
+++ b/Telegram/SourceFiles/countries/countries_manager.cpp
@@ -153,9 +153,9 @@ Manager::Manager(not_null<Main::Domain*> domain)
 	domain->activeValue(
 	) | rpl::filter([=](Main::Account *account) {
 		return (account != nullptr);
-	}) | rpl::start_with_next_done([=](Main::Account *account) {
+	}) | rpl::on_next_done([=](Main::Account *account) {
 		*mtpLifetime = account->mtpMainSessionValue(
-		) | rpl::start_with_next([=](not_null<MTP::Instance*> instance) {
+		) | rpl::on_next([=](not_null<MTP::Instance*> instance) {
 			_api.emplace(instance);
 			request();
 		});
diff --git a/Telegram/SourceFiles/data/business/data_shortcut_messages.cpp b/Telegram/SourceFiles/data/business/data_shortcut_messages.cpp
index 6cb4890973..b9ac9c665f 100644
--- a/Telegram/SourceFiles/data/business/data_shortcut_messages.cpp
+++ b/Telegram/SourceFiles/data/business/data_shortcut_messages.cpp
@@ -114,7 +114,7 @@ ShortcutMessages::ShortcutMessages(not_null<Session*> owner)
 	owner->itemRemoved(
 	) | rpl::filter([](not_null<const HistoryItem*> item) {
 		return item->isBusinessShortcut();
-	}) | rpl::start_with_next([=](not_null<const HistoryItem*> item) {
+	}) | rpl::on_next([=](not_null<const HistoryItem*> item) {
 		remove(item);
 	}, _lifetime);
 }
diff --git a/Telegram/SourceFiles/data/components/credits.cpp b/Telegram/SourceFiles/data/components/credits.cpp
index 121dad2da0..4dfc6febce 100644
--- a/Telegram/SourceFiles/data/components/credits.cpp
+++ b/Telegram/SourceFiles/data/components/credits.cpp
@@ -60,7 +60,7 @@ void Credits::load(bool force) {
 			apply(balance);
 			_loader = nullptr;
 		};
-		apiStats->request() | rpl::start_with_error_done([=] {
+		apiStats->request() | rpl::on_error_done([=] {
 			finish(false);
 		}, [=] {
 			finish(true);
diff --git a/Telegram/SourceFiles/data/components/factchecks.cpp b/Telegram/SourceFiles/data/components/factchecks.cpp
index 77251925ef..d31937e2c2 100644
--- a/Telegram/SourceFiles/data/components/factchecks.cpp
+++ b/Telegram/SourceFiles/data/components/factchecks.cpp
@@ -60,7 +60,7 @@ void Factchecks::subscribeIfNotYet() {
 	_subscribed = true;
 
 	_session->data().itemRemoved(
-	) | rpl::start_with_next([=](not_null<const HistoryItem*> item) {
+	) | rpl::on_next([=](not_null<const HistoryItem*> item) {
 		_pending.remove(item);
 		const auto i = ranges::find(_requested, item.get());
 		if (i != end(_requested)) {
diff --git a/Telegram/SourceFiles/data/components/gift_auctions.cpp b/Telegram/SourceFiles/data/components/gift_auctions.cpp
index f72b109846..8ad720e550 100644
--- a/Telegram/SourceFiles/data/components/gift_auctions.cpp
+++ b/Telegram/SourceFiles/data/components/gift_auctions.cpp
@@ -25,7 +25,7 @@ GiftAuctions::GiftAuctions(not_null<Main::Session*> session)
 			_session->data().chatsListLoadedEvents()
 		) | rpl::filter(
 			!rpl::mappers::_1
-		) | rpl::take(1) | rpl::start_with_next([=] {
+		) | rpl::take(1) | rpl::on_next([=] {
 			requestActive();
 		}, _lifetime);
 	});
@@ -43,7 +43,7 @@ rpl::producer<GiftAuctionState> GiftAuctions::state(const QString &slug) {
 		}
 		const auto raw = entry.get();
 
-		raw->changes.events() | rpl::start_with_next([=] {
+		raw->changes.events() | rpl::on_next([=] {
 			consumer.put_next_copy(raw->state);
 		}, lifetime);
 
diff --git a/Telegram/SourceFiles/data/components/promo_suggestions.cpp b/Telegram/SourceFiles/data/components/promo_suggestions.cpp
index 9482ccd08d..15d468c155 100644
--- a/Telegram/SourceFiles/data/components/promo_suggestions.cpp
+++ b/Telegram/SourceFiles/data/components/promo_suggestions.cpp
@@ -50,7 +50,7 @@ PromoSuggestions::PromoSuggestions(
 , _topPromotionTimer([=] { refreshTopPromotion(); })
 , _firstPromoLoaded(std::move(firstPromoLoaded)) {
 	Core::App().settings().proxy().connectionTypeValue(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		refreshTopPromotion();
 	}, _lifetime);
 }
diff --git a/Telegram/SourceFiles/data/components/scheduled_messages.cpp b/Telegram/SourceFiles/data/components/scheduled_messages.cpp
index 15e036dba9..53a135d210 100644
--- a/Telegram/SourceFiles/data/components/scheduled_messages.cpp
+++ b/Telegram/SourceFiles/data/components/scheduled_messages.cpp
@@ -117,7 +117,7 @@ ScheduledMessages::ScheduledMessages(not_null<Main::Session*> session)
 	_session->data().itemRemoved(
 	) | rpl::filter([](not_null<const HistoryItem*> item) {
 		return item->isScheduled();
-	}) | rpl::start_with_next([=](not_null<const HistoryItem*> item) {
+	}) | rpl::on_next([=](not_null<const HistoryItem*> item) {
 		remove(item);
 	}, _lifetime);
 }
diff --git a/Telegram/SourceFiles/data/components/sponsored_messages.cpp b/Telegram/SourceFiles/data/components/sponsored_messages.cpp
index e09c333a68..fb27db98d5 100644
--- a/Telegram/SourceFiles/data/components/sponsored_messages.cpp
+++ b/Telegram/SourceFiles/data/components/sponsored_messages.cpp
@@ -58,7 +58,7 @@ SponsoredMessages::SponsoredMessages(not_null<Main::Session*> session)
 , _clearTimer([=] { clearOldRequests(); }) {
 	Data::AmPremiumValue(
 		_session
-	) | rpl::start_with_next([=](bool premium) {
+	) | rpl::on_next([=](bool premium) {
 		if (premium) {
 			clear();
 		}
diff --git a/Telegram/SourceFiles/data/components/top_peers.cpp b/Telegram/SourceFiles/data/components/top_peers.cpp
index 4fac09a09c..561f052d9c 100644
--- a/Telegram/SourceFiles/data/components/top_peers.cpp
+++ b/Telegram/SourceFiles/data/components/top_peers.cpp
@@ -72,7 +72,7 @@ void TopPeers::loadAfterChats() {
 	using namespace rpl::mappers;
 	crl::on_main(_session, [=] {
 		_session->data().chatsListLoadedEvents(
-		) | rpl::filter(_1 == nullptr) | rpl::start_with_next([=] {
+		) | rpl::filter(_1 == nullptr) | rpl::on_next([=] {
 			crl::on_main(_session, [=] {
 				request();
 			});
diff --git a/Telegram/SourceFiles/data/data_channel.cpp b/Telegram/SourceFiles/data/data_channel.cpp
index b8cd47c2a0..9eee5c9e19 100644
--- a/Telegram/SourceFiles/data/data_channel.cpp
+++ b/Telegram/SourceFiles/data/data_channel.cpp
@@ -1478,7 +1478,7 @@ void ApplyChannelUpdate(
 			}
 			creditsLoadLifetime->destroy();
 		});
-		base::timer_once(kTimeout) | rpl::start_with_next([=] {
+		base::timer_once(kTimeout) | rpl::on_next([=] {
 			creditsLoadLifetime->destroy();
 		}, *creditsLoadLifetime);
 		const auto currencyLoadLifetime = std::make_shared<rpl::lifetime>();
@@ -1490,13 +1490,13 @@ void ApplyChannelUpdate(
 			}
 			currencyLoadLifetime->destroy();
 		};
-		currencyLoad->request() | rpl::start_with_error_done(
+		currencyLoad->request() | rpl::on_error_done(
 			[=](const QString &error) {
 				apply(CreditsAmount(0, CreditsType::Ton));
 			},
 			[=] { apply(currencyLoad->data().currentBalance); },
 			*currencyLoadLifetime);
-		base::timer_once(kTimeout) | rpl::start_with_next([=] {
+		base::timer_once(kTimeout) | rpl::on_next([=] {
 			currencyLoadLifetime->destroy();
 		}, *currencyLoadLifetime);
 	}
diff --git a/Telegram/SourceFiles/data/data_chat.cpp b/Telegram/SourceFiles/data/data_chat.cpp
index d453643732..774b0f57c9 100644
--- a/Telegram/SourceFiles/data/data_chat.cpp
+++ b/Telegram/SourceFiles/data/data_chat.cpp
@@ -30,7 +30,7 @@ ChatData::ChatData(not_null<Data::Session*> owner, PeerId id)
 : PeerData(owner, id)
 , inputChat(MTP_long(peerToChat(id).bare)) {
 	_flags.changes(
-	) | rpl::start_with_next([=](const Flags::Change &change) {
+	) | rpl::on_next([=](const Flags::Change &change) {
 		if (change.diff & Flag::CallNotEmpty) {
 			if (const auto history = this->owner().historyLoaded(this)) {
 				history->updateChatListEntry();
diff --git a/Telegram/SourceFiles/data/data_chat_filters.cpp b/Telegram/SourceFiles/data/data_chat_filters.cpp
index a2c5f48d89..9f04bcf66d 100644
--- a/Telegram/SourceFiles/data/data_chat_filters.cpp
+++ b/Telegram/SourceFiles/data/data_chat_filters.cpp
@@ -1047,7 +1047,7 @@ rpl::producer<Ui::MoreChatsBarContent> ChatFilters::moreChatsContent(
 
 		_moreChatsUpdated.events_starting_with_copy(
 			id
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			consumer.put_next(Ui::MoreChatsBarContent{
 				.count = int(moreChats(id).size()),
 			});
diff --git a/Telegram/SourceFiles/data/data_cloud_file.cpp b/Telegram/SourceFiles/data/data_cloud_file.cpp
index 7b3e738289..c80d8f26ee 100644
--- a/Telegram/SourceFiles/data/data_cloud_file.cpp
+++ b/Telegram/SourceFiles/data/data_cloud_file.cpp
@@ -289,7 +289,7 @@ void LoadCloudFile(
 	};
 
 	file.loader->updates(
-	) | rpl::start_with_next_error_done([=] {
+	) | rpl::on_next_error_done([=] {
 		if (const auto onstack = progress) {
 			onstack();
 		}
diff --git a/Telegram/SourceFiles/data/data_cloud_themes.cpp b/Telegram/SourceFiles/data/data_cloud_themes.cpp
index 8f8b3e09af..978bab8ca7 100644
--- a/Telegram/SourceFiles/data/data_cloud_themes.cpp
+++ b/Telegram/SourceFiles/data/data_cloud_themes.cpp
@@ -212,7 +212,7 @@ void CloudThemes::setupReload() {
 		return (update.type == BackgroundUpdate::Type::ApplyingTheme);
 	}) | rpl::map([=] {
 		return needReload();
-	}) | rpl::start_with_next([=](bool need) {
+	}) | rpl::on_next([=](bool need) {
 		install();
 		if (need) {
 			scheduleReload();
@@ -375,7 +375,7 @@ void CloudThemes::loadDocumentAndInvoke(
 		_session->downloaderTaskFinished(
 		) | rpl::filter([=, &value] {
 			return value.documentMedia->loaded();
-		}) | rpl::start_with_next([=, &value] {
+		}) | rpl::on_next([=, &value] {
 			invokeForLoaded(value);
 		}, value.subscription);
 	}
diff --git a/Telegram/SourceFiles/data/data_document.cpp b/Telegram/SourceFiles/data/data_document.cpp
index 5584fd66d7..7df823b626 100644
--- a/Telegram/SourceFiles/data/data_document.cpp
+++ b/Telegram/SourceFiles/data/data_document.cpp
@@ -1217,7 +1217,7 @@ void DocumentData::save(
 
 void DocumentData::handleLoaderUpdates() {
 	_loader->updates(
-	) | rpl::start_with_next_error_done([=] {
+	) | rpl::on_next_error_done([=] {
 		_owner->documentLoadProgress(this);
 	}, [=](FileLoader::Error error) {
 		using FailureReason = FileLoader::FailureReason;
diff --git a/Telegram/SourceFiles/data/data_download_manager.cpp b/Telegram/SourceFiles/data/data_download_manager.cpp
index 79db0acad8..15fcbae95d 100644
--- a/Telegram/SourceFiles/data/data_download_manager.cpp
+++ b/Telegram/SourceFiles/data/data_download_manager.cpp
@@ -141,32 +141,32 @@ void DownloadManager::trackSession(not_null<Main::Session*> session) {
 	session->data().documentLoadProgress(
 	) | rpl::filter([=](not_null<DocumentData*> document) {
 		return _loadingDocuments.contains(document);
-	}) | rpl::start_with_next([=](not_null<DocumentData*> document) {
+	}) | rpl::on_next([=](not_null<DocumentData*> document) {
 		check(document);
 	}, data.lifetime);
 
 	session->data().itemLayoutChanged(
 	) | rpl::filter([=](not_null<const HistoryItem*> item) {
 		return _loading.contains(item);
-	}) | rpl::start_with_next([=](not_null<const HistoryItem*> item) {
+	}) | rpl::on_next([=](not_null<const HistoryItem*> item) {
 		check(item);
 	}, data.lifetime);
 
 	session->data().itemViewRefreshRequest(
-	) | rpl::start_with_next([=](not_null<const HistoryItem*> item) {
+	) | rpl::on_next([=](not_null<const HistoryItem*> item) {
 		changed(item);
 	}, data.lifetime);
 
 	session->changes().messageUpdates(
 		MessageUpdate::Flag::Destroyed
-	) | rpl::start_with_next([=](const MessageUpdate &update) {
+	) | rpl::on_next([=](const MessageUpdate &update) {
 		removed(update.item);
 	}, data.lifetime);
 
 	session->account().sessionChanges(
 	) | rpl::filter(
 		rpl::mappers::_1 != session
-	) | rpl::take(1) | rpl::start_with_next([=] {
+	) | rpl::take(1) | rpl::on_next([=] {
 		untrack(session);
 	}, data.lifetime);
 }
@@ -1137,7 +1137,7 @@ rpl::producer<Ui::DownloadBarContent> MakeDownloadBarContent() {
 				state->document->session().downloaderTaskFinished(
 				) | rpl::filter([=] {
 					return self(self);
-				}) | rpl::start_with_next(
+				}) | rpl::on_next(
 					state->push,
 					state->downloadTaskLifetime);
 			}
@@ -1199,7 +1199,7 @@ rpl::producer<Ui::DownloadBarContent> MakeDownloadBarContent() {
 		manager.loadingListChanges(
 		) | rpl::filter([=] {
 			return !state->scheduled;
-		}) | rpl::start_with_next(state->push, lifetime);
+		}) | rpl::on_next(state->push, lifetime);
 
 		notify();
 		return lifetime;
diff --git a/Telegram/SourceFiles/data/data_emoji_statuses.cpp b/Telegram/SourceFiles/data/data_emoji_statuses.cpp
index 73c1598305..de822f33b0 100644
--- a/Telegram/SourceFiles/data/data_emoji_statuses.cpp
+++ b/Telegram/SourceFiles/data/data_emoji_statuses.cpp
@@ -53,7 +53,7 @@ EmojiStatuses::EmojiStatuses(not_null<Session*> owner)
 
 	base::timer_each(
 		kRefreshDefaultListEach
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		refreshDefault();
 		refreshChannelDefault();
 	}, _lifetime);
diff --git a/Telegram/SourceFiles/data/data_folder.cpp b/Telegram/SourceFiles/data/data_folder.cpp
index e6599a5eea..6724923f1c 100644
--- a/Telegram/SourceFiles/data/data_folder.cpp
+++ b/Telegram/SourceFiles/data/data_folder.cpp
@@ -124,7 +124,7 @@ Folder::Folder(not_null<Session*> owner, FolderId id)
 		PeerUpdate::Flag::Name
 	) | rpl::filter([=](const PeerUpdate &update) {
 		return ranges::contains(_lastHistories, update.peer, &History::peer);
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		++_chatListViewVersion;
 		updateChatListEntryPostponed();
 	}, _lifetime);
@@ -134,13 +134,13 @@ Folder::Folder(not_null<Session*> owner, FolderId id)
 	_chatsList.unreadStateChanges(
 	) | rpl::filter([=] {
 		return inChatList();
-	}) | rpl::start_with_next([=](const Dialogs::UnreadState &old) {
+	}) | rpl::on_next([=](const Dialogs::UnreadState &old) {
 		++_chatListViewVersion;
 		notifyUnreadStateChange(old);
 	}, _lifetime);
 
 	_chatsList.fullSize().changes(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateChatListEntryPostponed();
 	}, _lifetime);
 }
diff --git a/Telegram/SourceFiles/data/data_forum_topic.cpp b/Telegram/SourceFiles/data/data_forum_topic.cpp
index 4c4280ed7e..98279cdec3 100644
--- a/Telegram/SourceFiles/data/data_forum_topic.cpp
+++ b/Telegram/SourceFiles/data/data_forum_topic.cpp
@@ -250,7 +250,7 @@ ForumTopic::ForumTopic(not_null<Forum*> forum, MsgId rootId)
 
 	if (isGeneral()) {
 		style::PaletteChanged(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			_defaultIcon = QImage();
 		}, _lifetime);
 	}
@@ -374,7 +374,7 @@ void ForumTopic::subscribeToUnreadChanges() {
 	) | rpl::combine_previous(
 	) | rpl::filter([=] {
 		return inChatList();
-	}) | rpl::start_with_next([=](
+	}) | rpl::on_next([=](
 			std::optional<int> previous,
 			std::optional<int> now) {
 		if (previous.value_or(0) != now.value_or(0)) {
diff --git a/Telegram/SourceFiles/data/data_group_call.cpp b/Telegram/SourceFiles/data/data_group_call.cpp
index 7318e271db..dbadcbd3d7 100644
--- a/Telegram/SourceFiles/data/data_group_call.cpp
+++ b/Telegram/SourceFiles/data/data_group_call.cpp
@@ -84,7 +84,7 @@ GroupCall::GroupCall(
 			return !update.now
 				&& !update.was->peer->isSelf()
 				&& !_participantsWithAccess.current().empty();
-		}) | rpl::start_with_next([=](const ParticipantUpdate &update) {
+		}) | rpl::on_next([=](const ParticipantUpdate &update) {
 			if (const auto id = peerToUser(update.was->peer->id)) {
 				if (_participantsWithAccess.current().contains(id)) {
 					_staleParticipantIds.fire({ id });
@@ -95,7 +95,7 @@ GroupCall::GroupCall(
 		_participantsWithAccess.changes(
 		) | rpl::filter([=](const base::flat_set<UserId> &list) {
 			return !list.empty();
-		}) | rpl::start_with_next([=] {
+		}) | rpl::on_next([=] {
 			if (_allParticipantsLoaded) {
 				checkStaleParticipants();
 			} else {
diff --git a/Telegram/SourceFiles/data/data_history_messages.cpp b/Telegram/SourceFiles/data/data_history_messages.cpp
index 6711059297..c86a8907db 100644
--- a/Telegram/SourceFiles/data/data_history_messages.cpp
+++ b/Telegram/SourceFiles/data/data_history_messages.cpp
@@ -88,7 +88,7 @@ rpl::producer<SparseIdsSlice> HistoryViewer(
 			limitAfter);
 		using RequestAroundInfo = SparseIdsSliceBuilder::AroundData;
 		builder->insufficientAround(
-		) | rpl::start_with_next([=](const RequestAroundInfo &info) {
+		) | rpl::on_next([=](const RequestAroundInfo &info) {
 			if (!info.aroundId) {
 				// Ignore messages-count-only requests, because we perform
 				// them with non-zero limit of messages and end up adding
@@ -110,22 +110,22 @@ rpl::producer<SparseIdsSlice> HistoryViewer(
 		messages->sliceUpdated(
 		) | rpl::filter([=](const SliceUpdate &update) {
 			return builder->applyUpdate(update);
-		}) | rpl::start_with_next(pushNextSnapshot, lifetime);
+		}) | rpl::on_next(pushNextSnapshot, lifetime);
 
 		messages->oneRemoved(
 		) | rpl::filter([=](MsgId messageId) {
 			return builder->removeOne(messageId);
-		}) | rpl::start_with_next(pushNextSnapshot, lifetime);
+		}) | rpl::on_next(pushNextSnapshot, lifetime);
 
 		messages->allRemoved(
 		) | rpl::filter([=] {
 			return builder->removeAll();
-		}) | rpl::start_with_next(pushNextSnapshot, lifetime);
+		}) | rpl::on_next(pushNextSnapshot, lifetime);
 
 		messages->bottomInvalidated(
 		) | rpl::filter([=] {
 			return builder->invalidateBottom();
-		}) | rpl::start_with_next(pushNextSnapshot, lifetime);
+		}) | rpl::on_next(pushNextSnapshot, lifetime);
 
 		const auto snapshot = messages->snapshot({
 			aroundId,
diff --git a/Telegram/SourceFiles/data/data_media_preload.cpp b/Telegram/SourceFiles/data/data_media_preload.cpp
index 8fb9380673..934bbf13ad 100644
--- a/Telegram/SourceFiles/data/data_media_preload.cpp
+++ b/Telegram/SourceFiles/data/data_media_preload.cpp
@@ -75,7 +75,7 @@ void PhotoPreload::start(FileOrigin origin) {
 		_photo->owner()->session().downloaderTaskFinished(
 		) | rpl::filter([=] {
 			return _photo->loaded();
-		}) | rpl::start_with_next([=] { callDone(); }, _lifetime);
+		}) | rpl::on_next([=] { callDone(); }, _lifetime);
 	}
 }
 
diff --git a/Telegram/SourceFiles/data/data_message_reactions.cpp b/Telegram/SourceFiles/data/data_message_reactions.cpp
index 1b8b31c21c..995e89c6ac 100644
--- a/Telegram/SourceFiles/data/data_message_reactions.cpp
+++ b/Telegram/SourceFiles/data/data_message_reactions.cpp
@@ -367,14 +367,14 @@ Reactions::Reactions(not_null<Session*> owner)
 
 	base::timer_each(
 		kRefreshFullListEach
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		refreshDefault();
 		requestEffects();
 	}, _lifetime);
 
 	_owner->session().changes().messageUpdates(
 		MessageUpdate::Flag::Destroyed
-	) | rpl::start_with_next([=](const MessageUpdate &update) {
+	) | rpl::on_next([=](const MessageUpdate &update) {
 		const auto item = update.item;
 		_pollingItems.remove(item);
 		_pollItems.remove(item);
@@ -401,7 +401,7 @@ Reactions::Reactions(not_null<Session*> owner)
 				: ReactionId{ config.reactionDefaultEmoji };
 		}) | rpl::filter([=](const ReactionId &id) {
 			return !_saveFaveRequestId;
-		}) | rpl::start_with_next([=](ReactionId &&id) {
+		}) | rpl::on_next([=](ReactionId &&id) {
 			applyFavorite(id);
 		}, _lifetime);
 	});
@@ -915,7 +915,7 @@ void Reactions::loadImage(
 		setAnimatedIcon(set);
 	} else if (!_imagesLoadLifetime) {
 		document->session().downloaderTaskFinished(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			downloadTaskFinished();
 		}, _imagesLoadLifetime);
 	}
diff --git a/Telegram/SourceFiles/data/data_peer_values.cpp b/Telegram/SourceFiles/data/data_peer_values.cpp
index 3828d03ee9..2e8ee8c52d 100644
--- a/Telegram/SourceFiles/data/data_peer_values.cpp
+++ b/Telegram/SourceFiles/data/data_peer_values.cpp
@@ -558,7 +558,7 @@ rpl::producer<QImage> PeerUserpicImageValue(
 
 			if (loading && !state->waiting) {
 				peer->session().downloaderTaskFinished(
-				) | rpl::start_with_next(state->push, state->waiting);
+				) | rpl::on_next(state->push, state->waiting);
 			} else if (!loading && state->waiting) {
 				state->waiting.destroy();
 			}
@@ -578,7 +578,7 @@ rpl::producer<QImage> PeerUserpicImageValue(
 		peer->session().changes().peerFlagsValue(
 			peer,
 			PeerUpdate::Flag::Photo
-		) | rpl::start_with_next(state->push, result);
+		) | rpl::on_next(state->push, result);
 		return result;
 	};
 }
diff --git a/Telegram/SourceFiles/data/data_replies_list.cpp b/Telegram/SourceFiles/data/data_replies_list.cpp
index c34b10f672..d74a4da1f0 100644
--- a/Telegram/SourceFiles/data/data_replies_list.cpp
+++ b/Telegram/SourceFiles/data/data_replies_list.cpp
@@ -71,7 +71,7 @@ RepliesList::RepliesList(
 , _readRequestTimer([=] { sendReadTillRequest(); }) {
 	if (_owningTopic) {
 		_owningTopic->destroyed(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			_owningTopic = nullptr;
 			subscribeToUpdates();
 		}, _lifetime);
@@ -96,7 +96,7 @@ void RepliesList::subscribeToUpdates() {
 	) | rpl::filter([=](const RepliesReadTillUpdate &update) {
 		return (update.id.msg == _rootId)
 			&& (update.id.peer == _history->peer->id);
-	}) | rpl::start_with_next([=](const RepliesReadTillUpdate &update) {
+	}) | rpl::on_next([=](const RepliesReadTillUpdate &update) {
 		apply(update);
 	}, _lifetime);
 
@@ -105,18 +105,18 @@ void RepliesList::subscribeToUpdates() {
 		| MessageUpdate::Flag::NewMaybeAdded
 		| MessageUpdate::Flag::ReplyToTopAdded
 		| MessageUpdate::Flag::Destroyed
-	) | rpl::start_with_next([=](const MessageUpdate &update) {
+	) | rpl::on_next([=](const MessageUpdate &update) {
 		apply(update);
 	}, _lifetime);
 
 	_history->session().changes().topicUpdates(
 		TopicUpdate::Flag::Creator
-	) | rpl::start_with_next([=](const TopicUpdate &update) {
+	) | rpl::on_next([=](const TopicUpdate &update) {
 		apply(update);
 	}, _lifetime);
 
 	_history->owner().channelDifferenceTooLong(
-	) | rpl::start_with_next([=](not_null<ChannelData*> channel) {
+	) | rpl::on_next([=](not_null<ChannelData*> channel) {
 		if (channel == _history->peer) {
 			applyDifferenceTooLong();
 		}
@@ -194,19 +194,19 @@ rpl::producer<MessagesSlice> RepliesList::source(
 		_history->session().changes().historyUpdates(
 			_history,
 			HistoryUpdate::Flag::ClientSideMessages
-		) | rpl::start_with_next(pushDelayed, lifetime);
+		) | rpl::on_next(pushDelayed, lifetime);
 
 		_history->session().changes().messageUpdates(
 			MessageUpdate::Flag::Destroyed
 		) | rpl::filter([=](const MessageUpdate &update) {
 			return applyItemDestroyed(viewer, update.item);
-		}) | rpl::start_with_next(pushDelayed, lifetime);
+		}) | rpl::on_next(pushDelayed, lifetime);
 
 		_listChanges.events(
-		) | rpl::start_with_next(pushDelayed, lifetime);
+		) | rpl::on_next(pushDelayed, lifetime);
 
 		_instantChanges.events(
-		) | rpl::start_with_next(pushInstant, lifetime);
+		) | rpl::on_next(pushInstant, lifetime);
 
 		pushInstant();
 		return lifetime;
diff --git a/Telegram/SourceFiles/data/data_saved_music.cpp b/Telegram/SourceFiles/data/data_saved_music.cpp
index d6d8cc705e..4b59e9a05c 100644
--- a/Telegram/SourceFiles/data/data_saved_music.cpp
+++ b/Telegram/SourceFiles/data/data_saved_music.cpp
@@ -402,7 +402,7 @@ rpl::producer<SavedMusicSlice> SavedMusicList(
 		savedMusic->changed(
 		) | rpl::filter(
 			rpl::mappers::_1 == peerId
-		) | rpl::start_with_next(schedule, lifetime);
+		) | rpl::on_next(schedule, lifetime);
 
 		if (!savedMusic->countKnown(peerId)) {
 			savedMusic->loadMore(peerId);
diff --git a/Telegram/SourceFiles/data/data_saved_sublist.cpp b/Telegram/SourceFiles/data/data_saved_sublist.cpp
index bf6d050147..566c3fcd46 100644
--- a/Telegram/SourceFiles/data/data_saved_sublist.cpp
+++ b/Telegram/SourceFiles/data/data_saved_sublist.cpp
@@ -145,13 +145,13 @@ rpl::producer<MessagesSlice> SavedSublist::source(
 		history->session().changes().historyUpdates(
 			history,
 			HistoryUpdate::Flag::ClientSideMessages
-		) | rpl::start_with_next(pushDelayed, lifetime);
+		) | rpl::on_next(pushDelayed, lifetime);
 
 		_listChanges.events(
-		) | rpl::start_with_next(pushDelayed, lifetime);
+		) | rpl::on_next(pushDelayed, lifetime);
 
 		_instantChanges.events(
-		) | rpl::start_with_next(pushInstant, lifetime);
+		) | rpl::on_next(pushInstant, lifetime);
 
 		pushInstant();
 		return lifetime;
@@ -707,7 +707,7 @@ void SavedSublist::subscribeToUnreadChanges() {
 	) | rpl::combine_previous(
 	) | rpl::filter([=] {
 		return inChatList();
-	}) | rpl::start_with_next([=](
+	}) | rpl::on_next([=](
 			std::optional<int> previous,
 			std::optional<int> now) {
 		if (previous.value_or(0) != now.value_or(0)) {
diff --git a/Telegram/SourceFiles/data/data_search_controller.cpp b/Telegram/SourceFiles/data/data_search_controller.cpp
index 4d599c135b..b05ea91441 100644
--- a/Telegram/SourceFiles/data/data_search_controller.cpp
+++ b/Telegram/SourceFiles/data/data_search_controller.cpp
@@ -434,7 +434,7 @@ rpl::producer<SparseIdsSlice> SearchController::simpleIdsSlice(
 			limitBefore,
 			limitAfter);
 		builder->insufficientAround(
-		) | rpl::start_with_next([=](
+		) | rpl::on_next([=](
 				const SparseIdsSliceBuilder::AroundData &data) {
 			requestMore(data, query, listData);
 		}, lifetime);
@@ -446,7 +446,7 @@ rpl::producer<SparseIdsSlice> SearchController::simpleIdsSlice(
 		listData->list.sliceUpdated(
 		) | rpl::filter([=](const SliceUpdate &update) {
 			return builder->applyUpdate(update);
-		}) | rpl::start_with_next(pushNextSnapshot, lifetime);
+		}) | rpl::on_next(pushNextSnapshot, lifetime);
 
 		_session->data().itemRemoved(
 		) | rpl::filter([=](not_null<const HistoryItem*> item) {
@@ -456,14 +456,14 @@ rpl::producer<SparseIdsSlice> SearchController::simpleIdsSlice(
 					|| item->sublistPeerId() == monoforumPeerId);
 		}) | rpl::filter([=](not_null<const HistoryItem*> item) {
 			return builder->removeOne(item->id);
-		}) | rpl::start_with_next(pushNextSnapshot, lifetime);
+		}) | rpl::on_next(pushNextSnapshot, lifetime);
 
 		_session->data().historyCleared(
 		) | rpl::filter([=](not_null<const History*> history) {
 			return (history->peer->id == peerId);
 		}) | rpl::filter([=] {
 			return builder->removeAll();
-		}) | rpl::start_with_next(pushNextSnapshot, lifetime);
+		}) | rpl::on_next(pushNextSnapshot, lifetime);
 
 		using Result = Storage::SparseIdsListResult;
 		listData->list.query(Storage::SparseIdsListQuery(
@@ -472,7 +472,7 @@ rpl::producer<SparseIdsSlice> SearchController::simpleIdsSlice(
 			limitAfter
 		)) | rpl::filter([=](const Result &result) {
 			return builder->applyInitial(result);
-		}) | rpl::start_with_next_done(
+		}) | rpl::on_next_done(
 			pushNextSnapshot,
 			[=] { builder->checkInsufficient(); },
 			lifetime);
diff --git a/Telegram/SourceFiles/data/data_session.cpp b/Telegram/SourceFiles/data/data_session.cpp
index 934155204f..7c5a71a44b 100644
--- a/Telegram/SourceFiles/data/data_session.cpp
+++ b/Telegram/SourceFiles/data/data_session.cpp
@@ -274,12 +274,12 @@ Session::Session(not_null<Main::Session*> session)
 	setupUserIsContactViewer();
 
 	_chatsList.unreadStateChanges(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		notifyUnreadBadgeChanged();
 	}, _lifetime);
 
 	_chatsFilters->changed(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto enabled = _chatsFilters->has();
 		if (enabled != session->settings().dialogsFiltersEnabled()) {
 			session->settings().setDialogsFiltersEnabled(enabled);
@@ -288,7 +288,7 @@ Session::Session(not_null<Main::Session*> session)
 	}, _lifetime);
 
 	_reactions->myTagRenamed(
-	) | rpl::start_with_next([=](const ReactionId &id) {
+	) | rpl::on_next([=](const ReactionId &id) {
 		const auto i = _viewsByTag.find(id);
 		if (i != end(_viewsByTag)) {
 			for (const auto &view : i->second) {
@@ -298,7 +298,7 @@ Session::Session(not_null<Main::Session*> session)
 	}, _lifetime);
 
 	Spellchecker::HighlightReady(
-	) | rpl::start_with_next([=](uint64 processId) {
+	) | rpl::on_next([=](uint64 processId) {
 		highlightProcessDone(processId);
 	}, _lifetime);
 
@@ -307,7 +307,7 @@ Session::Session(not_null<Main::Session*> session)
 	crl::on_main(_session, [=] {
 		AmPremiumValue(
 			_session
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			for (const auto &[document, items] : _documentItems) {
 				if (document->isVoiceMessage()) {
 					for (const auto &item : items) {
@@ -321,7 +321,7 @@ Session::Session(not_null<Main::Session*> session)
 	});
 
 	session->appConfig().ignoredRestrictionReasonsChanges(
-	) | rpl::start_with_next([=](std::vector<QString> &&changed) {
+	) | rpl::on_next([=](std::vector<QString> &&changed) {
 		auto refresh = std::vector<not_null<const HistoryItem*>>();
 		for (const auto &[item, reasons] : _possiblyRestricted) {
 			for (const auto &reason : changed) {
@@ -339,7 +339,7 @@ Session::Session(not_null<Main::Session*> session)
 
 void Session::subscribeForTopicRepliesLists() {
 	repliesReadTillUpdates(
-	) | rpl::start_with_next([=](const RepliesReadTillUpdate &update) {
+	) | rpl::on_next([=](const RepliesReadTillUpdate &update) {
 		if (const auto peer = peerLoaded(update.id.peer)) {
 			if (const auto topic = peer->forumTopicFor(update.id.msg)) {
 				topic->replies()->apply(update);
@@ -348,7 +348,7 @@ void Session::subscribeForTopicRepliesLists() {
 	}, _lifetime);
 
 	sublistReadTillUpdates(
-	) | rpl::start_with_next([=](const SublistReadTillUpdate &update) {
+	) | rpl::on_next([=](const SublistReadTillUpdate &update) {
 		if (const auto parentChat = channelLoaded(update.parentChatId)) {
 			if (const auto monoforum = parentChat->monoforum()) {
 				const auto sublistPeerId = update.sublistPeerId;
@@ -365,7 +365,7 @@ void Session::subscribeForTopicRepliesLists() {
 		| MessageUpdate::Flag::NewMaybeAdded
 		| MessageUpdate::Flag::ReplyToTopAdded
 		| MessageUpdate::Flag::Destroyed
-	) | rpl::start_with_next([=](const MessageUpdate &update) {
+	) | rpl::on_next([=](const MessageUpdate &update) {
 		if (const auto topic = update.item->topic()) {
 			topic->replies()->apply(update);
 		} else if (update.flags == MessageUpdate::Flag::ReplyToTopAdded) {
@@ -378,12 +378,12 @@ void Session::subscribeForTopicRepliesLists() {
 
 	session().changes().topicUpdates(
 		TopicUpdate::Flag::Creator
-	) | rpl::start_with_next([=](const TopicUpdate &update) {
+	) | rpl::on_next([=](const TopicUpdate &update) {
 		update.topic->replies()->apply(update);
 	}, _lifetime);
 
 	channelDifferenceTooLong(
-	) | rpl::start_with_next([=](not_null<ChannelData*> channel) {
+	) | rpl::on_next([=](not_null<ChannelData*> channel) {
 		if (const auto forum = channel->forum()) {
 			forum->enumerateTopics([](not_null<ForumTopic*> topic) {
 				topic->replies()->applyDifferenceTooLong();
@@ -1622,7 +1622,7 @@ void Session::setupMigrationViewer() {
 		return update.peer->asChat();
 	}) | rpl::filter([=](ChatData *chat) {
 		return (chat != nullptr);
-	}) | rpl::start_with_next([=](not_null<ChatData*> chat) {
+	}) | rpl::on_next([=](not_null<ChatData*> chat) {
 		const auto channel = chat->migrateTo();
 		if (!channel) {
 			return;
@@ -1644,7 +1644,7 @@ void Session::setupChannelLeavingViewer() {
 		PeerUpdate::Flag::ChannelAmIn
 	) | rpl::map([](const PeerUpdate &update) {
 		return update.peer->asChannel();
-	}) | rpl::start_with_next([=](not_null<ChannelData*> channel) {
+	}) | rpl::on_next([=](not_null<ChannelData*> channel) {
 		if (channel->amIn()) {
 			channel->clearInvitePeek();
 		} else {
@@ -1662,7 +1662,7 @@ void Session::setupChannelLeavingViewer() {
 
 void Session::setupPeerNameViewer() {
 	session().changes().realtimeNameUpdates(
-	) | rpl::start_with_next([=](const NameUpdate &update) {
+	) | rpl::on_next([=](const NameUpdate &update) {
 		const auto peer = update.peer;
 		if (const auto history = historyLoaded(peer)) {
 			history->refreshChatListNameSortKey();
@@ -1678,7 +1678,7 @@ void Session::setupUserIsContactViewer() {
 		PeerUpdate::Flag::IsContact
 	) | rpl::map([](const PeerUpdate &update) {
 		return update.peer->asUser();
-	}) | rpl::start_with_next([=](not_null<UserData*> user) {
+	}) | rpl::on_next([=](not_null<UserData*> user) {
 		const auto i = _contactViews.find(peerToUser(user->id));
 		if (i != _contactViews.end()) {
 			for (const auto &view : i->second) {
diff --git a/Telegram/SourceFiles/data/data_shared_media.cpp b/Telegram/SourceFiles/data/data_shared_media.cpp
index 3ee5f54785..6a208106f4 100644
--- a/Telegram/SourceFiles/data/data_shared_media.cpp
+++ b/Telegram/SourceFiles/data/data_shared_media.cpp
@@ -122,7 +122,7 @@ rpl::producer<SparseIdsSlice> SharedMediaViewer(
 				data.direction);
 		};
 		builder->insufficientAround(
-		) | rpl::start_with_next(requestMediaAround, lifetime);
+		) | rpl::on_next(requestMediaAround, lifetime);
 
 		auto pushNextSnapshot = [=] {
 			consumer.put_next(builder->snapshot());
@@ -137,7 +137,7 @@ rpl::producer<SparseIdsSlice> SharedMediaViewer(
 				&& (update.type == key.type);
 		}) | rpl::filter([=](const SliceUpdate &update) {
 			return builder->applyUpdate(update.data);
-		}) | rpl::start_with_next(pushNextSnapshot, lifetime);
+		}) | rpl::on_next(pushNextSnapshot, lifetime);
 
 		using OneRemoved = Storage::SharedMediaRemoveOne;
 		session->storage().sharedMediaOneRemoved(
@@ -146,7 +146,7 @@ rpl::producer<SparseIdsSlice> SharedMediaViewer(
 				&& update.types.test(key.type);
 		}) | rpl::filter([=](const OneRemoved &update) {
 			return builder->removeOne(update.messageId);
-		}) | rpl::start_with_next(pushNextSnapshot, lifetime);
+		}) | rpl::on_next(pushNextSnapshot, lifetime);
 
 		using AllRemoved = Storage::SharedMediaRemoveAll;
 		session->storage().sharedMediaAllRemoved(
@@ -159,7 +159,7 @@ rpl::producer<SparseIdsSlice> SharedMediaViewer(
 				&& update.types.test(key.type);
 		}) | rpl::filter([=] {
 			return builder->removeAll();
-		}) | rpl::start_with_next(pushNextSnapshot, lifetime);
+		}) | rpl::on_next(pushNextSnapshot, lifetime);
 
 		using InvalidateBottom = Storage::SharedMediaInvalidateBottom;
 		session->storage().sharedMediaBottomInvalidated(
@@ -167,7 +167,7 @@ rpl::producer<SparseIdsSlice> SharedMediaViewer(
 			return (update.peerId == key.peerId);
 		}) | rpl::filter([=] {
 			return builder->invalidateBottom();
-		}) | rpl::start_with_next(pushNextSnapshot, lifetime);
+		}) | rpl::on_next(pushNextSnapshot, lifetime);
 
 		using Result = Storage::SharedMediaResult;
 		session->storage().query(Storage::SharedMediaQuery(
@@ -176,7 +176,7 @@ rpl::producer<SparseIdsSlice> SharedMediaViewer(
 			limitAfter
 		)) | rpl::filter([=](const Result &result) {
 			return builder->applyInitial(result);
-		}) | rpl::start_with_next_done(
+		}) | rpl::on_next_done(
 			pushNextSnapshot,
 			[=] { builder->checkInsufficient(); },
 			lifetime);
@@ -501,7 +501,7 @@ rpl::producer<SharedMediaWithLastSlice> SharedMediaWithLastViewer(
 				std::move(viewerKey),
 				limitBefore,
 				limitAfter
-			) | rpl::start_with_next([=](SparseIdsMergedSlice &&update) {
+			) | rpl::on_next([=](SparseIdsMergedSlice &&update) {
 				consumer.put_next(SharedMediaWithLastSlice(
 					session,
 					key,
@@ -516,7 +516,7 @@ rpl::producer<SharedMediaWithLastSlice> SharedMediaWithLastViewer(
 				std::move(viewerKey),
 				limitBefore,
 				limitAfter
-			) | rpl::start_with_next([=](SparseIdsMergedSlice &&update) {
+			) | rpl::on_next([=](SparseIdsMergedSlice &&update) {
 				consumer.put_next(SharedMediaWithLastSlice(
 					session,
 					key,
@@ -529,7 +529,7 @@ rpl::producer<SharedMediaWithLastSlice> SharedMediaWithLastViewer(
 				std::move(viewerKey),
 				limitBefore,
 				limitAfter
-			) | rpl::start_with_next([=](SparseIdsMergedSlice &&update) {
+			) | rpl::on_next([=](SparseIdsMergedSlice &&update) {
 				consumer.put_next(SharedMediaWithLastSlice(
 					session,
 					key,
@@ -550,7 +550,7 @@ rpl::producer<SharedMediaWithLastSlice> SharedMediaWithLastViewer(
 					key.type),
 				1,
 				1)
-		) | rpl::start_with_next([=](
+		) | rpl::on_next([=](
 				SparseIdsMergedSlice &&viewer,
 				SparseIdsMergedSlice &&ending) {
 			consumer.put_next(SharedMediaWithLastSlice(
diff --git a/Telegram/SourceFiles/data/data_sparse_ids.cpp b/Telegram/SourceFiles/data/data_sparse_ids.cpp
index 787c0148a3..1f11a04242 100644
--- a/Telegram/SourceFiles/data/data_sparse_ids.cpp
+++ b/Telegram/SourceFiles/data/data_sparse_ids.cpp
@@ -399,7 +399,7 @@ rpl::producer<SparseIdsMergedSlice> SparseIdsMergedSlice::CreateViewer(
 		if (!key.migratedPeerId) {
 			return std::move(
 				partViewer
-			) | rpl::start_with_next([=](SparseIdsSlice &&part) {
+			) | rpl::on_next([=](SparseIdsSlice &&part) {
 				consumer.put_next(SparseIdsMergedSlice(
 					key,
 					std::move(part),
@@ -416,7 +416,7 @@ rpl::producer<SparseIdsMergedSlice> SparseIdsMergedSlice::CreateViewer(
 		return rpl::combine(
 			std::move(partViewer),
 			std::move(migratedViewer)
-		) | rpl::start_with_next([=](
+		) | rpl::on_next([=](
 				SparseIdsSlice &&part,
 				SparseIdsSlice &&migrated) {
 			consumer.put_next(SparseIdsMergedSlice(
diff --git a/Telegram/SourceFiles/data/data_stories.cpp b/Telegram/SourceFiles/data/data_stories.cpp
index 6f69b9538e..dfa73b25ad 100644
--- a/Telegram/SourceFiles/data/data_stories.cpp
+++ b/Telegram/SourceFiles/data/data_stories.cpp
@@ -193,7 +193,7 @@ Stories::Stories(not_null<Session*> owner)
 	crl::on_main(this, [=] {
 		session().changes().peerUpdates(
 			Data::PeerUpdate::Flag::Rights
-		) | rpl::start_with_next([=](const Data::PeerUpdate &update) {
+		) | rpl::on_next([=](const Data::PeerUpdate &update) {
 			const auto channel = update.peer->asChannel();
 			if (!channel) {
 				return;
diff --git a/Telegram/SourceFiles/data/data_stories_ids.cpp b/Telegram/SourceFiles/data/data_stories_ids.cpp
index 04b36e148e..d6e85edd56 100644
--- a/Telegram/SourceFiles/data/data_stories_ids.cpp
+++ b/Telegram/SourceFiles/data/data_stories_ids.cpp
@@ -83,7 +83,7 @@ rpl::producer<StoriesIdsSlice> AlbumStoriesIds(
 		stories->albumIdsChanged(
 		) | rpl::filter(
 			rpl::mappers::_1 == Data::StoryAlbumIdsKey{ peerId, albumId }
-		) | rpl::start_with_next(schedule, lifetime);
+		) | rpl::on_next(schedule, lifetime);
 
 		if (!stories->albumIdsCountKnown(peerId, albumId)) {
 			stories->albumIdsLoadMore(peerId, albumId);
diff --git a/Telegram/SourceFiles/data/data_user.cpp b/Telegram/SourceFiles/data/data_user.cpp
index 2d55a60698..f1a52958a4 100644
--- a/Telegram/SourceFiles/data/data_user.cpp
+++ b/Telegram/SourceFiles/data/data_user.cpp
@@ -917,7 +917,7 @@ void ApplyUserUpdate(not_null<UserData*> user, const MTPDuserFull &update) {
 				}
 				creditsLoadLifetime->destroy();
 			});
-			base::timer_once(kTimeout) | rpl::start_with_next([=] {
+			base::timer_once(kTimeout) | rpl::on_next([=] {
 				creditsLoadLifetime->destroy();
 			}, *creditsLoadLifetime);
 			const auto currencyLoadLifetime
@@ -930,13 +930,13 @@ void ApplyUserUpdate(not_null<UserData*> user, const MTPDuserFull &update) {
 				}
 				currencyLoadLifetime->destroy();
 			};
-			currencyLoad->request() | rpl::start_with_error_done(
+			currencyLoad->request() | rpl::on_error_done(
 				[=](const QString &error) {
 					apply(CreditsAmount(0, CreditsType::Ton));
 				},
 				[=] { apply(currencyLoad->data().currentBalance); },
 				*currencyLoadLifetime);
-			base::timer_once(kTimeout) | rpl::start_with_next([=] {
+			base::timer_once(kTimeout) | rpl::on_next([=] {
 				currencyLoadLifetime->destroy();
 			}, *currencyLoadLifetime);
 		}
diff --git a/Telegram/SourceFiles/data/data_user_photos.cpp b/Telegram/SourceFiles/data/data_user_photos.cpp
index 6271f9b4c9..74553e6319 100644
--- a/Telegram/SourceFiles/data/data_user_photos.cpp
+++ b/Telegram/SourceFiles/data/data_user_photos.cpp
@@ -203,16 +203,16 @@ rpl::producer<UserPhotosSlice> UserPhotosViewer(
 				photoId);
 		};
 		builder->insufficientPhotosAround()
-			| rpl::start_with_next(std::move(requestPhotosAround), lifetime);
+			| rpl::on_next(std::move(requestPhotosAround), lifetime);
 
 		session->storage().userPhotosSliceUpdated()
-			| rpl::start_with_next(applyUpdate, lifetime);
+			| rpl::on_next(applyUpdate, lifetime);
 
 		session->storage().query(Storage::UserPhotosQuery(
 			key,
 			limitBefore,
 			limitAfter
-		)) | rpl::start_with_next_done(
+		)) | rpl::on_next_done(
 			applyUpdate,
 			[=] { builder->checkInsufficientPhotos(); },
 			lifetime);
@@ -247,7 +247,7 @@ std::optional<PhotoId> SyncUserFallbackPhotoViewer(not_null<UserData*> user) {
 		Storage::UserPhotosKey(peerToUser(user->id), true),
 		kFallbackCount,
 		kFallbackCount
-	)) | rpl::start_with_next([&](Storage::UserPhotosResult &&slice) {
+	)) | rpl::on_next([&](Storage::UserPhotosResult &&slice) {
 		if (slice.photoIds.empty()) {
 			return;
 		}
diff --git a/Telegram/SourceFiles/data/notify/data_notify_settings.cpp b/Telegram/SourceFiles/data/notify/data_notify_settings.cpp
index 299b7fc61b..d0df98687c 100644
--- a/Telegram/SourceFiles/data/notify/data_notify_settings.cpp
+++ b/Telegram/SourceFiles/data/notify/data_notify_settings.cpp
@@ -321,7 +321,7 @@ void NotifySettings::updateLocal(not_null<Thread*> thread) {
 		auto &lifetime = _mutedTopics.emplace(
 			topic,
 			rpl::lifetime()).first->second;
-		topic->destroyed() | rpl::start_with_next([=] {
+		topic->destroyed() | rpl::on_next([=] {
 			_mutedTopics.erase(topic);
 		}, lifetime);
 		unmuteByFinishedDelayed(changesIn);
@@ -385,7 +385,7 @@ void NotifySettings::cacheSound(const std::optional<NotifySound> &sound) {
 	}
 	// Not requested yet.
 	_owner->session().api().ringtones().listUpdates(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		for (const auto id : base::take(_ringtones.pendingIds)) {
 			cacheSound(id);
 		}
diff --git a/Telegram/SourceFiles/data/stickers/data_custom_emoji.cpp b/Telegram/SourceFiles/data/stickers/data_custom_emoji.cpp
index 840249d8ef..a90656303c 100644
--- a/Telegram/SourceFiles/data/stickers/data_custom_emoji.cpp
+++ b/Telegram/SourceFiles/data/stickers/data_custom_emoji.cpp
@@ -259,7 +259,7 @@ void CustomEmojiLoader::load(Fn<void(LoadResult)> loaded) {
 				check();
 			} else {
 				load->document->session().downloaderTaskFinished(
-				) | rpl::start_with_next([=] {
+				) | rpl::on_next([=] {
 					check();
 				}, load->process->lifetime);
 			}
@@ -463,7 +463,7 @@ CustomEmojiManager::CustomEmojiManager(not_null<Session*> owner)
 	appConfig->value(
 	) | rpl::take_while([=] {
 		return !_coloredSetId;
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		const auto setId = appConfig->get<QString>(
 			"default_emoji_statuses_stickerset_id",
 			QString()).toULongLong();
@@ -917,7 +917,7 @@ void CustomEmojiManager::scheduleRepaintTimer() {
 #if 0 // inject-to-on_main
 	if (!_repaintsLifetime) {
 		crl::on_main_update_requests(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			invokeRepaints();
 		}, _repaintsLifetime);
 	}
diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
index ac1273e4a9..dc6f0bafbd 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
@@ -206,7 +206,7 @@ constexpr auto kPreviewPostsLimit = 3;
 		rpl::single(std::move(text)));
 	if (suggestAllChats) {
 		result->handlerActivated(
-		) | rpl::start_with_next(resetChatTypeFilter, result->lifetime());
+		) | rpl::on_next(resetChatTypeFilter, result->lifetime());
 	}
 	result->show();
 	result->resizeToWidth(parent->width());
@@ -291,7 +291,7 @@ InnerWidget::InnerWidget(
 	setAttribute(Qt::WA_OpaquePaintEvent, true);
 
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_topicJumpCache = nullptr;
 		_chatsFilterTags.clear();
 		_rightButtons.clear();
@@ -304,12 +304,12 @@ InnerWidget::InnerWidget(
 	}, lifetime());
 
 	session().downloaderTaskFinished(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		update();
 	}, lifetime());
 
 	Core::App().notifications().settingsChanged(
-	) | rpl::start_with_next([=](Window::Notifications::ChangeType change) {
+	) | rpl::on_next([=](Window::Notifications::ChangeType change) {
 		if (change == Window::Notifications::ChangeType::CountMessages) {
 			// Folder rows change their unread badge with this setting.
 			update();
@@ -317,23 +317,23 @@ InnerWidget::InnerWidget(
 	}, lifetime());
 
 	session().data().contactsLoaded().changes(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		refresh();
 		refreshEmpty();
 	}, lifetime());
 
 	session().data().itemRemoved(
-	) | rpl::start_with_next([=](not_null<const HistoryItem*> item) {
+	) | rpl::on_next([=](not_null<const HistoryItem*> item) {
 		itemRemoved(item);
 	}, lifetime());
 
 	session().data().dialogsRowReplacements(
-	) | rpl::start_with_next([=](Data::Session::DialogsRowReplacement r) {
+	) | rpl::on_next([=](Data::Session::DialogsRowReplacement r) {
 		dialogRowReplaced(r.old, r.now);
 	}, lifetime());
 
 	session().data().sendActionManager().animationUpdated(
-	) | rpl::start_with_next([=](
+	) | rpl::on_next([=](
 			const Data::SendActionManager::AnimationUpdate &update) {
 		const auto updateRect = Ui::RowPainter::SendActionAnimationRect(
 			update.thread,
@@ -348,7 +348,7 @@ InnerWidget::InnerWidget(
 	}, lifetime());
 
 	session().data().sendActionManager().speakingAnimationUpdated(
-	) | rpl::start_with_next([=](not_null<History*> history) {
+	) | rpl::on_next([=](not_null<History*> history) {
 		repaintDialogRowCornerStatus(history);
 	}, lifetime());
 
@@ -361,7 +361,7 @@ InnerWidget::InnerWidget(
 		return !_savedSublists
 			&& !_openedForum
 			&& (folder == _openedFolder);
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		refresh();
 	}, lifetime());
 
@@ -370,7 +370,7 @@ InnerWidget::InnerWidget(
 		session().data().chatsFilters().changed() | rpl::map_to(true),
 		session().data().chatsFilters().tagsEnabledChanges(
 		) | rpl::map_to(true)
-	) | rpl::start_with_next([=](bool refreshHeight) {
+	) | rpl::on_next([=](bool refreshHeight) {
 		if (refreshHeight) {
 			_chatsFilterTags.clear();
 			_shownList->updateHeights(_narrowRatio);
@@ -379,7 +379,7 @@ InnerWidget::InnerWidget(
 	}, lifetime());
 
 	session().data().chatsFilters().tagsEnabledValue(
-	) | rpl::start_with_next([=](bool tags) {
+	) | rpl::on_next([=](bool tags) {
 		_handleChatListEntryTagRefreshesLifetime.destroy();
 		if (!tags) {
 			return;
@@ -397,7 +397,7 @@ InnerWidget::InnerWidget(
 				}
 			}
 			return false;
-		}) | rpl::start_with_next([=](const Event &event) {
+		}) | rpl::on_next([=](const Event &event) {
 			Ui::PostponeCall(crl::guard(this, [=] {
 				_waitingAllChatListEntryRefreshesForTags = false;
 				if (_shownList->updateHeights(_narrowRatio)) {
@@ -407,7 +407,7 @@ InnerWidget::InnerWidget(
 		}, _handleChatListEntryTagRefreshesLifetime);
 
 		session().data().chatsFilters().tagColorChanged(
-		) | rpl::start_with_next([=](Data::TagColorChanged data) {
+		) | rpl::on_next([=](Data::TagColorChanged data) {
 			const auto filterId = data.filterId;
 			const auto key = SerializeFilterTagsKey(filterId, 0, false);
 			const auto activeKey = SerializeFilterTagsKey(filterId, 0, true);
@@ -442,14 +442,14 @@ InnerWidget::InnerWidget(
 	}, lifetime());
 
 	session().settings().archiveInMainMenuChanges(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		refresh();
 	}, lifetime());
 
 	session().changes().historyUpdates(
 		Data::HistoryUpdate::Flag::IsPinned
 		| Data::HistoryUpdate::Flag::ChatOccupied
-	) | rpl::start_with_next([=](const Data::HistoryUpdate &update) {
+	) | rpl::on_next([=](const Data::HistoryUpdate &update) {
 		if (update.flags & Data::HistoryUpdate::Flag::IsPinned) {
 			stopReorderPinned();
 		}
@@ -466,7 +466,7 @@ InnerWidget::InnerWidget(
 		| UpdateFlag::IsContact
 		| UpdateFlag::FullInfo
 		| UpdateFlag::EmojiStatus
-	) | rpl::start_with_next([=](const Data::PeerUpdate &update) {
+	) | rpl::on_next([=](const Data::PeerUpdate &update) {
 		if (update.flags
 			& (UpdateFlag::Name
 				| UpdateFlag::Photo
@@ -491,14 +491,14 @@ InnerWidget::InnerWidget(
 
 	session().changes().messageUpdates(
 		Data::MessageUpdate::Flag::DialogRowRefresh
-	) | rpl::start_with_next([=](const Data::MessageUpdate &update) {
+	) | rpl::on_next([=](const Data::MessageUpdate &update) {
 		refreshDialogRow({ update.item->history(), update.item->fullId() });
 	}, lifetime());
 
 	session().changes().entryUpdates(
 		Data::EntryUpdate::Flag::Repaint
 		| Data::EntryUpdate::Flag::Height
-	) | rpl::start_with_next([=](const Data::EntryUpdate &update) {
+	) | rpl::on_next([=](const Data::EntryUpdate &update) {
 		const auto entry = update.entry;
 		if (update.flags & Data::EntryUpdate::Flag::Height) {
 			if (updateEntryHeight(entry)) {
@@ -520,7 +520,7 @@ InnerWidget::InnerWidget(
 
 	_controller->activeChatEntryValue(
 	) | rpl::combine_previous(
-	) | rpl::start_with_next([=](
+	) | rpl::on_next([=](
 			RowDescriptor previous,
 			RowDescriptor next) {
 		const auto update = [&](const RowDescriptor &descriptor) {
@@ -545,12 +545,12 @@ InnerWidget::InnerWidget(
 	}, lifetime());
 
 	_controller->activeChatsFilter(
-	) | rpl::start_with_next([=](FilterId filterId) {
+	) | rpl::on_next([=](FilterId filterId) {
 		switchToFilter(filterId);
 	}, lifetime());
 
 	_controller->window().widget()->globalForceClicks(
-	) | rpl::start_with_next([=](QPoint globalPosition) {
+	) | rpl::on_next([=](QPoint globalPosition) {
 		processGlobalForceClick(globalPosition);
 	}, lifetime());
 
@@ -780,7 +780,7 @@ void InnerWidget::changeOpenedForum(Data::Forum *forum) {
 		rpl::merge(
 			forum->chatsListChanges(),
 			forum->chatsListLoadedEvents()
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			refresh();
 		}, _openedForumLifetime);
 	}
@@ -812,7 +812,7 @@ void InnerWidget::showSavedSublists() {
 	_openedForumLifetime.destroy();
 
 	//session().data().savedMessages().chatsListChanges(
-	//) | rpl::start_with_next([=] {
+	//) | rpl::on_next([=] {
 	//	refresh();
 	//}, lifetime());
 
@@ -2751,7 +2751,7 @@ void InnerWidget::handleChatListEntryRefreshes() {
 		} else {
 			return !_openedForum;
 		}
-	}) | rpl::start_with_next([=](const Event &event) {
+	}) | rpl::on_next([=](const Event &event) {
 		const auto offset = dialogsOffset();
 		const auto from = offset + event.moved.from;
 		const auto to = offset + event.moved.to;
@@ -3441,13 +3441,13 @@ void InnerWidget::applySearchState(SearchState state) {
 			reactions->myTagsValue(sublist),
 			state.tags);
 
-		_searchTags->repaintRequests() | rpl::start_with_next([=] {
+		_searchTags->repaintRequests() | rpl::on_next([=] {
 			const auto height = _searchTags->height();
 			update(0, 0, width(), height);
 		}, _searchTags->lifetime());
 
 		_searchTags->menuRequests(
-		) | rpl::start_with_next([=](Data::ReactionId id) {
+		) | rpl::on_next([=](Data::ReactionId id) {
 			HistoryView::ShowTagInListMenu(
 				&_menu,
 				_lastMousePosition.value_or(QCursor::pos()),
@@ -3458,7 +3458,7 @@ void InnerWidget::applySearchState(SearchState state) {
 
 		_searchTags->heightValue() | rpl::skip(
 			1
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			refresh();
 			moveSearchIn();
 			if (_loadingAnimation) {
@@ -3645,7 +3645,7 @@ void InnerWidget::trackResultsHistory(not_null<History*> history) {
 		) | rpl::filter([=](const ChannelData::Flags::Change &change) {
 			return (change.diff & ChannelDataFlag::Forum);
 		}) | rpl::to_empty | rpl::type_erased;
-	std::move(changes) | rpl::start_with_next([=] {
+	std::move(changes) | rpl::on_next([=] {
 		for (const auto &row : _searchResults) {
 			if (row->item()->history()->peer == peer) {
 				row->invalidateTopic();
@@ -3678,7 +3678,7 @@ void InnerWidget::trackResultsHistory(not_null<History*> history) {
 
 	if (const auto forum = peer->forum()) {
 		forum->topicDestroyed(
-		) | rpl::start_with_next([=](not_null<Data::ForumTopic*> topic) {
+		) | rpl::on_next([=](not_null<Data::ForumTopic*> topic) {
 			auto removed = false;
 			const auto sfrom = ranges::remove(
 				_searchResults,
@@ -4204,13 +4204,13 @@ void InnerWidget::refreshEmpty() {
 		_emptyButton->setClickedCallback([=, window = _controller] {
 			window->show(PrepareContactsBox(window));
 		});
-		geometryValue() | rpl::start_with_next([=](const QRect &r) {
+		geometryValue() | rpl::on_next([=](const QRect &r) {
 			const auto top = r.height()
 				- _emptyButton->height()
 				- st::dialogEmptyButtonSkip;
 			_emptyButton->moveToLeft(st::dialogEmptyButtonSkip, top);
 		}, _emptyButton->lifetime());
-		geometryValue() | rpl::start_with_next([=](const QRect &r) {
+		geometryValue() | rpl::on_next([=](const QRect &r) {
 			const auto bottom = _emptyButton
 				? (_emptyButton->height() + st::dialogEmptyButtonSkip)
 				: 0;
@@ -5153,7 +5153,7 @@ void InnerWidget::setupOnlineStatusCheck() {
 		Data::PeerUpdate::Flag::OnlineStatus
 		| Data::PeerUpdate::Flag::GroupCall
 		| Data::PeerUpdate::Flag::MessagesTTL
-	) | rpl::start_with_next([=](const Data::PeerUpdate &update) {
+	) | rpl::on_next([=](const Data::PeerUpdate &update) {
 		const auto &peer = update.peer;
 		if (const auto user = peer->asUser()) {
 			if (user->isSelf()) {
@@ -5265,7 +5265,7 @@ void InnerWidget::setupShortcuts() {
 			&& !_controller->window().locked()
 			&& !_childListShown.current().shown
 			&& !_chatPreviewRow.key;
-	}) | rpl::start_with_next([=](not_null<Shortcuts::Request*> request) {
+	}) | rpl::on_next([=](not_null<Shortcuts::Request*> request) {
 		using Command = Shortcuts::Command;
 
 		const auto row = _controller->activeChatEntryCurrent();
diff --git a/Telegram/SourceFiles/dialogs/dialogs_main_list.cpp b/Telegram/SourceFiles/dialogs/dialogs_main_list.cpp
index c38d844ef0..affe4fab3d 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_main_list.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_main_list.cpp
@@ -27,12 +27,12 @@ MainList::MainList(
 
 	std::move(
 		pinnedLimit
-	) | rpl::start_with_next([=](int limit) {
+	) | rpl::on_next([=](int limit) {
 		_pinned.setLimit(std::max(limit, 1));
 	}, _lifetime);
 
 	session->changes().realtimeNameUpdates(
-	) | rpl::start_with_next([=](const Data::NameUpdate &update) {
+	) | rpl::on_next([=](const Data::NameUpdate &update) {
 		_all.peerNameChanged(_filterId, update.peer, update.oldFirstLetters);
 	}, _lifetime);
 }
diff --git a/Telegram/SourceFiles/dialogs/dialogs_search_from_controllers.cpp b/Telegram/SourceFiles/dialogs/dialogs_search_from_controllers.cpp
index b81e79f7b3..8790507de5 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_search_from_controllers.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_search_from_controllers.cpp
@@ -41,7 +41,7 @@ object_ptr<Ui::BoxContent> SearchFromBox(
 					box->closeBox();
 				});
 			});
-		box->boxClosing() | rpl::start_with_next(
+		box->boxClosing() | rpl::on_next(
 			std::move(closedCallback),
 			*subscription);
 		return box;
diff --git a/Telegram/SourceFiles/dialogs/dialogs_search_posts.cpp b/Telegram/SourceFiles/dialogs/dialogs_search_posts.cpp
index 626c96151f..0bf32a752c 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_search_posts.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_search_posts.cpp
@@ -33,7 +33,7 @@ PostsSearch::PostsSearch(not_null<Main::Session*> session)
 , _api(&_session->api().instance())
 , _timer([=] { applyQuery(); })
 , _recheckTimer([=] { recheck(); }) {
-	Data::AmPremiumValue(_session) | rpl::start_with_next([=] {
+	Data::AmPremiumValue(_session) | rpl::on_next([=] {
 		maybePushPremiumUpdate();
 	}, _lifetime);
 }
diff --git a/Telegram/SourceFiles/dialogs/dialogs_search_tags.cpp b/Telegram/SourceFiles/dialogs/dialogs_search_tags.cpp
index 61272816a0..d9cff28865 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_search_tags.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_search_tags.cpp
@@ -92,7 +92,7 @@ SearchTags::SearchTags(
 	rpl::combine(
 		std::move(tags),
 		Data::AmPremiumValue(&owner->session())
-	) | rpl::start_with_next([=](
+	) | rpl::on_next([=](
 			const std::vector<Data::Reaction> &list,
 			bool premium) {
 		fill(list, premium);
@@ -107,7 +107,7 @@ SearchTags::SearchTags(
 	}
 
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_normalBg = _selectedBg = QImage();
 	}, _lifetime);
 }
diff --git a/Telegram/SourceFiles/dialogs/dialogs_top_bar_suggestion.cpp b/Telegram/SourceFiles/dialogs/dialogs_top_bar_suggestion.cpp
index f20493ae81..51d034522a 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_top_bar_suggestion.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_top_bar_suggestion.cpp
@@ -204,7 +204,7 @@ rpl::producer<Ui::SlideWrap<Ui::RpWidget>*> TopBarSuggestionValue(
 				rpl::combine(
 					parent->widthValue(),
 					state->content->desiredHeightValue()
-				) | rpl::start_with_next([=](int width, int height) {
+				) | rpl::on_next([=](int width, int height) {
 					state->content->resize(width, height);
 				}, state->content->lifetime());
 			}
@@ -292,7 +292,7 @@ rpl::producer<Ui::SlideWrap<Ui::RpWidget>*> TopBarSuggestionValue(
 				const auto button = lifetime.template make_state<Button>();
 				const auto window = FindSessionController(parent);
 				auctions->active(
-				) | rpl::start_with_next([=](ActiveAuctions &&active) {
+				) | rpl::on_next([=](ActiveAuctions &&active) {
 					const auto empty = active.list.empty();
 					state->desiredWrapToggle.force_assign(
 						Toggle{ !empty, anim::type::normal });
@@ -425,7 +425,7 @@ rpl::producer<Ui::SlideWrap<Ui::RpWidget>*> TopBarSuggestionValue(
 				};
 				session->credits().load();
 				state->creditsLifetime.destroy();
-				session->credits().balanceValue() | rpl::start_with_next([=] {
+				session->credits().balanceValue() | rpl::on_next([=] {
 					state->creditsLifetime.destroy();
 					state->creditsHistory->requestSubscriptions(
 						Data::CreditsStatusSlice::OffsetToken(),
@@ -513,7 +513,7 @@ rpl::producer<Ui::SlideWrap<Ui::RpWidget>*> TopBarSuggestionValue(
 						widget->setAttribute(
 							Qt::WA_TransparentForMouseEvents);
 						content->sizeValue() | rpl::filter_size(
-						) | rpl::start_with_next([=](const QSize &size) {
+						) | rpl::on_next([=](const QSize &size) {
 							widget->resize(size);
 							widget->show();
 							widget->raise();
@@ -523,7 +523,7 @@ rpl::producer<Ui::SlideWrap<Ui::RpWidget>*> TopBarSuggestionValue(
 								s->inRow.push_back({ .peer = user });
 							}
 						}
-						widget->paintRequest() | rpl::start_with_next([=] {
+						widget->paintRequest() | rpl::on_next([=] {
 							auto p = QPainter(widget);
 							const auto regenerate = [&] {
 								if (s->userpics.isNull()) {
@@ -573,7 +573,7 @@ rpl::producer<Ui::SlideWrap<Ui::RpWidget>*> TopBarSuggestionValue(
 						rpl::combine(
 							state->leftPadding.value(),
 							content->sizeValue() | rpl::filter_size()
-						) | rpl::start_with_next([=](int p, const QSize &s) {
+						) | rpl::on_next([=](int p, const QSize &s) {
 							fake->raise();
 							fake->show();
 							fake->moveToLeft(
@@ -605,7 +605,7 @@ rpl::producer<Ui::SlideWrap<Ui::RpWidget>*> TopBarSuggestionValue(
 						Data::IsBirthdayTodayValue
 					) | rpl::flatten_latest(
 					) | rpl::distinct_until_changed(
-					) | rpl::start_with_next([=] {
+					) | rpl::on_next([=] {
 						repeat(repeat);
 					});
 				});
@@ -667,7 +667,7 @@ rpl::producer<Ui::SlideWrap<Ui::RpWidget>*> TopBarSuggestionValue(
 					content->setRightIcon(RightIcon::Arrow);
 					content->setLeftPadding(state->leftPadding.value());
 					const auto api = &session->api().premium();
-					api->statusTextValue() | rpl::start_with_next([=] {
+					api->statusTextValue() | rpl::on_next([=] {
 						for (const auto &o : api->subscriptionOptions()) {
 							if (o.months == 12) {
 								set(o.discount);
@@ -692,7 +692,7 @@ rpl::producer<Ui::SlideWrap<Ui::RpWidget>*> TopBarSuggestionValue(
 				rpl::combine(
 					state->leftPadding.value(),
 					content->sizeValue() | rpl::filter_size()
-				) | rpl::start_with_next([=](int padding, const QSize &s) {
+				) | rpl::on_next([=](int padding, const QSize &s) {
 					upload->raise();
 					upload->show();
 					upload->moveToLeft(
@@ -700,7 +700,7 @@ rpl::producer<Ui::SlideWrap<Ui::RpWidget>*> TopBarSuggestionValue(
 						(s.height() - upload->height()) / 2);
 				}, content->lifetime());
 				setLeftPaddingRelativeTo(content, upload);
-				upload->chosenImages() | rpl::start_with_next([=](
+				upload->chosenImages() | rpl::on_next([=](
 						Ui::UserpicButton::ChosenImage &&chosen) {
 					if (chosen.type == Ui::UserpicButton::ChosenType::Set) {
 						session->api().peerPhoto().upload(
@@ -716,7 +716,7 @@ rpl::producer<Ui::SlideWrap<Ui::RpWidget>*> TopBarSuggestionValue(
 				state->userpicLifetime = session->changes().peerUpdates(
 					session->user(),
 					Data::PeerUpdate::Flag::Photo
-				) | rpl::start_with_next([=] {
+				) | rpl::on_next([=] {
 					if (session->user()->userpicPhotoId()) {
 						repeat(repeat);
 					}
@@ -762,7 +762,7 @@ rpl::producer<Ui::SlideWrap<Ui::RpWidget>*> TopBarSuggestionValue(
 		state->desiredWrapToggle.value() | rpl::combine_previous(
 		) | rpl::filter([=] {
 			return state->wrap != nullptr;
-		}) | rpl::start_with_next([=](Toggle was, Toggle now) {
+		}) | rpl::on_next([=](Toggle was, Toggle now) {
 			state->wrap->toggle(
 				state->outerWrapToggle.current() && now.value,
 				(was.value == now.value)
@@ -773,7 +773,7 @@ rpl::producer<Ui::SlideWrap<Ui::RpWidget>*> TopBarSuggestionValue(
 		state->outerWrapToggle.value() | rpl::combine_previous(
 		) | rpl::filter([=] {
 			return state->wrap != nullptr;
-		}) | rpl::start_with_next([=](bool was, bool now) {
+		}) | rpl::on_next([=](bool was, bool now) {
 			const auto toggle = state->desiredWrapToggle.current();
 			state->wrap->toggle(
 				toggle.value && now,
@@ -785,7 +785,7 @@ rpl::producer<Ui::SlideWrap<Ui::RpWidget>*> TopBarSuggestionValue(
 			session->api().authorizations().unreviewedChanges(),
 			Data::AmPremiumValue(session) | rpl::skip(1) | rpl::to_empty,
 			session->giftAuctions().hasActiveChanges() | rpl::to_empty
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			const auto was = state->wrap.get();
 			const auto weak = base::make_weak(was);
 			processCurrentSuggestion(processCurrentSuggestion);
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index dc4d7b10c9..a6ae631f80 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -223,7 +223,7 @@ Widget::BottomButton::BottomButton(
 	if (_hasTextIcon) {
 		rpl::single(rpl::empty_value()) | rpl::then(
 			style::PaletteChanged()
-		) | rpl::start_with_next([this] {
+		) | rpl::on_next([this] {
 			_textIcon = UpdateIcon();
 		}, lifetime());
 	}
@@ -392,12 +392,12 @@ Widget::Widget(
 	rpl::combine(
 		_scroll->heightValue(),
 		_topBarSuggestionHeightChanged.events_starting_with(0)
-	) | rpl::start_with_next([=](int height, int topBarHeight) {
+	) | rpl::on_next([=](int height, int topBarHeight) {
 		innerList->setMinimumHeight(height);
 		_inner->setMinimumHeight(height - topBarHeight);
 		_inner->refresh();
 	}, innerList->lifetime());
-	_scroll->widthValue() | rpl::start_with_next([=](int width) {
+	_scroll->widthValue() | rpl::on_next([=](int width) {
 		innerList->resizeToWidth(width);
 	}, innerList->lifetime());
 	_scrollToTop->raise();
@@ -405,14 +405,14 @@ Widget::Widget(
 
 
 	_inner->updated(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		listScrollUpdated();
 	}, lifetime());
 
 	rpl::combine(
 		session().api().dialogsLoadMayBlockByDate(),
 		session().api().dialogsLoadBlockedByDate()
-	) | rpl::start_with_next([=](bool mayBlock, bool isBlocked) {
+	) | rpl::on_next([=](bool mayBlock, bool isBlocked) {
 		refreshLoadMoreButton(mayBlock, isBlocked);
 	}, lifetime());
 
@@ -429,7 +429,7 @@ Widget::Widget(
 				&& !update.history->isPinnedDialog(
 					controller->activeChatsFilterCurrent());
 		}
-	}) | rpl::start_with_next([=](const Data::HistoryUpdate &update) {
+	}) | rpl::on_next([=](const Data::HistoryUpdate &update) {
 		jumpToTop(true);
 	}, lifetime());
 
@@ -437,20 +437,20 @@ Widget::Widget(
 	) | rpl::to_empty);
 
 	_inner->scrollByDeltaRequests(
-	) | rpl::start_with_next([=](int delta) {
+	) | rpl::on_next([=](int delta) {
 		if (_scroll) {
 			_scroll->scrollToY(_scroll->scrollTop() + delta);
 		}
 	}, lifetime());
 
 	_inner->mustScrollTo(
-	) | rpl::start_with_next([=](const Ui::ScrollToRequest &data) {
+	) | rpl::on_next([=](const Ui::ScrollToRequest &data) {
 		if (_scroll) {
 			_scroll->scrollToY(data.ymin, data.ymax);
 		}
 	}, lifetime());
 	_inner->dialogMoved(
-	) | rpl::start_with_next([=](const Ui::ScrollToRequest &data) {
+	) | rpl::on_next([=](const Ui::ScrollToRequest &data) {
 		const auto movedFrom = data.ymin;
 		const auto movedTo = data.ymax;
 		const auto st = _scroll->scrollTop();
@@ -459,21 +459,21 @@ Widget::Widget(
 		}
 	}, lifetime());
 	_inner->searchRequests(
-	) | rpl::start_with_next([=](SearchRequestDelay delay) {
+	) | rpl::on_next([=](SearchRequestDelay delay) {
 		searchRequested(delay);
 	}, lifetime());
 	_inner->completeHashtagRequests(
-	) | rpl::start_with_next([=](const QString &tag) {
+	) | rpl::on_next([=](const QString &tag) {
 		completeHashtag(tag);
 	}, lifetime());
 	_inner->refreshHashtagsRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		searchCursorMoved();
 	}, lifetime());
 	_inner->changeSearchTabRequests(
 	) | rpl::filter([=](ChatSearchTab tab) {
 		return _searchState.tab != tab;
-	}) | rpl::start_with_next([=](ChatSearchTab tab) {
+	}) | rpl::on_next([=](ChatSearchTab tab) {
 		auto copy = _searchState;
 		copy.tab = tab;
 		applySearchState(std::move(copy));
@@ -482,13 +482,13 @@ Widget::Widget(
 	) | rpl::filter([=](ChatTypeFilter filter) {
 		return (_searchState.filter != filter)
 			&& (_searchState.tab == ChatSearchTab::MyMessages);
-	}) | rpl::start_with_next([=](ChatTypeFilter filter) {
+	}) | rpl::on_next([=](ChatTypeFilter filter) {
 		auto copy = _searchState;
 		copy.filter = filter;
 		applySearchState(copy);
 	}, lifetime());
 	_inner->cancelSearchRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		cancelSearch({
 			.forceFullCancel = true,
 			.jumpBackToSearchedChat = true,
@@ -496,7 +496,7 @@ Widget::Widget(
 		controller->widget()->setInnerFocus();
 	}, lifetime());
 	_inner->cancelSearchFromRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto copy = _searchState;
 		copy.fromPeer = nullptr;
 		if (copy.inChat.sublist()) {
@@ -505,33 +505,33 @@ Widget::Widget(
 		applySearchState(std::move(copy));
 	}, lifetime());
 	_inner->changeSearchFromRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		showSearchFrom();
 	}, lifetime());
 	_inner->chosenRow(
-	) | rpl::start_with_next([=](const ChosenRow &row) {
+	) | rpl::on_next([=](const ChosenRow &row) {
 		chosenRow(row);
 	}, lifetime());
 	_inner->openBotMainAppRequests(
-	) | rpl::start_with_next([=](UserId userId) {
+	) | rpl::on_next([=](UserId userId) {
 		if (const auto user = session().data().user(userId)) {
 			openBotMainApp(user);
 		}
 	}, lifetime());
 
 	_scroll->geometryChanged(
-	) | rpl::start_with_next(crl::guard(_inner, [=] {
+	) | rpl::on_next(crl::guard(_inner, [=] {
 		_inner->parentGeometryChanged();
 	}), lifetime());
 	_scroll->scrolls(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		listScrollUpdated();
 	}, lifetime());
 
 	session().data().chatsListChanges(
 	) | rpl::filter([=](Data::Folder *folder) {
 		return (folder == _inner->shownFolder());
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		Ui::PostponeCall(this, [=] { listScrollUpdated(); });
 	}, lifetime());
 
@@ -539,17 +539,17 @@ Widget::Widget(
 	controller->widget()->imeCompositionStarts(
 	) | rpl::filter([=] {
 		return redirectImeToSearch();
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		_search->setFocusFast();
 	}, lifetime());
 
 	_search->changes(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		crl::on_main(this, [=] { applySearchUpdate(); });
 	}, _search->lifetime());
 
 	_search->submits(
-	) | rpl::start_with_next([=] { submit(); }, _search->lifetime());
+	) | rpl::on_next([=] { submit(); }, _search->lifetime());
 
 	QObject::connect(
 		_search->rawTextEdit().get(),
@@ -565,7 +565,7 @@ Widget::Widget(
 			checker.isLatest(),
 			checker.failed(),
 			checker.ready()
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			checkUpdateStatus();
 		}, lifetime());
 	}
@@ -577,7 +577,7 @@ Widget::Widget(
 	_chooseFromUser->entity()->setClickedCallback([=] { showSearchFrom(); });
 	rpl::single(rpl::empty) | rpl::then(
 		session().domain().local().localPasscodeChanged()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateLockUnlockVisibility();
 	}, lifetime());
 	const auto lockUnlock = _lockUnlock->entity();
@@ -629,7 +629,7 @@ Widget::Widget(
 		}
 	});
 	_inner->listBottomReached(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		loadMoreBlockedByDate();
 	}, lifetime());
 
@@ -649,7 +649,7 @@ Widget::Widget(
 	};
 	_scroll->setOverscrollBg(overscrollBg());
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_scroll->setOverscrollBg(overscrollBg());
 	}, lifetime());
 
@@ -661,12 +661,12 @@ Widget::Widget(
 			anim::type::instant);
 
 		controller->openedFolder().changes(
-		) | rpl::start_with_next([=](Data::Folder *folder) {
+		) | rpl::on_next([=](Data::Folder *folder) {
 			changeOpenedFolder(folder, anim::type::normal);
 		}, lifetime());
 
 		controller->shownForum().changes(
-		) | rpl::filter(!rpl::mappers::_1) | rpl::start_with_next([=] {
+		) | rpl::filter(!rpl::mappers::_1) | rpl::on_next([=] {
 			if (_openedForum) {
 				changeOpenedForum(nullptr, anim::type::normal);
 			} else if (_childList) {
@@ -675,14 +675,14 @@ Widget::Widget(
 		}, lifetime());
 
 		_childListShown.changes(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			_scroll->setOverscrollBg(overscrollBg());
 			updateControlsGeometry();
 		}, lifetime());
 
 		_childListShown.changes(
 		) | rpl::filter((rpl::mappers::_1 == 0.) || (rpl::mappers::_1 == 1.)
-		) | rpl::start_with_next([=](float64 shown) {
+		) | rpl::on_next([=](float64 shown) {
 			const auto color = (shown > 0.) ? &st::dialogsRippleBg : nullptr;
 			_mainMenu.toggle->setRippleColorOverride(color);
 			_searchForNarrowLayout->setRippleColorOverride(color);
@@ -1042,7 +1042,7 @@ void Widget::setupTouchChatPreview() {
 	_scroll->setCustomTouchProcess([=](not_null<QTouchEvent*> e) {
 		return _inner->processTouchEvent(e);
 	});
-	_inner->touchCancelRequests() | rpl::start_with_next([=] {
+	_inner->touchCancelRequests() | rpl::on_next([=] {
 		QTouchEvent ev(QEvent::TouchCancel);
 		ev.setTimestamp(crl::now());
 		QGuiApplication::sendEvent(_scroll, &ev);
@@ -1051,7 +1051,7 @@ void Widget::setupTouchChatPreview() {
 
 void Widget::setupFrozenAccountBar() {
 	session().frozenValue(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateFrozenAccountBar();
 		updateControlsGeometry();
 	}, lifetime());
@@ -1065,7 +1065,7 @@ void Widget::setupTopBarSuggestions(not_null<Ui::VerticalLayout*> dialogs) {
 	crl::on_main(dialogs, [=] {
 		const auto owner = &session().data();
 		session().api().authorizations().unreviewedChanges(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			updateForceDisplayWide();
 		}, lifetime());
 		(owner->chatsListLoaded(nullptr)
@@ -1094,7 +1094,7 @@ void Widget::setupTopBarSuggestions(not_null<Ui::VerticalLayout*> dialogs) {
 					&& (id == owner->chatsFilters().defaultId());
 			});
 			return TopBarSuggestionValue(dialogs, &session(), std::move(on));
-		}) | rpl::flatten_latest() | rpl::start_with_next([=](
+		}) | rpl::flatten_latest() | rpl::on_next([=](
 				Ui::SlideWrap<Ui::RpWidget> *raw) {
 			if (raw) {
 				_topBarSuggestion = dialogs->insert(
@@ -1107,7 +1107,7 @@ void Widget::setupTopBarSuggestions(not_null<Ui::VerticalLayout*> dialogs) {
 				rpl::combine(
 					_topBarSuggestion->entity()->desiredHeightValue(),
 					_childListShown.value()
-				) | rpl::start_with_next([=](
+				) | rpl::on_next([=](
 						int desiredHeight,
 						float64 shown) {
 					const auto newHeight = desiredHeight * (1. - shown);
@@ -1153,7 +1153,7 @@ void Widget::setupMoreChatsBar() {
 		return;
 	}
 	controller()->activeChatsFilter(
-	) | rpl::start_with_next([=](FilterId id) {
+	) | rpl::on_next([=](FilterId id) {
 		storiesToggleExplicitExpand(false);
 		const auto cancelled = cancelSearch({ .forceFullCancel = true });
 		const auto guard = gsl::finally([&] {
@@ -1175,7 +1175,7 @@ void Widget::setupMoreChatsBar() {
 		trackScroll(_moreChatsBar->wrap());
 
 		_moreChatsBar->barClicks(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			if (const auto missing = filters->moreChats(id)
 				; !missing.empty()) {
 				Api::ProcessFilterUpdate(controller(), id, missing);
@@ -1183,7 +1183,7 @@ void Widget::setupMoreChatsBar() {
 		}, _moreChatsBar->lifetime());
 
 		_moreChatsBar->closeClicks(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			Api::ProcessFilterUpdate(controller(), id, {});
 		}, _moreChatsBar->lifetime());
 
@@ -1195,7 +1195,7 @@ void Widget::setupMoreChatsBar() {
 		}
 
 		_moreChatsBar->heightValue(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			updateControlsGeometry();
 		}, _moreChatsBar->lifetime());
 	}, lifetime());
@@ -1207,7 +1207,7 @@ void Widget::setupDownloadBar() {
 	}
 
 	Data::MakeDownloadBarContent(
-	) | rpl::start_with_next([=](Ui::DownloadBarContent &&content) {
+	) | rpl::on_next([=](Ui::DownloadBarContent &&content) {
 		const auto create = (content.count && !_downloadBar);
 		if (create) {
 			_downloadBar = std::make_unique<Ui::DownloadBar>(
@@ -1219,20 +1219,20 @@ void Widget::setupDownloadBar() {
 		}
 		if (create) {
 			_downloadBar->heightValue(
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				updateControlsGeometry();
 			}, _downloadBar->lifetime());
 
 			_downloadBar->shownValue(
 			) | rpl::filter(
 				!rpl::mappers::_1
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				_downloadBar = nullptr;
 				updateControlsGeometry();
 			}, _downloadBar->lifetime());
 
 			_downloadBar->clicks(
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				auto &&list = Core::App().downloadManager().loadingList();
 				const auto guard = gsl::finally([] {
 					Core::App().downloadManager().clearIfFinished();
@@ -1326,7 +1326,7 @@ void Widget::setupMainMenuToggle() {
 
 	rpl::single(rpl::empty) | rpl::then(
 		controller()->filtersMenuChanged()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto filtersHidden = !controller()->filtersWidth();
 		_mainMenu.toggle->setVisible(filtersHidden);
 		_mainMenu.under->setVisible(filtersHidden);
@@ -1336,7 +1336,7 @@ void Widget::setupMainMenuToggle() {
 
 	Window::OtherAccountsUnreadState(
 		&controller()->session().account()
-	) | rpl::start_with_next([=](const Window::OthersUnreadState &state) {
+	) | rpl::on_next([=](const Window::OthersUnreadState &state) {
 		const auto icon = !state.count
 			? nullptr
 			: !state.allMuted
@@ -1348,7 +1348,7 @@ void Widget::setupMainMenuToggle() {
 
 void Widget::setupStories() {
 	_stories->verticalScrollEvents(
-	) | rpl::start_with_next([=](not_null<QWheelEvent*> e) {
+	) | rpl::on_next([=](not_null<QWheelEvent*> e) {
 		_scroll->viewportEvent(e);
 	}, _stories->lifetime());
 
@@ -1383,7 +1383,7 @@ void Widget::setupStories() {
 		_scroll->positionValue(),
 		_scroll->movementValue(),
 		_storiesExplicitExpandValue.value()
-	) | rpl::start_with_next([=](
+	) | rpl::on_next([=](
 			Ui::ElasticScrollPosition position,
 			Ui::ElasticScrollMovement movement,
 			int explicitlyExpanded) {
@@ -1425,27 +1425,27 @@ void Widget::setupStories() {
 	}, lifetime());
 
 	_stories->collapsedGeometryChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateLockUnlockPosition();
 	}, lifetime());
 
 	_stories->clicks(
-	) | rpl::start_with_next([=](uint64 id) {
+	) | rpl::on_next([=](uint64 id) {
 		controller()->openPeerStories(PeerId(int64(id)), currentSource());
 	}, lifetime());
 
 	_stories->showMenuRequests(
-	) | rpl::start_with_next([=](const Stories::ShowMenuRequest &request) {
+	) | rpl::on_next([=](const Stories::ShowMenuRequest &request) {
 		FillSourceMenu(controller(), request);
 	}, lifetime());
 
 	_stories->loadMoreRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		session().data().stories().loadMore(currentSource());
 	}, lifetime());
 
 	_stories->toggleExpandedRequests(
-	) | rpl::start_with_next([=](bool expanded) {
+	) | rpl::on_next([=](bool expanded) {
 		const auto position = _scroll->position();
 		if (!expanded) {
 			_scroll->setOverscrollDefaults(0, 0);
@@ -1459,11 +1459,11 @@ void Widget::setupStories() {
 		}
 	}, lifetime());
 
-	_stories->emptyValue() | rpl::skip(1) | rpl::start_with_next([=] {
+	_stories->emptyValue() | rpl::skip(1) | rpl::on_next([=] {
 		updateStoriesVisibility();
 	}, lifetime());
 
-	_stories->widthValue() | rpl::start_with_next([=] {
+	_stories->widthValue() | rpl::on_next([=] {
 		updateLockUnlockPosition();
 	}, lifetime());
 }
@@ -1486,7 +1486,7 @@ void Widget::storiesToggleExplicitExpand(bool expand) {
 
 void Widget::trackScroll(not_null<Ui::RpWidget*> widget) {
 	widget->events(
-	) | rpl::start_with_next([=](not_null<QEvent*> e) {
+	) | rpl::on_next([=](not_null<QEvent*> e) {
 		const auto type = e->type();
 		if (type == QEvent::TouchBegin
 			|| type == QEvent::TouchUpdate
@@ -1506,7 +1506,7 @@ void Widget::setupShortcuts() {
 			&& !_childList
 			&& !controller()->isLayerShown()
 			&& !controller()->window().locked();
-	}) | rpl::start_with_next([=](not_null<Shortcuts::Request*> request) {
+	}) | rpl::on_next([=](not_null<Shortcuts::Request*> request) {
 		using Command = Shortcuts::Command;
 
 		if (!controller()->activeChatCurrent()) {
@@ -1547,7 +1547,7 @@ void Widget::fullSearchRefreshOn(rpl::producer<> events) {
 		events
 	) | rpl::filter([=] {
 		return !_searchQuery.isEmpty();
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		_searchTimer.cancel();
 		_searchProcess.cache.clear();
 		const auto queries = base::take(_searchProcess.queries);
@@ -1698,7 +1698,7 @@ void Widget::toggleFiltersMenu(bool enabled) {
 		raw->resizeToWidth(width());
 		const auto shadow = Ui::CreateChild<Ui::PlainShadow>(raw);
 		shadow->show();
-		inner->sizeValue() | rpl::start_with_next([=, this](const QSize &s) {
+		inner->sizeValue() | rpl::on_next([=, this](const QSize &s) {
 			raw->resize(s);
 			shadow->setGeometry(
 				0,
@@ -1773,7 +1773,7 @@ void Widget::updateSuggestions(anim::type animated) {
 			controller(),
 			TopPeersContent(&session()),
 			RecentPeersContent(&session()));
-		_suggestions->clearSearchQueryRequests() | rpl::start_with_next([=] {
+		_suggestions->clearSearchQueryRequests() | rpl::on_next([=] {
 			setSearchQuery(QString());
 		}, _suggestions->lifetime());
 		_searchSuggestionsLocked = false;
@@ -1783,7 +1783,7 @@ void Widget::updateSuggestions(anim::type animated) {
 			_suggestions->recentPeerChosen(),
 			_suggestions->myChannelChosen(),
 			_suggestions->recommendationChosen()
-		) | rpl::start_with_next([=](not_null<PeerData*> peer) {
+		) | rpl::on_next([=](not_null<PeerData*> peer) {
 			if (_searchSuggestionsLocked
 				&& (!_suggestions || !_suggestions->persist())) {
 				processSearchFocusChange();
@@ -1801,7 +1801,7 @@ void Widget::updateSuggestions(anim::type animated) {
 		rpl::merge(
 			_suggestions->openBotMainAppRequests(),
 			_suggestions->recentAppChosen()
-		) | rpl::start_with_next([=](not_null<PeerData*> peer) {
+		) | rpl::on_next([=](not_null<PeerData*> peer) {
 			if (const auto user = peer->asUser()) {
 				if (const auto info = user->botInfo.get()) {
 					if (info->hasMainApp) {
@@ -1817,11 +1817,11 @@ void Widget::updateSuggestions(anim::type animated) {
 		}, _suggestions->lifetime());
 
 		_suggestions->popularAppChosen(
-		) | rpl::start_with_next([=](not_null<PeerData*> peer) {
+		) | rpl::on_next([=](not_null<PeerData*> peer) {
 			controller()->showPeerInfo(peer);
 		}, _suggestions->lifetime());
 
-		_suggestions->closeRequests() | rpl::start_with_next([=] {
+		_suggestions->closeRequests() | rpl::on_next([=] {
 			closeSuggestions();
 		}, _suggestions->lifetime());
 
@@ -1992,23 +1992,23 @@ void Widget::refreshTopBars() {
 				_stories->raise();
 			}
 			_subsectionTopBar->searchCancelled(
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				escape();
 			}, _subsectionTopBar->lifetime());
 			_subsectionTopBar->searchSubmitted(
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				submit();
 			}, _subsectionTopBar->lifetime());
 			_subsectionTopBar->searchQuery(
-			) | rpl::start_with_next([=](QString query) {
+			) | rpl::on_next([=](QString query) {
 				applySearchUpdate();
 			}, _subsectionTopBar->lifetime());
 			_subsectionTopBar->jumpToDateRequest(
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				showCalendar();
 			}, _subsectionTopBar->lifetime());
 			_subsectionTopBar->chooseFromUserRequest(
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				showSearchFrom();
 			}, _subsectionTopBar->lifetime());
 			updateControlsGeometry();
@@ -2059,14 +2059,14 @@ void Widget::refreshTopBars() {
 		_forumTopShadow = std::make_unique<Ui::PlainShadow>(this);
 
 		_forumRequestsBar->barClicks(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			RequestsBoxController::Start(controller(), peer);
 		}, _forumRequestsBar->lifetime());
 
 		rpl::merge(
 			_forumGroupCallBar->barClicks(),
 			_forumGroupCallBar->joinClicks()
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			if (peer->groupCall()) {
 				controller()->startOrJoinGroupCall(peer);
 			}
@@ -2090,7 +2090,7 @@ void Widget::refreshTopBars() {
 			_forumGroupCallBar->heightValue(),
 			_forumRequestsBar->heightValue(),
 			_forumReportBar->bar().heightValue()
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			updateControlsGeometry();
 		}, _forumRequestsBar->lifetime());
 	} else {
@@ -3398,12 +3398,12 @@ void Widget::openChildList(
 	const auto opacity = shadow->lifetime().make_state<float64>(0.);
 	shadow->setAttribute(Qt::WA_TransparentForMouseEvents);
 	shadow->paintRequest(
-	) | rpl::start_with_next([=](QRect clip) {
+	) | rpl::on_next([=](QRect clip) {
 		auto p = QPainter(shadow);
 		p.setOpacity(*opacity);
 		p.fillRect(clip, st::shadowFg);
 	}, shadow->lifetime());
-	_childListShown.value() | rpl::start_with_next([=](float64 value) {
+	_childListShown.value() | rpl::on_next([=](float64 value) {
 		*opacity = value;
 		update();
 		_inner->update();
@@ -3445,7 +3445,7 @@ void Widget::closeChildList(anim::type animated) {
 			Window::SlideAnimation
 		>();
 		_hideChildListCanvas->paintRequest(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			QPainter p(_hideChildListCanvas.get());
 			animation->paintContents(p);
 		}, _hideChildListCanvas->lifetime());
@@ -3636,7 +3636,7 @@ bool Widget::applySearchState(SearchState state) {
 	}
 
 	_searchTagsLifetime = _inner->searchTagsChanges(
-	) | rpl::start_with_next([=](std::vector<Data::ReactionId> &&list) {
+	) | rpl::on_next([=](std::vector<Data::ReactionId> &&list) {
 		auto copy = _searchState;
 		copy.tags = std::move(list);
 		applySearchState(std::move(copy));
diff --git a/Telegram/SourceFiles/dialogs/ui/chat_search_empty.cpp b/Telegram/SourceFiles/dialogs/ui/chat_search_empty.cpp
index 028452e367..cc1f0cc6ec 100644
--- a/Telegram/SourceFiles/dialogs/ui/chat_search_empty.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/chat_search_empty.cpp
@@ -50,7 +50,7 @@ void SearchEmpty::setup(Icon icon, rpl::producer<TextWithEntities> text) {
 		st::recentPeersEmptyMargin);
 	const auto animated = widget.data();
 
-	sizeValue() | rpl::start_with_next([=](QSize size) {
+	sizeValue() | rpl::on_next([=](QSize size) {
 		const auto padding = st::recentPeersEmptyMargin;
 		const auto paddings = padding.left() + padding.right();
 		label->resizeToWidth(size.width() - paddings);
diff --git a/Telegram/SourceFiles/dialogs/ui/chat_search_in.cpp b/Telegram/SourceFiles/dialogs/ui/chat_search_in.cpp
index 42e8c33d78..8744f30861 100644
--- a/Telegram/SourceFiles/dialogs/ui/chat_search_in.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/chat_search_in.cpp
@@ -104,7 +104,7 @@ Action::Action(
 	resolveMinWidth();
 
 	paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		Painter p(this);
 		paint(p);
 	}, lifetime());
@@ -263,7 +263,7 @@ void ChatSearchIn::Section::update() {
 
 ChatSearchIn::ChatSearchIn(QWidget *parent)
 : RpWidget(parent) {
-	_in.clicks.events() | rpl::start_with_next([=] {
+	_in.clicks.events() | rpl::on_next([=] {
 		showMenu();
 	}, lifetime());
 }
@@ -410,7 +410,7 @@ void ChatSearchIn::updateSection(
 			st::columnMinimalWidthLeft,
 			st::dialogsSearchInHeight);
 
-		raw->paintRequest() | rpl::start_with_next([=] {
+		raw->paintRequest() | rpl::on_next([=] {
 			auto p = QPainter(raw);
 			if (!section->subscribed) {
 				section->subscribed = true;
@@ -452,7 +452,7 @@ void ChatSearchIn::updateSection(
 		const auto st = &st::dialogsCancelSearchInPeer;
 		section->cancel = std::make_unique<Ui::IconButton>(raw, *st);
 		section->cancel->show();
-		raw->sizeValue() | rpl::start_with_next([=](QSize size) {
+		raw->sizeValue() | rpl::on_next([=](QSize size) {
 			const auto left = size.width() - section->cancel->width();
 			const auto top = (size.height() - st->height) / 2;
 			section->cancel->moveToLeft(left, top);
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_message_view.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_message_view.cpp
index 448160e0bc..a007fa48b5 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_message_view.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_message_view.cpp
@@ -320,7 +320,7 @@ void MessageView::prepare(
 		if (!_loadingContext) {
 			_loadingContext = std::make_unique<LoadingContext>();
 			item->history()->session().downloaderTaskFinished(
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				_textCachedFor = nullptr;
 			}, _loadingContext->lifetime);
 		}
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp
index 2d8feff45c..2f3e06c4ed 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp
@@ -99,7 +99,7 @@ rpl::producer<Content> ContentForSession(
 			rpl::empty
 		) | rpl::then(
 			stories->sourcesChanged(list)
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			consumer.put_next(state->next());
 		}, result);
 		return result;
@@ -191,11 +191,11 @@ rpl::producer<Content> LastForPeer(not_null<PeerData*> peer) {
 
 			rpl::single(peerId) | rpl::then(
 				stories->itemsChanged() | rpl::filter(_1 == peerId)
-			) | rpl::start_with_next(state->check, lifetime);
+			) | rpl::on_next(state->check, lifetime);
 
 			stories->session().changes().storyUpdates(
 				Data::StoryUpdate::Flag::MarkRead
-			) | rpl::start_with_next([=](const Data::StoryUpdate &update) {
+			) | rpl::on_next([=](const Data::StoryUpdate &update) {
 				if (update.story->peer()->id == peerId) {
 					if (update.story->id() > state->readTill) {
 						state->readTill = update.story->id();
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
index b638e5abbc..993fa877a4 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
@@ -66,7 +66,7 @@ constexpr auto kMaxTooltipNames = 3;
 		result.data(),
 		st::dialogsStoriesTooltipHide);
 	result->sizeValue(
-	) | rpl::start_with_next([=](QSize size) {
+	) | rpl::on_next([=](QSize size) {
 		button->resize(button->width(), size.height());
 		button->moveToRight(0, 0, size.width());
 	}, button->lifetime());
@@ -106,7 +106,7 @@ List::List(
 , _st(st) {
 	setCursor(style::cur_default);
 
-	std::move(content) | rpl::start_with_next([=](Content &&content) {
+	std::move(content) | rpl::on_next([=](Content &&content) {
 		showContent(std::move(content));
 	}, lifetime());
 
@@ -996,7 +996,7 @@ void List::setShowTooltip(
 			notEmpty
 		) | rpl::distinct_until_changed(),
 		tooltipParent->windowActiveValue()
-	) | rpl::start_with_next([=](bool, bool, bool active) {
+	) | rpl::on_next([=](bool, bool, bool active) {
 		_tooltipWindowActive = active;
 		if (!isHidden()) {
 			toggleTooltip(false);
@@ -1004,7 +1004,7 @@ void List::setShowTooltip(
 	}, tooltip->lifetime());
 
 	shownValue(
-	) | rpl::skip(1) | rpl::start_with_next([=](bool shown) {
+	) | rpl::skip(1) | rpl::on_next([=](bool shown) {
 		toggleTooltip(true);
 	}, tooltip->lifetime());
 }
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
index a133130cf0..89bf9d918f 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
@@ -684,7 +684,7 @@ bool Suggestions::ObjectListController::processTouchEvent(
 
 void Suggestions::ObjectListController::setupTouchChatPreview(
 		not_null<Ui::ElasticScroll*> scroll) {
-	_touchCancelRequests.events() | rpl::start_with_next([=] {
+	_touchCancelRequests.events() | rpl::on_next([=] {
 		QTouchEvent ev(QEvent::TouchCancel);
 		ev.setTimestamp(crl::now());
 		QGuiApplication::sendEvent(scroll, &ev);
@@ -731,13 +731,13 @@ void Suggestions::ObjectListController::setupPlainDivider(
 		std::move(title),
 		st::searchedBarLabel);
 	raw->sizeValue(
-	) | rpl::start_with_next([=](QSize size) {
+	) | rpl::on_next([=](QSize size) {
 		const auto x = st::searchedBarPosition.x();
 		const auto y = st::searchedBarPosition.y();
 		label->resizeToWidth(size.width() - x * 2);
 		label->moveToLeft(x, y, size.width());
 	}, raw->lifetime());
-	raw->paintRequest() | rpl::start_with_next([=](QRect clip) {
+	raw->paintRequest() | rpl::on_next([=](QRect clip) {
 		QPainter(raw).fillRect(clip, st::searchedBarBg);
 	}, raw->lifetime());
 
@@ -757,7 +757,7 @@ void Suggestions::ObjectListController::setupExpandDivider(
 	count(
 	) | rpl::map(
 		rpl::mappers::_1 > kCollapsedChannelsCount
-	) | rpl::distinct_until_changed() | rpl::start_with_next([=](bool more) {
+	) | rpl::distinct_until_changed() | rpl::on_next([=](bool more) {
 		_expanded = false;
 		if (!more) {
 			const auto toggle = _toggleExpanded.current();
@@ -782,7 +782,7 @@ void Suggestions::ObjectListController::setupExpandDivider(
 		rpl::combine(
 			raw->sizeValue(),
 			toggle->widthValue()
-		) | rpl::start_with_next([=](QSize size, int width) {
+		) | rpl::on_next([=](QSize size, int width) {
 			const auto x = st::searchedBarPosition.x();
 			const auto y = st::searchedBarPosition.y();
 			toggle->moveToRight(0, 0, size.width());
@@ -797,14 +797,14 @@ void Suggestions::ObjectListController::setupExpandDivider(
 		_toggleExpanded.value()
 	) | rpl::filter(
 		rpl::mappers::_2 == nullptr
-	) | rpl::start_with_next([=](QSize size, const auto) {
+	) | rpl::on_next([=](QSize size, const auto) {
 		const auto x = st::searchedBarPosition.x();
 		const auto y = st::searchedBarPosition.y();
 		label->resizeToWidth(size.width() - x * 2);
 		label->moveToLeft(x, y, size.width());
 	}, raw->lifetime());
 
-	raw->paintRequest() | rpl::start_with_next([=](QRect clip) {
+	raw->paintRequest() | rpl::on_next([=](QRect clip) {
 		QPainter(raw).fillRect(clip, st::searchedBarBg);
 	}, raw->lifetime());
 
@@ -918,14 +918,14 @@ void RecentsController::setupDivider() {
 	rpl::combine(
 		raw->sizeValue(),
 		clear->widthValue()
-	) | rpl::start_with_next([=](QSize size, int width) {
+	) | rpl::on_next([=](QSize size, int width) {
 		const auto x = st::searchedBarPosition.x();
 		const auto y = st::searchedBarPosition.y();
 		clear->moveToRight(0, 0, size.width());
 		label->resizeToWidth(size.width() - x - width);
 		label->moveToLeft(x, y, size.width());
 	}, raw->lifetime());
-	raw->paintRequest() | rpl::start_with_next([=](QRect clip) {
+	raw->paintRequest() | rpl::on_next([=](QRect clip) {
 		QPainter(raw).fillRect(clip, st::searchedBarBg);
 	}, raw->lifetime());
 
@@ -937,7 +937,7 @@ void RecentsController::subscribeToEvents() {
 	session().changes().peerUpdates(
 		Flag::Notifications
 		| Flag::OnlineStatus
-	) | rpl::start_with_next([=](const Data::PeerUpdate &update) {
+	) | rpl::on_next([=](const Data::PeerUpdate &update) {
 		const auto peer = update.peer;
 		if (peer->isSelf()) {
 			return;
@@ -961,7 +961,7 @@ void RecentsController::subscribeToEvents() {
 	}, _lifetime);
 
 	session().data().unreadBadgeChanges(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		for (auto i = 0; i != countCurrent(); ++i) {
 			const auto row = delegate()->peerListRowAt(i);
 			if (static_cast<RecentRow*>(row.get())->refreshBadge()) {
@@ -981,7 +981,7 @@ void MyChannelsController::prepare() {
 
 	session().changes().peerUpdates(
 		Data::PeerUpdate::Flag::ChannelAmIn
-	) | rpl::start_with_next([=](const Data::PeerUpdate &update) {
+	) | rpl::on_next([=](const Data::PeerUpdate &update) {
 		const auto channel = update.peer->asBroadcast();
 		if (!channel || channel->amIn()) {
 			return;
@@ -1019,7 +1019,7 @@ void MyChannelsController::prepare() {
 	ranges::sort(_channels, ranges::greater(), &History::chatListTimeId);
 	setCount(_channels.size());
 
-	expanded() | rpl::start_with_next([=] {
+	expanded() | rpl::on_next([=] {
 		fill();
 	}, _lifetime);
 
@@ -1030,7 +1030,7 @@ void MyChannelsController::prepare() {
 	rpl::merge(
 		std::move(loading),
 		owner->chatsListLoadedEvents()
-	) | rpl::start_with_next([=](Data::Folder *folder) {
+	) | rpl::on_next([=](Data::Folder *folder) {
 		const auto list = owner->chatsList(folder);
 		for (const auto &row : list->indexed()->all()) {
 			if (const auto history = row->history()) {
@@ -1120,7 +1120,7 @@ void RecommendationsController::load() {
 	const auto participants = &session().api().chatParticipants();
 	participants->loadRecommendations();
 	participants->recommendationsLoaded(
-	) | rpl::take(1) | rpl::start_with_next([=] {
+	) | rpl::take(1) | rpl::on_next([=] {
 		fill();
 	}, _lifetime);
 }
@@ -1139,7 +1139,7 @@ void RecommendationsController::fill() {
 	delegate()->peerListRefreshRows();
 	setCount(delegate()->peerListFullRowsCount());
 
-	window()->activeChatValue() | rpl::start_with_next([=](const Key &key) {
+	window()->activeChatValue() | rpl::on_next([=](const Key &key) {
 		const auto history = key.history();
 		if (_activeHistory == history) {
 			return;
@@ -1185,7 +1185,7 @@ void RecentAppsController::prepare() {
 	_bots.reserve(kProbablyMaxApps);
 	rpl::single() | rpl::then(
 		session().topBotApps().updates()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_bots.clear();
 		for (const auto &peer : session().topBotApps().list()) {
 			if (const auto bot = peer->asUser()) {
@@ -1201,7 +1201,7 @@ void RecentAppsController::prepare() {
 		fill();
 	}, _lifetime);
 
-	expanded() | rpl::skip(1) | rpl::start_with_next([=] {
+	expanded() | rpl::skip(1) | rpl::on_next([=] {
 		fill();
 	}, _lifetime);
 }
@@ -1299,7 +1299,7 @@ void PopularAppsController::prepare() {
 	}
 	rpl::single() | rpl::then(
 		std::move(_filterOutRefreshes)
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		fill();
 	}, _lifetime);
 }
@@ -1312,7 +1312,7 @@ void PopularAppsController::load() {
 	const auto attachWebView = &session().attachWebView();
 	attachWebView->loadPopularAppBots();
 	attachWebView->popularAppBotsLoaded(
-	) | rpl::take(1) | rpl::start_with_next([=] {
+	) | rpl::take(1) | rpl::on_next([=] {
 		fill();
 	}, _lifetime);
 }
@@ -1429,7 +1429,7 @@ void Suggestions::setupTabs() {
 	rpl::single(-1) | rpl::then(
 		_tabs->sectionActivated()
 	) | rpl::combine_previous(
-	) | rpl::start_with_next([=](int was, int index) {
+	) | rpl::on_next([=](int was, int index) {
 		if (was != index) {
 			scrollToIndex(index, anim::type::normal);
 		}
@@ -1443,7 +1443,7 @@ void Suggestions::setupTabs() {
 	rpl::combine(
 		widthValue(),
 		_tabs->heightValue()
-	) | rpl::start_with_next([=](int width, int height) {
+	) | rpl::on_next([=](int width, int height) {
 		const auto line = st::lineWidth;
 		shadow->setGeometry(0, height - line, width, line);
 	}, shadow->lifetime());
@@ -1478,39 +1478,39 @@ void Suggestions::setupTabs() {
 	}
 	_tabs->setSections(sections);
 	_tabs->sectionActivated(
-	) | rpl::start_with_next([=](int section) {
+	) | rpl::on_next([=](int section) {
 		Assert(section >= 0 && section < _tabKeys.size());
 		switchTab(_tabKeys[section]);
 	}, _tabs->lifetime());
 }
 
 void Suggestions::setupChats() {
-	_recent->count.value() | rpl::start_with_next([=](int count) {
+	_recent->count.value() | rpl::on_next([=](int count) {
 		_recent->wrap->toggle(count > 0, anim::type::instant);
 		_emptyRecent->toggle(count == 0, anim::type::instant);
 	}, _recent->wrap->lifetime());
 
-	_topPeers->emptyValue() | rpl::start_with_next([=](bool empty) {
+	_topPeers->emptyValue() | rpl::on_next([=](bool empty) {
 		_topPeersWrap->toggle(!empty, anim::type::instant);
 	}, _topPeers->lifetime());
 
-	_topPeers->clicks() | rpl::start_with_next([=](uint64 peerIdRaw) {
+	_topPeers->clicks() | rpl::on_next([=](uint64 peerIdRaw) {
 		const auto peerId = PeerId(peerIdRaw);
 		_topPeerChosen.fire(_controller->session().data().peer(peerId));
 	}, _topPeers->lifetime());
 
-	_topPeers->pressed() | rpl::start_with_next([=](uint64 peerIdRaw) {
+	_topPeers->pressed() | rpl::on_next([=](uint64 peerIdRaw) {
 		handlePressForChatPreview(PeerId(peerIdRaw), [=](bool shown) {
 			_topPeers->pressLeftToContextMenu(shown);
 		});
 	}, _topPeers->lifetime());
 
-	_topPeers->pressCancelled() | rpl::start_with_next([=] {
+	_topPeers->pressCancelled() | rpl::on_next([=] {
 		_controller->cancelScheduledPreview();
 	}, _topPeers->lifetime());
 
 	_topPeers->showMenuRequests(
-	) | rpl::start_with_next([=](const ShowTopPeerMenuRequest &request) {
+	) | rpl::on_next([=](const ShowTopPeerMenuRequest &request) {
 		const auto weak = base::make_weak(this);
 		const auto owner = &_controller->session().data();
 		const auto peer = owner->peer(PeerId(request.id));
@@ -1544,12 +1544,12 @@ void Suggestions::setupChats() {
 	}, _topPeers->lifetime());
 
 	_topPeers->scrollToRequests(
-	) | rpl::start_with_next([this](Ui::ScrollToRequest request) {
+	) | rpl::on_next([this](Ui::ScrollToRequest request) {
 		_chatsScroll->scrollToY(request.ymin, request.ymax);
 	}, _topPeers->lifetime());
 
 	_topPeers->verticalScrollEvents(
-	) | rpl::start_with_next([=](not_null<QWheelEvent*> e) {
+	) | rpl::on_next([=](not_null<QWheelEvent*> e) {
 		_chatsScroll->viewportEvent(e);
 	}, _topPeers->lifetime());
 
@@ -1572,11 +1572,11 @@ void Suggestions::handlePressForChatPreview(
 }
 
 void Suggestions::setupChannels() {
-	_myChannels->count.value() | rpl::start_with_next([=](int count) {
+	_myChannels->count.value() | rpl::on_next([=](int count) {
 		_myChannels->wrap->toggle(count > 0, anim::type::instant);
 	}, _myChannels->wrap->lifetime());
 
-	_recommendations->count.value() | rpl::start_with_next([=](int count) {
+	_recommendations->count.value() | rpl::on_next([=](int count) {
 		_recommendations->wrap->toggle(count > 0, anim::type::instant);
 	}, _recommendations->wrap->lifetime());
 
@@ -1596,11 +1596,11 @@ void Suggestions::setupChannels() {
 }
 
 void Suggestions::setupApps() {
-	_recentApps->count.value() | rpl::start_with_next([=](int count) {
+	_recentApps->count.value() | rpl::on_next([=](int count) {
 		_recentApps->wrap->toggle(count > 0, anim::type::instant);
 	}, _recentApps->wrap->lifetime());
 
-	_popularApps->count.value() | rpl::start_with_next([=](int count) {
+	_popularApps->count.value() | rpl::on_next([=](int count) {
 		_popularApps->wrap->toggle(count > 0, anim::type::instant);
 	}, _popularApps->wrap->lifetime());
 
@@ -1901,7 +1901,7 @@ void Suggestions::setupPostsSearch() {
 	_postsSearch = std::make_unique<PostsSearch>(&_controller->session());
 
 	_postsSearch->stateUpdates(
-	) | rpl::start_with_next([=](const PostsSearchState &state) {
+	) | rpl::on_next([=](const PostsSearchState &state) {
 		if (state.intro) {
 			if (!_postsSearchIntro) {
 				setupPostsIntro(*state.intro);
@@ -1931,7 +1931,7 @@ void Suggestions::setupPostsSearch() {
 	}, _postsWrap->lifetime());
 
 	_postsSearch->pagesUpdates(
-	) | rpl::start_with_next([=](const PostsSearchState &state) {
+	) | rpl::on_next([=](const PostsSearchState &state) {
 		Expects(!state.intro && !state.loading);
 
 		if (!_postsContent) {
@@ -1974,7 +1974,7 @@ void Suggestions::setupPostsResults() {
 	_postsContent->searchRequested(true);
 
 	_postsContent->chosenRow(
-	) | rpl::start_with_next([=](const ChosenRow &row) {
+	) | rpl::on_next([=](const ChosenRow &row) {
 		const auto history = row.key.history();
 		if (!history) {
 			return;
@@ -1992,14 +1992,14 @@ void Suggestions::setupPostsResults() {
 		}
 	}, _postsContent->lifetime());
 
-	_postsContent->heightValue() | rpl::start_with_next([=](int height) {
+	_postsContent->heightValue() | rpl::on_next([=](int height) {
 		_postsWrap->resize(_postsWrap->width(), height);
 	}, _postsContent->lifetime());
 
 	rpl::combine(
 		rpl::single(rpl::empty) | rpl::then(_postsScroll->scrolls()),
 		_postsScroll->heightValue()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updatePostsSearchVisibleRange();
 	}, _postsContent->lifetime());
 
@@ -2027,7 +2027,7 @@ void Suggestions::setupPostsIntro(const PostsSearchIntroState &intro) {
 	_postsSearchIntro = Ui::CreateChild<PostsSearchIntro>(_postsWrap, intro);
 
 	_postsSearchIntro->searchWithStars(
-	) | rpl::start_with_next([=](int stars) {
+	) | rpl::on_next([=](int stars) {
 		if (!_controller->session().premium()) {
 			Settings::ShowPremium(
 				_controller,
@@ -2061,7 +2061,7 @@ void Suggestions::setupPostsIntro(const PostsSearchIntroState &intro) {
 		}
 	}, _postsSearchIntro->lifetime());
 
-	_postsScroll->heightValue() | rpl::start_with_next([=](int height) {
+	_postsScroll->heightValue() | rpl::on_next([=](int height) {
 		_postsWrap->resize(_postsWrap->width(), height);
 	}, _postsSearchIntro->lifetime());
 
@@ -2432,7 +2432,7 @@ auto Suggestions::setupRecentPeers(RecentPeersList recentPeers)
 	};
 
 	raw->chosen.events(
-	) | rpl::start_with_next([=](not_null<PeerData*> peer) {
+	) | rpl::on_next([=](not_null<PeerData*> peer) {
 		_controller->session().recentPeers().bump(peer);
 	}, list->lifetime());
 
@@ -2492,7 +2492,7 @@ auto Suggestions::setupMyChannels() -> std::unique_ptr<ObjectList> {
 	};
 
 	raw->chosen.events(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_persist = false;
 	}, list->lifetime());
 
@@ -2538,13 +2538,13 @@ auto Suggestions::setupRecommendations() -> std::unique_ptr<ObjectList> {
 	};
 
 	raw->chosen.events(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_persist = true;
 	}, list->lifetime());
 
 	_key.value() | rpl::filter(
 		rpl::mappers::_1 == Key{ Tab::Channels }
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		controller->load();
 	}, list->lifetime());
 
@@ -2606,7 +2606,7 @@ auto Suggestions::setupRecentApps() -> std::unique_ptr<ObjectList> {
 	};
 
 	raw->chosen.events(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_persist = false;
 	}, list->lifetime());
 
@@ -2656,13 +2656,13 @@ auto Suggestions::setupPopularApps() -> std::unique_ptr<ObjectList> {
 	};
 
 	raw->chosen.events(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_persist = true;
 	}, list->lifetime());
 
 	_key.value() | rpl::filter(
 		rpl::mappers::_1 == Key{ Tab::Apps }
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		controller->load();
 	}, list->lifetime());
 
@@ -2697,7 +2697,7 @@ auto Suggestions::setupObjectList(
 	};
 
 	controller->chosen(
-	) | rpl::start_with_next([=](not_null<PeerData*> peer) {
+	) | rpl::on_next([=](not_null<PeerData*> peer) {
 		raw->chosen.fire_copy(peer);
 	}, lifetime);
 
@@ -2712,7 +2712,7 @@ auto Suggestions::setupObjectList(
 	};
 
 	list->scrollToRequests(
-	) | rpl::start_with_next([=](Ui::ScrollToRequest request) {
+	) | rpl::on_next([=](Ui::ScrollToRequest request) {
 		const auto add = addToScroll ? addToScroll() : 0;
 		scroll->scrollToY(request.ymin + add, request.ymax + add);
 	}, list->lifetime());
@@ -2742,7 +2742,7 @@ object_ptr<Ui::SlideWrap<>> Suggestions::setupEmpty(
 	rpl::combine(
 		_chatsScroll->heightValue(),
 		_topPeersWrap->heightValue()
-	) | rpl::start_with_next([=](int height, int top) {
+	) | rpl::on_next([=](int height, int top) {
 		raw->setMinimalHeight(height - top);
 	}, raw->lifetime());
 
@@ -2753,7 +2753,7 @@ object_ptr<Ui::SlideWrap<>> Suggestions::setupEmpty(
 
 	result->toggledValue() | rpl::filter([=](bool shown) {
 		return shown && _controller->session().data().chatsListLoaded();
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		raw->animate();
 	}, raw->lifetime());
 
@@ -2841,7 +2841,7 @@ rpl::producer<TopPeersList> TopPeersContent(
 			| Flag::Photo
 			| Flag::Notifications
 			| Flag::OnlineStatus
-		) | rpl::start_with_next([=](const Data::PeerUpdate &update) {
+		) | rpl::on_next([=](const Data::PeerUpdate &update) {
 			const auto peer = update.peer;
 			if (peer->isSelf()) {
 				return;
@@ -2890,7 +2890,7 @@ rpl::producer<TopPeersList> TopPeersContent(
 		}, lifetime);
 
 		session->data().unreadBadgeChanges(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			auto changed = false;
 			auto &entries = state->data.entries;
 			for (const auto &[peer, data] : state->indices) {
@@ -2931,7 +2931,7 @@ object_ptr<Ui::BoxContent> StarsExamplesBox(
 		});
 
 		raw->load();
-		raw->chosen() | rpl::start_with_next([=](not_null<PeerData*> peer) {
+		raw->chosen() | rpl::on_next([=](not_null<PeerData*> peer) {
 			if (const auto user = peer->asUser()) {
 				if (const auto info = user->botInfo.get()) {
 					if (info->hasMainApp) {
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_top_bar_suggestion_content.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_top_bar_suggestion_content.cpp
index 9a4101b520..ac59323a92 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_top_bar_suggestion_content.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_top_bar_suggestion_content.cpp
@@ -54,7 +54,7 @@ not_null<Ui::SlideWrap<Ui::VerticalLayout>*> CreateUnconfirmedAuthContent(
 		parent,
 		object_ptr<Ui::VerticalLayout>(parent));
 	const auto content = wrap->entity();
-	content->paintRequest() | rpl::start_with_next([=] {
+	content->paintRequest() | rpl::on_next([=] {
 		auto p = QPainter(content);
 		p.fillRect(content->rect(), st::dialogsBg);
 	}, content->lifetime());
@@ -141,7 +141,7 @@ not_null<Ui::SlideWrap<Ui::VerticalLayout>*> CreateUnconfirmedAuthContent(
 	});
 	buttons->sizeValue(
 	) | rpl::filter_size(
-	) | rpl::start_with_next([=](const QSize &s) {
+	) | rpl::on_next([=](const QSize &s) {
 		const auto halfWidth = (s.width() - rect::m::sum::h(padding)) / 2;
 		yes->moveToLeft(
 			padding.left() + (halfWidth - yes->width()) / 2,
@@ -181,7 +181,7 @@ void TopBarSuggestionContent::setRightIcon(RightIcon icon) {
 			st::dialogsCancelSearchInPeer);
 		const auto rightHide = _rightHide.get();
 		sizeValue() | rpl::filter_size(
-		) | rpl::start_with_next([=](const QSize &s) {
+		) | rpl::on_next([=](const QSize &s) {
 			rightHide->moveToRight(st::buttonRadius, st::lineWidth);
 		}, rightHide->lifetime());
 		rightHide->show();
@@ -195,7 +195,7 @@ void TopBarSuggestionContent::setRightIcon(RightIcon icon) {
 			&st::settingsPremiumArrowOver);
 		arrow->setAttribute(Qt::WA_TransparentForMouseEvents);
 		sizeValue() | rpl::filter_size(
-		) | rpl::start_with_next([=](const QSize &s) {
+		) | rpl::on_next([=](const QSize &s) {
 			const auto &point = st::settingsPremiumArrowShift;
 			arrow->moveToLeft(
 				s.width() - arrow->width(),
@@ -224,7 +224,7 @@ void TopBarSuggestionContent::setRightButton(
 	rpl::combine(
 		sizeValue(),
 		_rightButton->sizeValue()
-	) | rpl::start_with_next([=](QSize outer, QSize inner) {
+	) | rpl::on_next([=](QSize outer, QSize inner) {
 		const auto top = (outer.height() - inner.height()) / 2;
 		_rightButton->moveToRight(top, top, outer.width());
 	}, _rightButton->lifetime());
@@ -371,7 +371,7 @@ void TopBarSuggestionContent::setHideCallback(Fn<void()> hideCallback) {
 }
 
 void TopBarSuggestionContent::setLeftPadding(rpl::producer<int> value) {
-	std::move(value) | rpl::start_with_next([=](int padding) {
+	std::move(value) | rpl::on_next([=](int padding) {
 		_leftPadding = padding;
 		update();
 	}, lifetime());
diff --git a/Telegram/SourceFiles/dialogs/ui/posts_search_intro.cpp b/Telegram/SourceFiles/dialogs/ui/posts_search_intro.cpp
index 87bda8fe71..a4ceb0f8a8 100644
--- a/Telegram/SourceFiles/dialogs/ui/posts_search_intro.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/posts_search_intro.cpp
@@ -79,7 +79,7 @@ void SetSearchButtonLabel(
 	rpl::combine(
 		button->sizeValue(),
 		std::move(text)
-	) | rpl::start_with_next([=](QSize size, const auto &) {
+	) | rpl::on_next([=](QSize size, const auto &) {
 		icons->setGeometry(QRect(QPoint(), size));
 		const auto available = size.width() - leftSkip - rightSkip;
 		if (available <= 0) {
@@ -93,7 +93,7 @@ void SetSearchButtonLabel(
 		label->moveToLeft(x + leftSkip, y, size.width());
 	}, icons->lifetime());
 
-	icons->paintRequest() | rpl::start_with_next([=] {
+	icons->paintRequest() | rpl::on_next([=] {
 		auto p = QPainter(icons);
 		left->paint(
 			p,
@@ -198,7 +198,7 @@ void PostsSearchIntro::setup() {
 	_footer->setTryMakeSimilarLines(true);
 
 	_state.value(
-	) | rpl::start_with_next([=](const PostsSearchIntroState &state) {
+	) | rpl::on_next([=](const PostsSearchIntroState &state) {
 		if (state.query.trimmed().isEmpty() && !state.needsPremium) {
 			_button->resize(_button->width(), 0);
 			_content->resizeToWidth(width());
diff --git a/Telegram/SourceFiles/dialogs/ui/top_peers_strip.cpp b/Telegram/SourceFiles/dialogs/ui/top_peers_strip.cpp
index 67cafb98cc..450b4d3fa6 100644
--- a/Telegram/SourceFiles/dialogs/ui/top_peers_strip.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/top_peers_strip.cpp
@@ -60,14 +60,14 @@ TopPeersStrip::TopPeersStrip(
 	setupHeader();
 	setupStrip();
 
-	std::move(content) | rpl::start_with_next([=](const TopPeersList &list) {
+	std::move(content) | rpl::on_next([=](const TopPeersList &list) {
 		apply(list);
 	}, lifetime());
 
 	rpl::combine(
 		_count.value(),
 		_expanded.value()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		resizeToWidth(width());
 	}, _strip.lifetime());
 
@@ -88,7 +88,7 @@ void TopPeersStrip::setupHeader() {
 		widthValue()
 	) | rpl::map(
 		(rpl::mappers::_1 * single) > (rpl::mappers::_2 + (single * 2) / 3)
-	) | rpl::distinct_until_changed() | rpl::start_with_next([=](bool more) {
+	) | rpl::distinct_until_changed() | rpl::on_next([=](bool more) {
 		setExpanded(false);
 		if (!more) {
 			const auto toggle = _toggleExpanded.current();
@@ -113,7 +113,7 @@ void TopPeersStrip::setupHeader() {
 		rpl::combine(
 			_header.sizeValue(),
 			toggle->widthValue()
-		) | rpl::start_with_next([=](QSize size, int width) {
+		) | rpl::on_next([=](QSize size, int width) {
 			const auto x = st::searchedBarPosition.x();
 			const auto y = st::searchedBarPosition.y();
 			toggle->moveToRight(0, 0, size.width());
@@ -128,14 +128,14 @@ void TopPeersStrip::setupHeader() {
 		_toggleExpanded.value()
 	) | rpl::filter(
 		rpl::mappers::_2 == nullptr
-	) | rpl::start_with_next([=](QSize size, const auto) {
+	) | rpl::on_next([=](QSize size, const auto) {
 		const auto x = st::searchedBarPosition.x();
 		const auto y = st::searchedBarPosition.y();
 		label->resizeToWidth(size.width() - x * 2);
 		label->moveToLeft(x, y, size.width());
 	}, _header.lifetime());
 
-	_header.paintRequest() | rpl::start_with_next([=](QRect clip) {
+	_header.paintRequest() | rpl::on_next([=](QRect clip) {
 		QPainter(&_header).fillRect(clip, st::searchedBarBg);
 	}, _header.lifetime());
 }
@@ -181,7 +181,7 @@ void TopPeersStrip::setupStrip() {
 		return base::EventFilterResult::Cancel;
 	});
 
-	_strip.paintRequest() | rpl::start_with_next([=](QRect clip) {
+	_strip.paintRequest() | rpl::on_next([=](QRect clip) {
 		paintStrip(clip);
 	}, _strip.lifetime());
 }
diff --git a/Telegram/SourceFiles/editor/color_picker.cpp b/Telegram/SourceFiles/editor/color_picker.cpp
index a07e021147..dcc1627ce2 100644
--- a/Telegram/SourceFiles/editor/color_picker.cpp
+++ b/Telegram/SourceFiles/editor/color_picker.cpp
@@ -113,7 +113,7 @@ ColorPicker::ColorPicker(
 	_down.pos = QPoint(colorToPosition(savedBrush.color), 0);
 
 	_colorLine->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(_colorLine);
 		PainterHighQualityEnabler hq(p);
 
@@ -125,13 +125,13 @@ ColorPicker::ColorPicker(
 	}, _colorLine->lifetime());
 
 	_canvasForCircle->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(_canvasForCircle);
 		paintCircle(p);
 	}, _canvasForCircle->lifetime());
 
 	_colorLine->events(
-	) | rpl::start_with_next([=](not_null<QEvent*> event) {
+	) | rpl::on_next([=](not_null<QEvent*> event) {
 		const auto type = event->type();
 		const auto isPress = (type == QEvent::MouseButtonPress)
 			|| (type == QEvent::MouseButtonDblClick);
diff --git a/Telegram/SourceFiles/editor/controllers/stickers_panel_controller.cpp b/Telegram/SourceFiles/editor/controllers/stickers_panel_controller.cpp
index 2c0482c332..831ccfaa8c 100644
--- a/Telegram/SourceFiles/editor/controllers/stickers_panel_controller.cpp
+++ b/Telegram/SourceFiles/editor/controllers/stickers_panel_controller.cpp
@@ -60,7 +60,7 @@ void StickersPanelController::setShowRequestChanges(
 		rpl::producer<ShowRequest> &&showRequest) {
 	std::move(
 		showRequest
-	) | rpl::start_with_next([=](ShowRequest show) {
+	) | rpl::on_next([=](ShowRequest show) {
 		if (show == ShowRequest::ToggleAnimated) {
 			_stickersPanel->toggleAnimated();
 			_stickersPanel->raise();
@@ -79,7 +79,7 @@ void StickersPanelController::setMoveRequestChanges(
 		rpl::producer<QPoint> &&moveRequest) {
 	std::move(
 		moveRequest
-	) | rpl::start_with_next([=](const QPoint &point) {
+	) | rpl::on_next([=](const QPoint &point) {
 		_stickersPanel->moveBottomRight(
 			point.y(),
 			point.x() + _stickersPanel->width() / 2);
diff --git a/Telegram/SourceFiles/editor/editor_crop.cpp b/Telegram/SourceFiles/editor/editor_crop.cpp
index b528881013..fd0d0de107 100644
--- a/Telegram/SourceFiles/editor/editor_crop.cpp
+++ b/Telegram/SourceFiles/editor/editor_crop.cpp
@@ -79,7 +79,7 @@ Crop::Crop(
 	setMouseTracking(true);
 
 	paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(this);
 
 		p.fillPath(_painterPath, st::photoCropFadeBg);
diff --git a/Telegram/SourceFiles/editor/editor_layer_widget.cpp b/Telegram/SourceFiles/editor/editor_layer_widget.cpp
index fc2096fa37..6c6d43f1c8 100644
--- a/Telegram/SourceFiles/editor/editor_layer_widget.cpp
+++ b/Telegram/SourceFiles/editor/editor_layer_widget.cpp
@@ -59,7 +59,7 @@ LayerWidget::LayerWidget(
 	_content->show();
 
 	paintRequest(
-	) | rpl::start_with_next([=](const QRect &clip) {
+	) | rpl::on_next([=](const QRect &clip) {
 		auto p = QPainter(this);
 		const auto faded = _backgroundFade.value(1.);
 		if (faded < 1.) {
@@ -83,12 +83,12 @@ void LayerWidget::start() {
 	_background = ProcessBackground(renderBackground(), _backgroundNight);
 
 	sizeValue(
-	) | rpl::start_with_next([=](const QSize &size) {
+	) | rpl::on_next([=](const QSize &size) {
 		checkBackgroundStale();
 		_content->resize(size);
 	}, lifetime());
 
-	style::PaletteChanged() | rpl::start_with_next([=] {
+	style::PaletteChanged() | rpl::on_next([=] {
 		checkBackgroundStale();
 	}, lifetime());
 }
diff --git a/Telegram/SourceFiles/editor/editor_paint.cpp b/Telegram/SourceFiles/editor/editor_paint.cpp
index e10058239c..caaf74b9bc 100644
--- a/Telegram/SourceFiles/editor/editor_paint.cpp
+++ b/Telegram/SourceFiles/editor/editor_paint.cpp
@@ -64,7 +64,7 @@ Paint::Paint(
 
 	// Undo / Redo.
 	controllers->undoController->performRequestChanges(
-	) | rpl::start_with_next([=](const Undo &command) {
+	) | rpl::on_next([=](const Undo &command) {
 		if (command == Undo::Undo) {
 			_scene->performUndo();
 		} else {
@@ -97,7 +97,7 @@ Paint::Paint(
 			) | rpl::map_to(ShowRequest::HideAnimated));
 
 		controllers->stickersPanelController->stickerChosen(
-		) | rpl::start_with_next([=](not_null<DocumentData*> document) {
+		) | rpl::on_next([=](not_null<DocumentData*> document) {
 			const auto item = std::make_shared<ItemSticker>(
 				document,
 				itemBaseData());
@@ -112,13 +112,13 @@ Paint::Paint(
 				) | rpl::to_empty
 			: rpl::never<>() | rpl::type_erased,
 		_scene->addsItem()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		clearRedoList();
 		updateUndoState();
 	}, lifetime());
 
 	_scene->removesItem(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateUndoState();
 	}, lifetime());
 
diff --git a/Telegram/SourceFiles/editor/photo_editor.cpp b/Telegram/SourceFiles/editor/photo_editor.cpp
index 0ec6de90b4..c6c419b3e9 100644
--- a/Telegram/SourceFiles/editor/photo_editor.cpp
+++ b/Telegram/SourceFiles/editor/photo_editor.cpp
@@ -96,7 +96,7 @@ PhotoEditor::PhotoEditor(
 	Deserialize(Core::App().settings().photoEditorBrush()))) {
 
 	sizeValue(
-	) | rpl::start_with_next([=](const QSize &size) {
+	) | rpl::on_next([=](const QSize &size) {
 		if (size.isEmpty()) {
 			return;
 		}
@@ -104,7 +104,7 @@ PhotoEditor::PhotoEditor(
 	}, lifetime());
 
 	_content->innerRect(
-	) | rpl::start_with_next([=](QRect inner) {
+	) | rpl::on_next([=](QRect inner) {
 		if (inner.isEmpty()) {
 			return;
 		}
@@ -116,23 +116,23 @@ PhotoEditor::PhotoEditor(
 	}, lifetime());
 
 	_controls->colorLinePositionValue(
-	) | rpl::start_with_next([=](const QPoint &p) {
+	) | rpl::on_next([=](const QPoint &p) {
 		_colorPicker->moveLine(p);
 	}, _controls->lifetime());
 
 	_controls->colorLineShownValue(
-	) | rpl::start_with_next([=](bool shown) {
+	) | rpl::on_next([=](bool shown) {
 		_colorPicker->setVisible(shown);
 	}, _controls->lifetime());
 
 	_mode.value(
-	) | rpl::start_with_next([=](const PhotoEditorMode &mode) {
+	) | rpl::on_next([=](const PhotoEditorMode &mode) {
 		_content->applyMode(mode);
 		_controls->applyMode(mode);
 	}, lifetime());
 
 	_controls->rotateRequests(
-	) | rpl::start_with_next([=](int angle) {
+	) | rpl::on_next([=](int angle) {
 		_modifications.angle += 90;
 		if (_modifications.angle >= 360) {
 			_modifications.angle -= 360;
@@ -141,13 +141,13 @@ PhotoEditor::PhotoEditor(
 	}, lifetime());
 
 	_controls->flipRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_modifications.flipped = !_modifications.flipped;
 		_content->applyModifications(_modifications);
 	}, lifetime());
 
 	_controls->paintModeRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_mode = PhotoEditorMode{
 			.mode = PhotoEditorMode::Mode::Paint,
 			.action = PhotoEditorMode::Action::None,
@@ -155,7 +155,7 @@ PhotoEditor::PhotoEditor(
 	}, lifetime());
 
 	_controls->doneRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto mode = _mode.current().mode;
 		if (mode == PhotoEditorMode::Mode::Paint) {
 			_mode = PhotoEditorMode{
@@ -172,7 +172,7 @@ PhotoEditor::PhotoEditor(
 	}, lifetime());
 
 	_controls->cancelRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto mode = _mode.current().mode;
 		if (mode == PhotoEditorMode::Mode::Paint) {
 			_mode = PhotoEditorMode{
@@ -189,7 +189,7 @@ PhotoEditor::PhotoEditor(
 	}, lifetime());
 
 	_colorPicker->saveBrushRequests(
-	) | rpl::start_with_next([=](const Brush &brush) {
+	) | rpl::on_next([=](const Brush &brush) {
 		_content->applyBrush(brush);
 
 		const auto serialized = Serialize(brush);
@@ -224,13 +224,13 @@ void InitEditorLayer(
 		not_null<PhotoEditor*> editor,
 		Fn<void(PhotoModifications)> doneCallback) {
 	editor->cancelRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		layer->closeLayer();
 	}, editor->lifetime());
 
 	const auto weak = base::make_weak(layer.get());
 	editor->doneRequests(
-	) | rpl::start_with_next([=, done = std::move(doneCallback)](
+	) | rpl::on_next([=, done = std::move(doneCallback)](
 			const PhotoModifications &mods) {
 		done(mods);
 		if (const auto strong = weak.get()) {
diff --git a/Telegram/SourceFiles/editor/photo_editor_content.cpp b/Telegram/SourceFiles/editor/photo_editor_content.cpp
index 1a379b9b3c..8fd6b1f434 100644
--- a/Telegram/SourceFiles/editor/photo_editor_content.cpp
+++ b/Telegram/SourceFiles/editor/photo_editor_content.cpp
@@ -42,7 +42,7 @@ PhotoEditorContent::PhotoEditorContent(
 	rpl::combine(
 		_modifications.value(),
 		sizeValue()
-	) | rpl::start_with_next([=](
+	) | rpl::on_next([=](
 			const PhotoModifications &mods, const QSize &size) {
 		if (size.isEmpty()) {
 			return;
@@ -85,7 +85,7 @@ PhotoEditorContent::PhotoEditorContent(
 	}, lifetime());
 
 	paintRequest(
-	) | rpl::start_with_next([=](const QRect &clip) {
+	) | rpl::on_next([=](const QRect &clip) {
 		auto p = QPainter(this);
 
 		p.fillRect(clip, Qt::transparent);
diff --git a/Telegram/SourceFiles/editor/photo_editor_controls.cpp b/Telegram/SourceFiles/editor/photo_editor_controls.cpp
index 72a4338651..26add10021 100644
--- a/Telegram/SourceFiles/editor/photo_editor_controls.cpp
+++ b/Telegram/SourceFiles/editor/photo_editor_controls.cpp
@@ -72,7 +72,7 @@ void EdgeButton::init() {
 	// const auto bg = rounded(_bg);
 
 	paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		Painter p(this);
 
 		// p.drawImage(QPoint(), bg);
@@ -122,7 +122,7 @@ ButtonBar::ButtonBar(
 	const style::color &bg)
 : RpWidget(parent) {
 	sizeValue(
-	) | rpl::start_with_next([=](const QSize &size) {
+	) | rpl::on_next([=](const QSize &size) {
 		const auto children = RpWidget::children();
 		const auto widgets = ranges::views::all(
 			children
@@ -181,7 +181,7 @@ ButtonBar::ButtonBar(
 	}, lifetime());
 
 	paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(this);
 		p.drawImage(QPoint(), _roundedBg);
 	}, lifetime());
@@ -269,7 +269,7 @@ PhotoEditorControls::PhotoEditorControls(
 	_paintModeButtonActive->setAttribute(Qt::WA_TransparentForMouseEvents);
 
 	sizeValue(
-	) | rpl::start_with_next([=](const QSize &size) {
+	) | rpl::on_next([=](const QSize &size) {
 		if (size.isEmpty()) {
 			return;
 		}
@@ -304,7 +304,7 @@ PhotoEditorControls::PhotoEditorControls(
 	}, lifetime());
 
 	_mode.changes(
-	) | rpl::start_with_next([=](const PhotoEditorMode &mode) {
+	) | rpl::on_next([=](const PhotoEditorMode &mode) {
 		if (mode.mode == PhotoEditorMode::Mode::Out) {
 			return;
 		}
@@ -316,7 +316,7 @@ PhotoEditorControls::PhotoEditorControls(
 	}, lifetime());
 
 	_paintBottomButtons->positionValue(
-	) | rpl::start_with_next([=](const QPoint &containerPos) {
+	) | rpl::on_next([=](const QPoint &containerPos) {
 		_paintTopButtons->moveToLeft(
 			containerPos.x(),
 			containerPos.y()
@@ -325,7 +325,7 @@ PhotoEditorControls::PhotoEditorControls(
 	}, _paintBottomButtons->lifetime());
 
 	_paintBottomButtons->shownValue(
-	) | rpl::start_with_next([=](bool shown) {
+	) | rpl::on_next([=](bool shown) {
 		_paintTopButtons->setVisible(shown);
 	}, _paintBottomButtons->lifetime());
 
@@ -350,7 +350,7 @@ PhotoEditorControls::PhotoEditorControls(
 		})));
 
 	controllers->undoController->canPerformChanges(
-	) | rpl::start_with_next([=](const UndoController::EnableRequest &r) {
+	) | rpl::on_next([=](const UndoController::EnableRequest &r) {
 		const auto isUndo = (r.command == Undo::Undo);
 		const auto &button = isUndo ? _undoButton : _redoButton;
 		button->setAttribute(Qt::WA_TransparentForMouseEvents, !r.enable);
@@ -385,7 +385,7 @@ PhotoEditorControls::PhotoEditorControls(
 			}));
 
 		controllers->stickersPanelController->panelShown(
-		) | rpl::start_with_next([=](bool shown) {
+		) | rpl::on_next([=](bool shown) {
 			const auto icon = shown
 				? &st::photoEditorStickersIconActive
 				: nullptr;
@@ -397,7 +397,7 @@ PhotoEditorControls::PhotoEditorControls(
 		modifications.flipped ? 0 : 1
 	) | rpl::then(
 		_flipButton->clicks() | rpl::to_empty
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_flipped = !_flipped;
 		const auto icon = _flipped ? &st::photoEditorFlipIconActive : nullptr;
 		_flipButton->setIconOverride(icon, icon);
diff --git a/Telegram/SourceFiles/editor/scene/scene.cpp b/Telegram/SourceFiles/editor/scene/scene.cpp
index cd19081b92..411741285e 100644
--- a/Telegram/SourceFiles/editor/scene/scene.cpp
+++ b/Telegram/SourceFiles/editor/scene/scene.cpp
@@ -33,7 +33,7 @@ Scene::Scene(const QRectF &rect)
 	_canvas->clearPixmap();
 
 	_canvas->grabContentRequests(
-	) | rpl::start_with_next([=](ItemCanvas::Content &&content) {
+	) | rpl::on_next([=](ItemCanvas::Content &&content) {
 		const auto item = std::make_shared<ItemLine>(
 			std::move(content.pixmap));
 		item->setPos(content.position);
diff --git a/Telegram/SourceFiles/editor/scene/scene_item_sticker.cpp b/Telegram/SourceFiles/editor/scene/scene_item_sticker.cpp
index 5d67508679..0e910bd0f1 100644
--- a/Telegram/SourceFiles/editor/scene/scene_item_sticker.cpp
+++ b/Telegram/SourceFiles/editor/scene/scene_item_sticker.cpp
@@ -46,7 +46,7 @@ ItemSticker::ItemSticker(
 					* style::DevicePixelRatio(),
 				Lottie::Quality::High);
 			_lottie.player->updates(
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				updatePixmap(_lottie.player->frame());
 				_lottie.player = nullptr;
 				_lottie.lifetime.destroy();
@@ -85,7 +85,7 @@ ItemSticker::ItemSticker(
 	};
 	if (!updateThumbnail()) {
 		_document->session().downloaderTaskFinished(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			if (updateThumbnail()) {
 				_loadingLifetime.destroy();
 				update();
diff --git a/Telegram/SourceFiles/export/export_controller.cpp b/Telegram/SourceFiles/export/export_controller.cpp
index 2dbe45ffbe..57abbbd7e9 100644
--- a/Telegram/SourceFiles/export/export_controller.cpp
+++ b/Telegram/SourceFiles/export/export_controller.cpp
@@ -163,12 +163,12 @@ ControllerObject::ControllerObject(
 : _api(mtproto, weak.runner())
 , _state(PasswordCheckState{}) {
 	_api.errors(
-	) | rpl::start_with_next([=](const MTP::Error &error) {
+	) | rpl::on_next([=](const MTP::Error &error) {
 		setState(ApiErrorState{ error });
 	}, _lifetime);
 
 	_api.ioErrors(
-	) | rpl::start_with_next([=](const Output::Result &result) {
+	) | rpl::on_next([=](const Output::Result &result) {
 		ioCatchError(result);
 	}, _lifetime);
 
@@ -193,12 +193,12 @@ ControllerObject::ControllerObject(
 , _topicPeerId(peerId)
 , _topicTitle(topicTitle) {
 	_api.errors(
-	) | rpl::start_with_next([=](const MTP::Error &error) {
+	) | rpl::on_next([=](const MTP::Error &error) {
 		setState(ApiErrorState{ error });
 	}, _lifetime);
 
 	_api.ioErrors(
-	) | rpl::start_with_next([=](const Output::Result &result) {
+	) | rpl::on_next([=](const Output::Result &result) {
 		ioCatchError(result);
 	}, _lifetime);
 
diff --git a/Telegram/SourceFiles/export/export_manager.cpp b/Telegram/SourceFiles/export/export_manager.cpp
index df9f7c3c57..157bf8d369 100644
--- a/Telegram/SourceFiles/export/export_manager.cpp
+++ b/Telegram/SourceFiles/export/export_manager.cpp
@@ -62,14 +62,14 @@ void Manager::setupPanel(not_null<Main::Session*> session) {
 	session->account().sessionChanges(
 	) | rpl::filter([=](Main::Session *value) {
 		return (value != session);
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		stop();
 	}, _panel->lifetime());
 
 	_viewChanges.fire(_panel.get());
 
 	_panel->stopRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		LOG(("Export Info: Stop requested."));
 		stop();
 	}, _controller->lifetime());
diff --git a/Telegram/SourceFiles/export/view/export_view_panel_controller.cpp b/Telegram/SourceFiles/export/view/export_view_panel_controller.cpp
index bef37dacc0..abd35bdbe1 100644
--- a/Telegram/SourceFiles/export/view/export_view_panel_controller.cpp
+++ b/Telegram/SourceFiles/export/view/export_view_panel_controller.cpp
@@ -68,7 +68,7 @@ void SuggestBox::prepare() {
 		tr::lng_export_suggest_text(tr::now),
 		st::boxLabel);
 	widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		const auto contentWidth = width
 			- st::boxPadding.left()
 			- st::boxPadding.right();
@@ -76,7 +76,7 @@ void SuggestBox::prepare() {
 		content->moveToLeft(st::boxPadding.left(), 0);
 	}, content->lifetime());
 	content->heightValue(
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		setDimensions(st::boxWidth, height + st::boxPadding.bottom());
 	}, content->lifetime());
 }
@@ -146,7 +146,7 @@ PanelController::PanelController(
 	ResolveSettings(session, *_settings);
 
 	_process->state(
-	) | rpl::start_with_next([=](State &&state) {
+	) | rpl::on_next([=](State &&state) {
 		updateState(std::move(state));
 	}, _lifetime);
 }
@@ -179,7 +179,7 @@ void PanelController::createPanel() {
 		: tr::lng_export_title)());
 	_panel->setInnerSize(st::exportPanelSize);
 	_panel->closeRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		LOG(("Export Info: Panel Hide By Close."));
 		_panel->hideGetDuration();
 	}, _panel->lifetime());
@@ -201,19 +201,19 @@ void PanelController::showSettings() {
 	});
 
 	settings->startClicks(
-	) | rpl::start_with_next([=]() {
+	) | rpl::on_next([=]() {
 		showProgress();
 		_process->startExport(*_settings, PrepareEnvironment(_session));
 	}, settings->lifetime());
 
 	settings->cancelClicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		LOG(("Export Info: Panel Hide By Cancel."));
 		_panel->hideGetDuration();
 	}, settings->lifetime());
 
 	settings->changes(
-	) | rpl::start_with_next([=](Settings &&settings) {
+	) | rpl::on_next([=](Settings &&settings) {
 		*_settings = std::move(settings);
 	}, settings->lifetime());
 
@@ -270,7 +270,7 @@ void PanelController::showCriticalError(const QString &text) {
 			st::exportErrorLabel),
 		style::margins(0, st::exportPanelSize.height() / 4, 0, 0));
 	container->widthValue(
-	) | rpl::start_with_next([label = container->entity()](int width) {
+	) | rpl::on_next([label = container->entity()](int width) {
 		label->resize(width, label->height());
 	}, container->lifetime());
 
@@ -289,7 +289,7 @@ void PanelController::showError(const QString &text) {
 	weak->setCloseByEscape(false);
 	weak->setCloseByOutsideClick(false);
 	weak->boxClosing(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		LOG(("Export Info: Panel Hide By Error: %1.").arg(text));
 		_panel->hideGetDuration();
 	}, weak->lifetime());
@@ -312,17 +312,17 @@ void PanelController::showProgress() {
 		) | rpl::then(progressState()));
 
 	progress->skipFileClicks(
-	) | rpl::start_with_next([=](uint64 randomId) {
+	) | rpl::on_next([=](uint64 randomId) {
 		_process->skipFile(randomId);
 	}, progress->lifetime());
 
 	progress->cancelClicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		stopWithConfirmation();
 	}, progress->lifetime());
 
 	progress->doneClicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (const auto finished = std::get_if<FinishedState>(&_state)) {
 			File::ShowInFolder(finished->path);
 			LOG(("Export Info: Panel Hide By Done: %1."
diff --git a/Telegram/SourceFiles/export/view/export_view_progress.cpp b/Telegram/SourceFiles/export/view/export_view_progress.cpp
index c3639b24ff..a1746d9313 100644
--- a/Telegram/SourceFiles/export/view/export_view_progress.cpp
+++ b/Telegram/SourceFiles/export/view/export_view_progress.cpp
@@ -244,7 +244,7 @@ ProgressWidget::ProgressWidget(
 , _body(this)
 , _fileShowSkipTimer([=] { _skipFile->show(anim::type::normal); }) {
 	widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		_body->resizeToWidth(width);
 		_body->moveToLeft(0, 0);
 	}, _body->lifetime());
@@ -270,7 +270,7 @@ ProgressWidget::ProgressWidget(
 
 	std::move(
 		content
-	) | rpl::start_with_next([=](Content &&content) {
+	) | rpl::on_next([=](Content &&content) {
 		updateState(std::move(content));
 	}, lifetime());
 
@@ -301,7 +301,7 @@ void ProgressWidget::setupBottomButton(not_null<Ui::RoundButton*> button) {
 	button->show();
 
 	sizeValue(
-	) | rpl::start_with_next([=](QSize size) {
+	) | rpl::on_next([=](QSize size) {
 		button->move(
 			(size.width() - button->width()) / 2,
 			(size.height() - st::exportCancelBottom - button->height()));
diff --git a/Telegram/SourceFiles/export/view/export_view_settings.cpp b/Telegram/SourceFiles/export/view/export_view_settings.cpp
index 9fb09807be..b31d87c7de 100644
--- a/Telegram/SourceFiles/export/view/export_view_settings.cpp
+++ b/Telegram/SourceFiles/export/view/export_view_settings.cpp
@@ -149,7 +149,7 @@ void SettingsWidget::setupContent() {
 	setupPathAndFormat(content);
 
 	sizeValue(
-	) | rpl::start_with_next([=](QSize size) {
+	) | rpl::on_next([=](QSize size) {
 		scroll->resize(size.width(), size.height() - buttons->height());
 		wrap->resizeToWidth(size.width());
 		content->resizeToWidth(size.width());
@@ -232,7 +232,7 @@ void SettingsWidget::setupMediaOptions(
 	value() | rpl::map([](const Settings &data) {
 		return data.types;
 	}) | rpl::distinct_until_changed(
-	) | rpl::start_with_next([=](Settings::Types types) {
+	) | rpl::on_next([=](Settings::Types types) {
 		mediaWrap->toggle((types & (Type::PersonalChats
 			| Type::BotChats
 			| Type::PrivateGroups
@@ -243,7 +243,7 @@ void SettingsWidget::setupMediaOptions(
 	}, mediaWrap->lifetime());
 
 	widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		mediaWrap->resizeToWidth(width);
 	}, mediaWrap->lifetime());
 }
@@ -495,7 +495,7 @@ void SettingsWidget::addLimitsLabel(
 			const auto toSave = widget->lifetime().make_state<TimeId>(0);
 			std::move(
 				result.secondsValue
-			) | rpl::start_with_next([=](TimeId t) {
+			) | rpl::on_next([=](TimeId t) {
 				*toSave = t;
 			}, box->lifetime());
 			box->addButton(tr::lng_settings_save(), [=] {
@@ -668,14 +668,14 @@ not_null<Ui::RpWidget*> SettingsWidget::setupButtons(
 	value() | rpl::map([](const Settings &data) {
 		return (data.types != Types(0)) || data.onlySinglePeer();
 	}) | rpl::distinct_until_changed(
-	) | rpl::start_with_next([=](bool canStart) {
+	) | rpl::on_next([=](bool canStart) {
 		refreshButtons(buttons, canStart);
 		topShadow->raise();
 		bottomShadow->raise();
 	}, buttons->lifetime());
 
 	sizeValue(
-	) | rpl::start_with_next([=](QSize size) {
+	) | rpl::on_next([=](QSize size) {
 		buttons->resizeToWidth(size.width());
 		buttons->moveToLeft(0, size.height() - buttons->height());
 		topShadow->resizeToWidth(size.width());
@@ -710,7 +710,7 @@ not_null<Ui::Checkbox*> SettingsWidget::addOption(
 			st::defaultBoxCheckbox),
 		st::exportSettingPadding);
 	checkbox->checkedChanges(
-	) | rpl::start_with_next([=](bool checked) {
+	) | rpl::on_next([=](bool checked) {
 		changeData([&](Settings &data) {
 			if (checked) {
 				data.types |= types;
@@ -753,7 +753,7 @@ void SettingsWidget::addChatOption(
 			st::exportSubSettingPadding));
 
 	onlyMy->entity()->checkedChanges(
-	) | rpl::start_with_next([=](bool checked) {
+	) | rpl::on_next([=](bool checked) {
 		changeData([&](Settings &data) {
 			if (checked) {
 				data.fullChats &= ~types;
@@ -816,7 +816,7 @@ void SettingsWidget::addMediaOption(
 			st::defaultBoxCheckbox),
 		st::exportSettingPadding);
 	checkbox->checkedChanges(
-	) | rpl::start_with_next([=](bool checked) {
+	) | rpl::on_next([=](bool checked) {
 		changeData([&](Settings &data) {
 			if (checked) {
 				data.media.types |= type;
@@ -850,7 +850,7 @@ void SettingsWidget::addSizeSlider(
 		st::exportFileSizeLabel);
 	value() | rpl::map([](const Settings &data) {
 		return data.media.sizeLimit;
-	}) | rpl::start_with_next([=](int64 sizeLimit) {
+	}) | rpl::on_next([=](int64 sizeLimit) {
 		const auto limit = sizeLimit / kMegabyte;
 		const auto size = QString::number(limit) + " MB";
 		const auto text = tr::lng_export_option_size_limit(
@@ -864,7 +864,7 @@ void SettingsWidget::addSizeSlider(
 		label->widthValue(),
 		slider->geometryValue(),
 		_2
-	) | rpl::start_with_next([=](QRect geometry) {
+	) | rpl::on_next([=](QRect geometry) {
 		label->moveToRight(
 			st::exportFileSizePadding.right(),
 			geometry.y() - label->height() - st::exportFileSizeLabelBottom);
@@ -893,7 +893,7 @@ void SettingsWidget::refreshButtons(
 		_startClicks = start->clicks() | rpl::to_empty;
 
 		container->sizeValue(
-		) | rpl::start_with_next([=](QSize size) {
+		) | rpl::on_next([=](QSize size) {
 			const auto right = st::defaultBox.buttonPadding.right();
 			const auto top = st::defaultBox.buttonPadding.top();
 			start->moveToRight(right, top);
@@ -911,7 +911,7 @@ void SettingsWidget::refreshButtons(
 	rpl::combine(
 		container->sizeValue(),
 		start ? start->widthValue() : rpl::single(0)
-	) | rpl::start_with_next([=](QSize size, int width) {
+	) | rpl::on_next([=](QSize size, int width) {
 		const auto right = st::defaultBox.buttonPadding.right()
 			+ (width ? width + st::defaultBox.buttonPadding.left() : 0);
 		const auto top = st::defaultBox.buttonPadding.top();
diff --git a/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp b/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp
index 6c956ac39f..91dff7e1ad 100644
--- a/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp
+++ b/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp
@@ -264,7 +264,7 @@ InnerWidget::InnerWidget(
 	Window::ChatThemeValueFromPeer(
 		controller,
 		channel
-	) | rpl::start_with_next([=](std::shared_ptr<Ui::ChatTheme> &&theme) {
+	) | rpl::on_next([=](std::shared_ptr<Ui::ChatTheme> &&theme) {
 		_theme = std::move(theme);
 		controller->setChatStyleTheme(_theme);
 	}, lifetime());
@@ -272,25 +272,25 @@ InnerWidget::InnerWidget(
 	setMouseTracking(true);
 	_scrollDateHideTimer.setCallback([=] { scrollDateHideByTimer(); });
 	session().data().viewRepaintRequest(
-	) | rpl::start_with_next([=](auto view) {
+	) | rpl::on_next([=](auto view) {
 		if (myView(view)) {
 			repaintItem(view);
 		}
 	}, lifetime());
 	session().data().viewResizeRequest(
-	) | rpl::start_with_next([=](auto view) {
+	) | rpl::on_next([=](auto view) {
 		if (myView(view)) {
 			resizeItem(view);
 		}
 	}, lifetime());
 	session().data().itemViewRefreshRequest(
-	) | rpl::start_with_next([=](auto item) {
+	) | rpl::on_next([=](auto item) {
 		if (const auto view = viewForItem(item)) {
 			refreshItem(view);
 		}
 	}, lifetime());
 	session().data().viewLayoutChanged(
-	) | rpl::start_with_next([=](auto view) {
+	) | rpl::on_next([=](auto view) {
 		if (myView(view)) {
 			if (view->isUnderCursor()) {
 				updateSelected();
@@ -298,7 +298,7 @@ InnerWidget::InnerWidget(
 		}
 	}, lifetime());
 	session().data().itemDataChanges(
-	) | rpl::start_with_next([=](not_null<HistoryItem*> item) {
+	) | rpl::on_next([=](not_null<HistoryItem*> item) {
 		if (const auto view = viewForItem(item)) {
 			view->itemDataChanged();
 		}
@@ -309,7 +309,7 @@ InnerWidget::InnerWidget(
 		return (_history == query.item->history())
 			&& query.item->isAdminLogEntry()
 			&& isVisible();
-	}) | rpl::start_with_next([=](
+	}) | rpl::on_next([=](
 			const Data::Session::ItemVisibilityQuery &query) {
 		if (const auto view = viewForItem(query.item)) {
 			auto top = itemTop(view);
@@ -322,7 +322,7 @@ InnerWidget::InnerWidget(
 	}, lifetime());
 
 	controller->adaptive().chatWideValue(
-	) | rpl::start_with_next([=](bool wide) {
+	) | rpl::on_next([=](bool wide) {
 		_isChatWide = wide;
 	}, lifetime());
 
@@ -1607,7 +1607,7 @@ void InnerWidget::suggestRestrictParticipant(
 			participant->session().changes().peerUpdates(
 				_channel,
 				Data::PeerUpdate::Flag::Members
-			) | rpl::start_with_next([=](const Data::PeerUpdate &update) {
+			) | rpl::on_next([=](const Data::PeerUpdate &update) {
 				_downLoaded = false;
 				preloadMore(Direction::Down);
 				lifetime->destroy();
diff --git a/Telegram/SourceFiles/history/admin_log/history_admin_log_section.cpp b/Telegram/SourceFiles/history/admin_log/history_admin_log_section.cpp
index b8f2177332..4def6c19ce 100644
--- a/Telegram/SourceFiles/history/admin_log/history_admin_log_section.cpp
+++ b/Telegram/SourceFiles/history/admin_log/history_admin_log_section.cpp
@@ -129,15 +129,15 @@ FixedBar::FixedBar(
 	_field->hide();
 	_filter->setTextTransform(Ui::RoundButton::TextTransform::NoTransform);
 	_field->cancelled(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		cancelSearch();
 	}, _field->lifetime());
 	_field->changes(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		searchUpdated();
 	}, _field->lifetime());
 	_field->submits(
-	) | rpl::start_with_next([=] { applySearch(); }, _field->lifetime());
+	) | rpl::on_next([=] { applySearch(); }, _field->lifetime());
 	_searchTimer.setCallback([=] { applySearch(); });
 
 	_cancel->hide(anim::type::instant);
@@ -296,15 +296,15 @@ Widget::Widget(
 	_fixedBar->move(0, 0);
 	_fixedBar->resizeToWidth(width());
 	_fixedBar->showFilterRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		showFilter();
 	}, lifetime());
 	_fixedBar->searchCancelRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		setInnerFocus();
 	}, lifetime());
 	_fixedBar->searchRequests(
-	) | rpl::start_with_next([=](const QString &query) {
+	) | rpl::on_next([=](const QString &query) {
 		_inner->applySearch(query);
 	}, lifetime());
 	_fixedBar->show();
@@ -312,28 +312,28 @@ Widget::Widget(
 	_fixedBarShadow->raise();
 
 	controller->adaptive().value(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateAdaptiveLayout();
 	}, lifetime());
 
 	_inner = _scroll->setOwnedWidget(object_ptr<InnerWidget>(this, controller, channel));
 	_inner->showSearchSignal(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_fixedBar->showSearch();
 	}, lifetime());
 	_inner->cancelSignal(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_fixedBar->goBack();
 	}, lifetime());
 	_inner->scrollToSignal(
-	) | rpl::start_with_next([=](int top) {
+	) | rpl::on_next([=](int top) {
 		_scroll->scrollToY(top);
 	}, lifetime());
 
 	_scroll->move(0, _fixedBar->height());
 	_scroll->show();
 	_scroll->scrolls(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		onScroll();
 	}, lifetime());
 
@@ -411,7 +411,7 @@ void Widget::setupShortcuts() {
 			&& Ui::InFocusChain(this)
 			&& !controller()->isLayerShown()
 			&& isActiveWindow();
-	}) | rpl::start_with_next([=](not_null<Shortcuts::Request*> request) {
+	}) | rpl::on_next([=](not_null<Shortcuts::Request*> request) {
 		using Command = Shortcuts::Command;
 		request->check(Command::Search, 2) && request->handle([=] {
 			_fixedBar->showSearch();
diff --git a/Telegram/SourceFiles/history/history.cpp b/Telegram/SourceFiles/history/history.cpp
index 1b770cb9c8..ac55d18102 100644
--- a/Telegram/SourceFiles/history/history.cpp
+++ b/Telegram/SourceFiles/history/history.cpp
@@ -3429,12 +3429,12 @@ void History::forumChanged(Data::Forum *old) {
 			return (_flags & Flag::IsForum) && inChatList();
 		}) | rpl::map(
 			AdjustedForumUnreadState
-		) | rpl::start_with_next([=](const Dialogs::UnreadState &old) {
+		) | rpl::on_next([=](const Dialogs::UnreadState &old) {
 			notifyUnreadStateChange(old);
 		}, forum->lifetime());
 
 		forum->chatsListChanges(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			updateChatListEntry();
 		}, forum->lifetime());
 	} else {
@@ -3466,12 +3466,12 @@ void History::monoforumChanged(Data::SavedMessages *old) {
 			return (_flags & Flag::IsMonoforumAdmin) && inChatList();
 		}) | rpl::map([=](const Dialogs::UnreadState &was) {
 			return AdjustedForumUnreadState(withMyMuted(was));
-		}) | rpl::start_with_next([=](const Dialogs::UnreadState &old) {
+		}) | rpl::on_next([=](const Dialogs::UnreadState &old) {
 			notifyUnreadStateChange(old);
 		}, monoforum->lifetime());
 
 		monoforum->chatsListChanges(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			updateChatListEntry();
 		}, monoforum->lifetime());
 	} else {
diff --git a/Telegram/SourceFiles/history/history_drag_area.cpp b/Telegram/SourceFiles/history/history_drag_area.cpp
index 4f99ec7782..f407c573d2 100644
--- a/Telegram/SourceFiles/history/history_drag_area.cpp
+++ b/Telegram/SourceFiles/history/history_drag_area.cpp
@@ -160,7 +160,7 @@ DragArea::Areas DragArea::SetupDragAreaToContainer(
 	};
 
 	container->sizeValue(
-	) | rpl::start_with_next(updateAttachGeometry, lifetime);
+	) | rpl::on_next(updateAttachGeometry, lifetime);
 
 	const auto resetDragStateIfNeeded = [=] {
 		if (*attachDragState != DragState::None
@@ -220,7 +220,7 @@ DragArea::Areas DragArea::SetupDragAreaToContainer(
 	container->events(
 	) | rpl::filter([=](not_null<QEvent*> event) {
 		return ranges::contains(kDragAreaEvents, event->type());
-	}) | rpl::start_with_next([=](not_null<QEvent*> event) {
+	}) | rpl::on_next([=](not_null<QEvent*> event) {
 		const auto type = event->type();
 
 		if (processDragEvents(event)) {
diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp
index 13c7ffa55e..793d370f71 100644
--- a/Telegram/SourceFiles/history/history_inner_widget.cpp
+++ b/Telegram/SourceFiles/history/history_inner_widget.cpp
@@ -343,7 +343,7 @@ HistoryInner::HistoryInner(
 	Window::ChatThemeValueFromPeer(
 		controller,
 		_peer
-	) | rpl::start_with_next([=](std::shared_ptr<Ui::ChatTheme> &&theme) {
+	) | rpl::on_next([=](std::shared_ptr<Ui::ChatTheme> &&theme) {
 		_theme = std::move(theme);
 		controller->setChatStyleTheme(_theme);
 	}, lifetime());
@@ -355,7 +355,7 @@ HistoryInner::HistoryInner(
 
 	setMouseTracking(true);
 	_controller->gifPauseLevelChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (!elementAnimationsPaused()) {
 			update();
 		}
@@ -366,32 +366,32 @@ HistoryInner::HistoryInner(
 	) | rpl::filter([=](const PlayRequest &request) {
 		return (request.item->history() == _history)
 			&& _controller->widget()->isActive();
-	}) | rpl::start_with_next([=](PlayRequest &&request) {
+	}) | rpl::on_next([=](PlayRequest &&request) {
 		if (const auto view = viewByItem(request.item)) {
 			_emojiInteractions->play(std::move(request), view);
 		}
 	}, lifetime());
 	_emojiInteractions->playStarted(
-	) | rpl::start_with_next([=](QString &&emoji) {
+	) | rpl::on_next([=](QString &&emoji) {
 		_controller->emojiInteractions().playStarted(_peer, std::move(emoji));
 	}, lifetime());
 
 	_reactionsManager->chosen(
-	) | rpl::start_with_next([=](ChosenReaction reaction) {
+	) | rpl::on_next([=](ChosenReaction reaction) {
 		_reactionsManager->updateButton({});
 		reactionChosen(reaction);
 	}, lifetime());
 
 	session().data().peerDecorationsUpdated(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		update();
 	}, lifetime());
 	session().data().itemRemoved(
-	) | rpl::start_with_next(
+	) | rpl::on_next(
 		[this](auto item) { itemRemoved(item); },
 		lifetime());
 	session().data().viewRemoved(
-	) | rpl::start_with_next(
+	) | rpl::on_next(
 		[this](auto view) { viewRemoved(view); },
 		lifetime());
 	rpl::merge(
@@ -399,22 +399,22 @@ HistoryInner::HistoryInner(
 		session().data().historyCleared()
 	) | rpl::filter([this](not_null<const History*> history) {
 		return (_history == history);
-	}) | rpl::start_with_next([this] {
+	}) | rpl::on_next([this] {
 		mouseActionCancel();
 	}, lifetime());
 	session().data().viewRepaintRequest(
-	) | rpl::start_with_next([this](not_null<const Element*> view) {
+	) | rpl::on_next([this](not_null<const Element*> view) {
 		repaintItem(view);
 	}, lifetime());
 	session().data().viewLayoutChanged(
 	) | rpl::filter([=](not_null<const Element*> view) {
 		return (view == viewByItem(view->data())) && view->isUnderCursor();
-	}) | rpl::start_with_next([=](not_null<const Element*> view) {
+	}) | rpl::on_next([=](not_null<const Element*> view) {
 		mouseActionUpdate();
 	}, lifetime());
 
 	session().data().itemDataChanges(
-	) | rpl::start_with_next([=](not_null<HistoryItem*> item) {
+	) | rpl::on_next([=](not_null<HistoryItem*> item) {
 		if (const auto view = viewByItem(item)) {
 			view->itemDataChanged();
 		}
@@ -424,7 +424,7 @@ HistoryInner::HistoryInner(
 		_history,
 		(Data::HistoryUpdate::Flag::OutboxRead
 			| Data::HistoryUpdate::Flag::TranslatedTo)
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		update();
 	}, lifetime());
 
@@ -433,7 +433,7 @@ HistoryInner::HistoryInner(
 		_reactionsItem.value());
 
 	Core::App().settings().cornerReactionValue(
-	) | rpl::start_with_next([=](bool value) {
+	) | rpl::on_next([=](bool value) {
 		_useCornerReaction = value;
 		if (!value) {
 			_reactionsManager->updateButton({});
@@ -441,12 +441,12 @@ HistoryInner::HistoryInner(
 	}, lifetime());
 
 	controller->adaptive().chatWideValue(
-	) | rpl::start_with_next([=](bool wide) {
+	) | rpl::on_next([=](bool wide) {
 		_isChatWide = wide;
 	}, lifetime());
 
 	_selectScroll.scrolls(
-	) | rpl::start_with_next([=](int d) {
+	) | rpl::on_next([=](int d) {
 		_scroll->scrollToY(_scroll->scrollTop() + d);
 	}, _scroll->lifetime());
 
@@ -526,7 +526,7 @@ void HistoryInner::setupSharingDisallowed() {
 		std::move(canDelete)
 	) | rpl::filter([=](bool disallowed, bool canDelete) {
 		return hasSelectRestriction() && !getSelectedItems().empty();
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		_widget->clearSelected();
 		if (_mouseAction == MouseAction::PrepareSelect) {
 			mouseActionCancel();
@@ -3079,7 +3079,7 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 					TextWithEntities{ tr::lng_sponsored_title(tr::now) },
 					&st::menuIconInfo);
 				item->clicks(
-				) | rpl::start_with_next([=] {
+				) | rpl::on_next([=] {
 					controller->show(Box(Ui::AboutSponsoredBox));
 				}, item->lifetime());
 				_menu->addAction(std::move(item));
@@ -4672,7 +4672,7 @@ void HistoryInner::refreshAboutView(bool force) {
 			_aboutView = std::make_unique<HistoryView::AboutView>(
 				_history,
 				_history->delegateMixin()->delegate());
-			_aboutView->refreshRequests() | rpl::start_with_next([=] {
+			_aboutView->refreshRequests() | rpl::on_next([=] {
 				updateBotInfo();
 			}, _aboutView->lifetime());
 			_aboutView->sendIntroSticker() | rpl::start_to_stream(
diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp
index a59c65647e..f260ce77a4 100644
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -4774,7 +4774,7 @@ void HistoryItem::createServiceFromMtp(const MTPDmessageService &message) {
 			call->lifetime.destroy();
 
 			const auto users = data.vusers().v;
-			std::move(hasLink) | rpl::start_with_next([=](bool has) {
+			std::move(hasLink) | rpl::on_next([=](bool has) {
 				updateServiceText(
 					prepareInvitedToCallText(
 						ParseInvitedToCallUsers(this, users),
@@ -7291,7 +7291,7 @@ PreparedServiceText HistoryItem::prepareCallScheduledText(
 	if (nextIn) {
 		call->lifetime = base::timer_once(
 			(nextIn + 2) * crl::time(1000)
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			updateServiceText(prepareCallScheduledText(scheduleDate));
 		});
 	}
diff --git a/Telegram/SourceFiles/history/history_item_helpers.cpp b/Telegram/SourceFiles/history/history_item_helpers.cpp
index f7097ee0f5..aabdc56ef5 100644
--- a/Telegram/SourceFiles/history/history_item_helpers.cpp
+++ b/Telegram/SourceFiles/history/history_item_helpers.cpp
@@ -460,7 +460,7 @@ bool SendPaymentHelper::check(
 			peer->session().credits().loadedValue(
 			) | rpl::filter(
 				rpl::mappers::_1
-			) | rpl::take(1) | rpl::start_with_next([=] {
+			) | rpl::take(1) | rpl::on_next([=] {
 				if (const auto callback = base::take(_resend)) {
 					callback();
 				}
@@ -472,7 +472,7 @@ bool SendPaymentHelper::check(
 			peer->session().credits().tonLoadedValue(
 			) | rpl::filter(
 				rpl::mappers::_1
-			) | rpl::take(1) | rpl::start_with_next([=] {
+			) | rpl::take(1) | rpl::on_next([=] {
 				if (const auto callback = base::take(_resend)) {
 					callback();
 				}
@@ -482,7 +482,7 @@ bool SendPaymentHelper::check(
 		peer->session().changes().peerUpdates(
 			peer,
 			Data::PeerUpdate::Flag::FullInfo
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			if (const auto callback = base::take(_resend)) {
 				callback();
 			}
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 9737f0aec4..0739f75868 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -314,7 +314,7 @@ HistoryWidget::HistoryWidget(
 , _topShadow(this) {
 	setAcceptDrops(true);
 
-	session().downloaderTaskFinished() | rpl::start_with_next([=] {
+	session().downloaderTaskFinished() | rpl::on_next([=] {
 		update();
 	}, lifetime());
 
@@ -327,16 +327,16 @@ HistoryWidget::HistoryWidget(
 			? base::EventFilterResult::Cancel
 			: base::EventFilterResult::Continue;
 	});
-	_scroll->scrolls() | rpl::start_with_next([=] {
+	_scroll->scrolls() | rpl::on_next([=] {
 		handleScroll();
 	}, lifetime());
 	_scroll->geometryChanged(
-	) | rpl::start_with_next(crl::guard(_list, [=] {
+	) | rpl::on_next(crl::guard(_list, [=] {
 		_list->onParentGeometryChanged();
 	}), lifetime());
 
 	_scroll->addContentRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (_history && _history->loadedAtBottom()) {
 			using Result = Data::SponsoredMessages::AppendResult;
 			const auto tryToAppend = [=] {
@@ -350,7 +350,7 @@ HistoryWidget::HistoryWidget(
 			if (tryToAppend() == Result::MediaLoading
 				&& !_historySponsoredPreloading) {
 				session().downloaderTaskFinished(
-				) | rpl::start_with_next([=] {
+				) | rpl::on_next([=] {
 					if (tryToAppend() != Result::MediaLoading) {
 						_historySponsoredPreloading.destroy();
 					}
@@ -362,7 +362,7 @@ HistoryWidget::HistoryWidget(
 	_fieldBarCancel->addClickHandler([=] { cancelFieldAreaState(); });
 	_send->addClickHandler([=] { sendButtonClicked(); });
 
-	_mediaEditManager.updateRequests() | rpl::start_with_next([this] {
+	_mediaEditManager.updateRequests() | rpl::on_next([this] {
 		updateOverStates(mapFromGlobal(QCursor::pos()));
 	}, lifetime());
 
@@ -394,39 +394,39 @@ HistoryWidget::HistoryWidget(
 	setupDirectMessageButton();
 	_reportMessages->addClickHandler([=] { reportSelectedMessages(); });
 	_field->submits(
-	) | rpl::start_with_next([=](Qt::KeyboardModifiers modifiers) {
+	) | rpl::on_next([=](Qt::KeyboardModifiers modifiers) {
 		sendWithModifiers(modifiers);
 	}, _field->lifetime());
 	_field->cancelled(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		escape();
 	}, _field->lifetime());
 	_field->tabbed(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		fieldTabbed();
 	}, _field->lifetime());
 	_field->heightChanges(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		fieldResized();
 	}, _field->lifetime());
 	_field->focusedChanges(
-	) | rpl::filter(rpl::mappers::_1) | rpl::start_with_next([=] {
+	) | rpl::filter(rpl::mappers::_1) | rpl::on_next([=] {
 		fieldFocused();
 	}, _field->lifetime());
 	_field->changes(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		fieldChanged();
 	}, _field->lifetime());
 #ifdef Q_OS_MAC
 	// Removed an ability to insert text from the menu bar
 	// when the field is hidden.
 	_field->shownValue(
-	) | rpl::start_with_next([=](bool shown) {
+	) | rpl::on_next([=](bool shown) {
 		_field->setEnabled(shown);
 	}, _field->lifetime());
 #endif // Q_OS_MAC
 	controller->widget()->shownValue(
-	) | rpl::skip(1) | rpl::start_with_next([=] {
+	) | rpl::skip(1) | rpl::on_next([=] {
 		windowIsVisibleChanged();
 	}, lifetime());
 
@@ -452,7 +452,7 @@ HistoryWidget::HistoryWidget(
 		base::qt_signal_producer(
 			rawTextEdit,
 			&QTextEdit::cursorPositionChanged)
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		saveDraftDelayed();
 	}, _field->lifetime());
 
@@ -463,12 +463,12 @@ HistoryWidget::HistoryWidget(
 	_kbScroll->hide();
 
 	controller->chatStyle()->paletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_scroll->updateBars();
 	}, lifetime());
 
 	_forwardPanel->itemsUpdated(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateControlsVisibility();
 		updateControlsGeometry();
 	}, lifetime());
@@ -486,7 +486,7 @@ HistoryWidget::HistoryWidget(
 	setupFastButtonMode();
 
 	_fieldCharsCountManager.limitExceeds(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto hide = _fieldCharsCountManager.isLimitExceeded();
 		if (_silent) {
 			_silent->setVisible(!hide);
@@ -504,13 +504,13 @@ HistoryWidget::HistoryWidget(
 		moveFieldControls();
 	}, lifetime());
 
-	_send->widthValue() | rpl::skip(1) | rpl::start_with_next([=] {
+	_send->widthValue() | rpl::skip(1) | rpl::on_next([=] {
 		updateFieldSize();
 		moveFieldControls();
 	}, _send->lifetime());
 
 	_keyboard->sendCommandRequests(
-	) | rpl::start_with_next([=](Bot::SendCommandRequest r) {
+	) | rpl::on_next([=](Bot::SendCommandRequest r) {
 		sendBotCommand(r);
 	}, lifetime());
 
@@ -559,7 +559,7 @@ HistoryWidget::HistoryWidget(
 		) | rpl::filter([=](const Data::PeerUpdate &update) {
 			return update.peer == _peer;
 		}) | rpl::to_empty
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		refreshAttachBotsMenu();
 	}, lifetime());
 
@@ -592,7 +592,7 @@ HistoryWidget::HistoryWidget(
 	});
 
 	Core::App().mediaDevices().recordAvailabilityValue(
-	) | rpl::start_with_next([=](Webrtc::RecordAvailability value) {
+	) | rpl::on_next([=](Webrtc::RecordAvailability value) {
 		_recordAvailability = value;
 		if (_list) {
 			updateSendButtonType();
@@ -600,17 +600,17 @@ HistoryWidget::HistoryWidget(
 	}, lifetime());
 
 	session().data().newItemAdded(
-	) | rpl::start_with_next([=](not_null<HistoryItem*> item) {
+	) | rpl::on_next([=](not_null<HistoryItem*> item) {
 		newItemAdded(item);
 	}, lifetime());
 
 	session().data().historyChanged(
-	) | rpl::start_with_next([=](not_null<History*> history) {
+	) | rpl::on_next([=](not_null<History*> history) {
 		handleHistoryChange(history);
 	}, lifetime());
 
 	session().data().viewResizeRequest(
-	) | rpl::start_with_next([=](not_null<HistoryView::Element*> view) {
+	) | rpl::on_next([=](not_null<HistoryView::Element*> view) {
 		const auto item = view->data();
 		const auto history = item->history();
 		if (item->mainView() == view
@@ -622,18 +622,18 @@ HistoryWidget::HistoryWidget(
 	session().data().itemDataChanges(
 	) | rpl::filter([=](not_null<HistoryItem*> item) {
 		return !_list && (item->mainView() != nullptr);
-	}) | rpl::start_with_next([=](not_null<HistoryItem*> item) {
+	}) | rpl::on_next([=](not_null<HistoryItem*> item) {
 		item->mainView()->itemDataChanged();
 	}, lifetime());
 
 	Core::App().settings().largeEmojiChanges(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		crl::on_main(this, [=] {
 			updateHistoryGeometry();
 		});
 	}, lifetime());
 	Core::App().settings().sendSubmitWayValue(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		crl::on_main(this, [=] {
 			updateFieldSubmitSettings();
 		});
@@ -642,7 +642,7 @@ HistoryWidget::HistoryWidget(
 	session().data().channelDifferenceTooLong(
 	) | rpl::filter([=](not_null<ChannelData*> channel) {
 		return _peer == channel.get();
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		_cornerButtons.updateJumpDownVisibility();
 		preloadHistoryIfNeeded();
 	}, lifetime());
@@ -650,7 +650,7 @@ HistoryWidget::HistoryWidget(
 	session().data().userIsBotChanges(
 	) | rpl::filter([=](not_null<UserData*> user) {
 		return (_peer == user.get());
-	}) | rpl::start_with_next([=](not_null<UserData*> user) {
+	}) | rpl::on_next([=](not_null<UserData*> user) {
 		_list->refreshAboutView();
 		_list->updateBotInfo();
 		updateControlsVisibility();
@@ -660,7 +660,7 @@ HistoryWidget::HistoryWidget(
 	session().data().botCommandsChanges(
 	) | rpl::filter([=](not_null<PeerData*> peer) {
 		return _peer && (_peer == peer);
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		if (updateCmdStartShown()) {
 			updateControlsVisibility();
 			updateControlsGeometry();
@@ -671,7 +671,7 @@ HistoryWidget::HistoryWidget(
 	session().changes().entryUpdates(
 		EntryUpdateFlag::HasPinnedMessages
 		| EntryUpdateFlag::ForwardDraft
-	) | rpl::start_with_next([=](const Data::EntryUpdate &update) {
+	) | rpl::on_next([=](const Data::EntryUpdate &update) {
 		if (_pinnedTracker
 			&& (update.flags & EntryUpdateFlag::HasPinnedMessages)
 			&& ((update.entry.get() == _history)
@@ -695,7 +695,7 @@ HistoryWidget::HistoryWidget(
 		| HistoryUpdateFlag::ClientSideMessages
 	) | rpl::filter([=](const Data::HistoryUpdate &update) {
 		return (_history == update.history.get());
-	}) | rpl::start_with_next([=](const Data::HistoryUpdate &update) {
+	}) | rpl::on_next([=](const Data::HistoryUpdate &update) {
 		const auto flags = update.flags;
 		if (flags & HistoryUpdateFlag::MessageSent) {
 			synteticScrollToY(_scroll->scrollTopMax());
@@ -730,7 +730,7 @@ HistoryWidget::HistoryWidget(
 		| MessageUpdateFlag::Edited
 		| MessageUpdateFlag::ReplyMarkup
 		| MessageUpdateFlag::BotCallbackSent
-	) | rpl::start_with_next([=](const Data::MessageUpdate &update) {
+	) | rpl::on_next([=](const Data::MessageUpdate &update) {
 		const auto flags = update.flags;
 		if (flags & MessageUpdateFlag::Destroyed) {
 			itemRemoved(update.item);
@@ -751,12 +751,12 @@ HistoryWidget::HistoryWidget(
 
 	session().changes().realtimeMessageUpdates(
 		MessageUpdateFlag::NewUnreadReaction
-	) | rpl::start_with_next([=](const Data::MessageUpdate &update) {
+	) | rpl::on_next([=](const Data::MessageUpdate &update) {
 		maybeMarkReactionsRead(update.item);
 	}, lifetime());
 
 	session().data().sentToScheduled(
-	) | rpl::start_with_next([=](const Data::SentToScheduled &value) {
+	) | rpl::on_next([=](const Data::SentToScheduled &value) {
 		const auto history = value.history;
 		if (history == _history) {
 			const auto id = value.scheduledId;
@@ -773,7 +773,7 @@ HistoryWidget::HistoryWidget(
 	}, lifetime());
 
 	session().data().sentFromScheduled(
-	) | rpl::start_with_next([=](const Data::SentFromScheduled &value) {
+	) | rpl::on_next([=](const Data::SentFromScheduled &value) {
 		if (value.item->awaitingVideoProcessing()
 			&& !_sentFromScheduledTip
 			&& HistoryView::ShowScheduledVideoPublished(
@@ -788,12 +788,12 @@ HistoryWidget::HistoryWidget(
 	Media::Player::instance()->switchToNextEvents(
 	) | rpl::filter([=](const MediaSwitch &pair) {
 		return (pair.from.type() == AudioMsgId::Type::Voice);
-	}) | rpl::start_with_next([=](const MediaSwitch &pair) {
+	}) | rpl::on_next([=](const MediaSwitch &pair) {
 		scrollToCurrentVoiceMessage(pair.from.contextId(), pair.to);
 	}, lifetime());
 
 	session().user()->flagsValue(
-	) | rpl::start_with_next([=](UserData::Flags::Change change) {
+	) | rpl::on_next([=](UserData::Flags::Change change) {
 		if (change.diff & UserData::Flag::Premium) {
 			if (const auto user = _peer ? _peer->asUser() : nullptr) {
 				if (user->requiresPremiumToWrite()) {
@@ -834,7 +834,7 @@ HistoryWidget::HistoryWidget(
 		return false;
 	}) | rpl::map([](const Data::PeerUpdate &update) {
 		return update.flags;
-	}) | rpl::start_with_next([=](Data::PeerUpdate::Flags flags) {
+	}) | rpl::on_next([=](Data::PeerUpdate::Flags flags) {
 		if (flags & PeerUpdateFlag::Rights) {
 			updateFieldPlaceholder();
 			updateSendButtonType();
@@ -900,7 +900,7 @@ HistoryWidget::HistoryWidget(
 				) | rpl::filter_optional(
 				) | rpl::take(
 					1
-				) | rpl::start_with_next([=](const Data::CloudTheme &theme) {
+				) | rpl::on_next([=](const Data::CloudTheme &theme) {
 					const auto &themes = _peer->owner().cloudThemes();
 					const auto text = themes.prepareTestingLink(theme);
 					if (!text.isEmpty()) {
@@ -926,7 +926,7 @@ HistoryWidget::HistoryWidget(
 		session().data().notifySettings().defaultUpdates(Type::User),
 		session().data().notifySettings().defaultUpdates(Type::Group),
 		session().data().notifySettings().defaultUpdates(Type::Broadcast)
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateNotifyControls();
 	}, lifetime());
 
@@ -937,7 +937,7 @@ HistoryWidget::HistoryWidget(
 			&& (_history == query.item->history())
 			&& (query.item->mainView() != nullptr)
 			&& isVisible();
-	}) | rpl::start_with_next([=](
+	}) | rpl::on_next([=](
 			const Data::Session::ItemVisibilityQuery &query) {
 		if (const auto view = query.item->mainView()) {
 			auto top = _list->itemTop(view);
@@ -952,27 +952,27 @@ HistoryWidget::HistoryWidget(
 	}, lifetime());
 
 	_topBar->membersShowAreaActive(
-	) | rpl::start_with_next([=](bool active) {
+	) | rpl::on_next([=](bool active) {
 		setMembersShowAreaActive(active);
 	}, _topBar->lifetime());
 	_topBar->forwardSelectionRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		forwardSelected();
 	}, _topBar->lifetime());
 	_topBar->deleteSelectionRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		confirmDeleteSelected();
 	}, _topBar->lifetime());
 	_topBar->clearSelectionRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		clearSelected();
 	}, _topBar->lifetime());
 	_topBar->cancelChooseForReportRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		setChooseReportMessagesDetails({}, nullptr);
 	}, _topBar->lifetime());
 	_topBar->searchRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (_history) {
 			controller->searchInChat(_history);
 		}
@@ -996,7 +996,7 @@ HistoryWidget::HistoryWidget(
 			return false;
 		}
 		return (action.history == _history);
-	}) | rpl::start_with_next([=](const Api::SendAction &action) {
+	}) | rpl::on_next([=](const Api::SendAction &action) {
 		const auto lastKeyboardUsed = lastForceReplyReplied(
 			action.replyTo.messageId);
 		if (action.replaceMediaOf) {
@@ -1028,13 +1028,13 @@ HistoryWidget::HistoryWidget(
 
 	if (session().supportMode()) {
 		session().data().chatListEntryRefreshes(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			crl::on_main(this, [=] { checkSupportPreload(true); });
 		}, lifetime());
 	}
 
 	Core::App().materializeLocalDraftsRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		saveFieldToHistoryLocalDraft();
 	}, lifetime());
 
@@ -1104,7 +1104,7 @@ void HistoryWidget::refreshDirectMessageShown() {
 		_directMessageLifetime = monoforum->flagsValue(
 		) | rpl::skip(
 			1
-		) | rpl::start_with_next([=](Flags::Change change) {
+		) | rpl::on_next([=](Flags::Change change) {
 			if (change.diff & ChannelDataFlag::MonoforumDisabled) {
 				refreshDirectMessageShown();
 			}
@@ -1166,7 +1166,7 @@ void HistoryWidget::initVoiceRecordBar() {
 	};
 
 	_voiceRecordBar->sendActionUpdates(
-	) | rpl::start_with_next([=](const auto &data) {
+	) | rpl::on_next([=](const auto &data) {
 		if (!_history) {
 			return;
 		}
@@ -1177,21 +1177,21 @@ void HistoryWidget::initVoiceRecordBar() {
 	}, lifetime());
 
 	_voiceRecordBar->sendVoiceRequests(
-	) | rpl::start_with_next([=](const VoiceToSend &data) {
+	) | rpl::on_next([=](const VoiceToSend &data) {
 		sendVoice(data);
 	}, lifetime());
 
 	_voiceRecordBar->cancelRequests(
-	) | rpl::start_with_next(applyLocalDraft, lifetime());
+	) | rpl::on_next(applyLocalDraft, lifetime());
 
 	_voiceRecordBar->lockShowStarts(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_cornerButtons.updateJumpDownVisibility();
 		_cornerButtons.updateUnreadThingsVisibility();
 	}, lifetime());
 
 	_voiceRecordBar->errors(
-	) | rpl::start_with_next([=](::Media::Capture::Error error) {
+	) | rpl::on_next([=](::Media::Capture::Error error) {
 		using Error = ::Media::Capture::Error;
 		switch (error) {
 		case Error::AudioInit:
@@ -1209,17 +1209,17 @@ void HistoryWidget::initVoiceRecordBar() {
 	}, lifetime());
 
 	_voiceRecordBar->updateSendButtonTypeRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateSendButtonType();
 	}, lifetime());
 
 	_voiceRecordBar->lockViewportEvents(
-	) | rpl::start_with_next([=](not_null<QEvent*> e) {
+	) | rpl::on_next([=](not_null<QEvent*> e) {
 		_scroll->viewportEvent(e);
 	}, lifetime());
 
 	_voiceRecordBar->recordingTipRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		Core::App().settings().setRecordVideoMessages(
 			!Core::App().settings().recordVideoMessages());
 		updateSendButtonType();
@@ -1237,7 +1237,7 @@ void HistoryWidget::initVoiceRecordBar() {
 	}, lifetime());
 
 	_voiceRecordBar->recordingStateChanges(
-	) | rpl::start_with_next([=](bool active) {
+	) | rpl::on_next([=](bool active) {
 		_field->setDisabled(active);
 		controller()->widget()->setInnerFocus();
 	}, lifetime());
@@ -1273,7 +1273,7 @@ void HistoryWidget::initTabbedSelector() {
 	selector->emojiChosen(
 	) | rpl::filter([=] {
 		return !isHidden() && !_field->isHidden();
-	}) | rpl::start_with_next([=](ChatHelpers::EmojiChosen data) {
+	}) | rpl::on_next([=](ChatHelpers::EmojiChosen data) {
 		Ui::InsertEmojiAtCursor(_field->textCursor(), data.emoji);
 	}, lifetime());
 
@@ -1281,12 +1281,12 @@ void HistoryWidget::initTabbedSelector() {
 		selector->fileChosen() | filter,
 		selector->customEmojiChosen() | filter,
 		controller()->stickerOrEmojiChosen() | filter
-	) | rpl::start_with_next([=](ChatHelpers::FileChosen &&data) {
+	) | rpl::on_next([=](ChatHelpers::FileChosen &&data) {
 		fileChosen(std::move(data));
 	}, lifetime());
 
 	selector->photoChosen(
-	) | filter | rpl::start_with_next([=](ChatHelpers::PhotoChosen data) {
+	) | filter | rpl::on_next([=](ChatHelpers::PhotoChosen data) {
 		sendExistingPhoto(data.photo, data.options);
 	}, lifetime());
 
@@ -1298,17 +1298,17 @@ void HistoryWidget::initTabbedSelector() {
 			showHistory(data.recipientOverride->id, ShowAtTheEndMsgId);
 		}
 		return (data.recipientOverride == _peer);
-	}) | rpl::start_with_next([=](ChatHelpers::InlineChosen data) {
+	}) | rpl::on_next([=](ChatHelpers::InlineChosen data) {
 		sendInlineResult(data);
 	}, lifetime());
 
 	selector->contextMenuRequested(
-	) | filter | rpl::start_with_next([=] {
+	) | filter | rpl::on_next([=] {
 		selector->showMenuWithDetails(sendMenuDetails());
 	}, lifetime());
 
 	selector->choosingStickerUpdated(
-	) | rpl::start_with_next([=](const Selector::Action &data) {
+	) | rpl::on_next([=](const Selector::Action &data) {
 		if (!_history) {
 			return;
 		}
@@ -1325,12 +1325,12 @@ void HistoryWidget::supportInitAutocomplete() {
 	_supportAutocomplete->hide();
 
 	_supportAutocomplete->insertRequests(
-	) | rpl::start_with_next([=](const QString &text) {
+	) | rpl::on_next([=](const QString &text) {
 		supportInsertText(text);
 	}, _supportAutocomplete->lifetime());
 
 	_supportAutocomplete->shareContactRequests(
-	) | rpl::start_with_next([=](const Support::Contact &contact) {
+	) | rpl::on_next([=](const Support::Contact &contact) {
 		supportShareContact(contact);
 	}, _supportAutocomplete->lifetime());
 }
@@ -1372,7 +1372,7 @@ void HistoryWidget::supportShareContact(Support::Contact contact) {
 		contact,
 		crl::guard(this, submit)));
 	box->boxClosing(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_field->document()->undo();
 	}, lifetime());
 }
@@ -1747,7 +1747,7 @@ void HistoryWidget::applyInlineBotQuery(UserData *bot, const QString &query) {
 				return sendMenuDetails();
 			});
 			_inlineResults->requesting(
-			) | rpl::start_with_next([=](bool requesting) {
+			) | rpl::on_next([=](bool requesting) {
 				_tabbedSelectorToggle->setLoading(requesting);
 			}, _inlineResults->lifetime());
 			updateControlsGeometry();
@@ -1849,7 +1849,7 @@ void HistoryWidget::toggleChooseChatTheme(
 		controller(),
 		peer);
 	_chooseTheme->shouldBeShownValue(
-	) | rpl::start_with_next(update, _chooseTheme->lifetime());
+	) | rpl::on_next(update, _chooseTheme->lifetime());
 }
 
 Ui::ChatTheme *HistoryWidget::customChatTheme() const {
@@ -2116,7 +2116,7 @@ void HistoryWidget::setupShortcuts() {
 			&& Ui::InFocusChain(this)
 			&& !controller()->isLayerShown()
 			&& window()->isActiveWindow();
-	}) | rpl::start_with_next([=](not_null<Shortcuts::Request*> request) {
+	}) | rpl::on_next([=](not_null<Shortcuts::Request*> request) {
 		using Command = Shortcuts::Command;
 		request->check(Command::Search, 1) && request->handle([=] {
 			controller()->searchInChat(_history);
@@ -2165,7 +2165,7 @@ void HistoryWidget::setupGiftToChannelButton() {
 	_giftToChannel = Ui::CreateChild<Ui::IconButton>(
 		_muteUnmute.data(),
 		st::historyGiftToChannel);
-	widthValue() | rpl::start_with_next([=](int width) {
+	widthValue() | rpl::on_next([=](int width) {
 		_giftToChannel->moveToRight(0, 0, width);
 	}, _giftToChannel->lifetime());
 	_giftToChannel->setClickedCallback([=] {
@@ -2174,7 +2174,7 @@ void HistoryWidget::setupGiftToChannelButton() {
 	rpl::combine(
 		_muteUnmute->shownValue(),
 		_joinChannel->shownValue()
-	) | rpl::start_with_next([=](bool muteUnmute, bool joinChannel) {
+	) | rpl::on_next([=](bool muteUnmute, bool joinChannel) {
 		const auto newParent = (muteUnmute && !joinChannel)
 			? _muteUnmute.data()
 			: (joinChannel && !muteUnmute)
@@ -2192,7 +2192,7 @@ void HistoryWidget::setupDirectMessageButton() {
 	_directMessage = Ui::CreateChild<Ui::IconButton>(
 		_muteUnmute.data(),
 		st::historyDirectMessage);
-	widthValue() | rpl::start_with_next([=](int width) {
+	widthValue() | rpl::on_next([=](int width) {
 		_directMessage->moveToLeft(0, 0, width);
 	}, _directMessage->lifetime());
 	_directMessage->setClickedCallback([=] {
@@ -2210,7 +2210,7 @@ void HistoryWidget::setupDirectMessageButton() {
 	rpl::combine(
 		_muteUnmute->shownValue(),
 		_joinChannel->shownValue()
-	) | rpl::start_with_next([=](bool muteUnmute, bool joinChannel) {
+	) | rpl::on_next([=](bool muteUnmute, bool joinChannel) {
 		const auto newParent = (muteUnmute && !joinChannel)
 			? _muteUnmute.data()
 			: (joinChannel && !muteUnmute)
@@ -2607,7 +2607,7 @@ void HistoryWidget::showHistory(
 			_peer,
 			false);
 		_contactStatus->bar().heightValue(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			updateControlsGeometry();
 		}, _contactStatus->bar().lifetime());
 
@@ -2619,7 +2619,7 @@ void HistoryWidget::showHistory(
 				_topBars.get(),
 				user);
 			_paysStatus->bar().heightValue(
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				updateControlsGeometry();
 			}, _paysStatus->bar().lifetime());
 			_businessBotStatus = std::make_unique<BusinessBotStatus>(
@@ -2627,7 +2627,7 @@ void HistoryWidget::showHistory(
 				_topBars.get(),
 				user);
 			_businessBotStatus->bar().heightValue(
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				updateControlsGeometry();
 			}, _businessBotStatus->bar().lifetime());
 		}
@@ -2702,7 +2702,7 @@ void HistoryWidget::showHistory(
 		_list = _scroll->setOwnedWidget(
 			object_ptr<HistoryInner>(this, _scroll, controller(), _history));
 		_list->sendIntroSticker(
-		) | rpl::start_with_next([=](not_null<DocumentData*> sticker) {
+		) | rpl::on_next([=](not_null<DocumentData*> sticker) {
 			sendExistingDocument(
 				sticker,
 				Api::MessageToSend(prepareSendAction({})));
@@ -2715,7 +2715,7 @@ void HistoryWidget::showHistory(
 				using Flags = Data::Flags<ChannelDataFlags>;
 				channel->flagsValue() | rpl::skip(
 					1
-				) | rpl::start_with_next([=](Flags::Change change) {
+				) | rpl::on_next([=](Flags::Change change) {
 					refreshJoinChannelText();
 					if (change.diff & ChannelDataFlag::MonoforumDisabled) {
 						updateCanSendMessage();
@@ -2728,7 +2728,7 @@ void HistoryWidget::showHistory(
 		}
 
 		controller()->adaptive().changes(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			_history->forceFullResize();
 			if (_migrated) {
 				_migrated->forceFullResize();
@@ -2785,7 +2785,7 @@ void HistoryWidget::showHistory(
 					Data::IsBirthdayTodayValue
 				) | rpl::flatten_latest(
 				) | rpl::distinct_until_changed(
-				) | rpl::start_with_next([=] {
+				) | rpl::on_next([=] {
 					refreshSendGiftToggle();
 					updateControlsVisibility();
 					updateControlsGeometry();
@@ -2918,12 +2918,12 @@ void HistoryWidget::setupPreview() {
 
 	using namespace HistoryView::Controls;
 	_preview = std::make_unique<WebpageProcessor>(_history, _field);
-	_preview->repaintRequests() | rpl::start_with_next([=] {
+	_preview->repaintRequests() | rpl::on_next([=] {
 		updateField();
 	}, _preview->lifetime());
 
 	_preview->parsedValue(
-	) | rpl::start_with_next([=](WebpageParsed value) {
+	) | rpl::on_next([=](WebpageParsed value) {
 		_previewTitle.setText(
 			st::msgNameStyle,
 			value.title,
@@ -2970,7 +2970,7 @@ void HistoryWidget::refreshAttachBotsMenu() {
 		_attachToggle->installEventFilter(_attachBotsMenu.get());
 	}
 	_attachBotsMenu->heightValue(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		moveFieldControls();
 	}, _attachBotsMenu->lifetime());
 }
@@ -3184,7 +3184,7 @@ void HistoryWidget::setupScheduledToggle() {
 		}
 		return rpl::never<rpl::empty_value>();
 	}) | rpl::flatten_latest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		refreshScheduledToggle();
 		updateControlsVisibility();
 		updateControlsGeometry();
@@ -3248,7 +3248,7 @@ void HistoryWidget::applySuggestOptions(
 		_peer,
 		suggest,
 		mode);
-	_suggestOptions->updates() | rpl::start_with_next([=] {
+	_suggestOptions->updates() | rpl::on_next([=] {
 		updateField();
 		saveDraftWithTextNow();
 	}, _suggestOptions->lifetime());
@@ -3289,7 +3289,7 @@ void HistoryWidget::setupSendAsToggle() {
 	) | rpl::filter([=](Main::SendAsKey key) {
 		return (key.peer == _peer)
 			&& (key.type == Main::SendAsType::Message);
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		refreshSendAsToggle();
 		updateControlsVisibility();
 		updateControlsGeometry();
@@ -5652,7 +5652,7 @@ bool HistoryWidget::updateCmdStartShown() {
 			}
 		});
 		_botMenu.button->widthValue(
-		) | rpl::start_with_next([=](int width) {
+		) | rpl::on_next([=](int width) {
 			if (width > st::historyBotMenuMaxWidth) {
 				_botMenu.button->setFullWidth(st::historyBotMenuMaxWidth);
 			} else {
@@ -5729,7 +5729,7 @@ void HistoryWidget::switchToSearch(QString query) {
 
 		using Activation = HistoryView::ComposeSearch::Activation;
 		_composeSearch->activations(
-		) | rpl::start_with_next([=](Activation activation) {
+		) | rpl::on_next([=](Activation activation) {
 			const auto item = activation.item;
 			auto params = ::Window::SectionShow(
 				::Window::SectionShow::Way::ClearStack);
@@ -5741,7 +5741,7 @@ void HistoryWidget::switchToSearch(QString query) {
 		}, _composeSearch->lifetime());
 
 		_composeSearch->destroyRequests(
-		) | rpl::take(1) | rpl::start_with_next([=] {
+		) | rpl::take(1) | rpl::on_next([=] {
 			_composeSearch = nullptr;
 
 			update();
@@ -7924,7 +7924,7 @@ void HistoryWidget::setupTranslateBar() {
 		_history);
 
 	controller()->adaptive().oneColumnValue(
-	) | rpl::start_with_next([=, raw = _translateBar.get()](bool one) {
+	) | rpl::on_next([=, raw = _translateBar.get()](bool one) {
 		raw->setShadowGeometryPostprocess([=](QRect geometry) {
 			if (!one) {
 				geometry.setLeft(geometry.left() + st::lineWidth);
@@ -7935,7 +7935,7 @@ void HistoryWidget::setupTranslateBar() {
 
 	_translateBarHeight = 0;
 	_translateBar->heightValue(
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		_topDelta = _preserveScrollTop ? 0 : (height - _translateBarHeight);
 		_translateBarHeight = height;
 		updateHistoryGeometry();
@@ -8016,7 +8016,7 @@ void HistoryWidget::checkPinnedBarState() {
 	rpl::combine(
 		rpl::duplicate(pinnedRefreshed),
 		rpl::duplicate(customButtonItem)
-	) | rpl::start_with_next([=](bool many, HistoryItem *item) {
+	) | rpl::on_next([=](bool many, HistoryItem *item) {
 		refreshPinnedBarButton(many, item);
 	}, _pinnedBar->lifetime());
 
@@ -8048,7 +8048,7 @@ void HistoryWidget::checkPinnedBarState() {
 	}));
 
 	controller()->adaptive().oneColumnValue(
-	) | rpl::start_with_next([=, raw = _pinnedBar.get()](bool one) {
+	) | rpl::on_next([=, raw = _pinnedBar.get()](bool one) {
 		raw->setShadowGeometryPostprocess([=](QRect geometry) {
 			if (!one) {
 				geometry.setLeft(geometry.left() + st::lineWidth);
@@ -8058,7 +8058,7 @@ void HistoryWidget::checkPinnedBarState() {
 	}, _pinnedBar->lifetime());
 
 	_pinnedBar->barClicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto id = _pinnedTracker->currentMessageId();
 		if (const auto item = session().data().message(id.message)) {
 			controller()->showPeerHistory(
@@ -8079,7 +8079,7 @@ void HistoryWidget::checkPinnedBarState() {
 
 	_pinnedBarHeight = 0;
 	_pinnedBar->heightValue(
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		_topDelta = _preserveScrollTop ? 0 : (height - _pinnedBarHeight);
 		_pinnedBarHeight = height;
 		updateHistoryGeometry();
@@ -8174,7 +8174,7 @@ void HistoryWidget::refreshPinnedBarButton(bool many, HistoryItem *item) {
 		const auto buttonRaw = customButton.data();
 		const auto state = buttonRaw->lifetime().make_state<State>();
 		_pinnedBar->contextMenuRequested(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			state->menu = base::make_unique_q<Ui::PopupMenu>(buttonRaw);
 			state->menu->addAction(
 				tr::lng_settings_events_pinned(tr::now),
@@ -8190,7 +8190,7 @@ void HistoryWidget::refreshPinnedBarButton(bool many, HistoryItem *item) {
 		this,
 		close ? st::historyReplyCancel : st::historyPinnedShowAll);
 	button->clicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (close) {
 			hidePinnedMessage();
 		} else {
@@ -8217,7 +8217,7 @@ void HistoryWidget::setupGroupCallBar() {
 		Core::App().appDeactivatedValue());
 
 	controller()->adaptive().oneColumnValue(
-	) | rpl::start_with_next([=](bool one) {
+	) | rpl::on_next([=](bool one) {
 		_groupCallBar->setShadowGeometryPostprocess([=](QRect geometry) {
 			if (!one) {
 				geometry.setLeft(geometry.left() + st::lineWidth);
@@ -8229,7 +8229,7 @@ void HistoryWidget::setupGroupCallBar() {
 	rpl::merge(
 		_groupCallBar->barClicks(),
 		_groupCallBar->joinClicks()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto peer = _history->peer;
 		if (peer->groupCall()) {
 			controller()->startOrJoinGroupCall(peer, {});
@@ -8238,7 +8238,7 @@ void HistoryWidget::setupGroupCallBar() {
 
 	_groupCallBarHeight = 0;
 	_groupCallBar->heightValue(
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		_topDelta = _preserveScrollTop ? 0 : (height - _groupCallBarHeight);
 		_groupCallBarHeight = height;
 		updateHistoryGeometry();
@@ -8265,7 +8265,7 @@ void HistoryWidget::setupRequestsBar() {
 			false));
 
 	controller()->adaptive().oneColumnValue(
-	) | rpl::start_with_next([=](bool one) {
+	) | rpl::on_next([=](bool one) {
 		_requestsBar->setShadowGeometryPostprocess([=](QRect geometry) {
 			if (!one) {
 				geometry.setLeft(geometry.left() + st::lineWidth);
@@ -8275,13 +8275,13 @@ void HistoryWidget::setupRequestsBar() {
 	}, _requestsBar->lifetime());
 
 	_requestsBar->barClicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		RequestsBoxController::Start(controller(), _peer);
 	}, _requestsBar->lifetime());
 
 	_requestsBarHeight = 0;
 	_requestsBar->heightValue(
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		_topDelta = _preserveScrollTop ? 0 : (height - _requestsBarHeight);
 		_requestsBarHeight = height;
 		updateHistoryGeometry();
@@ -8327,7 +8327,7 @@ void HistoryWidget::requestSponsoredMessageBar() {
 				const auto heightLifetime
 					= lifetime.make_state<rpl::lifetime>();
 				_list->heightValue(
-				) | rpl::start_with_next([=, this] {
+				) | rpl::on_next([=, this] {
 					if (_sponsoredMessageBar->toggled()) {
 						heightLifetime->destroy();
 					} else if (checkSponsoredMessageBarVisibility()) {
@@ -8376,11 +8376,11 @@ void HistoryWidget::createSponsoredMessageBar() {
 		_sponsoredMessageBar->entity());
 	session().sponsoredMessages().itemRemoved(
 		maybeFullId
-	) | rpl::start_with_next([this] {
+	) | rpl::on_next([this] {
 		_sponsoredMessageBar->toggle(false, anim::type::normal);
 		_sponsoredMessageBar->shownValue() | rpl::filter(
 			!rpl::mappers::_1
-		) | rpl::start_with_next([this] {
+		) | rpl::on_next([this] {
 			_sponsoredMessageBar = nullptr;
 		}, _sponsoredMessageBar->lifetime());
 	}, _sponsoredMessageBar->lifetime());
@@ -8393,7 +8393,7 @@ void HistoryWidget::createSponsoredMessageBar() {
 			_sponsoredMessageBar->heightValue()
 		) | rpl::filter(
 			rpl::mappers::_1 == rpl::mappers::_2
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			session().sponsoredMessages().view(maybeFullId);
 			viewLifetime->destroy();
 		}, *viewLifetime);
@@ -8401,7 +8401,7 @@ void HistoryWidget::createSponsoredMessageBar() {
 
 	_sponsoredMessageBarHeight = 0;
 	_sponsoredMessageBar->heightValue(
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		_topDelta = _preserveScrollTop
 			? 0
 			: (height - _sponsoredMessageBarHeight);
@@ -8539,7 +8539,7 @@ void HistoryWidget::validateSubsectionTabs() {
 				| ChannelDataFlag::ForumTabs
 				| ChannelDataFlag::MonoforumAdmin;
 			return change.diff & mask;
-		}) | rpl::start_with_next([=] {
+		}) | rpl::on_next([=] {
 			validateSubsectionTabs();
 		});
 	}
@@ -8567,12 +8567,12 @@ void HistoryWidget::validateSubsectionTabs() {
 			this,
 			_history);
 	}
-	_subsectionTabs->removeRequests() | rpl::start_with_next([=] {
+	_subsectionTabs->removeRequests() | rpl::on_next([=] {
 		_subsectionTabsLifetime.destroy();
 		_subsectionTabs = nullptr;
 		updateControlsGeometry();
 	}, _subsectionTabsLifetime);
-	_subsectionTabs->layoutRequests() | rpl::start_with_next([=] {
+	_subsectionTabs->layoutRequests() | rpl::on_next([=] {
 		_list->toggleRemoveFromUserpics(_subsectionTabs->leftSkip() > 0);
 		updateControlsGeometry();
 		orderWidgets();
@@ -8612,7 +8612,7 @@ void HistoryWidget::checkCharsLimitation() {
 			_charsLimitation->show();
 			Data::AmPremiumValue(
 				&session()
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				checkCharsLimitation();
 			}, _charsLimitation->lifetime());
 		}
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_characters_limit.cpp b/Telegram/SourceFiles/history/view/controls/history_view_characters_limit.cpp
index 2f56541578..f8bd4660dd 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_characters_limit.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_characters_limit.cpp
@@ -47,7 +47,7 @@ CharactersLimitLabel::CharactersLimitLabel(
 	rpl::combine(
 		Ui::RpWidget::heightValue(),
 		widgetToAlign->geometryValue()
-	) | rpl::start_with_next(_position, lifetime());
+	) | rpl::on_next(_position, lifetime());
 }
 
 void CharactersLimitLabel::setLeft(int value) {
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
index d2e41245e3..3a3abae803 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -296,17 +296,17 @@ void FieldHeader::updateTopicRootId(MsgId topicRootId) {
 
 void FieldHeader::init() {
 	sizeValue(
-	) | rpl::start_with_next([=](QSize size) {
+	) | rpl::on_next([=](QSize size) {
 		updateControlsGeometry(size);
 	}, lifetime());
 
 	_forwardPanel->itemsUpdated(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateVisible();
 	}, lifetime());
 
 	paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		Painter p(this);
 		p.setInactive(_show->paused(Window::GifPauseReason::Any));
 		p.fillRect(rect(), st::historyComposeAreaBg);
@@ -340,13 +340,13 @@ void FieldHeader::init() {
 	}, lifetime());
 
 	_editMsgId.value(
-	) | rpl::start_with_next([=](FullMsgId value) {
+	) | rpl::on_next([=](FullMsgId value) {
 		const auto shown = value ? value : _replyTo.current().messageId;
 		setShownMessage(_data->message(shown));
 	}, lifetime());
 
 	_replyTo.value(
-	) | rpl::start_with_next([=](const FullReplyTo &value) {
+	) | rpl::on_next([=](const FullReplyTo &value) {
 		if (!_editMsgId.current()) {
 			setShownMessage(_data->message(value.messageId));
 		}
@@ -357,7 +357,7 @@ void FieldHeader::init() {
 		| Data::MessageUpdate::Flag::Destroyed
 	) | rpl::filter([=](const Data::MessageUpdate &update) {
 		return (update.item == _shownMessage);
-	}) | rpl::start_with_next([=](const Data::MessageUpdate &update) {
+	}) | rpl::on_next([=](const Data::MessageUpdate &update) {
 		if (update.flags & Data::MessageUpdate::Flag::Destroyed) {
 			if (_editMsgId.current() == update.item->fullId()) {
 				_editCancelled.fire({});
@@ -395,7 +395,7 @@ void FieldHeader::init() {
 				|| readyToForward()
 				|| replyingToMessage()
 				|| _preview.parsed);
-	}) | rpl::start_with_next([=](not_null<QEvent*> event) {
+	}) | rpl::on_next([=](not_null<QEvent*> event) {
 		const auto updateOver = [&](bool inClickable, bool inPhotoEdit) {
 			if (_inClickable != inClickable) {
 				_inClickable = inClickable;
@@ -553,7 +553,7 @@ void FieldHeader::previewReady(
 
 	std::move(
 		parsed
-	) | rpl::start_with_next([=](Controls::WebpageParsed parsed) {
+	) | rpl::on_next([=](Controls::WebpageParsed parsed) {
 		_preview.parsed = std::move(parsed);
 		_preview.title.setText(
 			st::msgNameStyle,
@@ -827,7 +827,7 @@ void FieldHeader::applySuggestOptions(
 		_history->peer,
 		suggest,
 		mode);
-	_suggestOptions->updates() | rpl::start_with_next([=] {
+	_suggestOptions->updates() | rpl::on_next([=] {
 		update();
 		_saveDraftRequests.fire({});
 	}, _suggestOptions->lifetime());
@@ -1059,7 +1059,7 @@ ComposeControls::ComposeControls(
 	if (descriptor.scheduledToggleValue) {
 		std::move(
 			descriptor.scheduledToggleValue
-		) | rpl::start_with_next([=](bool hasScheduled) {
+		) | rpl::on_next([=](bool hasScheduled) {
 			if (!_scheduled && hasScheduled) {
 				_scheduled = base::make_unique_q<Ui::IconButton>(
 					_wrap.get(),
@@ -1175,7 +1175,7 @@ void ComposeControls::initLikeButton() {
 	if (_like) {
 		_like->setClickedCallback([=] { _likeToggled.fire({}); });
 		_liked.value(
-		) | rpl::start_with_next([=](bool liked) {
+		) | rpl::on_next([=](bool liked) {
 			const auto icon = liked ? &_st.liked : nullptr;
 			_like->setIconOverride(icon, icon);
 		}, _like->lifetime());
@@ -1363,7 +1363,7 @@ void ComposeControls::setupCommentsShownNewDot() {
 	_commentsShownNewDot->setGeometry(
 		QRect(_st.commentsUnreadPosition, QSize(full, full)));
 	_commentsShownNewDot->show();
-	_commentsShownNewDot->paintRequest() | rpl::start_with_next([=] {
+	_commentsShownNewDot->paintRequest() | rpl::on_next([=] {
 		auto p = QPainter(_commentsShownNewDot);
 		auto hq = PainterHighQualityEnabler(p);
 
@@ -1388,7 +1388,7 @@ void ComposeControls::setToggleCommentsButton(
 		});
 		updateControlsParents();
 		_commentsShownHidden.value(
-		) | rpl::start_with_next([=](bool hidden) {
+		) | rpl::on_next([=](bool hidden) {
 			if (_commentsShown->isHidden() != hidden) {
 				if (hidden) {
 					_commentsShown->hide();
@@ -1400,7 +1400,7 @@ void ComposeControls::setToggleCommentsButton(
 		}, _commentsShown->lifetime());
 		std::move(
 			state
-		) | rpl::start_with_next([=](ToggleCommentsState value) {
+		) | rpl::on_next([=](ToggleCommentsState value) {
 			if (value == ToggleCommentsState::Empty) {
 				_commentsShownHidden = true;
 				return;
@@ -1441,13 +1441,13 @@ void ComposeControls::setStarsReactionCounter(
 		updateControlsVisibility();
 
 		_starsReaction->widthValue(
-		) | rpl::start_with_next([=](int width) {
+		) | rpl::on_next([=](int width) {
 			updateControlsGeometry(_wrap->size());
 		}, _starsReaction->lifetime());
 
 		_starsReaction->setAcceptBoth();
 		_starsReaction->clicks(
-		) | rpl::start_with_next([=](Qt::MouseButton button) {
+		) | rpl::on_next([=](Qt::MouseButton button) {
 			if (_chosenStarsCount && button == Qt::LeftButton) {
 				_starsReactionIncrements.fire({ .count = 1 });
 				startStarsSendEffect();
@@ -1471,7 +1471,7 @@ void ComposeControls::setStarsReactionCounter(
 
 		std::move(
 			effects
-		) | rpl::start_with_next([=](const SendStarButtonEffect &event) {
+		) | rpl::on_next([=](const SendStarButtonEffect &event) {
 			startStarsEffect(event);
 		}, _starsReaction->lifetime());
 	}
@@ -1507,7 +1507,7 @@ void ComposeControls::setupStarsSendEffectsCanvas() {
 		_wrap->geometryValue(),
 		_writeRestricted->geometryValue(),
 		_starsReaction->geometryValue()
-	) | rpl::start_with_next([=](QRect wrap, QRect restriction, QRect star) {
+	) | rpl::on_next([=](QRect wrap, QRect restriction, QRect star) {
 		const auto parent = (_starsReaction->parentWidget() == _wrap.get())
 			? wrap
 			: restriction;
@@ -1520,7 +1520,7 @@ void ComposeControls::setupStarsSendEffectsCanvas() {
 			effectSize);
 	}, raw->lifetime());
 
-	raw->paintRequest() | rpl::start_with_next([=] {
+	raw->paintRequest() | rpl::on_next([=] {
 		for (auto i = begin(_starSendEffects); i != end(_starSendEffects);) {
 			if ((*i)->finished()) {
 				i = _starSendEffects.erase(i);
@@ -1582,7 +1582,7 @@ void ComposeControls::setupStarsEffectsCanvas() {
 		_wrap->geometryValue(),
 		_writeRestricted->geometryValue(),
 		_starsReaction->geometryValue()
-	) | rpl::start_with_next([=](QRect wrap, QRect restriction, QRect star) {
+	) | rpl::on_next([=](QRect wrap, QRect restriction, QRect star) {
 		const auto parent = (_starsReaction->parentWidget() == _wrap.get())
 			? wrap
 			: restriction;
@@ -1595,7 +1595,7 @@ void ComposeControls::setupStarsEffectsCanvas() {
 			height);
 	}, raw->lifetime());
 
-	raw->paintRequest() | rpl::start_with_next([=] {
+	raw->paintRequest() | rpl::on_next([=] {
 		const auto now = crl::now();
 		for (auto i = begin(_starEffects); i != end(_starEffects);) {
 			const auto progress = float64(now - (*i)->start)
@@ -2003,13 +2003,13 @@ void ComposeControls::init() {
 	initVoiceRecordBar();
 	initKeyHandler();
 	initEditStarsButton();
-	_minStarsCount.changes() | rpl::start_with_next([=] {
+	_minStarsCount.changes() | rpl::on_next([=] {
 		initEditStarsButton();
 		updateControlsGeometry(_wrap->size());
 	}, _wrap->lifetime());
 
 	_hidden.changes(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateWrappingVisibility();
 	}, _wrap->lifetime());
 
@@ -2020,23 +2020,23 @@ void ComposeControls::init() {
 	initLikeButton();
 
 	_wrap->sizeValue(
-	) | rpl::start_with_next([=](QSize size) {
+	) | rpl::on_next([=](QSize size) {
 		updateControlsGeometry(size);
 	}, _wrap->lifetime());
 
 	_wrap->geometryValue(
-	) | rpl::start_with_next([=](QRect rect) {
+	) | rpl::on_next([=](QRect rect) {
 		updateOuterGeometry(rect);
 	}, _wrap->lifetime());
 
 	_wrap->paintRequest(
-	) | rpl::start_with_next([=](QRect clip) {
+	) | rpl::on_next([=](QRect clip) {
 		auto p = QPainter(_wrap.get());
 		paintBackground(p, _wrap->rect(), clip);
 	}, _wrap->lifetime());
 
 	_header->editMsgIdValue(
-	) | rpl::start_with_next([=](const auto &id) {
+	) | rpl::on_next([=](const auto &id) {
 		unregisterDraftSources();
 		updateSendButtonType();
 		if (_history && updateSendAsButton(nullptr)) {
@@ -2048,7 +2048,7 @@ void ComposeControls::init() {
 	}, _wrap->lifetime());
 
 	_header->editPhotoRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto queryToEdit = _header->queryToEdit();
 		EditCaptionBox::StartPhotoEdit(
 			_regularWindow,
@@ -2062,7 +2062,7 @@ void ComposeControls::init() {
 	}, _wrap->lifetime());
 
 	_header->editOptionsRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto history = _history;
 		const auto topicRootId = _topicRootId;
 		const auto monoforumPeerId = _monoforumPeerId;
@@ -2111,7 +2111,7 @@ void ComposeControls::init() {
 	}, _wrap->lifetime());
 
 	_header->previewCancelled(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (_preview) {
 			_preview->apply({ .removed = true });
 		}
@@ -2119,27 +2119,27 @@ void ComposeControls::init() {
 	}, _wrap->lifetime());
 
 	_header->saveDraftRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		saveDraftWithTextNow();
 	}, _wrap->lifetime());
 
 	_header->editCancelled(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		cancelEditMessage();
 	}, _wrap->lifetime());
 
 	_header->replyCancelled(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		cancelReplyMessage();
 	}, _wrap->lifetime());
 
 	_header->forwardCancelled(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		cancelForward();
 	}, _wrap->lifetime());
 
 	_header->visibleChanged(
-	) | rpl::start_with_next([=](bool shown) {
+	) | rpl::on_next([=](bool shown) {
 		updateHeight();
 		if (shown) {
 			raisePanels();
@@ -2148,34 +2148,34 @@ void ComposeControls::init() {
 
 	sendContentRequests(
 		SendRequestType::Voice
-	) | rpl::start_with_next([=](Api::SendOptions options) {
+	) | rpl::on_next([=](Api::SendOptions options) {
 		_voiceRecordBar->requestToSendWithOptions(options);
 	}, _wrap->lifetime());
 
 	_header->editMsgIdValue(
-	) | rpl::start_with_next([=](const auto &id) {
+	) | rpl::on_next([=](const auto &id) {
 		_editingId = id;
 	}, _wrap->lifetime());
 
 	session().data().itemRemoved(
 	) | rpl::filter([=](not_null<const HistoryItem*> item) {
 		return (_editingId == item->fullId());
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		cancelEditMessage();
 	}, _wrap->lifetime());
 
 	Core::App().materializeLocalDraftsRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		saveFieldToHistoryLocalDraft();
 	}, _wrap->lifetime());
 
 	Core::App().settings().sendSubmitWayValue(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateSubmitSettings();
 	}, _wrap->lifetime());
 
 	session().attachWebView().attachBotsUpdates(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateAttachBotsMenu();
 	}, _wrap->lifetime());
 
@@ -2236,7 +2236,7 @@ void ComposeControls::initKeyHandler() {
 	_wrap->events(
 	) | rpl::filter([=](not_null<QEvent*> event) {
 		return (event->type() == QEvent::KeyPress);
-	}) | rpl::start_with_next([=](not_null<QEvent*> e) {
+	}) | rpl::on_next([=](not_null<QEvent*> e) {
 		auto keyEvent = static_cast<QKeyEvent*>(e.get());
 		const auto key = keyEvent->key();
 		const auto isCtrl = keyEvent->modifiers() == Qt::ControlModifier;
@@ -2300,22 +2300,22 @@ void ComposeControls::initField() {
 	_field->setMaxHeight(st::historyComposeFieldMaxHeight);
 	updateSubmitSettings();
 	_field->cancelled(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		escape();
 	}, _field->lifetime());
 	_field->heightChanges(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateHeight();
 	}, _field->lifetime());
 	_field->changes(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		fieldChanged();
 	}, _field->lifetime());
 #ifdef Q_OS_MAC
 	// Removed an ability to insert text from the menu bar
 	// when the field is hidden.
 	_field->shownValue(
-	) | rpl::start_with_next([=](bool shown) {
+	) | rpl::on_next([=](bool shown) {
 		_field->setEnabled(shown);
 	}, _field->lifetime());
 #endif // Q_OS_MAC
@@ -2340,7 +2340,7 @@ void ComposeControls::initField() {
 		base::qt_signal_producer(
 			rawTextEdit,
 			&QTextEdit::cursorPositionChanged)
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		saveDraftDelayed();
 	}, _field->lifetime());
 }
@@ -2785,7 +2785,7 @@ void ComposeControls::initTabbedSelector() {
 	});
 
 	_selector->emojiChosen(
-	) | rpl::start_with_next([=](ChatHelpers::EmojiChosen data) {
+	) | rpl::on_next([=](ChatHelpers::EmojiChosen data) {
 		Ui::InsertEmojiAtCursor(_field->textCursor(), data.emoji);
 	}, wrap->lifetime());
 
@@ -2793,7 +2793,7 @@ void ComposeControls::initTabbedSelector() {
 		_selector->fileChosen(),
 		_selector->customEmojiChosen(),
 		_stickerOrEmojiChosen.events()
-	) | rpl::start_with_next([=](ChatHelpers::FileChosen &&data) {
+	) | rpl::on_next([=](ChatHelpers::FileChosen &&data) {
 		if (const auto info = data.document->sticker()
 			; info && info->setType == Data::StickersType::Emoji) {
 			if (data.document->isPremiumEmoji()
@@ -2820,12 +2820,12 @@ void ComposeControls::initTabbedSelector() {
 	) | rpl::start_to_stream(_inlineResultChosen, wrap->lifetime());
 
 	_selector->contextMenuRequested(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_selector->showMenuWithDetails(sendMenuDetails());
 	}, wrap->lifetime());
 
 	_selector->choosingStickerUpdated(
-	) | rpl::start_with_next([=](ChatHelpers::TabbedSelector::Action action) {
+	) | rpl::on_next([=](ChatHelpers::TabbedSelector::Action action) {
 		_sendActionUpdates.fire({
 			.type = Api::SendProgressType::ChooseSticker,
 			.cancel = (action == ChatHelpers::TabbedSelector::Action::Cancel),
@@ -2837,12 +2837,12 @@ void ComposeControls::initSendButton() {
 	rpl::combine(
 		_slowmodeSecondsLeft.value(),
 		_sendDisabledBySlowmode.value()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateSendButtonType();
 	}, _send->lifetime());
 
 	Core::App().mediaDevices().recordAvailabilityValue(
-	) | rpl::start_with_next([=](Webrtc::RecordAvailability value) {
+	) | rpl::on_next([=](Webrtc::RecordAvailability value) {
 		_recordAvailability = value;
 		updateSendButtonType();
 	}, _send->lifetime());
@@ -2850,7 +2850,7 @@ void ComposeControls::initSendButton() {
 	_send->finishAnimating();
 
 	_send->clicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (_send->type() == Ui::SendButton::Type::Cancel) {
 			cancelInlineBot();
 		}
@@ -2883,7 +2883,7 @@ void ComposeControls::initSendButton() {
 		&_st.tabbed.menu,
 		&_st.tabbed.icons);
 
-	_send->widthValue() | rpl::skip(1) | rpl::start_with_next([=] {
+	_send->widthValue() | rpl::skip(1) | rpl::on_next([=] {
 		updateControlsGeometry(_wrap->size());
 	}, _send->lifetime());
 }
@@ -2906,7 +2906,7 @@ void ComposeControls::initSendAsButton(
 		(videoStream
 			? rpl::single(true)
 			: Data::CanSendAnythingValue(key.peer, false))
-	) | rpl::skip(1) | rpl::start_with_next([=] {
+	) | rpl::skip(1) | rpl::on_next([=] {
 		if (updateSendAsButton(videoStream)) {
 			updateControlsVisibility();
 			updateControlsGeometry(_wrap->size());
@@ -3017,7 +3017,7 @@ void SetupRestrictionView(
 		label->show();
 		label->setAttribute(Qt::WA_TransparentForMouseEvents);
 		label->heightValue(
-		) | rpl::start_with_next(
+		) | rpl::on_next(
 			state->updateGeometries,
 			label->lifetime());
 		return label;
@@ -3038,7 +3038,7 @@ void SetupRestrictionView(
 		auto icon = std::make_unique<Ui::RpWidget>(widget);
 		icon->resize(st->premiumRequired.icon.size());
 		icon->show();
-		icon->paintRequest() | rpl::start_with_next([st, raw = icon.get()] {
+		icon->paintRequest() | rpl::on_next([st, raw = icon.get()] {
 			auto p = QPainter(raw);
 			st->premiumRequired.icon.paint(p, {}, raw->width());
 		}, icon->lifetime());
@@ -3047,7 +3047,7 @@ void SetupRestrictionView(
 	std::move(
 		restriction
 	) | rpl::distinct_until_changed(
-	) | rpl::start_with_next([=](Controls::WriteRestriction value) {
+	) | rpl::on_next([=](Controls::WriteRestriction value) {
 		using Type = Controls::WriteRestriction::Type;
 		if (value.type == Type::Frozen) {
 			state->icon = nullptr;
@@ -3096,9 +3096,9 @@ void SetupRestrictionView(
 	}, widget->lifetime());
 
 	widget->sizeValue(
-	) | rpl::start_with_next(state->updateGeometries, widget->lifetime());
+	) | rpl::on_next(state->updateGeometries, widget->lifetime());
 
-	widget->paintRequest() | rpl::start_with_next([=](QRect clip) {
+	widget->paintRequest() | rpl::on_next([=](QRect clip) {
 		auto p = QPainter(widget);
 		paintBackground(p, clip);
 	}, widget->lifetime());
@@ -3117,7 +3117,7 @@ void ComposeControls::initWriteRestriction() {
 	_writeRestricted = std::make_unique<Ui::RpWidget>(_parent);
 	_writeRestricted->move(_wrap->pos());
 	_writeRestricted->resizeToWidth(_wrap->widthNoMargins());
-	_writeRestricted->sizeValue() | rpl::start_with_next([=] {
+	_writeRestricted->sizeValue() | rpl::on_next([=] {
 		if (_like && _like->parentWidget() == _writeRestricted.get()) {
 			updateControlsGeometry(_wrap->size());
 		}
@@ -3137,7 +3137,7 @@ void ComposeControls::initWriteRestriction() {
 		background);
 
 	_writeRestriction.value(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateWrappingVisibility();
 	}, _writeRestricted->lifetime());
 }
@@ -3151,7 +3151,7 @@ void ComposeControls::changeFocusedControl() {
 
 void ComposeControls::initVoiceRecordBar() {
 	_voiceRecordBar->recordingStateChanges(
-	) | rpl::start_with_next([=](bool active) {
+	) | rpl::on_next([=](bool active) {
 		if (active) {
 			_recording = true;
 			changeFocusedControl();
@@ -3186,7 +3186,7 @@ void ComposeControls::initVoiceRecordBar() {
 	});
 
 	_voiceRecordBar->recordingTipRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		Core::App().settings().setRecordVideoMessages(
 			!Core::App().settings().recordVideoMessages());
 		updateSendButtonType();
@@ -3204,7 +3204,7 @@ void ComposeControls::initVoiceRecordBar() {
 	}, _wrap->lifetime());
 
 	_voiceRecordBar->errors(
-	) | rpl::start_with_next([=](::Media::Capture::Error error) {
+	) | rpl::on_next([=](::Media::Capture::Error error) {
 		using Error = ::Media::Capture::Error;
 		switch (error) {
 		case Error::AudioInit:
@@ -3222,14 +3222,14 @@ void ComposeControls::initVoiceRecordBar() {
 	}, _wrap->lifetime());
 
 	_voiceRecordBar->updateSendButtonTypeRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateSendButtonType();
 	}, _wrap->lifetime());
 
 	Shortcuts::Requests(
 	) | rpl::filter([=] {
 		return Ui::AppInFocus();
-	}) | rpl::start_with_next([=](not_null<Shortcuts::Request*> request) {
+	}) | rpl::on_next([=](not_null<Shortcuts::Request*> request) {
 		using Command = Shortcuts::Command;
 		if (Data::CanSendAnything(_history->peer)) {
 			const auto isVoice = request->check(Command::RecordVoice, 1);
@@ -3590,7 +3590,7 @@ void ComposeControls::updateAttachBotsMenu() {
 		Ui::PanelAnimation::Origin::BottomLeft);
 	_attachToggle->installEventFilter(_attachBotsMenu.get());
 	_attachBotsMenu->heightValue(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateOuterGeometry(_wrap->geometry());
 	}, _attachBotsMenu->lifetime());
 }
@@ -3936,7 +3936,7 @@ void ComposeControls::initWebpageProcess() {
 		_field);
 
 	_preview->repaintRequests(
-	) | rpl::start_with_next(crl::guard(_header.get(), [=] {
+	) | rpl::on_next(crl::guard(_header.get(), [=] {
 		_header->update();
 	}), _historyLifetime);
 
@@ -3950,7 +3950,7 @@ void ComposeControls::initWebpageProcess() {
 		return (update.peer.get() == peer);
 	}) | rpl::map([](const Data::PeerUpdate &update) {
 		return update.flags;
-	}) | rpl::start_with_next([=](Data::PeerUpdate::Flags flags) {
+	}) | rpl::on_next([=](Data::PeerUpdate::Flags flags) {
 		if (flags & Data::PeerUpdate::Flag::Rights) {
 			_preview->checkNow(false);
 			updateFieldPlaceholder();
@@ -3979,7 +3979,7 @@ void ComposeControls::initForwardProcess() {
 	using EntryUpdateFlag = Data::EntryUpdate::Flag;
 	session().changes().entryUpdates(
 		EntryUpdateFlag::ForwardDraft
-	) | rpl::start_with_next([=](const Data::EntryUpdate &update) {
+	) | rpl::on_next([=](const Data::EntryUpdate &update) {
 		if (const auto topic = update.entry->asTopic()) {
 			if (topic->history() == _history
 				&& topic->rootId() == _topicRootId) {
@@ -4189,7 +4189,7 @@ void ComposeControls::applyInlineBotQuery(
 				return sendMenuDetails();
 			});
 			_inlineResults->requesting(
-			) | rpl::start_with_next([=](bool requesting) {
+			) | rpl::on_next([=](bool requesting) {
 				_tabbedSelectorToggle->setLoading(requesting);
 			}, _inlineResults->lifetime());
 			updateOuterGeometry(_wrap->geometry());
@@ -4272,7 +4272,7 @@ void ComposeControls::checkCharsLimitation() {
 			_charsLimitation->show();
 			Data::AmPremiumValue(
 				&session()
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				checkCharsLimitation();
 			}, _charsLimitation->lifetime());
 		}
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_media_edit_manager.cpp b/Telegram/SourceFiles/history/view/controls/history_view_compose_media_edit_manager.cpp
index 45ababebce..2897317dff 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_media_edit_manager.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_media_edit_manager.cpp
@@ -36,7 +36,7 @@ void MediaEditManager::start(
 	_spoilered = spoilered.value_or(media->hasSpoiler());
 	_invertCaption = invertCaption.value_or(item->invertMedia());
 	_lifetime = item->history()->owner().itemRemoved(
-	) | rpl::start_with_next([=](not_null<const HistoryItem*> removed) {
+	) | rpl::on_next([=](not_null<const HistoryItem*> removed) {
 		if (removed == _item) {
 			cancel();
 		}
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_search.cpp b/Telegram/SourceFiles/history/view/controls/history_view_compose_search.cpp
index 81710f3b5d..7f0297b102 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_search.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_search.cpp
@@ -250,12 +250,12 @@ List CreateList(
 		object_ptr<PeerListContent>(scroll, list.controller.get()));
 
 	list.controller->resetScrollRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		scroll->scrollToY(0);
 	}, scroll->lifetime());
 
 	scroll->scrolls(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto top = scroll->scrollTop();
 		content->setVisibleTopBottom(top, top + scroll->height());
 	}, scroll->lifetime());
@@ -264,13 +264,13 @@ List CreateList(
 	list.controller->setDelegate(delegate);
 
 	list.container->sizeValue(
-	) | rpl::start_with_next([=](const QSize &size) {
+	) | rpl::on_next([=](const QSize &size) {
 		content->resize(size.width(), content->height());
 		scroll->resize(size);
 	}, list.container->lifetime());
 
 	list.container->paintRequest(
-	) | rpl::start_with_next([weak = base::make_weak(list.container.get())](
+	) | rpl::on_next([weak = base::make_weak(list.container.get())](
 			const QRect &r) {
 		auto p = QPainter(weak.get());
 		p.fillRect(r, st::dialogsBg);
@@ -357,12 +357,12 @@ TopBar::TopBar(
 	moveToLeft(0, 0);
 
 	parent->geometryValue(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateSize();
 	}, lifetime());
 
 	sizeValue(
-	) | rpl::start_with_next([=](const QSize &s) {
+	) | rpl::on_next([=](const QSize &s) {
 		const auto height = st::topBarHeight;
 		_cancel->moveToLeft(0, (height - _cancel->height()) / 2);
 
@@ -373,7 +373,7 @@ TopBar::TopBar(
 	}, lifetime());
 
 	paintRequest(
-	) | rpl::start_with_next([=](const QRect &r) {
+	) | rpl::on_next([=](const QRect &r) {
 		auto p = QPainter(this);
 		p.fillRect(r, st::dialogsBg);
 	}, lifetime());
@@ -464,12 +464,12 @@ void TopBar::refreshTags() {
 	parent->show();
 
 	_searchTags->heightValue(
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		updateSize();
 		shadow->setVisible(height > 0);
 	}, _searchTags->lifetime());
 
-	geometryValue() | rpl::start_with_next([=](QRect geometry) {
+	geometryValue() | rpl::on_next([=](QRect geometry) {
 		shadow->setGeometry(
 			geometry.x(),
 			geometry.y() + geometry.height(),
@@ -478,13 +478,13 @@ void TopBar::refreshTags() {
 	}, shadow->lifetime());
 
 	_searchTags->selectedChanges(
-	) | rpl::start_with_next([=](std::vector<Data::ReactionId> &&list) {
+	) | rpl::on_next([=](std::vector<Data::ReactionId> &&list) {
 		_searchTagsSelected = std::move(list);
 		requestSearch(false);
 	}, _searchTags->lifetime());
 
 	_searchTags->menuRequests(
-	) | rpl::start_with_next([=](Data::ReactionId id) {
+	) | rpl::on_next([=](Data::ReactionId id) {
 		ShowTagInListMenu(
 			&_menu,
 			_mouseGlobalPosition.value_or(QCursor::pos()),
@@ -502,11 +502,11 @@ void TopBar::refreshTags() {
 	const auto padding = st::searchInChatTagsPadding;
 	const auto position = QPoint(padding.left(), padding.top());
 
-	_searchTags->repaintRequests() | rpl::start_with_next([=] {
+	_searchTags->repaintRequests() | rpl::on_next([=] {
 		parent->update();
 	}, _searchTags->lifetime());
 
-	widthValue() | rpl::start_with_next([=](int width) {
+	widthValue() | rpl::on_next([=](int width) {
 		width -= padding.left() + padding.right();
 		_searchTags->resizeToWidth(width);
 	}, _searchTags->lifetime());
@@ -514,19 +514,19 @@ void TopBar::refreshTags() {
 	rpl::combine(
 		widthValue(),
 		_searchTags->heightValue()
-	) | rpl::start_with_next([=](int width, int height) {
+	) | rpl::on_next([=](int width, int height) {
 		height += padding.top() + padding.bottom();
 		parent->setGeometry(0, st::topBarHeight, width, height);
 	}, _searchTags->lifetime());
 
-	parent->paintRequest() | rpl::start_with_next([=](const QRect &r) {
+	parent->paintRequest() | rpl::on_next([=](const QRect &r) {
 		auto p = Painter(parent);
 		p.fillRect(r, st::dialogsBg);
 		_searchTags->paint(p, position, crl::now(), false);
 	}, parent->lifetime());
 
 	parent->setMouseTracking(true);
-	parent->events() | rpl::start_with_next([=](not_null<QEvent*> e) {
+	parent->events() | rpl::on_next([=](not_null<QEvent*> e) {
 		if (e->type() == QEvent::MouseMove) {
 			const auto mouse = static_cast<QMouseEvent*>(e.get());
 			_mouseGlobalPosition = mouse->globalPos();
@@ -685,7 +685,7 @@ BottomBar::BottomBar(not_null<Ui::RpWidget*> parent, bool fastShowChooseFrom)
 	_chooseFromUser->setVisible(fastShowChooseFrom);
 
 	parent->geometryValue(
-	) | rpl::start_with_next([=](const QRect &r) {
+	) | rpl::on_next([=](const QRect &r) {
 		const auto height = st::historyComposeButton.height;
 		resize(r.width(), height);
 		moveToLeft(0, r.height() - height);
@@ -697,7 +697,7 @@ BottomBar::BottomBar(not_null<Ui::RpWidget*> parent, bool fastShowChooseFrom)
 		_chooseFromUser->shownValue() | mapSize,
 		_counter->sizeValue() | mapSize,
 		sizeValue()
-	) | rpl::start_with_next([=](const QSize &s) {
+	) | rpl::on_next([=](const QSize &s) {
 		_showList->setGeometry(QRect(QPoint(), s));
 		_previous->moveToRight(0, (s.height() - _previous->height()) / 2);
 		_next->moveToRight(
@@ -719,13 +719,13 @@ BottomBar::BottomBar(not_null<Ui::RpWidget*> parent, bool fastShowChooseFrom)
 	}, lifetime());
 
 	paintRequest(
-	) | rpl::start_with_next([=](const QRect &r) {
+	) | rpl::on_next([=](const QRect &r) {
 		auto p = QPainter(this);
 		p.fillRect(r, st::dialogsBg);
 	}, lifetime());
 
 	_current.value(
-	) | rpl::start_with_next([=](int current) {
+	) | rpl::on_next([=](int current) {
 		const auto nextDisabled = (current <= 0) || (current >= _total);
 		const auto prevDisabled = (current <= 1);
 		_next.enabled = !nextDisabled;
@@ -750,7 +750,7 @@ BottomBar::BottomBar(not_null<Ui::RpWidget*> parent, bool fastShowChooseFrom)
 	rpl::merge(
 		_next->clicks() | rpl::map_to(1),
 		_previous->clicks() | rpl::map_to(-1)
-	) | rpl::start_with_next([=](int way) {
+	) | rpl::on_next([=](int way) {
 		_current = _current.current() + way;
 	}, lifetime());
 }
@@ -826,7 +826,7 @@ rpl::producer<> BottomBar::showListRequests() const {
 void BottomBar::buttonFromToggleOn(rpl::producer<bool> &&visible) {
 	std::move(
 		visible
-	) | rpl::start_with_next([=](bool value) {
+	) | rpl::on_next([=](bool value) {
 		_chooseFromUser->setVisible(value);
 	}, _chooseFromUser->lifetime());
 }
@@ -834,7 +834,7 @@ void BottomBar::buttonFromToggleOn(rpl::producer<bool> &&visible) {
 void BottomBar::buttonCalendarToggleOn(rpl::producer<bool> &&visible) {
 	std::move(
 		visible
-	) | rpl::start_with_next([=](bool value) {
+	) | rpl::on_next([=](bool value) {
 		_jumpToDate->setVisible(value);
 	}, _jumpToDate->lifetime());
 }
@@ -904,21 +904,21 @@ ComposeSearch::Inner::Inner(
 	rpl::combine(
 		_topBar->geometryValue(),
 		_bottomBar->geometryValue()
-	) | rpl::start_with_next([=](const QRect &top, const QRect &bottom) {
+	) | rpl::on_next([=](const QRect &top, const QRect &bottom) {
 		_list.container->setGeometry(QRect(
 			top.topLeft() + QPoint(0, top.height()),
 			bottom.topLeft() + QPoint(bottom.width(), 0)));
 	}, _list.container->lifetime());
 
 	_topBar->keyEvents(
-	) | rpl::start_with_next([=](not_null<QKeyEvent*> e) {
+	) | rpl::on_next([=](not_null<QKeyEvent*> e) {
 		if (!_bottomBar->handleKeyPress(e)) {
 			_topBar->handleKeyPress(e);
 		}
 	}, _topBar->lifetime());
 
 	_topBar->searchRequests(
-	) | rpl::start_with_next([=](SearchRequest search) {
+	) | rpl::on_next([=](SearchRequest search) {
 		if (search.query.isEmpty() && search.tags.empty()) {
 			if (!search.from || _history->peer->isSelf()) {
 				return;
@@ -933,17 +933,17 @@ ComposeSearch::Inner::Inner(
 	}, _topBar->lifetime());
 
 	_topBar->queryChanges(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		hideList();
 	}, _topBar->lifetime());
 
 	_topBar->closeRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		hideAnimated();
 	}, _topBar->lifetime());
 
 	_topBar->cancelRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (!_list.container->isHidden()) {
 			Ui::Animations::HideWidgets({ _list.container.get() });
 		} else {
@@ -952,7 +952,7 @@ ComposeSearch::Inner::Inner(
 	}, _topBar->lifetime());
 
 	_apiSearch.newFounds(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto &apiData = _apiSearch.messages();
 		const auto weak = base::make_weak(_bottomBar.get());
 		_bottomBar->setTotal(apiData.total);
@@ -963,7 +963,7 @@ ComposeSearch::Inner::Inner(
 	}, _topBar->lifetime());
 
 	_apiSearch.nextFounds(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (_pendingJump.data.token == _apiSearch.messages().nextToken) {
 			_pendingJump.jumps.fire_copy(_pendingJump.data.index);
 		}
@@ -973,7 +973,7 @@ ComposeSearch::Inner::Inner(
 	rpl::merge(
 		_pendingJump.jumps.events() | rpl::filter(rpl::mappers::_1 >= 0),
 		_bottomBar->showItemRequests()
-	) | rpl::start_with_next([=](BottomBar::Index index) {
+	) | rpl::on_next([=](BottomBar::Index index) {
 		const auto &apiData = _apiSearch.messages();
 		const auto &messages = apiData.messages;
 		const auto size = int(messages.size());
@@ -996,7 +996,7 @@ ComposeSearch::Inner::Inner(
 	}, _bottomBar->lifetime());
 
 	_list.controller->showItemRequests(
-	) | rpl::start_with_next([=](const FullMsgId &id) {
+	) | rpl::on_next([=](const FullMsgId &id) {
 		const auto &messages = _apiSearch.messages().messages;
 		const auto it = ranges::find(messages, id);
 		if (it != end(messages)) {
@@ -1005,7 +1005,7 @@ ComposeSearch::Inner::Inner(
 	}, _list.container->lifetime());
 
 	_list.controller->searchMoreRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto &apiData = _apiSearch.messages();
 		if (int(apiData.messages.size()) != apiData.total) {
 			_apiSearch.searchMore();
@@ -1013,13 +1013,13 @@ ComposeSearch::Inner::Inner(
 	}, _list.container->lifetime());
 
 	_bottomBar->showCalendarRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		hideList();
 		_window->showCalendar({ _history }, QDate());
 	}, _bottomBar->lifetime());
 
 	_bottomBar->showBoxFromRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto peer = _history->peer;
 		auto box = Dialogs::SearchFromBox(
 			peer,
@@ -1033,7 +1033,7 @@ ComposeSearch::Inner::Inner(
 	}, _bottomBar->lifetime());
 
 	_bottomBar->showListRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (_list.container->isHidden()) {
 			Ui::Animations::ShowWidgets({ _list.container.get() });
 		} else {
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_draft_options.cpp b/Telegram/SourceFiles/history/view/controls/history_view_draft_options.cpp
index e22cc48204..e3a982a427 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_draft_options.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_draft_options.cpp
@@ -205,19 +205,19 @@ PreviewWrap::PreviewWrap(
 
 	const auto session = &_history->session();
 	session->data().viewRepaintRequest(
-	) | rpl::start_with_next([=](not_null<const Element*> view) {
+	) | rpl::on_next([=](not_null<const Element*> view) {
 		if (_views.contains(view)) {
 			update();
 		}
 	}, lifetime());
 
-	_selection.changes() | rpl::start_with_next([=] {
+	_selection.changes() | rpl::on_next([=] {
 		update();
 	}, lifetime());
 
 	_box->setAttribute(Qt::WA_OpaquePaintEvent, false);
 
-	_box->paintRequest() | rpl::start_with_next([=](QRect clip) {
+	_box->paintRequest() | rpl::on_next([=](QRect clip) {
 		const auto geometry = Ui::MapFrom(_box, this, rect());
 		const auto fill = geometry.intersected(clip);
 		if (!fill.isEmpty()) {
@@ -618,7 +618,7 @@ void PreviewWrap::initElements() {
 	widthValue(
 	) | rpl::filter([=](int width) {
 		return width > st::msgMinWidth;
-	}) | rpl::start_with_next([=](int width) {
+	}) | rpl::on_next([=](int width) {
 		auto height = _position.y();
 		for (const auto &entry : _entries) {
 			height += entry.view->resizeGetHeight(width);
@@ -684,7 +684,7 @@ void AddFilledSkip(not_null<Ui::VerticalLayout*> container) {
 	const auto skip = container->add(object_ptr<Ui::FixedHeightWidget>(
 		container,
 		st::settingsPrivacySkipTop));
-	skip->paintRequest() | rpl::start_with_next([=](QRect clip) {
+	skip->paintRequest() | rpl::on_next([=](QRect clip) {
 		QPainter(skip).fillRect(clip, st::boxBg);
 	}, skip->lifetime());
 };
@@ -774,7 +774,7 @@ void DraftOptionsBox(
 			state->tabs->setSections(labels);
 			state->tabs->setActiveSectionFast(indices[now]);
 			state->tabs->sectionActivated(
-			) | rpl::start_with_next([=](int index) {
+			) | rpl::on_next([=](int index) {
 				state->shown = sections[index];
 			}, box->lifetime());
 		} else {
@@ -1030,12 +1030,12 @@ void DraftOptionsBox(
 			const auto delay = std::max(page->pendingTill - now, TimeId());
 			base::timer_once(
 				(delay + 1) * crl::time(1000)
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				state->requestAndSwitch(link, true);
 			}, state->resolveLifetime);
 
 			page->owner().webPageUpdates(
-			) | rpl::start_with_next([=](not_null<WebPageData*> updated) {
+			) | rpl::on_next([=](not_null<WebPageData*> updated) {
 				if (updated == page && !updated->pendingTill) {
 					state->resolveLifetime.destroy();
 					state->performSwitch(link, page);
@@ -1054,7 +1054,7 @@ void DraftOptionsBox(
 		resolver->request(link, force);
 
 		state->resolveLifetime = resolver->resolved(
-		) | rpl::start_with_next([=](const QString &resolved) {
+		) | rpl::on_next([=](const QString &resolved) {
 			if (resolved == link) {
 				state->resolveLifetime.destroy();
 				state->performSwitch(
@@ -1077,12 +1077,12 @@ void DraftOptionsBox(
 		object_ptr<PreviewWrap>(box, args.history),
 		style::margins());
 	state->wrap->draggingScrollDelta(
-	) | rpl::start_with_next([=](int delta) {
+	) | rpl::on_next([=](int delta) {
 		box->scrollByDraggingDelta(delta);
 	}, state->wrap->lifetime());
 
 	const auto &linkRanges = args.links;
-	state->shown.value() | rpl::start_with_next([=](Section shown) {
+	state->shown.value() | rpl::on_next([=](Section shown) {
 		bottom->clear();
 		state->shownLifetime.destroy();
 		switch (shown) {
@@ -1097,7 +1097,7 @@ void DraftOptionsBox(
 					state->webpage,
 					linkRanges,
 					state->link
-				) | rpl::start_with_next([=](QString link) {
+				) | rpl::on_next([=](QString link) {
 					switchTo(link);
 				}, state->shownLifetime);
 				setupLinkActions();
@@ -1134,7 +1134,7 @@ void DraftOptionsBox(
 		box->closeBox();
 	});
 
-	box->events() | rpl::start_with_next([=](not_null<QEvent*> e) {
+	box->events() | rpl::on_next([=](not_null<QEvent*> e) {
 		if (e->type() == QEvent::KeyPress) {
 			const auto key = static_cast<QKeyEvent*>(e.get())->key();
 			if (key == Qt::Key_Enter || key == Qt::Key_Return) {
@@ -1144,7 +1144,7 @@ void DraftOptionsBox(
 	}, box->lifetime());
 
 	args.show->session().data().itemRemoved(
-	) | rpl::start_with_next([=](not_null<const HistoryItem*> removed) {
+	) | rpl::on_next([=](not_null<const HistoryItem*> removed) {
 		const auto inReply = (state->quote.current().item == removed);
 		if (inReply) {
 			state->quote = SelectedQuote();
@@ -1160,7 +1160,7 @@ void DraftOptionsBox(
 	}, box->lifetime());
 
 	args.show->session().data().itemViewRefreshRequest(
-	) | rpl::start_with_next([=](not_null<const HistoryItem*> item) {
+	) | rpl::on_next([=](not_null<const HistoryItem*> item) {
 		if (state->wrap->hasViewForItem(item)) {
 			state->rebuild();
 		}
@@ -1363,7 +1363,7 @@ void ShowReplyToChatBox(
 				not_null<PeerListBox*> box) {
 			box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
 
-			box->noSearchSubmits() | rpl::start_with_next([=] {
+			box->noSearchSubmits() | rpl::on_next([=] {
 				controllerRaw->noSearchSubmit();
 			}, box->lifetime());
 		});
@@ -1410,7 +1410,7 @@ void ShowReplyToChatBox(
 		}
 	};
 	state->controller->singleChosen(
-	) | rpl::start_with_next(std::move(callback), state->box->lifetime());
+	) | rpl::on_next(std::move(callback), state->box->lifetime());
 }
 
 void EditDraftOptions(EditDraftOptionsArgs &&args) {
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_forward_panel.cpp b/Telegram/SourceFiles/history/view/controls/history_view_forward_panel.cpp
index 82c4c44f0b..8dcbfe0423 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_forward_panel.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_forward_panel.cpp
@@ -66,18 +66,18 @@ void ForwardPanel::update(
 		Assert(to != nullptr);
 
 		_data.items.front()->history()->owner().itemRemoved(
-		) | rpl::start_with_next([=](not_null<const HistoryItem*> item) {
+		) | rpl::on_next([=](not_null<const HistoryItem*> item) {
 			itemRemoved(item);
 		}, _dataLifetime);
 
 		if (const auto topic = _to->asTopic()) {
 			topic->destroyed(
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				update(nullptr, {});
 			}, _dataLifetime);
 		} else if (const auto sublist = _to->asSublist()) {
 			sublist->destroyed(
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				update(nullptr, {});
 			}, _dataLifetime);
 		}
@@ -408,7 +408,7 @@ void EditWebPageOptions(
 		});
 
 		state->result.value(
-		) | rpl::start_with_next([=](const Data::WebPageDraft &draft) {
+		) | rpl::on_next([=](const Data::WebPageDraft &draft) {
 			state->large->setColorOverride(draft.forceLargeMedia
 				? st::windowActiveTextFg->c
 				: std::optional<QColor>());
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_suggest_options.cpp b/Telegram/SourceFiles/history/view/controls/history_view_suggest_options.cpp
index 051a6705dd..687d94ea52 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_suggest_options.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_suggest_options.cpp
@@ -150,7 +150,7 @@ void AddApproximateUsd(
 		}
 		return base::EventFilterResult::Continue;
 	});
-	usd->widthValue() | rpl::start_with_next(move, usd->lifetime());
+	usd->widthValue() | rpl::on_next(move, usd->lifetime());
 }
 
 not_null<Ui::NumberInput*> AddStarsInputField(
@@ -171,7 +171,7 @@ not_null<Ui::NumberInput*> AddStarsInputField(
 		result,
 		Ui::Earn::IconCreditsEmoji());
 
-	wrap->widthValue() | rpl::start_with_next([=](int width) {
+	wrap->widthValue() | rpl::on_next([=](int width) {
 		icon->move(st::starsFieldIconPosition);
 		result->move(0, 0);
 		result->resize(width, result->height());
@@ -197,7 +197,7 @@ not_null<Ui::InputField*> AddTonInputField(
 		result,
 		Ui::Earn::IconCurrencyEmoji());
 
-	wrap->widthValue() | rpl::start_with_next([=](int width) {
+	wrap->widthValue() | rpl::on_next([=](int width) {
 		icon->move(st::tonFieldIconPosition);
 		result->move(0, 0);
 		result->resize(width, result->height());
@@ -346,7 +346,7 @@ StarsTonPriceInput AddStarsTonPriceInput(
 		}
 	});
 	tonField->changes(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (state->ton.current()) {
 			updatePrice();
 			updateStarsFromTon();
@@ -354,7 +354,7 @@ StarsTonPriceInput AddStarsTonPriceInput(
 	}, tonField->lifetime());
 
 	state->ton.changes(
-	) | rpl::start_with_next(updatePrice, container->lifetime());
+	) | rpl::on_next(updatePrice, container->lifetime());
 	if (state->ton.current()) {
 		updateStarsFromTon();
 	} else {
@@ -494,7 +494,7 @@ void ChooseSuggestPriceBox(
 	buttons->resize(buttons->width(), height);
 
 	buttons->setMouseTracking(true);
-	buttons->events() | rpl::start_with_next([=](not_null<QEvent*> e) {
+	buttons->events() | rpl::on_next([=](not_null<QEvent*> e) {
 		const auto type = e->type();
 		switch (type) {
 		case QEvent::MouseMove: {
@@ -534,7 +534,7 @@ void ChooseSuggestPriceBox(
 		}
 	}, buttons->lifetime());
 
-	buttons->paintRequest() | rpl::start_with_next([=] {
+	buttons->paintRequest() | rpl::on_next([=] {
 		auto p = QPainter(buttons);
 		auto hq = PainterHighQualityEnabler(p);
 		const auto padding = st::giftBoxTabPadding;
@@ -770,7 +770,7 @@ void ChooseSuggestPriceBox(
 		credits->balanceValue()
 	) | rpl::filter([=] {
 		return state->savePending;
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		state->savePending = false;
 		if (const auto onstack = state->save) {
 			onstack();
@@ -779,7 +779,7 @@ void ChooseSuggestPriceBox(
 
 	std::move(
 		priceInput.submits
-	) | rpl::start_with_next(state->save, box->lifetime());
+	) | rpl::on_next(state->save, box->lifetime());
 
 	auto helper = Ui::Text::CustomEmojiHelper();
 	const auto button = box->addButton(rpl::single(QString()), state->save);
@@ -815,7 +815,7 @@ void ChooseSuggestPriceBox(
 		- rect::m::sum::h(st::suggestPriceBox.buttonPadding);
 	button->widthValue() | rpl::filter([=] {
 		return (button->widthNoMargins() != buttonWidth);
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		button->resizeToWidth(buttonWidth);
 	}, button->lifetime());
 
@@ -828,7 +828,7 @@ void ChooseSuggestPriceBox(
 			container,
 			st::boxTitleClose);
 		close->setClickedCallback([=] { box->closeBox(); });
-		container->widthValue() | rpl::start_with_next([=](int) {
+		container->widthValue() | rpl::on_next([=](int) {
 			close->moveToRight(0, 0);
 		}, close->lifetime());
 
@@ -845,7 +845,7 @@ void ChooseSuggestPriceBox(
 		rpl::combine(
 			balance->sizeValue(),
 			container->sizeValue()
-		) | rpl::start_with_next([=](const QSize &, const QSize &) {
+		) | rpl::on_next([=](const QSize &, const QSize &) {
 			balance->moveToLeft(
 				st::creditsHistoryRightSkip * 2,
 				st::creditsHistoryRightSkip);
@@ -944,7 +944,7 @@ void InsufficientTonBox(
 		- rect::m::sum::h(st::suggestPriceBox.buttonPadding);
 	button->widthValue() | rpl::filter([=] {
 		return (button->widthNoMargins() != buttonWidth);
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		button->resizeToWidth(buttonWidth);
 	}, button->lifetime());
 }
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_ttl_button.cpp b/Telegram/SourceFiles/history/view/controls/history_view_ttl_button.cpp
index f7e15f5e50..71f7a2f943 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_ttl_button.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_ttl_button.cpp
@@ -37,7 +37,7 @@ TTLButton::TTLButton(
 	peer->session().changes().peerFlagsValue(
 		peer,
 		Data::PeerUpdate::Flag::MessagesTTL
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_button.setText(Ui::FormatTTLTiny(peer->messagesTTL()));
 	}, _button.lifetime());
 }
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
index da34c30c33..d470169f4a 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
@@ -97,7 +97,7 @@ SoundedPreview::SoundedPreview(
 	not_null<DocumentData*> document,
 	rpl::producer<> repaints)
 : _document(document) {
-	std::move(repaints) | rpl::start_with_next([=] {
+	std::move(repaints) | rpl::on_next([=] {
 		if (const auto onstack = _repaint) {
 			onstack();
 		}
@@ -400,7 +400,7 @@ TTLButton::TTLButton(
 			st::universalDuration);
 	});
 
-	Ui::RpWidget::shownValue() | rpl::start_with_next([=](bool shown) {
+	Ui::RpWidget::shownValue() | rpl::on_next([=](bool shown) {
 		if (!shown) {
 			_tooltip = nullptr;
 			return;
@@ -427,7 +427,7 @@ TTLButton::TTLButton(
 				st::defaultImportantTooltip.padding),
 			st::historyRecordTooltip));
 		Ui::RpWidget::geometryValue(
-		) | rpl::start_with_next([=](const QRect &r) {
+		) | rpl::on_next([=](const QRect &r) {
 			if (r.isEmpty()) {
 				return;
 			}
@@ -446,7 +446,7 @@ TTLButton::TTLButton(
 		_tooltip->show();
 		if (!Core::App().settings().ttlVoiceClickTooltipHidden()) {
 			clicks(
-			) | rpl::take(1) | rpl::start_with_next([=] {
+			) | rpl::take(1) | rpl::on_next([=] {
 				Core::App().settings().setTtlVoiceClickTooltipHidden(true);
 			}, _tooltip->lifetime());
 			_tooltip->toggleAnimated(true);
@@ -455,7 +455,7 @@ TTLButton::TTLButton(
 		}
 
 		clicks(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			const auto toggled = !Ui::AbstractButton::isDisabled();
 			_tooltip->toggleAnimated(toggled);
 
@@ -469,7 +469,7 @@ TTLButton::TTLButton(
 		) | rpl::map([=](const QRect &r) {
 			return (r.left() + r.width() > parentWidget()->width());
 		}) | rpl::distinct_until_changed(
-		) | rpl::start_with_next([=](bool toHide) {
+		) | rpl::on_next([=](bool toHide) {
 			const auto isFirstTooltip
 				= !Core::App().settings().ttlVoiceClickTooltipHidden();
 			if (isFirstTooltip || toHide) {
@@ -479,7 +479,7 @@ TTLButton::TTLButton(
 	}, lifetime());
 
 	paintRequest(
-	) | rpl::start_with_next([=](const QRect &clip) {
+	) | rpl::on_next([=](const QRect &clip) {
 		auto p = QPainter(this);
 
 		const auto inner = DrawLockCircle(p, rect(), _st.lock, 1.);
@@ -620,7 +620,7 @@ void ListenWrap::init() {
 	rpl::combine(
 		_parent->sizeValue(),
 		_send->widthValue()
-	) | rpl::start_with_next([=](QSize size, int send) {
+	) | rpl::on_next([=](QSize size, int send) {
 		_waveformBgRect = QRect({ 0, 0 }, size)
 			.marginsRemoved(st::historyRecordWaveformBgMargins);
 		{
@@ -641,7 +641,7 @@ void ListenWrap::init() {
 	}, _lifetime);
 
 	_parent->paintRequest(
-	) | rpl::start_with_next([=](const QRect &clip) {
+	) | rpl::on_next([=](const QRect &clip) {
 		auto p = QPainter(_parent);
 		auto hq = PainterHighQualityEnabler(p);
 		const auto progress = _showProgress.current();
@@ -757,7 +757,7 @@ void ListenWrap::initPlayButton() {
 	_playPauseButton->show();
 
 	_playPauseButton->paintRequest(
-	) | rpl::start_with_next([=](const QRect &clip) {
+	) | rpl::on_next([=](const QRect &clip) {
 		auto p = QPainter(_playPauseButton);
 
 		const auto progress = _showProgress.current();
@@ -775,14 +775,14 @@ void ListenWrap::initPlayButton() {
 
 	const auto showPause = _lifetime.make_state<rpl::variable<bool>>(false);
 	showPause->changes(
-	) | rpl::start_with_next([=](bool pause) {
+	) | rpl::on_next([=](bool pause) {
 		_playPause.setState(pause
 			? PlayButtonLayout::State::Pause
 			: PlayButtonLayout::State::Play);
 	}, _lifetime);
 
 	instance()->updatedNotifier(
-	) | rpl::start_with_next([=](const State &state) {
+	) | rpl::on_next([=](const State &state) {
 		if (isInPlayer(state)) {
 			*showPause = ShowPauseIcon(state.state);
 			if (!_data->minithumbs.isNull()) {
@@ -795,7 +795,7 @@ void ListenWrap::initPlayButton() {
 
 	instance()->stops(
 		AudioMsgId::Type::Voice
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		*showPause = false;
 	}, _lifetime);
 
@@ -822,13 +822,13 @@ void ListenWrap::initPlayProgress() {
 	rpl::merge(
 		instance()->startsPlay(voice) | rpl::map_to(true),
 		instance()->stops(voice) | rpl::map_to(false)
-	) | rpl::start_with_next([=](bool play) {
+	) | rpl::on_next([=](bool play) {
 		_parent->setMouseTracking(isInPlayer() && play);
 		updateCursor(_parent->mapFromGlobal(QCursor::pos()));
 	}, _lifetime);
 
 	instance()->updatedNotifier(
-	) | rpl::start_with_next([=](const State &state) {
+	) | rpl::on_next([=](const State &state) {
 		if (!isInPlayer(state)) {
 			return;
 		}
@@ -864,7 +864,7 @@ void ListenWrap::initPlayProgress() {
 	const auto isPressed = _lifetime.make_state<bool>(false);
 
 	isPointer->changes(
-	) | rpl::start_with_next([=](bool pointer) {
+	) | rpl::on_next([=](bool pointer) {
 		_parent->setCursor(pointer ? style::cur_pointer : style::cur_default);
 	}, _lifetime);
 
@@ -873,7 +873,7 @@ void ListenWrap::initPlayProgress() {
 		return (e->type() == QEvent::MouseMove
 			|| e->type() == QEvent::MouseButtonPress
 			|| e->type() == QEvent::MouseButtonRelease);
-	}) | rpl::start_with_next([=](not_null<QEvent*> e) {
+	}) | rpl::on_next([=](not_null<QEvent*> e) {
 		if (!isInPlayer()) {
 			return;
 		}
@@ -1023,7 +1023,7 @@ void RecordLock::setRecordingVideo(bool value) {
 
 void RecordLock::init() {
 	shownValue(
-	) | rpl::start_with_next([=](bool shown) {
+	) | rpl::on_next([=](bool shown) {
 		resize(
 			st::historyRecordLockTopShadow.width(),
 			st::historyRecordLockSize.height());
@@ -1038,7 +1038,7 @@ void RecordLock::init() {
 	}, lifetime());
 
 	paintRequest(
-	) | rpl::start_with_next([=](const QRect &clip) {
+	) | rpl::on_next([=](const QRect &clip) {
 		if (!_visibleTopPart) {
 			return;
 		}
@@ -1310,12 +1310,12 @@ CancelButton::CancelButton(
 void CancelButton::init() {
 	_showProgress.value(
 	) | rpl::map(rpl::mappers::_1 > 0.) | rpl::distinct_until_changed(
-	) | rpl::start_with_next([=](bool hasProgress) {
+	) | rpl::on_next([=](bool hasProgress) {
 		setVisible(hasProgress);
 	}, lifetime());
 
 	paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(this);
 
 		p.setOpacity(_showProgress.current());
@@ -1477,19 +1477,19 @@ void VoiceRecordBar::init() {
 		) | rpl::filter([](not_null<QEvent*> e) {
 			return e->type() == QEvent::ZOrderChange;
 		}) | rpl::to_empty
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		orderControls();
 	}, lifetime());
 
 	shownValue(
-	) | rpl::start_with_next([=](bool show) {
+	) | rpl::on_next([=](bool show) {
 		if (!show) {
 			finish();
 		}
 	}, lifetime());
 
 	sizeValue(
-	) | rpl::start_with_next([=](QSize size) {
+	) | rpl::on_next([=](QSize size) {
 		_centerY = size.height() / 2;
 		{
 			const auto maxD = st::historyRecordSignalRadius * 2;
@@ -1512,7 +1512,7 @@ void VoiceRecordBar::init() {
 	}, lifetime());
 
 	paintRequest(
-	) | rpl::start_with_next([=](const QRect &clip) {
+	) | rpl::on_next([=](const QRect &clip) {
 		auto p = QPainter(this);
 		if (_showAnimation.animating()) {
 			p.setOpacity(showAnimationRatio());
@@ -1546,12 +1546,12 @@ void VoiceRecordBar::init() {
 	}, lifetime());
 
 	_inField.changes(
-	) | rpl::start_with_next([=](bool value) {
+	) | rpl::on_next([=](bool value) {
 		activeAnimate(value);
 	}, lifetime());
 
 	_lockShowing.changes(
-	) | rpl::start_with_next([=](bool show) {
+	) | rpl::on_next([=](bool show) {
 		const auto to = show ? 1. : 0.;
 		const auto from = show ? 0. : 1.;
 		const auto &duration = st::historyRecordLockShowDuration;
@@ -1574,7 +1574,7 @@ void VoiceRecordBar::init() {
 		_level->setType(VoiceRecordButton::Type::Send);
 
 		_level->clicks(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			stop(true);
 		}, _recordingLifetime);
 
@@ -1582,7 +1582,7 @@ void VoiceRecordBar::init() {
 			false
 		) | rpl::then(
 			_level->actives()
-		) | rpl::start_with_next([=](bool enter) {
+		) | rpl::on_next([=](bool enter) {
 			_inField = enter;
 		}, _recordingLifetime);
 	};
@@ -1619,7 +1619,7 @@ void VoiceRecordBar::init() {
 	});
 
 	_paused.value() | rpl::distinct_until_changed(
-	) | rpl::start_with_next([=](bool paused) {
+	) | rpl::on_next([=](bool paused) {
 		if (!paused) {
 			return;
 		}
@@ -1640,7 +1640,7 @@ void VoiceRecordBar::init() {
 	}, lifetime());
 
 	_lock->locks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (_hasTTLFilter && _hasTTLFilter()) {
 			if (!_ttlButton) {
 				_ttlButton = std::make_unique<TTLButton>(
@@ -1675,7 +1675,7 @@ void VoiceRecordBar::init() {
 			&& !_lock->isLocked()
 			&& (e->type() == QEvent::MouseButtonPress
 				|| e->type() == QEvent::MouseButtonRelease);
-	}) | rpl::start_with_next([=](not_null<QEvent*> e) {
+	}) | rpl::on_next([=](not_null<QEvent*> e) {
 		if (e->type() == QEvent::MouseButtonPress) {
 			if (_startRecordingFilter && _startRecordingFilter()) {
 				return;
@@ -1691,9 +1691,9 @@ void VoiceRecordBar::init() {
 	_listenChanges.events(
 	) | rpl::filter([=] {
 		return _listen != nullptr;
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		_listen->stopRequests(
-		) | rpl::take(1) | rpl::start_with_next([=] {
+		) | rpl::take(1) | rpl::on_next([=] {
 			hideAnimated();
 		}, _listen->lifetime());
 
@@ -1784,11 +1784,11 @@ void VoiceRecordBar::initLockGeometry() {
 		_lock->heightValue() | rpl::to_empty,
 		geometryValue() | rpl::to_empty,
 		parent->geometryValue() | rpl::to_empty
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateLockGeometry();
 	}, lifetime());
 	parent->geometryValue(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateTTLGeometry(TTLAnimationType::RightLeft, 1.);
 	}, lifetime());
 }
@@ -1798,7 +1798,7 @@ void VoiceRecordBar::initLevelGeometry() {
 		_send->geometryValue(),
 		geometryValue(),
 		static_cast<Ui::RpWidget*>(parentWidget())->geometryValue()
-	) | rpl::start_with_next([=](QRect send, auto, auto) {
+	) | rpl::on_next([=](QRect send, auto, auto) {
 		const auto mapped = Ui::MapFrom(
 			_outerContainer,
 			_send->parentWidget(),
@@ -1863,14 +1863,14 @@ void VoiceRecordBar::startRecording() {
 				: nullptr);
 		}
 		instance()->updated(
-		) | rpl::start_with_next_error([=](const Update &update) {
+		) | rpl::on_next_error([=](const Update &update) {
 			recordUpdated(update.level, update.samples);
 		}, [=] {
 			stop(false);
 		}, _recordingLifetime);
 		if (_videoRecorder) {
 			_videoRecorder->updated(
-			) | rpl::start_with_next_error([=](const Update &update) {
+			) | rpl::on_next_error([=](const Update &update) {
 				recordUpdated(update.level, update.samples);
 				if (update.finished) {
 					_fullRecord = true;
@@ -1904,7 +1904,7 @@ void VoiceRecordBar::startRecording() {
 			std::make_unique<FloatingState>());
 	const auto state = stateOwned->get();
 
-	_lock->locks() | rpl::start_with_next([=] {
+	_lock->locks() | rpl::on_next([=] {
 		stateOwned->reset();
 	}, state->lifetime);
 
@@ -1943,7 +1943,7 @@ void VoiceRecordBar::startRecording() {
 			|| e->type() == QEvent::MouseButtonRelease)
 			&& isTypeRecord()
 			&& !_lock->isLocked();
-	}) | rpl::start_with_next([=](not_null<QEvent*> e) {
+	}) | rpl::on_next([=](not_null<QEvent*> e) {
 		const auto type = e->type();
 		if (type == QEvent::MouseMove) {
 			const auto mouse = static_cast<QMouseEvent*>(e.get());
@@ -1971,7 +1971,7 @@ void VoiceRecordBar::startRecording() {
 		rpl::empty_value()
 	) | rpl::filter([=] {
 		return _listen == nullptr;
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		auto keyFilterCallback = [=](not_null<QEvent*> e) {
 			using Result = base::EventFilterResult;
 			if (_send->type() != Ui::SendButton::Type::Record
@@ -2510,7 +2510,7 @@ bool VoiceRecordBar::createVideoRecorder() {
 	capturer->setOutput(track->sink());
 	capturer->setPreferredAspectRatio(1.);
 	_videoCapturerLifetime = track->stateValue(
-	) | rpl::start_with_next([=](Webrtc::VideoState state) {
+	) | rpl::on_next([=](Webrtc::VideoState state) {
 		capturer->setState((state == Webrtc::VideoState::Active)
 			? tgcalls::VideoState::Active
 			: tgcalls::VideoState::Inactive);
@@ -2525,7 +2525,7 @@ bool VoiceRecordBar::createVideoRecorder() {
 			.placeholder = _show->session().local().readRoundPlaceholder(),
 		});
 	_videoRecorder->placeholderUpdates(
-	) | rpl::start_with_next([=](QImage &&placeholder) {
+	) | rpl::on_next([=](QImage &&placeholder) {
 		_show->session().local().writeRoundPlaceholder(placeholder);
 	}, _videoCapturerLifetime);
 
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.cpp
index b32fa2d965..b796d27858 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.cpp
@@ -80,7 +80,7 @@ void VoiceRecordButton::init() {
 		anim::Disabled()
 	) | rpl::then(
 		anim::Disables()
-	) | rpl::start_with_next([=](bool hide) {
+	) | rpl::on_next([=](bool hide) {
 		if (hide) {
 			_blobs->setLevel(0.);
 		}
@@ -94,7 +94,7 @@ void VoiceRecordButton::init() {
 	const auto mainRadiusDiff = st::historyRecordMainBlobMaxRadius
 		- mainRadiusMin;
 	paintRequest(
-	) | rpl::start_with_next([=](const QRect &clip) {
+	) | rpl::on_next([=](const QRect &clip) {
 		auto p = QPainter(this);
 
 		const auto hideProgress = _blobsHideLastTime
@@ -170,7 +170,7 @@ void VoiceRecordButton::init() {
 		shownValue(),
 		_showProgress.value(
 		) | rpl::map(rpl::mappers::_1 != 0.) | rpl::distinct_until_changed()
-	) | rpl::start_with_next([=](bool show) {
+	) | rpl::on_next([=](bool show) {
 		setVisible(show);
 		setMouseTracking(show);
 		if (!show) {
@@ -187,12 +187,12 @@ void VoiceRecordButton::init() {
 
 	actives(
 	) | rpl::distinct_until_changed(
-	) | rpl::start_with_next([=](bool active) {
+	) | rpl::on_next([=](bool active) {
 		setPointerCursor(active);
 	}, lifetime());
 
 	_state.changes(
-	) | rpl::start_with_next([=](Type newState) {
+	) | rpl::on_next([=](Type newState) {
 		const auto to = 1.;
 		auto callback = [=](float64 value) {
 			if (value >= (to * .5)) {
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_webpage_processor.cpp b/Telegram/SourceFiles/history/view/controls/history_view_webpage_processor.cpp
index 379ffb92ea..feb0a5edf8 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_webpage_processor.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_webpage_processor.cpp
@@ -200,26 +200,26 @@ WebpageProcessor::WebpageProcessor(
 	_history->session().downloaderTaskFinished(
 	) | rpl::filter([=] {
 		return _data && (_data->document || _data->photo);
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		_repaintRequests.fire({});
 	}, _lifetime);
 
 	_history->owner().webPageUpdates(
 	) | rpl::filter([=](not_null<WebPageData*> page) {
 		return (_data == page.get());
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		_draft.id = _data->id;
 		_draft.url = _data->url;
 		updateFromData();
 	}, _lifetime);
 
 	_parser.list().changes(
-	) | rpl::start_with_next([=](QStringList &&parsed) {
+	) | rpl::on_next([=](QStringList &&parsed) {
 		_parsedLinks = std::move(parsed);
 		checkPreview();
 	}, _lifetime);
 
-	_resolver->resolved() | rpl::start_with_next([=](QString link) {
+	_resolver->resolved() | rpl::on_next([=](QString link) {
 		if (_link != link
 			|| _draft.removed
 			|| (_draft.manual && _draft.url != link)) {
diff --git a/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp b/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp
index b1f0de5081..4d2500d1d3 100644
--- a/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp
@@ -327,7 +327,7 @@ void Item::setupTop() {
 	_top->setClickedCallback([=] {
 		_actions.fire({ .openInfo = true });
 	});
-	_top->paintRequest() | rpl::start_with_next([=](QRect clip) {
+	_top->paintRequest() | rpl::on_next([=](QRect clip) {
 		auto p = QPainter(_top.get());
 		p.fillRect(clip, st::topBarBg);
 	}, _top->lifetime());
@@ -363,7 +363,7 @@ void Item::setupTop() {
 	if (status) {
 		std::move(
 			statusFields
-		) | rpl::start_with_next([=](const StatusFields &fields) {
+		) | rpl::on_next([=](const StatusFields &fields) {
 			status->setTextColorOverride(fields.active
 				? st::windowActiveTextFg->c
 				: std::optional<QColor>());
@@ -396,7 +396,7 @@ void Item::setupTop() {
 		_top->widthValue(),
 		std::move(nameValue),
 		rpl::single(rpl::empty) | rpl::then(_badge.updated())
-	) | rpl::start_with_next([=](int width, const auto &, const auto &) {
+	) | rpl::on_next([=](int width, const auto &, const auto &) {
 		const auto &st = st::previewTop;
 		name->resizeToNaturalWidth(width
 			- st.namePosition.x()
@@ -415,7 +415,7 @@ void Item::setupTop() {
 			name->y() + name->height());
 	}, name->lifetime());
 
-	_top->geometryValue() | rpl::start_with_next([=](QRect geometry) {
+	_top->geometryValue() | rpl::on_next([=](QRect geometry) {
 		const auto &st = st::previewTop;
 		if (status) {
 			status->resizeToWidth(geometry.width()
@@ -447,7 +447,7 @@ void Item::setupMarkRead() {
 	) | rpl::then(
 		_thread->owner().chatsListFor(_thread)->unreadStateChanges(
 		) | rpl::to_empty
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto state = _thread->chatListBadgesState();
 		const auto unread = (state.unreadCounter || state.unread);
 		const auto hidden = (_thread->asTopic() || _thread->asSublist())
@@ -468,7 +468,7 @@ void Item::setupMarkRead() {
 	}, _markRead->lifetime());
 
 	const auto shadow = Ui::CreateChild<Ui::PlainShadow>(this);
-	_markRead->geometryValue() | rpl::start_with_next([=](QRect geometry) {
+	_markRead->geometryValue() | rpl::on_next([=](QRect geometry) {
 		shadow->setGeometry(
 			geometry.x(),
 			geometry.y() - st::lineWidth,
@@ -493,7 +493,7 @@ void Item::setupBackground() {
 			QRect(QPoint(), size()));
 	};
 	paint();
-	_theme->repaintBackgroundRequests() | rpl::start_with_next([=] {
+	_theme->repaintBackgroundRequests() | rpl::on_next([=] {
 		paint();
 		update();
 	}, lifetime());
@@ -509,7 +509,7 @@ void Item::setupHistory() {
 		_chatStyle.get(),
 		static_cast<CornerButtonsDelegate*>(this));
 
-	_markRead->shownValue() | rpl::start_with_next([=](bool shown) {
+	_markRead->shownValue() | rpl::on_next([=](bool shown) {
 		const auto top = _top->height();
 		const auto bottom = shown ? _markRead->height() : 0;
 		_scroll->setGeometry(rect().marginsRemoved({ 0, top, 0, bottom }));
@@ -517,7 +517,7 @@ void Item::setupHistory() {
 	}, _markRead->lifetime());
 
 	_scroll->scrolls(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateInnerVisibleArea();
 	}, lifetime());
 	_scroll->setOverscrollBg(QColor(0, 0, 0, 0));
@@ -525,11 +525,11 @@ void Item::setupHistory() {
 	_scroll->setOverscrollTypes(Type::Real, Type::Real);
 
 	_inner->scrollKeyEvents(
-	) | rpl::start_with_next([=](not_null<QKeyEvent*> e) {
+	) | rpl::on_next([=](not_null<QKeyEvent*> e) {
 		_scroll->keyPressEvent(e);
 	}, lifetime());
 
-	_scroll->events() | rpl::start_with_next([=](not_null<QEvent*> e) {
+	_scroll->events() | rpl::on_next([=](not_null<QEvent*> e) {
 		if (e->type() == QEvent::MouseButtonDblClick) {
 			const auto button = static_cast<QMouseEvent*>(e.get())->button();
 			if (button == Qt::LeftButton) {
@@ -965,7 +965,7 @@ ChatPreview MakeChatPreview(
 	menu->addAction(std::move(action));
 	if (const auto topic = thread->asTopic()) {
 		const auto weak = base::make_weak(menu);
-		topic->destroyed() | rpl::start_with_next([weak] {
+		topic->destroyed() | rpl::on_next([weak] {
 			if (const auto strong = weak.get()) {
 				LOG(("Preview hidden for a destroyed topic."));
 				strong->hideMenu(true);
diff --git a/Telegram/SourceFiles/history/view/history_view_chat_section.cpp b/Telegram/SourceFiles/history/view/history_view_chat_section.cpp
index d054f5a1be..89e28b100f 100644
--- a/Telegram/SourceFiles/history/view/history_view_chat_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_chat_section.cpp
@@ -215,7 +215,7 @@ object_ptr<Window::SectionWidget> ChatMemento::createWidget(
 void ChatMemento::setupTopicViewer() {
 	if (_id.repliesRootId) {
 		_id.history->owner().itemIdChanged(
-		) | rpl::start_with_next([=](const Data::Session::IdChange &change) {
+		) | rpl::on_next([=](const Data::Session::IdChange &change) {
 			if (_id.repliesRootId == change.oldId) {
 				_id.repliesRootId = change.newId.msg;
 				_replies = nullptr;
@@ -279,14 +279,14 @@ ChatWidget::ChatWidget(
 		controller->chatStyle(),
 		static_cast<HistoryView::CornerButtonsDelegate*>(this)) {
 	controller->chatStyle()->paletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_scroll->updateBars();
 	}, _scroll->lifetime());
 
 	Window::ChatThemeValueFromPeer(
 		controller,
 		_peer
-	) | rpl::start_with_next([=](std::shared_ptr<Ui::ChatTheme> &&theme) {
+	) | rpl::on_next([=](std::shared_ptr<Ui::ChatTheme> &&theme) {
 		_theme = std::move(theme);
 		controller->setChatStyleTheme(_theme);
 	}, lifetime());
@@ -311,19 +311,19 @@ ChatWidget::ChatWidget(
 	}
 
 	_topBar->deleteSelectionRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		confirmDeleteSelected();
 	}, _topBar->lifetime());
 	_topBar->forwardSelectionRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		confirmForwardSelected();
 	}, _topBar->lifetime());
 	_topBar->clearSelectionRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		clearSelected();
 	}, _topBar->lifetime());
 	_topBar->searchRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		searchRequested();
 	}, _topBar->lifetime());
 	if (_sublist) {
@@ -331,7 +331,7 @@ ChatWidget::ChatWidget(
 	}
 
 	controller->adaptive().value(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateAdaptiveLayout();
 	}, lifetime());
 
@@ -342,14 +342,14 @@ ChatWidget::ChatWidget(
 	_scroll->move(0, _topBar->height());
 	_scroll->show();
 	_scroll->scrolls(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		onScroll();
 	}, lifetime());
 
 	_inner->editMessageRequested(
 	) | rpl::filter([=] {
 		return !_joinGroup;
-	}) | rpl::start_with_next([=](auto fullId) {
+	}) | rpl::on_next([=](auto fullId) {
 		if (const auto item = session().data().message(fullId)) {
 			const auto media = item->media();
 			if (!media || media->webpage() || media->allowsEditCaption()) {
@@ -363,7 +363,7 @@ ChatWidget::ChatWidget(
 	}, _inner->lifetime());
 
 	_inner->replyToMessageRequested(
-	) | rpl::start_with_next([=](ListWidget::ReplyToMessageRequest request) {
+	) | rpl::on_next([=](ListWidget::ReplyToMessageRequest request) {
 		const auto canSendReply = _topic
 			? Data::CanSendAnything(_topic)
 			: Data::CanSendAnything(_peer);
@@ -383,14 +383,14 @@ ChatWidget::ChatWidget(
 	}, _inner->lifetime());
 
 	_inner->showMessageRequested(
-	) | rpl::start_with_next([=](auto fullId) {
+	) | rpl::on_next([=](auto fullId) {
 		if (const auto item = session().data().message(fullId)) {
 			showAtPosition(item->position());
 		}
 	}, _inner->lifetime());
 
 	_composeControls->sendActionUpdates(
-	) | rpl::start_with_next([=](ComposeControls::SendActionUpdate &&data) {
+	) | rpl::on_next([=](ComposeControls::SendActionUpdate &&data) {
 		if (!_repliesRootId) {
 			return;
 		} else if (!data.cancel) {
@@ -409,7 +409,7 @@ ChatWidget::ChatWidget(
 
 	_history->session().changes().messageUpdates(
 		Data::MessageUpdate::Flag::Destroyed
-	) | rpl::start_with_next([=](const Data::MessageUpdate &update) {
+	) | rpl::on_next([=](const Data::MessageUpdate &update) {
 		if (update.item == _repliesRoot) {
 			_repliesRoot = nullptr;
 			updatePinnedVisibility();
@@ -425,7 +425,7 @@ ChatWidget::ChatWidget(
 		_history->session().changes().historyUpdates(
 			_history,
 			Data::HistoryUpdate::Flag::OutboxRead
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			_inner->update();
 		}, lifetime());
 	} else {
@@ -433,7 +433,7 @@ ChatWidget::ChatWidget(
 		) | rpl::filter([=](const Api::SendAction &action) {
 			return (action.history == _history)
 				&& (action.replyTo.topicRootId == _topic->topicRootId());
-		}) | rpl::start_with_next([=](const Api::SendAction &action) {
+		}) | rpl::on_next([=](const Api::SendAction &action) {
 			if (action.options.scheduled) {
 				_composeControls->cancelReplyMessage();
 				crl::on_main(this, [=, t = _topic] {
@@ -549,7 +549,7 @@ void ChatWidget::setupRootView() {
 	}));
 
 	controller()->adaptive().oneColumnValue(
-	) | rpl::start_with_next([=](bool one) {
+	) | rpl::on_next([=](bool one) {
 		_repliesRootView->setShadowGeometryPostprocess([=](QRect geometry) {
 			if (!one) {
 				geometry.setLeft(geometry.left() + st::lineWidth);
@@ -559,13 +559,13 @@ void ChatWidget::setupRootView() {
 	}, _repliesRootView->lifetime());
 
 	_repliesRootView->barClicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		showAtStart();
 	}, lifetime());
 
 	_repliesRootViewHeight = 0;
 	_repliesRootView->heightValue(
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		if (const auto delta = height - _repliesRootViewHeight) {
 			_repliesRootViewHeight = height;
 			setGeometryWithTopMoved(geometry(), delta);
@@ -579,7 +579,7 @@ void ChatWidget::setupTopicViewer() {
 	}
 	const auto owner = &_history->owner();
 	owner->itemIdChanged(
-	) | rpl::start_with_next([=](const Data::Session::IdChange &change) {
+	) | rpl::on_next([=](const Data::Session::IdChange &change) {
 		if (_repliesRootId == change.oldId) {
 			_repliesRootId = _id.repliesRootId = change.newId.msg;
 			_composeControls->updateTopicRootId(_repliesRootId);
@@ -614,7 +614,7 @@ void ChatWidget::subscribeToTopic() {
 	_topicReopenBar->bar().setVisible(!animatingShow());
 	_topicReopenBarHeight = _topicReopenBar->bar().height();
 	_topicReopenBar->bar().heightValue(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto height = _topicReopenBar->bar().height();
 		_scrollTopDelta = (height - _topicReopenBarHeight);
 		if (_scrollTopDelta) {
@@ -630,7 +630,7 @@ void ChatWidget::subscribeToTopic() {
 		(Flag::UnreadMentions
 			| Flag::UnreadReactions
 			| Flag::CloudDraft)
-	) | rpl::start_with_next([=](const Data::TopicUpdate &update) {
+	) | rpl::on_next([=](const Data::TopicUpdate &update) {
 		if (update.flags & (Flag::UnreadMentions | Flag::UnreadReactions)) {
 			_cornerButtons.updateUnreadThingsVisibility();
 		}
@@ -640,7 +640,7 @@ void ChatWidget::subscribeToTopic() {
 	}, _topicLifetime);
 
 	_topic->destroyed(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		closeCurrent();
 	}, _topicLifetime);
 
@@ -670,7 +670,7 @@ void ChatWidget::subscribeToPinnedMessages() {
 	using EntryUpdateFlag = Data::EntryUpdate::Flag;
 	session().changes().entryUpdates(
 		EntryUpdateFlag::HasPinnedMessages
-	) | rpl::start_with_next([=](const Data::EntryUpdate &update) {
+	) | rpl::on_next([=](const Data::EntryUpdate &update) {
 		if (_pinnedTracker
 			&& (update.flags & EntryUpdateFlag::HasPinnedMessages)
 			&& (_topic == update.entry.get()
@@ -805,7 +805,7 @@ void ChatWidget::setupComposeControls() {
 	_composeControls->height(
 	) | rpl::filter([=] {
 		return !_joinGroup;
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		const auto wasMax = (_scroll->scrollTopMax() == _scroll->scrollTop());
 		updateControlsGeometry();
 		if (wasMax) {
@@ -814,27 +814,27 @@ void ChatWidget::setupComposeControls() {
 	}, lifetime());
 
 	_composeControls->cancelRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		listCancelRequest();
 	}, lifetime());
 
 	_composeControls->sendRequests(
-	) | rpl::start_with_next([=](Api::SendOptions options) {
+	) | rpl::on_next([=](Api::SendOptions options) {
 		send(options);
 	}, lifetime());
 
 	_composeControls->scrollToMaxRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		listScrollTo(_scroll->scrollTopMax());
 	}, lifetime());
 
 	_composeControls->sendVoiceRequests(
-	) | rpl::start_with_next([=](const ComposeControls::VoiceToSend &data) {
+	) | rpl::on_next([=](const ComposeControls::VoiceToSend &data) {
 		sendVoice(data);
 	}, lifetime());
 
 	_composeControls->sendCommandRequests(
-	) | rpl::start_with_next([=](const QString &command) {
+	) | rpl::on_next([=](const QString &command) {
 		if (showSlowmodeError()) {
 			return;
 		}
@@ -844,7 +844,7 @@ void ChatWidget::setupComposeControls() {
 
 	const auto saveEditMsgRequestId = lifetime().make_state<mtpRequestId>(0);
 	_composeControls->editRequests(
-	) | rpl::start_with_next([=](auto data) {
+	) | rpl::on_next([=](auto data) {
 		if (const auto item = session().data().message(data.fullId)) {
 			const auto spoiler = data.spoilered;
 			edit(item, data.options, saveEditMsgRequestId, spoiler);
@@ -854,7 +854,7 @@ void ChatWidget::setupComposeControls() {
 	_composeControls->attachRequests(
 	) | rpl::filter([=] {
 		return !_choosingAttach;
-	}) | rpl::start_with_next([=](std::optional<bool> overrideCompress) {
+	}) | rpl::on_next([=](std::optional<bool> overrideCompress) {
 		_choosingAttach = true;
 		base::call_delayed(
 			st::historyAttach.ripple.hideDuration,
@@ -863,7 +863,7 @@ void ChatWidget::setupComposeControls() {
 	}, lifetime());
 
 	_composeControls->fileChosen(
-	) | rpl::start_with_next([=](ChatHelpers::FileChosen data) {
+	) | rpl::on_next([=](ChatHelpers::FileChosen data) {
 		controller()->hideLayer(anim::type::normal);
 		controller()->sendingAnimation().appendSending(
 			data.messageSendingFrom);
@@ -877,12 +877,12 @@ void ChatWidget::setupComposeControls() {
 	}, lifetime());
 
 	_composeControls->photoChosen(
-	) | rpl::start_with_next([=](ChatHelpers::PhotoChosen chosen) {
+	) | rpl::on_next([=](ChatHelpers::PhotoChosen chosen) {
 		sendExistingPhoto(chosen.photo, chosen.options);
 	}, lifetime());
 
 	_composeControls->inlineResultChosen(
-	) | rpl::start_with_next([=](ChatHelpers::InlineChosen chosen) {
+	) | rpl::on_next([=](ChatHelpers::InlineChosen chosen) {
 		controller()->sendingAnimation().appendSending(
 			chosen.messageSendingFrom);
 		const auto localId = chosen.messageSendingFrom.localId;
@@ -890,7 +890,7 @@ void ChatWidget::setupComposeControls() {
 	}, lifetime());
 
 	_composeControls->jumpToItemRequests(
-	) | rpl::start_with_next([=](FullReplyTo to) {
+	) | rpl::on_next([=](FullReplyTo to) {
 		if (const auto item = session().data().message(to.messageId)) {
 			JumpToMessageClickHandler(item, {}, to.highlight())->onClick({});
 		}
@@ -899,19 +899,19 @@ void ChatWidget::setupComposeControls() {
 	rpl::merge(
 		_composeControls->scrollKeyEvents(),
 		_inner->scrollKeyEvents()
-	) | rpl::start_with_next([=](not_null<QKeyEvent*> e) {
+	) | rpl::on_next([=](not_null<QKeyEvent*> e) {
 		_scroll->keyPressEvent(e);
 	}, lifetime());
 
 	_composeControls->editLastMessageRequests(
-	) | rpl::start_with_next([=](not_null<QKeyEvent*> e) {
+	) | rpl::on_next([=](not_null<QKeyEvent*> e) {
 		if (!_inner->lastMessageEditRequestNotify()) {
 			_scroll->keyPressEvent(e);
 		}
 	}, lifetime());
 
 	_composeControls->replyNextRequests(
-	) | rpl::start_with_next([=](ComposeControls::ReplyNextRequest &&data) {
+	) | rpl::on_next([=](ComposeControls::ReplyNextRequest &&data) {
 		using Direction = ComposeControls::ReplyNextRequest::Direction;
 		_inner->replyNextMessage(
 			data.replyId,
@@ -919,7 +919,7 @@ void ChatWidget::setupComposeControls() {
 	}, lifetime());
 
 	_composeControls->showScheduledRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		controller()->showSection(
 			_topic
 				? std::make_shared<HistoryView::ScheduledMemento>(_topic)
@@ -941,13 +941,13 @@ void ChatWidget::setupComposeControls() {
 	});
 
 	_composeControls->lockShowStarts(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_cornerButtons.updateJumpDownVisibility();
 		_cornerButtons.updateUnreadThingsVisibility();
 	}, lifetime());
 
 	_composeControls->viewportEvents(
-	) | rpl::start_with_next([=](not_null<QEvent*> e) {
+	) | rpl::on_next([=](not_null<QEvent*> e) {
 		_scroll->viewportEvent(e);
 	}, lifetime());
 
@@ -959,7 +959,7 @@ void ChatWidget::setupComposeControls() {
 			rpl::combine(
 				Data::CanSendAnythingValue(channel),
 				channel->flagsValue()
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				refreshJoinGroupButton();
 			}, lifetime());
 		} else {
@@ -1579,7 +1579,7 @@ void ChatWidget::validateSubsectionTabs() {
 				| ChannelDataFlag::ForumTabs
 				| ChannelDataFlag::MonoforumAdmin;
 			return change.diff & mask;
-		}) | rpl::start_with_next([=] {
+		}) | rpl::on_next([=] {
 			validateSubsectionTabs();
 		});
 	}
@@ -1608,12 +1608,12 @@ void ChatWidget::validateSubsectionTabs() {
 			this,
 			thread);
 	}
-	_subsectionTabs->removeRequests() | rpl::start_with_next([=] {
+	_subsectionTabs->removeRequests() | rpl::on_next([=] {
 		_subsectionTabsLifetime.destroy();
 		_subsectionTabs = nullptr;
 		updateControlsGeometry();
 	}, _subsectionTabsLifetime);
-	_subsectionTabs->layoutRequests() | rpl::start_with_next([=] {
+	_subsectionTabs->layoutRequests() | rpl::on_next([=] {
 		_inner->overrideChatMode((_subsectionTabs->leftSkip() > 0)
 			? ElementChatMode::Narrow
 			: std::optional<ElementChatMode>());
@@ -1947,7 +1947,7 @@ void ChatWidget::setupAboutHiddenAuthor() {
 		return;
 	}
 	_aboutHiddenAuthor = std::make_unique<Ui::RpWidget>(this);
-	_aboutHiddenAuthor->paintRequest() | rpl::start_with_next([=] {
+	_aboutHiddenAuthor->paintRequest() | rpl::on_next([=] {
 		auto p = QPainter(_aboutHiddenAuthor.get());
 		auto rect = _aboutHiddenAuthor->rect();
 
@@ -1965,7 +1965,7 @@ void ChatWidget::setupAboutHiddenAuthor() {
 
 void ChatWidget::setupTranslateBar() {
 	controller()->adaptive().oneColumnValue(
-	) | rpl::start_with_next([=, raw = _translateBar.get()](bool one) {
+	) | rpl::on_next([=, raw = _translateBar.get()](bool one) {
 		raw->setShadowGeometryPostprocess([=](QRect geometry) {
 			if (!one) {
 				geometry.setLeft(geometry.left() + st::lineWidth);
@@ -1976,7 +1976,7 @@ void ChatWidget::setupTranslateBar() {
 
 	_translateBarHeight = 0;
 	_translateBar->heightValue(
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		if (const auto delta = height - _translateBarHeight) {
 			_translateBarHeight = height;
 			setGeometryWithTopMoved(geometry(), delta);
@@ -2005,7 +2005,7 @@ void ChatWidget::setupPinnedTracker() {
 		1
 	) | rpl::filter([=](const SparseIdsSlice &result) {
 		return result.fullCount().has_value();
-	}) | rpl::start_with_next([=](const SparseIdsSlice &result) {
+	}) | rpl::on_next([=](const SparseIdsSlice &result) {
 		thread->setHasPinnedMessages(*result.fullCount() != 0);
 		if (result.skippedAfter() == 0) {
 			auto &settings = _history->session().settings();
@@ -2090,7 +2090,7 @@ void ChatWidget::checkPinnedBarState() {
 	rpl::combine(
 		rpl::duplicate(pinnedRefreshed),
 		rpl::duplicate(customButtonItem)
-	) | rpl::start_with_next([=](bool many, HistoryItem *item) {
+	) | rpl::on_next([=](bool many, HistoryItem *item) {
 		refreshPinnedBarButton(many, item);
 	}, _pinnedBar->lifetime());
 
@@ -2114,7 +2114,7 @@ void ChatWidget::checkPinnedBarState() {
 	}));
 
 	controller()->adaptive().oneColumnValue(
-	) | rpl::start_with_next([=, raw = _pinnedBar.get()](bool one) {
+	) | rpl::on_next([=, raw = _pinnedBar.get()](bool one) {
 		raw->setShadowGeometryPostprocess([=](QRect geometry) {
 			if (!one) {
 				geometry.setLeft(geometry.left() + st::lineWidth);
@@ -2124,7 +2124,7 @@ void ChatWidget::checkPinnedBarState() {
 	}, _pinnedBar->lifetime());
 
 	_pinnedBar->barClicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto id = _pinnedTracker->currentMessageId();
 		if (const auto item = session().data().message(id.message)) {
 			showAtPosition(item->position());
@@ -2142,7 +2142,7 @@ void ChatWidget::checkPinnedBarState() {
 
 	_pinnedBarHeight = 0;
 	_pinnedBar->heightValue(
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		if (const auto delta = height - _pinnedBarHeight) {
 			_pinnedBarHeight = height;
 			setGeometryWithTopMoved(geometry(), delta);
@@ -2192,7 +2192,7 @@ void ChatWidget::refreshPinnedBarButton(bool many, HistoryItem *item) {
 		const auto buttonRaw = customButton.data();
 		const auto state = buttonRaw->lifetime().make_state<State>();
 		_pinnedBar->contextMenuRequested(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			state->menu = base::make_unique_q<Ui::PopupMenu>(buttonRaw);
 			state->menu->addAction(
 				tr::lng_settings_events_pinned(tr::now),
@@ -2207,7 +2207,7 @@ void ChatWidget::refreshPinnedBarButton(bool many, HistoryItem *item) {
 		this,
 		close ? st::historyReplyCancel : st::historyPinnedShowAll);
 	button->clicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (close) {
 			hidePinnedMessage();
 		} else {
@@ -2556,7 +2556,7 @@ void ChatWidget::setReplies(std::shared_ptr<Data::RepliesList> replies) {
 	_repliesLifetime.destroy();
 
 	_replies->unreadCountValue(
-	) | rpl::start_with_next([=](std::optional<int> count) {
+	) | rpl::on_next([=](std::optional<int> count) {
 		refreshUnreadCountBadge(count);
 	}, lifetime());
 
@@ -2587,7 +2587,7 @@ void ChatWidget::setReplies(std::shared_ptr<Data::RepliesList> replies) {
 				? tr::lng_comments_header_none
 				: tr::lng_replies_header_none)();
 	}) | rpl::flatten_latest(
-	) | rpl::start_with_next([=](const QString &text) {
+	) | rpl::on_next([=](const QString &text) {
 		_topBar->setCustomTitle(text);
 	}, _repliesLifetime);
 }
@@ -2603,7 +2603,7 @@ void ChatWidget::subscribeToSublist() {
 	}
 
 	_sublist->unreadCountValue(
-	) | rpl::start_with_next([=](std::optional<int> count) {
+	) | rpl::on_next([=](std::optional<int> count) {
 		refreshUnreadCountBadge(count);
 	}, lifetime());
 
@@ -2611,7 +2611,7 @@ void ChatWidget::subscribeToSublist() {
 	session().changes().sublistUpdates(
 		_sublist,
 		Flag::UnreadView | Flag::UnreadReactions | Flag::CloudDraft
-	) | rpl::start_with_next([=](const Data::SublistUpdate &update) {
+	) | rpl::on_next([=](const Data::SublistUpdate &update) {
 		if (update.flags & Flag::UnreadView) {
 			unreadCountUpdated();
 		}
@@ -2624,7 +2624,7 @@ void ChatWidget::subscribeToSublist() {
 	}, lifetime());
 
 	_sublist->destroyed(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		closeCurrent();
 	}, lifetime());
 
@@ -3388,7 +3388,7 @@ void ChatWidget::setupShortcuts() {
 			&& Ui::InFocusChain(this)
 			&& !controller()->isLayerShown()
 			&& (Core::App().activeWindow() == &controller()->window());
-	}) | rpl::start_with_next([=](not_null<Shortcuts::Request*> request) {
+	}) | rpl::on_next([=](not_null<Shortcuts::Request*> request) {
 		using Command = Shortcuts::Command;
 		request->check(Command::Search, 1) && request->handle([=] {
 			searchRequested();
@@ -3430,12 +3430,12 @@ void ChatWidget::searchInTopic() {
 
 		using Activation = HistoryView::ComposeSearch::Activation;
 		_composeSearch->activations(
-		) | rpl::start_with_next([=](Activation activation) {
+		) | rpl::on_next([=](Activation activation) {
 			showAtPosition(activation.item->position());
 		}, _composeSearch->lifetime());
 
 		_composeSearch->destroyRequests(
-		) | rpl::take(1) | rpl::start_with_next([=] {
+		) | rpl::take(1) | rpl::on_next([=] {
 			_composeSearch = nullptr;
 
 			update();
@@ -3467,7 +3467,7 @@ bool ChatWidget::searchInChatEmbedded(
 	setInnerFocus();
 
 	_composeSearch->activations(
-	) | rpl::start_with_next([=](ComposeSearch::Activation activation) {
+	) | rpl::on_next([=](ComposeSearch::Activation activation) {
 		const auto item = activation.item;
 		auto params = ::Window::SectionShow(
 			::Window::SectionShow::Way::ClearStack);
@@ -3481,7 +3481,7 @@ bool ChatWidget::searchInChatEmbedded(
 	_composeSearch->destroyRequests(
 	) | rpl::take(
 		1
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_composeSearch = nullptr;
 
 		updateControlsGeometry();
diff --git a/Telegram/SourceFiles/history/view/history_view_contact_status.cpp b/Telegram/SourceFiles/history/view/history_view_contact_status.cpp
index b4ead445b8..e87ca9798c 100644
--- a/Telegram/SourceFiles/history/view/history_view_contact_status.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_contact_status.cpp
@@ -131,7 +131,7 @@ namespace {
 		st::historyContactStatusButton.ripple);
 	const auto raw = result.data();
 	raw->paintRequest(
-	) | rpl::start_with_next([=, &icon] {
+	) | rpl::on_next([=, &icon] {
 		auto p = QPainter(raw);
 		p.fillRect(raw->rect(), st::historyContactStatusButton.bgColor);
 		raw->paintRipple(p, 0, 0);
@@ -263,7 +263,7 @@ ContactStatus::Bar::Bar(
 , _emojiStatusShadow(this) {
 	_requestChatInfo->setAttribute(Qt::WA_TransparentForMouseEvents);
 	_emojiStatusInfo->paintRequest(
-	) | rpl::start_with_next([=, raw = _emojiStatusInfo.data()](QRect clip) {
+	) | rpl::on_next([=, raw = _emojiStatusInfo.data()](QRect clip) {
 		_emojiStatusRepaintScheduled = false;
 		QPainter(raw).fillRect(clip, st::historyComposeButtonBg);
 	}, lifetime());
@@ -499,12 +499,12 @@ SlidingBar::SlidingBar(
 
 void SlidingBar::setup(not_null<Ui::RpWidget*> parent) {
 	parent->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		_wrapped.resizeToWidth(width);
 	}, _wrapped.lifetime());
 
 	_wrapped.geometryValue(
-	) | rpl::start_with_next([=](QRect geometry) {
+	) | rpl::on_next([=](QRect geometry) {
 		_shadow.setGeometry(
 			geometry.x(),
 			geometry.y() + geometry.height(),
@@ -641,7 +641,7 @@ void ContactStatus::setupState(not_null<PeerData*> peer, bool showInForum) {
 		((channel && !showInForum)
 			? Data::PeerFlagValue(channel, ChannelData::Flag::Forum)
 			: (rpl::single(false) | rpl::type_erased))
-	) | rpl::start_with_next([=](
+	) | rpl::on_next([=](
 			State state,
 			TextWithEntities status,
 			bool hiddenByForum) {
@@ -672,14 +672,14 @@ void ContactStatus::setupHandlers(not_null<PeerData*> peer) {
 
 void ContactStatus::setupAddHandler(not_null<UserData*> user) {
 	_inner->addClicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_controller->window().show(Box(EditContactBox, _controller, user));
 	}, _bar.lifetime());
 }
 
 void ContactStatus::setupBlockHandler(not_null<UserData*> user) {
 	_inner->blockClicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_controller->window().show(Box(
 			Window::PeerMenuBlockUserBox,
 			&_controller->window(),
@@ -691,7 +691,7 @@ void ContactStatus::setupBlockHandler(not_null<UserData*> user) {
 
 void ContactStatus::setupShareHandler(not_null<UserData*> user) {
 	_inner->shareClicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto show = _controller->uiShow();
 		const auto share = [=](Fn<void()> &&close) {
 			user->setBarSettings(0);
@@ -723,7 +723,7 @@ void ContactStatus::setupShareHandler(not_null<UserData*> user) {
 
 void ContactStatus::setupUnarchiveHandler(not_null<PeerData*> peer) {
 	_inner->unarchiveClicks(
-	) | rpl::start_with_next([=, show = _controller->uiShow()] {
+	) | rpl::on_next([=, show = _controller->uiShow()] {
 		using namespace Window;
 		ToggleHistoryArchived(show, peer->owner().history(peer), false);
 		peer->owner().notifySettings().resetToDefault(peer);
@@ -738,7 +738,7 @@ void ContactStatus::setupUnarchiveHandler(not_null<PeerData*> peer) {
 
 void ContactStatus::setupReportHandler(not_null<PeerData*> peer) {
 	_inner->reportClicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		Expects(!peer->isUser());
 
 		const auto show = _controller->uiShow();
@@ -781,7 +781,7 @@ void ContactStatus::setupCloseHandler(not_null<PeerData*> peer) {
 	_inner->closeClicks(
 	) | rpl::filter([=] {
 		return !(*request);
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		peer->setBarSettings(0);
 		*request = peer->session().api().request(
 			MTPmessages_HidePeerSettingsBar(peer->input)
@@ -794,7 +794,7 @@ void ContactStatus::setupRequestInfoHandler(not_null<PeerData*> peer) {
 	_inner->requestInfoClicks(
 	) | rpl::filter([=] {
 		return !(*request);
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		_controller->show(Box([=](not_null<Ui::GenericBox*> box) {
 			box->setTitle((_state.requestChatIsBroadcast
 				? tr::lng_from_request_title_channel
@@ -828,7 +828,7 @@ void ContactStatus::setupRequestInfoHandler(not_null<PeerData*> peer) {
 
 void ContactStatus::setupEmojiStatusHandler(not_null<PeerData*> peer) {
 	_inner->emojiStatusClicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		Settings::ShowEmojiStatusPremium(_controller, peer);
 	}, _bar.lifetime());
 }
@@ -1042,7 +1042,7 @@ void BusinessBotStatus::setupState(not_null<PeerData*> peer) {
 	}
 	PeerState(
 		peer
-	) | rpl::start_with_next([=](State state) {
+	) | rpl::on_next([=](State state) {
 		_state = state;
 		if (!state.bot) {
 			_bar.toggleContent(false);
@@ -1055,22 +1055,22 @@ void BusinessBotStatus::setupState(not_null<PeerData*> peer) {
 
 void BusinessBotStatus::setupHandlers(not_null<PeerData*> peer) {
 	_inner->pauseClicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		peer->owner().chatbots().togglePaused(peer, true);
 	}, _bar.lifetime());
 
 	_inner->resumeClicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		peer->owner().chatbots().togglePaused(peer, false);
 	}, _bar.lifetime());
 
 	_inner->removeClicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		peer->owner().chatbots().removeFrom(peer);
 	}, _bar.lifetime());
 
 	_inner->manageClicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		UrlClickHandler::Open(
 			_state.manageUrl,
 			QVariant::fromValue(ClickHandlerContext{
@@ -1122,7 +1122,7 @@ void TopicReopenBar::setupState() {
 			_topic,
 			Data::TopicUpdate::Flag::Closed),
 		std::move(canToggle)
-	) | rpl::start_with_next([=](const auto &, bool can) {
+	) | rpl::on_next([=](const auto &, bool can) {
 		_bar.toggleContent(can && _topic->closed());
 	}, _bar.lifetime());
 }
@@ -1209,7 +1209,7 @@ void PaysStatus::setupState() {
 	_user->session().changes().peerFlagsValue(
 		_user,
 		Data::PeerUpdate::Flag::PaysPerMessage
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_state = State{ _user->paysPerMessage() };
 		if (_state.perMessage > 0) {
 			_inner->showState(_state);
@@ -1222,7 +1222,7 @@ void PaysStatus::setupState() {
 
 void PaysStatus::setupHandlers() {
 	_inner->removeClicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		Window::PeerMenuConfirmToggleFee(
 			_controller,
 			_paidAlready,
diff --git a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
index 36b0b6ca6a..d4b2746334 100644
--- a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
@@ -586,7 +586,7 @@ bool AddRescheduleAction(
 				date));
 
 		owner->itemRemoved(
-		) | rpl::start_with_next([=](not_null<const HistoryItem*> item) {
+		) | rpl::on_next([=](not_null<const HistoryItem*> item) {
 			if (ranges::contains(ids, item->fullId())) {
 				box->closeBox();
 			}
@@ -1103,7 +1103,7 @@ void EditTagBox(
 	} else {
 		owner->reactions().preloadReactionImageFor(id);
 	}
-	field->paintRequest() | rpl::start_with_next([=](QRect clip) {
+	field->paintRequest() | rpl::on_next([=](QRect clip) {
 		auto p = QPainter(field);
 		const auto top = st::editTagField.textMargins.top();
 		if (const auto custom = state->custom.get()) {
@@ -1143,7 +1143,7 @@ void EditTagBox(
 	};
 
 	field->submits(
-	) | rpl::start_with_next(save, field->lifetime());
+	) | rpl::on_next(save, field->lifetime());
 
 	box->addButton(tr::lng_settings_save(), save);
 	box->addButton(tr::lng_cancel(), [=] {
@@ -1248,7 +1248,7 @@ void ShowWhoReadInfo(
 	action->setDisabled(true);
 	auto lifetime = LookupMessageAuthor(
 		item
-	) | rpl::start_with_next([=](not_null<UserData*> author) {
+	) | rpl::on_next([=](not_null<UserData*> author) {
 		action->setText(
 			tr::lng_context_sent_by(tr::now, lt_user, author->name()));
 		action->setDisabled(false);
@@ -1857,7 +1857,7 @@ void ShowWhoReactedMenu(
 		st::defaultWhoRead
 	) | rpl::filter([=](const Ui::WhoReadContent &content) {
 		return content.state != Ui::WhoReadState::Unknown;
-	}) | rpl::start_with_next([=, &lifetime](Ui::WhoReadContent &&content) {
+	}) | rpl::on_next([=, &lifetime](Ui::WhoReadContent &&content) {
 		const auto creating = !*menu;
 		const auto refillTop = [=] {
 			if (activeNonQuick) {
diff --git a/Telegram/SourceFiles/history/view/history_view_corner_buttons.cpp b/Telegram/SourceFiles/history/view/history_view_corner_buttons.cpp
index 37885d8e0e..8d9d7fed2d 100644
--- a/Telegram/SourceFiles/history/view/history_view_corner_buttons.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_corner_buttons.cpp
@@ -195,7 +195,7 @@ void CornerButtons::pushReplyReturn(not_null<HistoryItem*> item) {
 	if (!_replyReturnStarted) {
 		_replyReturnStarted = true;
 		item->history()->owner().itemRemoved(
-		) | rpl::start_with_next([=](not_null<const HistoryItem*> item) {
+		) | rpl::on_next([=](not_null<const HistoryItem*> item) {
 			while (item == _replyReturn) {
 				calculateNextReplyReturn();
 			}
diff --git a/Telegram/SourceFiles/history/view/history_view_element.cpp b/Telegram/SourceFiles/history/view/history_view_element.cpp
index 8db91380f3..742eab946d 100644
--- a/Telegram/SourceFiles/history/view/history_view_element.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_element.cpp
@@ -1878,7 +1878,7 @@ void Element::createUnreadBar(rpl::producer<QString> text) {
 	const auto bar = Get<UnreadBar>();
 	std::move(
 		text
-	) | rpl::start_with_next([=](const QString &text) {
+	) | rpl::on_next([=](const QString &text) {
 		if (const auto bar = Get<UnreadBar>()) {
 			bar->init(text);
 		}
diff --git a/Telegram/SourceFiles/history/view/history_view_emoji_interactions.cpp b/Telegram/SourceFiles/history/view/history_view_emoji_interactions.cpp
index fed0bddf07..86fc4c17ed 100644
--- a/Telegram/SourceFiles/history/view/history_view_emoji_interactions.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_emoji_interactions.cpp
@@ -58,7 +58,7 @@ EmojiInteractions::EmojiInteractions(
 	_session->data().viewRemoved(
 	) | rpl::filter([=] {
 		return !_plays.empty() || !_delayed.empty();
-	}) | rpl::start_with_next([=](not_null<const Element*> view) {
+	}) | rpl::on_next([=](not_null<const Element*> view) {
 		_plays.erase(ranges::remove(_plays, view, &Play::view), end(_plays));
 		_delayed.erase(
 			ranges::remove(_delayed, view, &Delayed::view),
@@ -66,7 +66,7 @@ EmojiInteractions::EmojiInteractions(
 	}, _lifetime);
 
 	_session->data().reactions().effectsUpdates(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		checkPendingEffects();
 	}, _lifetime);
 }
@@ -169,7 +169,7 @@ void EmojiInteractions::playEffect(not_null<const Element*> view) {
 	} else if (view->data()->effectId()) {
 		if (resolved.document && !_downloadLifetime) {
 			_downloadLifetime = _session->downloaderTaskFinished(
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				checkPendingEffects();
 			});
 		}
@@ -266,7 +266,7 @@ void EmojiInteractions::checkPendingEffects() {
 		_downloadLifetime.destroy();
 	} else if (!_downloadLifetime) {
 		_downloadLifetime = _session->downloaderTaskFinished(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			checkPendingEffects();
 		});
 	}
@@ -294,7 +294,7 @@ void EmojiInteractions::play(
 		const auto raw = _layer.get();
 		raw->setAttribute(Qt::WA_TransparentForMouseEvents);
 		raw->show();
-		raw->paintRequest() | rpl::start_with_next([=](QRect clip) {
+		raw->paintRequest() | rpl::on_next([=](QRect clip) {
 			paint(raw, clip);
 		}, raw->lifetime());
 	}
@@ -315,7 +315,7 @@ void EmojiInteractions::play(
 		: QPoint();
 	const auto raw = lottie.get();
 	lottie->updates(
-	) | rpl::start_with_next([=](Lottie::Update update) {
+	) | rpl::on_next([=](Lottie::Update update) {
 		v::match(update.data, [&](const Lottie::Information &information) {
 		}, [&](const Lottie::DisplayFrameRequest &request) {
 			const auto i = ranges::find(_plays, raw, [](const Play &p) {
diff --git a/Telegram/SourceFiles/history/view/history_view_empty_list_bubble.cpp b/Telegram/SourceFiles/history/view/history_view_empty_list_bubble.cpp
index 0b47a0183b..ba26b76ddb 100644
--- a/Telegram/SourceFiles/history/view/history_view_empty_list_bubble.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_empty_list_bubble.cpp
@@ -21,7 +21,7 @@ EmptyListBubbleWidget::EmptyListBubbleWidget(
 , _padding(padding)
 , _st(st) {
 	parent->sizeValue(
-	) | rpl::start_with_next([=](const QSize &s) {
+	) | rpl::on_next([=](const QSize &s) {
 		updateGeometry(s);
 	}, lifetime());
 }
diff --git a/Telegram/SourceFiles/history/view/history_view_group_call_bar.cpp b/Telegram/SourceFiles/history/view/history_view_group_call_bar.cpp
index 95cb34fe41..f114cb5f08 100644
--- a/Telegram/SourceFiles/history/view/history_view_group_call_bar.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_group_call_bar.cpp
@@ -291,7 +291,7 @@ rpl::producer<Ui::GroupCallBarContent> GroupCallBarContentByCall(
 
 		using ParticipantUpdate = Data::GroupCall::ParticipantUpdate;
 		call->participantUpdated(
-		) | rpl::start_with_next([=](const ParticipantUpdate &update) {
+		) | rpl::on_next([=](const ParticipantUpdate &update) {
 			const auto participantPeer = update.now
 				? update.now->peer
 				: update.was->peer;
@@ -341,12 +341,12 @@ rpl::producer<Ui::GroupCallBarContent> GroupCallBarContentByCall(
 		call->participantsReloaded(
 		) | rpl::filter([=] {
 			return RegenerateUserpics(state, call, userpicSize);
-		}) | rpl::start_with_next(pushNext, lifetime);
+		}) | rpl::on_next(pushNext, lifetime);
 
 		call->peer()->session().downloaderTaskFinished(
 		) | rpl::filter([=] {
 			return state->someUserpicsNotLoaded;
-		}) | rpl::start_with_next([=] {
+		}) | rpl::on_next([=] {
 			for (const auto &userpic : state->userpics) {
 				if (userpic.peer->userpicUniqueKey(userpic.view)
 					!= userpic.uniqueKey) {
@@ -363,7 +363,7 @@ rpl::producer<Ui::GroupCallBarContent> GroupCallBarContentByCall(
 			call->titleValue(),
 			call->scheduleDateValue(),
 			call->fullCountValue()
-		) | rpl::start_with_next([=](
+		) | rpl::on_next([=](
 				const QString &title,
 				TimeId scheduleDate,
 				int count) {
diff --git a/Telegram/SourceFiles/history/view/history_view_group_members_widget.cpp b/Telegram/SourceFiles/history/view/history_view_group_members_widget.cpp
index 63b090d16d..36a6585844 100644
--- a/Telegram/SourceFiles/history/view/history_view_group_members_widget.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_group_members_widget.cpp
@@ -51,12 +51,12 @@ void GroupMembersWidget::setupList() {
 	_listController->setStyleOverrides(&st::groupMembersWidgetList);
 	_listController->setStoriesShown(true);
 	_list = object_ptr<PeerListContent>(this, _listController.get());
-	widthValue() | rpl::start_with_next([this](int newWidth) {
+	widthValue() | rpl::on_next([this](int newWidth) {
 		if (newWidth > 0) {
 			_list->resizeToWidth(newWidth);
 		}
 	}, _list->lifetime());
-	_list->heightValue() | rpl::start_with_next([=](int listHeight) {
+	_list->heightValue() | rpl::on_next([=](int listHeight) {
 		if (const auto newHeight = topSkip + listHeight; newHeight > 0) {
 			resize(width(), newHeight);
 		}
diff --git a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
index 1e24dee71c..88dcf2d944 100644
--- a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
@@ -416,25 +416,25 @@ ListWidget::ListWidget(
 	setMouseTracking(true);
 	_scrollDateHideTimer.setCallback([this] { scrollDateHideByTimer(); });
 	_session->data().viewRepaintRequest(
-	) | rpl::start_with_next([this](auto view) {
+	) | rpl::on_next([this](auto view) {
 		if (view->delegate() == this) {
 			repaintItem(view);
 		}
 	}, lifetime());
 	_session->data().viewResizeRequest(
-	) | rpl::start_with_next([this](auto view) {
+	) | rpl::on_next([this](auto view) {
 		if (view->delegate() == this) {
 			resizeItem(view);
 		}
 	}, lifetime());
 	_session->data().itemViewRefreshRequest(
-	) | rpl::start_with_next([this](auto item) {
+	) | rpl::on_next([this](auto item) {
 		if (const auto view = viewForItem(item)) {
 			refreshItem(view);
 		}
 	}, lifetime());
 	_session->data().viewLayoutChanged(
-	) | rpl::start_with_next([this](auto view) {
+	) | rpl::on_next([this](auto view) {
 		if (view->delegate() == this) {
 			if (view->isUnderCursor()) {
 				mouseActionUpdate();
@@ -442,31 +442,31 @@ ListWidget::ListWidget(
 		}
 	}, lifetime());
 	_session->data().itemDataChanges(
-	) | rpl::start_with_next([=](not_null<HistoryItem*> item) {
+	) | rpl::on_next([=](not_null<HistoryItem*> item) {
 		if (const auto view = viewForItem(item)) {
 			view->itemDataChanged();
 		}
 	}, lifetime());
 
 	_session->downloaderTaskFinished(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		update();
 	}, lifetime());
 
 	_session->data().peerDecorationsUpdated(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		update();
 	}, lifetime());
 
 	_session->data().itemRemoved(
-	) | rpl::start_with_next([=](not_null<const HistoryItem*> item) {
+	) | rpl::on_next([=](not_null<const HistoryItem*> item) {
 		itemRemoved(item);
 	}, lifetime());
 
 	using MessageUpdateFlag = Data::MessageUpdate::Flag;
 	_session->changes().realtimeMessageUpdates(
 		MessageUpdateFlag::NewUnreadReaction
-	) | rpl::start_with_next([=](const Data::MessageUpdate &update) {
+	) | rpl::on_next([=](const Data::MessageUpdate &update) {
 		maybeMarkReactionsRead(update.item);
 	}, lifetime());
 
@@ -474,13 +474,13 @@ ListWidget::ListWidget(
 		_session->changes().historyUpdates(
 			history,
 			Data::HistoryUpdate::Flag::TranslatedTo
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			update();
 		}, lifetime());
 	}
 
 	_session->data().itemVisibilityQueries(
-	) | rpl::start_with_next([=](
+	) | rpl::on_next([=](
 			const Data::Session::ItemVisibilityQuery &query) {
 		if (const auto view = viewForItem(query.item)) {
 			const auto top = itemTop(view);
@@ -494,7 +494,7 @@ ListWidget::ListWidget(
 
 	if (_reactionsManager) {
 		_reactionsManager->chosen(
-		) | rpl::start_with_next([=](ChosenReaction reaction) {
+		) | rpl::on_next([=](ChosenReaction reaction) {
 			_reactionsManager->updateButton({});
 			reactionChosen(reaction);
 		}, lifetime());
@@ -504,7 +504,7 @@ ListWidget::ListWidget(
 			_reactionsItem.value());
 
 		Core::App().settings().cornerReactionValue(
-		) | rpl::start_with_next([=](bool value) {
+		) | rpl::on_next([=](bool value) {
 			_useCornerReaction = value;
 			if (!value) {
 				_reactionsManager->updateButton({});
@@ -513,12 +513,12 @@ ListWidget::ListWidget(
 	}
 
 	_delegate->listChatWideValue(
-	) | rpl::start_with_next([=](bool wide) {
+	) | rpl::on_next([=](bool wide) {
 		_isChatWide = wide;
 	}, lifetime());
 
 	_selectScroll.scrolls(
-	) | rpl::start_with_next([=](int d) {
+	) | rpl::on_next([=](int d) {
 		delegate->listScrollTo(_visibleTop + d, false);
 	}, lifetime());
 }
@@ -542,7 +542,7 @@ void ListWidget::refreshViewer() {
 		_aroundPosition,
 		_idsLimit,
 		_idsLimit
-	) | rpl::start_with_next([=](Data::MessagesSlice &&slice) {
+	) | rpl::on_next([=](Data::MessagesSlice &&slice) {
 		_refreshingViewer = false;
 		std::swap(_slice, slice);
 		refreshRows(slice);
diff --git a/Telegram/SourceFiles/history/view/history_view_paid_reaction_toast.cpp b/Telegram/SourceFiles/history/view/history_view_paid_reaction_toast.cpp
index 762712192d..7c35960b7f 100644
--- a/Telegram/SourceFiles/history/view/history_view_paid_reaction_toast.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_paid_reaction_toast.cpp
@@ -91,7 +91,7 @@ constexpr auto kPremiumToastDuration = 5 * crl::time(1000);
 		result->update();
 	};
 
-	result->paintRequest() | rpl::start_with_next([=] {
+	result->paintRequest() | rpl::on_next([=] {
 		auto p = QPainter(result);
 
 		const auto font = st::historyPremiumViewSet.style.font;
@@ -125,7 +125,7 @@ constexpr auto kPremiumToastDuration = 5 * crl::time(1000);
 	}, result->lifetime());
 	result->resize(width, st::historyPremiumViewSet.height);
 
-	std::move(finish) | rpl::start_with_next([=](crl::time value) {
+	std::move(finish) | rpl::on_next([=](crl::time value) {
 		state->finish = value;
 		state->update();
 	}, result->lifetime());
@@ -150,7 +150,7 @@ PaidReactionToast::PaidReactionToast(
 	_owner->viewPaidReactionSent(
 	) | rpl::filter(
 		std::move(mine)
-	) | rpl::start_with_next([=](not_null<const Element*> view) {
+	) | rpl::on_next([=](not_null<const Element*> view) {
 		maybeShowFor(view->data());
 	}, _lifetime);
 }
@@ -166,7 +166,7 @@ PaidReactionToast::PaidReactionToast(
 	_owner->callPaidReactionSent(
 	) | rpl::filter(
 		std::move(mine)
-	) | rpl::start_with_next([=](not_null<Calls::GroupCall*> call) {
+	) | rpl::on_next([=](not_null<Calls::GroupCall*> call) {
 		maybeShowFor(call);
 	}, _lifetime);
 }
@@ -358,7 +358,7 @@ void PaidReactionToast::showFor(
 	rpl::combine(
 		widget->sizeValue(),
 		button->sizeValue()
-	) | rpl::start_with_next([=](QSize outer, QSize inner) {
+	) | rpl::on_next([=](QSize outer, QSize inner) {
 		button->moveToRight(
 			0,
 			(outer.height() - inner.height()) / 2,
@@ -413,7 +413,7 @@ void PaidReactionToast::setupLottiePreview(
 		Lottie::Quality::Default);
 
 	widget->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (!player->ready()) {
 			return;
 		}
@@ -427,7 +427,7 @@ void PaidReactionToast::setupLottiePreview(
 	}, widget->lifetime());
 
 	player->updates(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		widget->update();
 	}, widget->lifetime());
 }
diff --git a/Telegram/SourceFiles/history/view/history_view_pinned_bar.cpp b/Telegram/SourceFiles/history/view/history_view_pinned_bar.cpp
index 97b7164b2b..6636fd858c 100644
--- a/Telegram/SourceFiles/history/view/history_view_pinned_bar.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_pinned_bar.cpp
@@ -260,7 +260,7 @@ rpl::producer<HistoryItem*> PinnedBarItemWithCustomButton(
 			id
 		) | rpl::filter([=](PinnedId current) {
 			return current.message && (current.message != state->resolvedId);
-		}) | rpl::start_with_next([=](PinnedId current) {
+		}) | rpl::on_next([=](PinnedId current) {
 			const auto fullId = current.message;
 			state->lifetime.destroy();
 			state->resolvedId = fullId;
@@ -273,7 +273,7 @@ rpl::producer<HistoryItem*> PinnedBarItemWithCustomButton(
 					(Update::Flag::ReplyMarkup
 						| Update::Flag::Edited
 						| Update::Flag::Destroyed)
-				) | rpl::start_with_next([=](const Update &update) {
+				) | rpl::on_next([=](const Update &update) {
 					if (update.flags & Update::Flag::Destroyed) {
 						state->lifetime.destroy();
 						invalidate_weak_ptrs(&state->guard);
diff --git a/Telegram/SourceFiles/history/view/history_view_pinned_section.cpp b/Telegram/SourceFiles/history/view/history_view_pinned_section.cpp
index 3330001bc7..d922068604 100644
--- a/Telegram/SourceFiles/history/view/history_view_pinned_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_pinned_section.cpp
@@ -121,14 +121,14 @@ PinnedWidget::PinnedWidget(
 		controller->chatStyle(),
 		static_cast<HistoryView::CornerButtonsDelegate*>(this)) {
 	controller->chatStyle()->paletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_scroll->updateBars();
 	}, _scroll->lifetime());
 
 	Window::ChatThemeValueFromPeer(
 		controller,
 		thread->peer()
-	) | rpl::start_with_next([=](std::shared_ptr<Ui::ChatTheme> &&theme) {
+	) | rpl::on_next([=](std::shared_ptr<Ui::ChatTheme> &&theme) {
 		_theme = std::move(theme);
 		controller->setChatStyleTheme(_theme);
 	}, lifetime());
@@ -146,22 +146,22 @@ PinnedWidget::PinnedWidget(
 	_topBar->setCustomTitle(tr::lng_contacts_loading(tr::now));
 
 	_topBar->deleteSelectionRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		confirmDeleteSelected();
 	}, _topBar->lifetime());
 	_topBar->forwardSelectionRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		confirmForwardSelected();
 	}, _topBar->lifetime());
 	_topBar->clearSelectionRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		clearSelected();
 	}, _topBar->lifetime());
 
 	_translateBar->raise();
 	_topBarShadow->raise();
 	controller->adaptive().value(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateAdaptiveLayout();
 	}, lifetime());
 
@@ -172,12 +172,12 @@ PinnedWidget::PinnedWidget(
 	_scroll->move(0, _topBar->height());
 	_scroll->show();
 	_scroll->scrolls(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		onScroll();
 	}, lifetime());
 
 	_inner->scrollKeyEvents(
-	) | rpl::start_with_next([=](not_null<QKeyEvent*> e) {
+	) | rpl::on_next([=](not_null<QKeyEvent*> e) {
 		_scroll->keyPressEvent(e);
 	}, lifetime());
 
@@ -191,7 +191,7 @@ PinnedWidget::~PinnedWidget() = default;
 void PinnedWidget::setupClearButton() {
 	Data::CanPinMessagesValue(
 		_history->peer
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		refreshClearButtonText();
 	}, _clearButton->lifetime());
 
@@ -214,7 +214,7 @@ void PinnedWidget::setupClearButton() {
 
 void PinnedWidget::setupTranslateBar() {
 	controller()->adaptive().oneColumnValue(
-	) | rpl::start_with_next([=, raw = _translateBar.get()](bool one) {
+	) | rpl::on_next([=, raw = _translateBar.get()](bool one) {
 		raw->setShadowGeometryPostprocess([=](QRect geometry) {
 			if (!one) {
 				geometry.setLeft(geometry.left() + st::lineWidth);
@@ -225,7 +225,7 @@ void PinnedWidget::setupTranslateBar() {
 
 	_translateBarHeight = 0;
 	_translateBar->heightValue(
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		if (const auto delta = height - _translateBarHeight) {
 			_translateBarHeight = height;
 			setGeometryWithTopMoved(geometry(), delta);
diff --git a/Telegram/SourceFiles/history/view/history_view_pinned_tracker.cpp b/Telegram/SourceFiles/history/view/history_view_pinned_tracker.cpp
index fcc7226566..0851af828f 100644
--- a/Telegram/SourceFiles/history/view/history_view_pinned_tracker.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_pinned_tracker.cpp
@@ -50,7 +50,7 @@ PinnedTracker::PinnedTracker(not_null<Data::Thread*> thread)
 			: nullptr),
 		_1 || _2
 	) | rpl::distinct_until_changed(
-	) | rpl::start_with_next([=](bool has) {
+	) | rpl::on_next([=](bool has) {
 		if (has) {
 			refreshViewer();
 		} else {
@@ -92,7 +92,7 @@ void PinnedTracker::refreshViewer() {
 			Storage::SharedMediaType::Pinned),
 		kLoadedLimit,
 		kLoadedLimit
-	) | rpl::start_with_next([=](const SparseIdsMergedSlice &result) {
+	) | rpl::on_next([=](const SparseIdsMergedSlice &result) {
 		_slice.fullCount = result.fullCount();
 		_slice.skippedBefore = result.skippedBefore();
 		_slice.skippedAfter = result.skippedAfter();
diff --git a/Telegram/SourceFiles/history/view/history_view_reaction_preview.cpp b/Telegram/SourceFiles/history/view/history_view_reaction_preview.cpp
index 5bb2faa6c3..8dfb7a0adb 100644
--- a/Telegram/SourceFiles/history/view/history_view_reaction_preview.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_reaction_preview.cpp
@@ -132,7 +132,7 @@ bool ShowReactionPreview(
 	const auto backgroundRaw = state->background.get();
 	const auto labelRaw = state->label.get();
 
-	mainwidget->sizeValue() | rpl::start_with_next([=](QSize size) {
+	mainwidget->sizeValue() | rpl::on_next([=](QSize size) {
 		mediaPreviewRaw->setGeometry(Rect(size));
 		clickableRaw->setGeometry(Rect(size));
 		clickableRaw->raise();
diff --git a/Telegram/SourceFiles/history/view/history_view_requests_bar.cpp b/Telegram/SourceFiles/history/view/history_view_requests_bar.cpp
index 7c8d16282b..505a3f64ec 100644
--- a/Telegram/SourceFiles/history/view/history_view_requests_bar.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_requests_bar.cpp
@@ -137,7 +137,7 @@ rpl::producer<Ui::RequestsBarContent> RequestsBarContentByPeer(
 				Data::PeerFlagValue(
 					channel,
 					ChannelData::Flag::Forum
-				) | rpl::start_with_next([=](bool hiddenByForum) {
+				) | rpl::on_next([=](bool hiddenByForum) {
 					if (hiddenByForum) {
 						consumer.put_next({});
 					} else {
@@ -150,7 +150,7 @@ rpl::producer<Ui::RequestsBarContent> RequestsBarContentByPeer(
 		peer->session().downloaderTaskFinished(
 		) | rpl::filter([=] {
 			return state->someUserpicsNotLoaded;
-		}) | rpl::start_with_next([=] {
+		}) | rpl::on_next([=] {
 			for (const auto &userpic : state->userpics) {
 				if (userpic.peer->userpicUniqueKey(userpic.view)
 					!= userpic.uniqueKey) {
@@ -165,7 +165,7 @@ rpl::producer<Ui::RequestsBarContent> RequestsBarContentByPeer(
 			peer
 		) | rpl::filter([=](int count) {
 			return (state->current.count != count);
-		}) | rpl::start_with_next([=](int count) {
+		}) | rpl::on_next([=](int count) {
 			const auto &requesters = peer->isChat()
 				? peer->asChat()->recentRequesters()
 				: peer->asChannel()->recentRequesters();
diff --git a/Telegram/SourceFiles/history/view/history_view_schedule_box.cpp b/Telegram/SourceFiles/history/view/history_view_schedule_box.cpp
index 8f9ed5926a..60629cc7da 100644
--- a/Telegram/SourceFiles/history/view/history_view_schedule_box.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_schedule_box.cpp
@@ -154,7 +154,7 @@ void ScheduleBox(
 			.changed = [=](TimeId value) { *repeat = value; },
 			.test = session->isTestMode(),
 		}), style::al_top);
-		std::move(descriptor.width) | rpl::start_with_next([=](int width) {
+		std::move(descriptor.width) | rpl::on_next([=](int width) {
 			row->setNaturalWidth(width);
 		}, row->lifetime());
 	}
diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
index b5264dae0a..474859e7d4 100644
--- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
@@ -169,14 +169,14 @@ ScheduledWidget::ScheduledWidget(
 	controller->chatStyle(),
 	static_cast<HistoryView::CornerButtonsDelegate*>(this)) {
 	controller->chatStyle()->paletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_scroll->updateBars();
 	}, _scroll->lifetime());
 
 	Window::ChatThemeValueFromPeer(
 		controller,
 		history->peer
-	) | rpl::start_with_next([=](std::shared_ptr<Ui::ChatTheme> &&theme) {
+	) | rpl::on_next([=](std::shared_ptr<Ui::ChatTheme> &&theme) {
 		_theme = std::move(theme);
 		controller->setChatStyleTheme(_theme);
 	}, lifetime());
@@ -194,21 +194,21 @@ ScheduledWidget::ScheduledWidget(
 	_topBar->show();
 
 	_topBar->sendNowSelectionRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		confirmSendNowSelected();
 	}, _topBar->lifetime());
 	_topBar->deleteSelectionRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		confirmDeleteSelected();
 	}, _topBar->lifetime());
 	_topBar->clearSelectionRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		clearSelected();
 	}, _topBar->lifetime());
 
 	_topBarShadow->raise();
 	controller->adaptive().value(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateAdaptiveLayout();
 	}, lifetime());
 
@@ -219,12 +219,12 @@ ScheduledWidget::ScheduledWidget(
 	_scroll->move(0, _topBar->height());
 	_scroll->show();
 	_scroll->scrolls(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		onScroll();
 	}, lifetime());
 
 	_inner->editMessageRequested(
-	) | rpl::start_with_next([=](auto fullId) {
+	) | rpl::on_next([=](auto fullId) {
 		if (const auto item = session().data().message(fullId)) {
 			const auto media = item->media();
 			if (!media || media->webpage() || media->allowsEditCaption()) {
@@ -350,7 +350,7 @@ void ScheduledWidget::setupComposeControls() {
 	});
 
 	_composeControls->height(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto wasMax = (_scroll->scrollTopMax() == _scroll->scrollTop());
 		updateControlsGeometry();
 		if (wasMax) {
@@ -359,28 +359,28 @@ void ScheduledWidget::setupComposeControls() {
 	}, lifetime());
 
 	_composeControls->cancelRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		listCancelRequest();
 	}, lifetime());
 
 	_composeControls->sendRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		send();
 	}, lifetime());
 
 	_composeControls->sendVoiceRequests(
-	) | rpl::start_with_next([=](ComposeControls::VoiceToSend &&data) {
+	) | rpl::on_next([=](ComposeControls::VoiceToSend &&data) {
 		sendVoice(std::move(data));
 	}, lifetime());
 
 	_composeControls->sendCommandRequests(
-	) | rpl::start_with_next([=](const QString &command) {
+	) | rpl::on_next([=](const QString &command) {
 		listSendBotCommand(command, FullMsgId());
 	}, lifetime());
 
 	const auto saveEditMsgRequestId = lifetime().make_state<mtpRequestId>(0);
 	_composeControls->editRequests(
-	) | rpl::start_with_next([=](auto data) {
+	) | rpl::on_next([=](auto data) {
 		if (const auto item = session().data().message(data.fullId)) {
 			if (item->isScheduled()) {
 				const auto spoiler = data.spoilered;
@@ -394,7 +394,7 @@ void ScheduledWidget::setupComposeControls() {
 	_composeControls->attachRequests(
 	) | rpl::filter([=] {
 		return !_choosingAttach;
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		_choosingAttach = true;
 		base::call_delayed(
 			st::historyAttach.ripple.hideDuration,
@@ -403,7 +403,7 @@ void ScheduledWidget::setupComposeControls() {
 	}, lifetime());
 
 	_composeControls->fileChosen(
-	) | rpl::start_with_next([=](ChatHelpers::FileChosen data) {
+	) | rpl::on_next([=](ChatHelpers::FileChosen data) {
 		controller()->hideLayer(anim::type::normal);
 		const auto document = data.document;
 		const auto callback = crl::guard(this, [=](Api::SendOptions options) {
@@ -417,17 +417,17 @@ void ScheduledWidget::setupComposeControls() {
 	}, lifetime());
 
 	_composeControls->photoChosen(
-	) | rpl::start_with_next([=](ChatHelpers::PhotoChosen chosen) {
+	) | rpl::on_next([=](ChatHelpers::PhotoChosen chosen) {
 		sendExistingPhoto(chosen.photo);
 	}, lifetime());
 
 	_composeControls->inlineResultChosen(
-	) | rpl::start_with_next([=](ChatHelpers::InlineChosen chosen) {
+	) | rpl::on_next([=](ChatHelpers::InlineChosen chosen) {
 		sendInlineResult(chosen.result, chosen.bot);
 	}, lifetime());
 
 	_composeControls->jumpToItemRequests(
-	) | rpl::start_with_next([=](FullReplyTo to) {
+	) | rpl::on_next([=](FullReplyTo to) {
 		if (const auto item = session().data().message(to.messageId)) {
 			if (item->isScheduled() && item->history() == _history) {
 				showAtPosition(item->position());
@@ -441,12 +441,12 @@ void ScheduledWidget::setupComposeControls() {
 	rpl::merge(
 		_composeControls->scrollKeyEvents(),
 		_inner->scrollKeyEvents()
-	) | rpl::start_with_next([=](not_null<QKeyEvent*> e) {
+	) | rpl::on_next([=](not_null<QKeyEvent*> e) {
 		_scroll->keyPressEvent(e);
 	}, lifetime());
 
 	_composeControls->editLastMessageRequests(
-	) | rpl::start_with_next([=](not_null<QKeyEvent*> e) {
+	) | rpl::on_next([=](not_null<QKeyEvent*> e) {
 		if (!_inner->lastMessageEditRequestNotify()) {
 			_scroll->keyPressEvent(e);
 		}
@@ -467,13 +467,13 @@ void ScheduledWidget::setupComposeControls() {
 	});
 
 	_composeControls->lockShowStarts(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_cornerButtons.updateJumpDownVisibility();
 		_cornerButtons.updateUnreadThingsVisibility();
 	}, lifetime());
 
 	_composeControls->viewportEvents(
-	) | rpl::start_with_next([=](not_null<QEvent*> e) {
+	) | rpl::on_next([=](not_null<QEvent*> e) {
 		_scroll->viewportEvent(e);
 	}, lifetime());
 }
@@ -1233,7 +1233,7 @@ void ScheduledWidget::initProcessingVideoView(not_null<Element*> view) {
 	_processingVideoView = view;
 
 	controller()->session().data().sentFromScheduled(
-	) | rpl::start_with_next([=](const Data::SentFromScheduled &value) {
+	) | rpl::on_next([=](const Data::SentFromScheduled &value) {
 		if (value.item->position() == _processingVideoPosition) {
 			controller()->showPeerHistory(
 				value.item->history(),
@@ -1243,7 +1243,7 @@ void ScheduledWidget::initProcessingVideoView(not_null<Element*> view) {
 	}, _processingVideoLifetime);
 
 	controller()->session().data().viewRemoved(
-	) | rpl::start_with_next([=](not_null<const Element*> view) {
+	) | rpl::on_next([=](not_null<const Element*> view) {
 		if (view == _processingVideoView.get()) {
 			const auto position = _processingVideoPosition;
 			if (const auto now = _inner->viewByPosition(position)) {
@@ -1256,7 +1256,7 @@ void ScheduledWidget::initProcessingVideoView(not_null<Element*> view) {
 	}, _processingVideoLifetime);
 
 	controller()->session().data().viewResizeRequest(
-	) | rpl::start_with_next([this](not_null<const Element*> view) {
+	) | rpl::on_next([this](not_null<const Element*> view) {
 		if (view->delegate() == _inner.data()) {
 			if (!_processingVideoUpdateScheduled) {
 				if (const auto tooltip = _processingVideoTooltip.get()) {
@@ -1781,7 +1781,7 @@ bool ShowScheduledVideoPublished(
 	rpl::combine(
 		widget->sizeValue(),
 		button->sizeValue()
-	) | rpl::start_with_next([=](QSize outer, QSize inner) {
+	) | rpl::on_next([=](QSize outer, QSize inner) {
 		button->moveToRight(
 			0,
 			(outer.height() - inner.height()) / 2,
@@ -1800,7 +1800,7 @@ bool ShowScheduledVideoPublished(
 		preview->update();
 	});
 	preview->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(preview);
 		const auto image = Images::Round(
 			thumbnail->image(size),
diff --git a/Telegram/SourceFiles/history/view/history_view_self_forwards_tagger.cpp b/Telegram/SourceFiles/history/view/history_view_self_forwards_tagger.cpp
index 9c3416b66c..c52dd290dc 100644
--- a/Telegram/SourceFiles/history/view/history_view_self_forwards_tagger.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_self_forwards_tagger.cpp
@@ -62,7 +62,7 @@ SelfForwardsTagger::~SelfForwardsTagger() = default;
 
 void SelfForwardsTagger::setup() {
 	_controller->session().data().recentSelfForwards(
-	) | rpl::start_with_next([=](const Data::RecentSelfForwards &data) {
+	) | rpl::on_next([=](const Data::RecentSelfForwards &data) {
 		const auto history = _history ? _history() : nullptr;
 		if (!history || history->peer->id != data.fromPeerId) {
 			return;
@@ -70,7 +70,7 @@ void SelfForwardsTagger::setup() {
 		showSelectorForMessages(data.ids);
 	}, _lifetime);
 	_controller->session().data().recentJoinChat(
-	) | rpl::start_with_next([=](const Data::RecentJoinChat &data) {
+	) | rpl::on_next([=](const Data::RecentJoinChat &data) {
 		if (!_controller->session().data().chatsFilters().has()) {
 			return;
 		}
@@ -148,7 +148,7 @@ void SelfForwardsTagger::showSelectorForMessages(
 		}
 		Ui::Animations::HideWidgets({ toastWidget->widget(), selector });
 		selector->shownValue(
-		) | rpl::start_with_next([toastWidgetWeak](bool shown) {
+		) | rpl::on_next([toastWidgetWeak](bool shown) {
 			if (!shown) {
 				if (const auto toast = toastWidgetWeak.get()) {
 					delete toast->widget();
@@ -158,7 +158,7 @@ void SelfForwardsTagger::showSelectorForMessages(
 	};
 
 	selector->chosen(
-	) | rpl::start_with_next([=](ChosenReaction reaction) {
+	) | rpl::on_next([=](ChosenReaction reaction) {
 		selector->setAttribute(Qt::WA_TransparentForMouseEvents);
 		for (const auto &id : ids) {
 			if (const auto item = _controller->session().data().message(id)) {
@@ -190,7 +190,7 @@ void SelfForwardsTagger::showSelectorForMessages(
 
 	const auto state = selector->lifetime().make_state<ToastTimerState>();
 
-	selector->willExpand() | rpl::start_with_next([=] {
+	selector->willExpand() | rpl::on_next([=] {
 		state->expanded = true;
 	}, selector->lifetime());
 
@@ -207,7 +207,7 @@ void SelfForwardsTagger::showSelectorForMessages(
 	selector->initGeometry(_parent->height() / 2);
 
 	_toast->widget()->geometryValue(
-	) | rpl::start_with_next([=](const QRect &rect) {
+	) | rpl::on_next([=](const QRect &rect) {
 		if (rect.isEmpty()) {
 			return;
 		}
@@ -263,7 +263,7 @@ void SelfForwardsTagger::createLottieIcon(
 		[=] { lottieWidget->update(); },
 		0,
 		icon->framesCount() - 1);
-	lottieWidget->paintRequest() | rpl::start_with_next([=] {
+	lottieWidget->paintRequest() | rpl::on_next([=] {
 		auto p = QPainter(lottieWidget);
 		icon->paint(p, 0, 0);
 	}, lottieWidget->lifetime());
@@ -304,7 +304,7 @@ void SelfForwardsTagger::showTaggedToast(DocumentId reaction) {
 			hideToast();
 		});
 
-		button->paintRequest() | rpl::start_with_next([=] {
+		button->paintRequest() | rpl::on_next([=] {
 			auto p = QPainter(button);
 			const auto font = st::historyPremiumViewSet.style.font;
 			const auto top = (button->height() - font->height) / 2;
@@ -320,7 +320,7 @@ void SelfForwardsTagger::showTaggedToast(DocumentId reaction) {
 		rpl::combine(
 			widget->sizeValue(),
 			button->sizeValue()
-		) | rpl::start_with_next([=](const QSize &outer, const QSize &inner) {
+		) | rpl::on_next([=](const QSize &outer, const QSize &inner) {
 			button->moveToRight(
 				st.padding.right(),
 				(outer.height() - inner.height()) / 2,
@@ -382,7 +382,7 @@ not_null<Ui::AbstractButton*> SelfForwardsTagger::createRightButton(
 	const auto button = Ui::CreateChild<Ui::IconButton>(
 		widget.get(),
 		st::joinChatAddToFilterToastButton);
-	widget->sizeValue() | rpl::start_with_next([=](const QSize &size) {
+	widget->sizeValue() | rpl::on_next([=](const QSize &size) {
 		button->moveToRight(
 			st::lineWidth * 4,
 			(size.height() - button->height()) / 2);
@@ -398,7 +398,7 @@ void SelfForwardsTagger::setupToastTimer(
 		Fn<void()> hideCallback) {
 	const auto restartTimer = [=](crl::time ms) {
 		state->timerLifetime.destroy();
-		base::timer_once(ms) | rpl::start_with_next([=] {
+		base::timer_once(ms) | rpl::on_next([=] {
 			hideCallback();
 		}, state->timerLifetime);
 	};
diff --git a/Telegram/SourceFiles/history/view/history_view_sticker_toast.cpp b/Telegram/SourceFiles/history/view/history_view_sticker_toast.cpp
index 2644bc4a2f..23b7c37df3 100644
--- a/Telegram/SourceFiles/history/view/history_view_sticker_toast.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_sticker_toast.cpp
@@ -207,7 +207,7 @@ void StickerToast::showWithTitle(const QString &title) {
 	rpl::combine(
 		widget->sizeValue(),
 		button->sizeValue()
-	) | rpl::start_with_next([=](QSize outer, QSize inner) {
+	) | rpl::on_next([=](QSize outer, QSize inner) {
 		button->moveToRight(
 			0,
 			(outer.height() - inner.height()) / 2,
@@ -310,7 +310,7 @@ void StickerToast::setupEmojiPreview(
 		[=] { widget->update(); });
 
 	widget->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(widget);
 		const auto size = Ui::Emoji::GetSizeLarge()
 			/ style::DevicePixelRatio();
@@ -336,7 +336,7 @@ void StickerToast::setupLottiePreview(not_null<Ui::RpWidget*> widget, int size)
 		Lottie::Quality::Default);
 
 	widget->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (!player->ready()) {
 			return;
 		}
@@ -348,7 +348,7 @@ void StickerToast::setupLottiePreview(not_null<Ui::RpWidget*> widget, int size)
 	}, widget->lifetime());
 
 	player->updates(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		widget->update();
 	}, widget->lifetime());
 }
diff --git a/Telegram/SourceFiles/history/view/history_view_subsection_tabs.cpp b/Telegram/SourceFiles/history/view/history_view_subsection_tabs.cpp
index 8f6568c438..f625531583 100644
--- a/Telegram/SourceFiles/history/view/history_view_subsection_tabs.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_subsection_tabs.cpp
@@ -65,11 +65,11 @@ SubsectionTabs::SubsectionTabs(
 	refreshSlice();
 	setup(parent);
 
-	session().data().pinnedDialogsOrderUpdated() | rpl::start_with_next([=] {
+	session().data().pinnedDialogsOrderUpdated() | rpl::on_next([=] {
 		_refreshed.fire({});
 	}, _lifetime);
 
-	dataChanged() | rpl::start_with_next([=] {
+	dataChanged() | rpl::on_next([=] {
 		if (_loading) {
 			_loading = false;
 			refreshSlice();
@@ -146,14 +146,14 @@ void SubsectionTabs::setupHorizontal(not_null<QWidget*> parent) {
 	});
 
 	_horizontal->sizeValue(
-	) | rpl::start_with_next([=](QSize size) {
+	) | rpl::on_next([=](QSize size) {
 		const auto togglew = toggle->width();
 		const auto height = size.height();
 		scroll->setGeometry(togglew, 0, size.width() - togglew, height);
 		shadow->setGeometry(togglew, 0, st::lineWidth, height);
 	}, scroll->lifetime());
 
-	_horizontal->paintRequest() | rpl::start_with_next([=](QRect clip) {
+	_horizontal->paintRequest() | rpl::on_next([=](QRect clip) {
 		QPainter(_horizontal).fillRect(
 			clip.intersected(
 				_horizontal->rect().marginsRemoved(
@@ -208,14 +208,14 @@ void SubsectionTabs::setupVertical(not_null<QWidget*> parent) {
 		_vertical->height());
 
 	_vertical->sizeValue(
-	) | rpl::start_with_next([=](QSize size) {
+	) | rpl::on_next([=](QSize size) {
 		const auto toggleh = toggle->height();
 		const auto width = size.width();
 		scroll->setGeometry(0, toggleh, width, size.height() - toggleh);
 		shadow->setGeometry(0, toggleh, width, st::lineWidth);
 	}, scroll->lifetime());
 
-	_vertical->paintRequest() | rpl::start_with_next([=](QRect clip) {
+	_vertical->paintRequest() | rpl::on_next([=](QRect clip) {
 		QPainter(_vertical).fillRect(clip, st::windowBg);
 	}, _vertical->lifetime());
 
@@ -228,7 +228,7 @@ void SubsectionTabs::setupSlider(
 		not_null<Ui::ScrollArea*> scroll,
 		not_null<Ui::SubsectionSlider*> slider,
 		bool vertical) {
-	slider->sectionActivated() | rpl::start_with_next([=](int active) {
+	slider->sectionActivated() | rpl::on_next([=](int active) {
 		if (_reordering) {
 			return;
 		}
@@ -251,7 +251,7 @@ void SubsectionTabs::setupSlider(
 	}, slider->lifetime());
 
 	_reorder->updates(
-	) | rpl::start_with_next([=](Ui::SubsectionSliderReorder::Single data) {
+	) | rpl::on_next([=](Ui::SubsectionSliderReorder::Single data) {
 		using State = Ui::SubsectionSliderReorder::State;
 		if (data.state == State::Started) {
 			++_reordering;
@@ -270,14 +270,14 @@ void SubsectionTabs::setupSlider(
 		return _reordering > 0;
 	});
 
-	slider->sectionContextMenu() | rpl::start_with_next([=](int index) {
+	slider->sectionContextMenu() | rpl::on_next([=](int index) {
 		if (index >= 0 && index < _slice.size()) {
 			showThreadContextMenu(_slice[index].thread);
 		}
 	}, slider->lifetime());
 
 	slider->requestShown(
-	) | rpl::start_with_next([=](Ui::ScrollToRequest request) {
+	) | rpl::on_next([=](Ui::ScrollToRequest request) {
 		const auto full = vertical ? scroll->height() : scroll->width();
 		const auto tab = request.ymax - request.ymin;
 		if (tab < full) {
@@ -315,7 +315,7 @@ void SubsectionTabs::startScrollChecking(
 		(vertical
 			? scroll->heightValue()
 			: scroll->widthValue()) | rpl::skip(1) | rpl::map_to(rpl::empty)
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto full = vertical ? scroll->height() : scroll->width();
 		const auto scrollValue = vertical
 			? scroll->scrollTop()
@@ -350,7 +350,7 @@ void SubsectionTabs::startScrollChecking(
 		Data::PeerUpdate::Flag::Rights
 	) | rpl::filter([=](const Data::PeerUpdate &update) {
 		return (update.peer == _history->peer);
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		if (_reorder) {
 			_reorder->cancel();
 			if (_history->peer->canManageTopics()) {
@@ -374,7 +374,7 @@ void SubsectionTabs::startFillingSlider(
 
 	_refreshed.events_starting_with_copy(
 		rpl::empty
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto manager = &_history->owner().customEmojiManager();
 		const auto paused = [=] {
 			return _controller->isGifPausedAtLeastFor(
@@ -721,7 +721,7 @@ void SubsectionTabs::track() {
 	using Event = Data::Session::ChatListEntryRefresh;
 	if (const auto forum = _history->peer->forum()) {
 		forum->topicDestroyed(
-		) | rpl::start_with_next([=](not_null<Data::ForumTopic*> topic) {
+		) | rpl::on_next([=](not_null<Data::ForumTopic*> topic) {
 			if (_around == topic) {
 				_around = _history;
 				refreshSlice();
@@ -729,7 +729,7 @@ void SubsectionTabs::track() {
 		}, _lifetime);
 
 		forum->topicsList()->unreadStateChanges(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			scheduleRefresh();
 		}, _lifetime);
 
@@ -737,7 +737,7 @@ void SubsectionTabs::track() {
 		) | rpl::filter([=](const Event &event) {
 			const auto topic = event.filterId ? nullptr : event.key.topic();
 			return (topic && topic->forum() == forum);
-		}) | rpl::start_with_next([=] {
+		}) | rpl::on_next([=] {
 			scheduleRefresh();
 		}, _lifetime);
 
@@ -747,12 +747,12 @@ void SubsectionTabs::track() {
 			| Data::TopicUpdate::Flag::ColorId
 		) | rpl::filter([=](const Data::TopicUpdate &update) {
 			return update.topic->forum() == forum;
-		}) | rpl::start_with_next([=] {
+		}) | rpl::on_next([=] {
 			scheduleRefresh();
 		}, _lifetime);
 	} else if (const auto monoforum = _history->peer->monoforum()) {
 		monoforum->sublistDestroyed(
-		) | rpl::start_with_next([=](not_null<Data::SavedSublist*> sublist) {
+		) | rpl::on_next([=](not_null<Data::SavedSublist*> sublist) {
 			if (_around == sublist) {
 				_around = _history;
 				refreshSlice();
@@ -760,7 +760,7 @@ void SubsectionTabs::track() {
 		}, _lifetime);
 
 		monoforum->chatsList()->unreadStateChanges(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			scheduleRefresh();
 		}, _lifetime);
 
@@ -770,7 +770,7 @@ void SubsectionTabs::track() {
 				? nullptr
 				: event.key.sublist();
 			return (sublist && sublist->parent() == monoforum);
-		}) | rpl::start_with_next([=] {
+		}) | rpl::on_next([=] {
 			scheduleRefresh();
 		}, _lifetime);
 	} else {
diff --git a/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp b/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp
index b9df35ee87..04056574cb 100644
--- a/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp
@@ -131,7 +131,7 @@ TopBarWidget::TopBarWidget(
 	setAttribute(Qt::WA_OpaquePaintEvent);
 
 	Lang::Updated(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		refreshLang();
 	}, lifetime());
 
@@ -166,7 +166,7 @@ TopBarWidget::TopBarWidget(
 		const auto activeChanged = (active != std::get<0>(previous));
 		const auto searchInChat = search && (active == search);
 		return std::make_tuple(searchInChat, activeChanged);
-	}) | rpl::start_with_next([=](
+	}) | rpl::on_next([=](
 			bool searchInActiveChat,
 			bool activeChanged) {
 		auto animated = activeChanged
@@ -176,7 +176,7 @@ TopBarWidget::TopBarWidget(
 	}, lifetime());
 
 	controller->adaptive().changes(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateAdaptiveLayout();
 	}, lifetime());
 
@@ -186,7 +186,7 @@ TopBarWidget::TopBarWidget(
 		session().data().sendActionManager().animationUpdated(
 		) | rpl::filter([=](const AnimationUpdate &update) {
 			return (update.thread == _activeChat.key.thread());
-		}) | rpl::start_with_next([=] {
+		}) | rpl::on_next([=] {
 			update();
 		}, lifetime());
 	}
@@ -199,7 +199,7 @@ TopBarWidget::TopBarWidget(
 		| UpdateFlag::SupportInfo
 		| UpdateFlag::Rights
 		| UpdateFlag::EmojiStatus
-	) | rpl::start_with_next([=](const Data::PeerUpdate &update) {
+	) | rpl::on_next([=](const Data::PeerUpdate &update) {
 		if (update.flags & UpdateFlag::HasCalls) {
 			if (update.peer->isUser()
 				&& (update.peer->isSelf()
@@ -229,12 +229,12 @@ TopBarWidget::TopBarWidget(
 	rpl::combine(
 		Core::App().settings().thirdSectionInfoEnabledValue(),
 		Core::App().settings().tabbedReplacedWithInfoValue()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateInfoToggleActive();
 	}, lifetime());
 
 	Core::App().settings().proxy().connectionTypeValue(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateConnectingState();
 	}, lifetime());
 
@@ -821,7 +821,7 @@ void TopBarWidget::setActiveChat(
 			) | rpl::map([](int count) {
 				return (count == 0);
 			}) | rpl::distinct_until_changed(
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				updateControlsVisibility();
 				updateControlsGeometry();
 			}, _activeChatLifetime);
@@ -843,7 +843,7 @@ void TopBarWidget::setActiveChat(
 			_controller->emojiInteractions().seen(
 			) | rpl::filter([=](const InteractionSeen &seen) {
 				return (seen.peer == history->peer);
-			}) | rpl::start_with_next([=](const InteractionSeen &seen) {
+			}) | rpl::on_next([=](const InteractionSeen &seen) {
 				handleEmojiInteractionSeen(seen.emoticon);
 			}, _activeChatLifetime);
 		}
@@ -851,7 +851,7 @@ void TopBarWidget::setActiveChat(
 		if (const auto topic = _activeChat.key.topic()) {
 			Info::Profile::NameValue(
 				topic->peer()
-			) | rpl::start_with_next([=](const QString &name) {
+			) | rpl::on_next([=](const QString &name) {
 				_titlePeerText.setText(st::dialogsTextStyle, name);
 				_titlePeerTextOnline = false;
 				update();
@@ -860,7 +860,7 @@ void TopBarWidget::setActiveChat(
 			// _menuToggle visibility depends on "View topic info",
 			// "View topic info" visibility depends on activeChatCurrent.
 			_controller->activeChatChanges(
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				updateControlsVisibility();
 			}, _activeChatLifetime);
 		}
@@ -1355,11 +1355,11 @@ bool TopBarWidget::toggleSearch(bool shown, anim::type animated) {
 		_searchCancel->show(anim::type::instant);
 		_searchCancel->setClickedCallback([=] { _searchCancelled.fire({}); });
 		_searchField->submits(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			_searchSubmitted.fire({});
 		}, _searchField->lifetime());
 		_searchField->changes(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			const auto was = _searchQuery.current();
 			const auto now = _searchField->getLastText();
 			if (_jumpToDate && was.isEmpty() != now.isEmpty()) {
@@ -1557,7 +1557,7 @@ void TopBarWidget::refreshUnreadBadge() {
 	rpl::combine(
 		_back->geometryValue(),
 		_unreadBadge->widthValue()
-	) | rpl::start_with_next([=](QRect geometry, int width) {
+	) | rpl::on_next([=](QRect geometry, int width) {
 		_unreadBadge->move(
 			geometry.x() + geometry.width() - width,
 			geometry.y() + st::titleUnreadCounterTop);
@@ -1566,7 +1566,7 @@ void TopBarWidget::refreshUnreadBadge() {
 	_unreadBadge->setVisible(!rootChatsListBar());
 	_unreadBadge->setAttribute(Qt::WA_TransparentForMouseEvents);
 	_controller->session().data().unreadBadgeChanges(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateUnreadBadge();
 	}, _unreadBadge->lifetime());
 	updateUnreadBadge();
@@ -1614,7 +1614,7 @@ void TopBarWidget::setupDragOnBackButton() {
 	_back->events(
 	) | rpl::filter([=](not_null<QEvent*> e) {
 		return e->type() == QEvent::DragEnter;
-	}) | rpl::start_with_next([=](not_null<QEvent*> e) {
+	}) | rpl::on_next([=](not_null<QEvent*> e) {
 		using namespace Storage;
 		const auto d = static_cast<QDragEnterEvent*>(e.get());
 		const auto data = d->mimeData();
@@ -1631,7 +1631,7 @@ void TopBarWidget::setupDragOnBackButton() {
 		) | rpl::filter([=](not_null<QEvent*> e) {
 			return e->type() == QEvent::DragMove
 				|| e->type() == QEvent::DragLeave;
-		}) | rpl::start_with_next([=](not_null<QEvent*> e) {
+		}) | rpl::on_next([=](not_null<QEvent*> e) {
 			if (e->type() == QEvent::DragMove) {
 				timer->callOnce(ChoosePeerByDragTimeout);
 			} else if (e->type() == QEvent::DragLeave) {
diff --git a/Telegram/SourceFiles/history/view/history_view_translate_bar.cpp b/Telegram/SourceFiles/history/view/history_view_translate_bar.cpp
index c263c5f9ee..3d97e5a8b8 100644
--- a/Telegram/SourceFiles/history/view/history_view_translate_bar.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_translate_bar.cpp
@@ -102,7 +102,7 @@ TwoTextAction::TwoTextAction(
 	setClickedCallback(std::move(callback));
 
 	paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		Painter p(this);
 		paint(p);
 	}, lifetime());
@@ -268,7 +268,7 @@ void TranslateBar::updateShadowGeometry(QRect wrapGeometry) {
 
 void TranslateBar::setup(not_null<History*> history) {
 	_wrap.geometryValue(
-	) | rpl::start_with_next([=](QRect rect) {
+	) | rpl::on_next([=](QRect rect) {
 		updateShadowGeometry(rect);
 	}, _wrap.lifetime());
 
@@ -283,7 +283,7 @@ void TranslateBar::setup(not_null<History*> history) {
 	button->setAttribute(Qt::WA_OpaquePaintEvent);
 
 	button->paintRequest(
-	) | rpl::start_with_next([=](QRect clip) {
+	) | rpl::on_next([=](QRect clip) {
 		QPainter(button).fillRect(clip, st::historyComposeButtonBg);
 	}, button->lifetime());
 
@@ -298,7 +298,7 @@ void TranslateBar::setup(not_null<History*> history) {
 	label->setAttribute(Qt::WA_TransparentForMouseEvents);
 	icon->setAttribute(Qt::WA_TransparentForMouseEvents);
 	icon->resize(st::historyTranslateIcon.size());
-	icon->paintRequest() | rpl::start_with_next([=] {
+	icon->paintRequest() | rpl::on_next([=] {
 		auto p = QPainter(icon);
 		st::historyTranslateIcon.paint(p, 0, 0, icon->width());
 	}, icon->lifetime());
@@ -327,7 +327,7 @@ void TranslateBar::setup(not_null<History*> history) {
 			(_wrap.height() - icon->height()) / 2);
 	};
 
-	_wrap.sizeValue() | rpl::start_with_next([=](QSize size) {
+	_wrap.sizeValue() | rpl::on_next([=](QSize size) {
 		settings->moveToRight(0, 0, size.width());
 		updateLabelGeometry();
 	}, lifetime());
@@ -354,7 +354,7 @@ void TranslateBar::setup(not_null<History*> history) {
 	) | rpl::filter([=](LanguageId should) {
 		const auto now = history->translatedTo();
 		return now && (now != should);
-	}) | rpl::start_with_next([=](LanguageId should) {
+	}) | rpl::on_next([=](LanguageId should) {
 		translateTo(should);
 	}, _wrap.lifetime());
 
@@ -387,7 +387,7 @@ void TranslateBar::setup(not_null<History*> history) {
 			: rpl::single(QString());
 	}) | rpl::flatten_latest(
 	) | rpl::distinct_until_changed(
-	) | rpl::start_with_next([=](QString phrase) {
+	) | rpl::on_next([=](QString phrase) {
 		_shouldBeShown = !phrase.isEmpty();
 		if (_shouldBeShown) {
 			label->setText(phrase);
@@ -494,7 +494,7 @@ void TranslateBar::showSettingsToast(
 			const auto box = strong->show(
 				Ui::EditSkipTranslationLanguages());
 			if (box) {
-				box->boxClosing() | rpl::start_with_next([=] {
+				box->boxClosing() | rpl::on_next([=] {
 					const auto in = ranges::contains(
 						Core::App().settings().skipTranslationLanguages(),
 						ignored);
@@ -566,7 +566,7 @@ void TranslateBar::showToast(
 	rpl::combine(
 		widget->sizeValue(),
 		button->sizeValue()
-	) | rpl::start_with_next([=](QSize outer, QSize inner) {
+	) | rpl::on_next([=](QSize outer, QSize inner) {
 		button->moveToRight(
 			0,
 			(outer.height() - inner.height()) / 2,
diff --git a/Telegram/SourceFiles/history/view/history_view_translate_tracker.cpp b/Telegram/SourceFiles/history/view/history_view_translate_tracker.cpp
index f91dea0a9e..4792753bad 100644
--- a/Telegram/SourceFiles/history/view/history_view_translate_tracker.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_translate_tracker.cpp
@@ -67,7 +67,7 @@ void TranslateTracker::setup() {
 		Data::AmPremiumValue(&_history->session()),
 		std::move(autoTranslationValue),
 		_1 && (_2 || _3));
-	_trackingLanguage.value() | rpl::start_with_next([=](bool tracking) {
+	_trackingLanguage.value() | rpl::on_next([=](bool tracking) {
 		_trackingLifetime.destroy();
 		if (tracking) {
 			recognizeCollected();
@@ -354,7 +354,7 @@ void TranslateTracker::recognizeCollected() {
 
 void TranslateTracker::trackSkipLanguages() {
 	Core::App().settings().skipTranslationLanguagesValue(
-	) | rpl::start_with_next([=](const std::vector<LanguageId> &skip) {
+	) | rpl::on_next([=](const std::vector<LanguageId> &skip) {
 		checkRecognized(skip);
 	}, _trackingLifetime);
 }
diff --git a/Telegram/SourceFiles/history/view/media/history_view_document.cpp b/Telegram/SourceFiles/history/view/media/history_view_document.cpp
index 4d59345914..0f9a554c24 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_document.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_document.cpp
@@ -313,7 +313,7 @@ Document::Document(
 		const auto fullId = _realParent->fullId();
 		if (_parent->delegate()->elementContext() == Context::TTLViewer) {
 			auto lifetime = std::make_shared<rpl::lifetime>();
-			TTLVoiceStops(fullId) | rpl::start_with_next([=]() mutable {
+			TTLVoiceStops(fullId) | rpl::on_next([=]() mutable {
 				if (lifetime) {
 					base::take(lifetime)->destroy();
 				}
@@ -326,7 +326,7 @@ Document::Document(
 				_openl = nullptr;
 
 				auto lifetime = std::make_shared<rpl::lifetime>();
-				TTLVoiceStops(fullId) | rpl::start_with_next([=]() mutable {
+				TTLVoiceStops(fullId) | rpl::on_next([=]() mutable {
 					if (lifetime) {
 						base::take(lifetime)->destroy();
 					}
diff --git a/Telegram/SourceFiles/history/view/media/history_view_gif.cpp b/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
index 9e45c231da..e60a1a2024 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
@@ -168,7 +168,7 @@ Gif::Gif(
 		_parent->data()->removeFromSharedMediaIndex();
 		setDocumentLinks(_data, realParent, [=] {
 			auto lifetime = std::make_shared<rpl::lifetime>();
-			TTLVoiceStops(fullId) | rpl::start_with_next([=]() mutable {
+			TTLVoiceStops(fullId) | rpl::on_next([=]() mutable {
 				if (lifetime) {
 					base::take(lifetime)->destroy();
 				}
@@ -2033,14 +2033,14 @@ void Gif::createStreamedPlayer() {
 		[=] { repaintStreamedContent(); }));
 
 	_streamed->instance.player().updates(
-	) | rpl::start_with_next_error([=](::Media::Streaming::Update &&update) {
+	) | rpl::on_next_error([=](::Media::Streaming::Update &&update) {
 		handleStreamingUpdate(std::move(update));
 	}, [=](::Media::Streaming::Error &&error) {
 		handleStreamingError(std::move(error));
 	}, _streamed->instance.lifetime());
 
 	_streamed->instance.switchQualityRequests(
-	) | rpl::start_with_next([=](int quality) {
+	) | rpl::on_next([=](int quality) {
 		auto now = Core::App().settings().videoQuality();
 		if (now.manual || now.height == quality) {
 			return;
diff --git a/Telegram/SourceFiles/history/view/media/history_view_media_common.cpp b/Telegram/SourceFiles/history/view/media/history_view_media_common.cpp
index 8a9cec6910..7e1017a955 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_media_common.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_media_common.cpp
@@ -94,7 +94,7 @@ rpl::producer<TextWithEntities> AgeVerifyAbout(
 	auto result = object_ptr<Ui::RpWidget>(parent);
 	const auto raw = result.data();
 	raw->resize(full);
-	raw->paintRequest() | rpl::start_with_next([=] {
+	raw->paintRequest() | rpl::on_next([=] {
 		auto p = QPainter(raw);
 		const auto x = (raw->width() - full.width()) / 2;
 		auto hq = PainterHighQualityEnabler(p);
@@ -399,7 +399,7 @@ void ShowAgeVerification(
 			});
 		});
 		box->widthValue(
-		) | rpl::start_with_next([=](int width) {
+		) | rpl::on_next([=](int width) {
 			const auto &padding = st::settingsAgeVerifyBox.buttonPadding;
 			button->resizeToWidth(width
 				- padding.left()
@@ -414,7 +414,7 @@ void ShowAgeVerification(
 			box->closeBox();
 		});
 		box->widthValue(
-		) | rpl::start_with_next([=](int width) {
+		) | rpl::on_next([=](int width) {
 			close->moveToRight(0, 0);
 		}, box->lifetime());
 		crl::on_main(close, [=] { close->raise(); });
@@ -438,7 +438,7 @@ void ShowAgeVerificationMobile(
 			st::peerAppearanceIconPadding);
 
 		box->showFinishes(
-		) | rpl::start_with_next([animate = std::move(icon.animate)] {
+		) | rpl::on_next([animate = std::move(icon.animate)] {
 			animate(anim::repeat::once);
 		}, box->lifetime());
 
@@ -503,7 +503,7 @@ void ShowAgeVerificationRequired(
 			state->lifetime = sensitive->loadedValue(
 			) | rpl::filter(
 				rpl::mappers::_1
-			) | rpl::take(1) | rpl::start_with_next(state->check);
+			) | rpl::take(1) | rpl::on_next(state->check);
 			return;
 		} else if (!state->bot.has_value()) {
 			return;
diff --git a/Telegram/SourceFiles/history/view/media/history_view_photo.cpp b/Telegram/SourceFiles/history/view/media/history_view_photo.cpp
index 3e56d773f4..43c71b0e2b 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_photo.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_photo.cpp
@@ -946,7 +946,7 @@ bool Photo::createStreamingObjects() {
 			_data,
 			_realParent->fullId())));
 	_streamed->instance.player().updates(
-	) | rpl::start_with_next_error([=](Update &&update) {
+	) | rpl::on_next_error([=](Update &&update) {
 		handleStreamingUpdate(std::move(update));
 	}, [=](Error &&error) {
 		handleStreamingError(std::move(error));
diff --git a/Telegram/SourceFiles/history/view/media/history_view_premium_gift.cpp b/Telegram/SourceFiles/history/view/media/history_view_premium_gift.cpp
index e73bc4b55e..0dafd6a706 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_premium_gift.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_premium_gift.cpp
@@ -278,7 +278,7 @@ ClickHandlerPtr PremiumGift::createViewLink() {
 						return window->session().credits().tonLoaded();
 					}
 					return false;
-				}) | rpl::take(1) | rpl::start_with_next([=] {
+				}) | rpl::take(1) | rpl::on_next([=] {
 					if (const auto window = weak.get()) {
 						window->showSettings(Settings::CurrencyId());
 					}
diff --git a/Telegram/SourceFiles/history/view/media/history_view_service_box.cpp b/Telegram/SourceFiles/history/view/media/history_view_service_box.cpp
index 7e0e8960cb..f28fd31c3e 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_service_box.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_service_box.cpp
@@ -102,7 +102,7 @@ ServiceBox::ServiceBox(
 	InitElementTextPart(_parent, _subtitle);
 	if (auto text = _content->button()) {
 		_button.repaint = [=] { repaint(); };
-		std::move(text) | rpl::start_with_next([=](QString value) {
+		std::move(text) | rpl::on_next([=](QString value) {
 			_button.text.setText(st::semiboldTextStyle, value);
 			const auto height = st::msgServiceGiftBoxButtonHeight;
 			const auto &padding = st::msgServiceGiftBoxButtonPadding;
@@ -126,7 +126,7 @@ ServiceBox::ServiceBox(
 	}
 
 	if (auto changes = _content->changes()) {
-		std::move(changes) | rpl::start_with_next([=] {
+		std::move(changes) | rpl::on_next([=] {
 			applyContentChanges();
 		}, _lifetime);
 	}
diff --git a/Telegram/SourceFiles/history/view/media/history_view_sticker_player.cpp b/Telegram/SourceFiles/history/view/media/history_view_sticker_player.cpp
index da95870577..947681e16a 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_sticker_player.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_sticker_player.cpp
@@ -26,7 +26,7 @@ void LottiePlayer::setRepaintCallback(Fn<void()> callback) {
 		return;
 	}
 	_repaintLifetime = _lottie->updates(
-	) | rpl::start_with_next([=](Lottie::Update update) {
+	) | rpl::on_next([=](Lottie::Update update) {
 		v::match(update.data, [&](const Lottie::Information &) {
 			callback();
 			//markFramesTillExternal();
diff --git a/Telegram/SourceFiles/history/view/media/history_view_theme_document.cpp b/Telegram/SourceFiles/history/view/media/history_view_theme_document.cpp
index 1b003d387e..a52c53c9f2 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_theme_document.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_theme_document.cpp
@@ -483,7 +483,7 @@ ThemeDocumentBox::ThemeDocumentBox(
 	Window::WallPaperResolved(
 		&_parent->history()->owner(),
 		&paper
-	) | rpl::start_with_next([=](const Data::WallPaper *paper) {
+	) | rpl::on_next([=](const Data::WallPaper *paper) {
 		_parent->repaint();
 		if (!paper) {
 			_preview.reset();
diff --git a/Telegram/SourceFiles/history/view/media/history_view_userpic_suggestion.cpp b/Telegram/SourceFiles/history/view/media/history_view_userpic_suggestion.cpp
index 6e5252adda..9b8a5d7c75 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_userpic_suggestion.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_userpic_suggestion.cpp
@@ -159,7 +159,7 @@ void ShowSetToast(
 		preview->show();
 		preview->setAttribute(Qt::WA_TransparentForMouseEvents);
 		preview->paintRequest(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			QPainter(preview).drawImage(0, 0, copy);
 		}, preview->lifetime());
 	}
diff --git a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_button.cpp b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_button.cpp
index 9f2759f36b..eb2bd2c58e 100644
--- a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_button.cpp
+++ b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_button.cpp
@@ -848,7 +848,7 @@ void SetupManagerList(
 		items
 	) | rpl::filter([=](HistoryItem *item) {
 		return (item != state->item);
-	}) | rpl::start_with_next([=](HistoryItem *item) {
+	}) | rpl::on_next([=](HistoryItem *item) {
 		state->item = item;
 		if (!item) {
 			return;
@@ -871,11 +871,11 @@ void SetupManagerList(
 				session
 			) | rpl::skip(
 				1
-			) | rpl::start_with_next(push, state->sessionLifetime);
+			) | rpl::on_next(push, state->sessionLifetime);
 
 			session->changes().messageUpdates(
 				Data::MessageUpdate::Flag::Destroyed
-			) | rpl::start_with_next([=](const Data::MessageUpdate &update) {
+			) | rpl::on_next([=](const Data::MessageUpdate &update) {
 				if (update.item == state->item) {
 					state->item = nullptr;
 					state->timer.cancel();
@@ -885,7 +885,7 @@ void SetupManagerList(
 			session->data().itemDataChanges(
 			) | rpl::filter([=](not_null<HistoryItem*> item) {
 				return (item == state->item);
-			}) | rpl::start_with_next(push, state->sessionLifetime);
+			}) | rpl::on_next(push, state->sessionLifetime);
 
 			const auto &reactions = session->data().reactions();
 			rpl::merge(
@@ -895,7 +895,7 @@ void SetupManagerList(
 				reactions.favoriteUpdates(),
 				reactions.myTagsUpdates(),
 				reactions.tagsUpdates()
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				if (!state->timer.isActive()) {
 					state->timer.callOnce(kRefreshListDelay);
 				}
@@ -906,7 +906,7 @@ void SetupManagerList(
 			state->peerLifetime = rpl::combine(
 				Data::PeerAllowedReactionsValue(peer),
 				Data::UniqueReactionsLimitValue(peer)
-			) | rpl::start_with_next(push);
+			) | rpl::on_next(push);
 		} else {
 			push();
 		}
@@ -915,7 +915,7 @@ void SetupManagerList(
 	manager->faveRequests(
 	) | rpl::filter([=] {
 		return (state->session != nullptr);
-	}) | rpl::start_with_next([=](const Data::ReactionId &id) {
+	}) | rpl::on_next([=](const Data::ReactionId &id) {
 		state->session->data().reactions().setFavorite(id);
 		manager->updateButton({});
 	}, manager->lifetime());
diff --git a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_list.cpp b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_list.cpp
index 90c6d52fac..6ce76edaab 100644
--- a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_list.cpp
+++ b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_list.cpp
@@ -217,7 +217,7 @@ Controller::Controller(
 		switches
 	) | rpl::filter([=](const ReactionId &reaction) {
 		return (_shownReaction != reaction);
-	}) | rpl::start_with_next([=](const ReactionId &reaction) {
+	}) | rpl::on_next([=](const ReactionId &reaction) {
 		showReaction(reaction);
 	}, lifetime());
 }
diff --git a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp
index 0b360904a0..cbe9e3e3cc 100644
--- a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp
+++ b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp
@@ -1106,7 +1106,7 @@ void Selector::createList() {
 		(_stickers
 			? _stickers->chosen()
 			: rpl::never<ChatHelpers::FileChosen>())
-	) | rpl::start_with_next([=](ChatHelpers::FileChosen data) {
+	) | rpl::on_next([=](ChatHelpers::FileChosen data) {
 		_chosen.fire({
 			.id = _unifiedFactoryOwner->lookupReactionId(data.document->id),
 			.icon = data.messageSendingFrom.frame,
@@ -1115,7 +1115,7 @@ void Selector::createList() {
 	}, _list->lifetime());
 
 	_list->jumpedToPremium(
-	) | rpl::start_with_next(_jumpedToPremium, _list->lifetime());
+	) | rpl::on_next(_jumpedToPremium, _list->lifetime());
 
 	const auto inner = rect().marginsRemoved(marginsForShadow());
 	const auto footer = _reactions.customAllowed
@@ -1135,7 +1135,7 @@ void Selector::createList() {
 		rpl::combine(
 			_shadowTop.value(),
 			_shadowSkip.value()
-		) | rpl::start_with_next([=](int top, int skip) {
+		) | rpl::on_next([=](int top, int skip) {
 			_shadow->setGeometry(
 				inner.x() + skip,
 				top,
@@ -1156,10 +1156,10 @@ void Selector::createList() {
 		lists->setVisibleTopBottom(scrollTop, scrollBottom);
 	};
 	_scroll->scrollTopChanges(
-	) | rpl::start_with_next(updateVisibleTopBottom, lists->lifetime());
+	) | rpl::on_next(updateVisibleTopBottom, lists->lifetime());
 
 	_list->scrollToRequests(
-	) | rpl::start_with_next([=](int y) {
+	) | rpl::on_next([=](int y) {
 		_scroll->scrollToY(y);
 		if (_shadow) {
 			_shadow->update();
@@ -1177,28 +1177,28 @@ void Selector::createList() {
 		_stickers->setMinimalHeight(geometry.width(), 0);
 
 		_list->searchQueries(
-		) | rpl::start_with_next([=](std::vector<QString> &&query) {
+		) | rpl::on_next([=](std::vector<QString> &&query) {
 			_stickers->applySearchQuery(std::move(query));
 		}, _stickers->lifetime());
 
 		rpl::combine(
 			_list->heightValue(),
 			_stickers->heightValue()
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			InvokeQueued(lists, updateVisibleTopBottom);
 		}, _stickers->lifetime());
 
 		rpl::combine(
 			_list->recentShownCount(),
 			_stickers->recentShownCount()
-		) | rpl::start_with_next([=](int emoji, int stickers) {
+		) | rpl::on_next([=](int emoji, int stickers) {
 			_showEmptySearch = !emoji && !stickers;
 			_scroll->update();
 		}, _scroll->lifetime());
 
 		_scroll->paintRequest() | rpl::filter([=] {
 			return _showEmptySearch;
-		}) | rpl::start_with_next([=] {
+		}) | rpl::on_next([=] {
 			auto p = QPainter(_scroll);
 			p.setPen(st::windowSubTextFg);
 			p.setFont(st::normalFont);
@@ -1326,7 +1326,7 @@ AttachSelectorResult MakeJustSelectorMenu(
 	const auto selectorInnerTop = menu->preparedPadding().top()
 		- st::reactStripExtend.top();
 	menu->animatePhaseValue(
-	) | rpl::start_with_next([=](Ui::PopupMenu::AnimatePhase phase) {
+	) | rpl::on_next([=](Ui::PopupMenu::AnimatePhase phase) {
 		if (phase == Ui::PopupMenu::AnimatePhase::StartHide) {
 			selector->beforeDestroy();
 		}
@@ -1334,14 +1334,14 @@ AttachSelectorResult MakeJustSelectorMenu(
 	selector->initGeometry(selectorInnerTop);
 	selector->show();
 
-	selector->chosen() | rpl::start_with_next([=](ChosenReaction reaction) {
+	selector->chosen() | rpl::on_next([=](ChosenReaction reaction) {
 		menu->hideMenu();
 		chosen(std::move(reaction));
 	}, selector->lifetime());
 
 	const auto correctTop = selector->y();
 	menu->showStateValue(
-	) | rpl::start_with_next([=](Ui::PopupMenu::ShowState state) {
+	) | rpl::on_next([=](Ui::PopupMenu::ShowState state) {
 		const auto origin = menu->preparedOrigin();
 		using Origin = Ui::PanelAnimation::Origin;
 		if (origin == Origin::BottomLeft || origin == Origin::BottomRight) {
@@ -1395,13 +1395,13 @@ AttachSelectorResult AttachSelectorToMenu(
 	const auto selector = *result;
 	const auto itemId = item->fullId();
 
-	selector->chosen() | rpl::start_with_next([=](ChosenReaction reaction) {
+	selector->chosen() | rpl::on_next([=](ChosenReaction reaction) {
 		menu->hideMenu();
 		reaction.context = itemId;
 		chosen(std::move(reaction));
 	}, selector->lifetime());
 
-	selector->escapes() | rpl::start_with_next([=] {
+	selector->escapes() | rpl::on_next([=] {
 		menu->hideMenu();
 	}, selector->lifetime());
 
@@ -1452,7 +1452,7 @@ auto AttachSelectorToMenu(
 		? (menu->preparedPadding().top() - st::reactStripExtend.top())
 		: st::lineWidth;
 	menu->animatePhaseValue(
-	) | rpl::start_with_next([=](Ui::PopupMenu::AnimatePhase phase) {
+	) | rpl::on_next([=](Ui::PopupMenu::AnimatePhase phase) {
 		if (phase == Ui::PopupMenu::AnimatePhase::StartHide) {
 			selector->beforeDestroy();
 		}
@@ -1462,7 +1462,7 @@ auto AttachSelectorToMenu(
 
 	const auto correctTop = selector->y();
 	menu->showStateValue(
-	) | rpl::start_with_next([=](Ui::PopupMenu::ShowState state) {
+	) | rpl::on_next([=](Ui::PopupMenu::ShowState state) {
 		const auto origin = menu->preparedOrigin();
 		using Origin = Ui::PanelAnimation::Origin;
 		if (origin == Origin::BottomLeft || origin == Origin::BottomRight) {
diff --git a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_strip.cpp b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_strip.cpp
index 7fb68cb064..e691cc38ef 100644
--- a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_strip.cpp
+++ b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_strip.cpp
@@ -58,7 +58,7 @@ Strip::Strip(
 , _finalSize(size)
 , _update(std::move(update)) {
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		invalidateMainReactionImage();
 	}, _lifetime);
 }
@@ -394,7 +394,7 @@ void Strip::loadIcons() {
 		entry.media->checkStickerLarge();
 		if (!checkIconLoaded(entry) && !_loadCacheLifetime) {
 			document->session().downloaderTaskFinished(
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				checkIcons();
 			}, _loadCacheLifetime);
 		}
@@ -459,7 +459,7 @@ void Strip::resolveMainReactionIcon() {
 		main->session().downloaderTaskFinished(
 		) | rpl::filter([=] {
 			return _mainReactionMedia->loaded();
-		}) | rpl::take(1) | rpl::start_with_next([=] {
+		}) | rpl::take(1) | rpl::on_next([=] {
 			setMainReactionIcon();
 		}, _mainReactionLifetime);
 	}
diff --git a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_tabs.cpp b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_tabs.cpp
index df06ba49fe..acaad5ba4b 100644
--- a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_tabs.cpp
+++ b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_tabs.cpp
@@ -48,7 +48,7 @@ not_null<Ui::AbstractButton*> CreateTab(
 	const auto state = result->lifetime().make_state<State>();
 	std::move(
 		selected
-	) | rpl::start_with_next([=](bool selected) {
+	) | rpl::on_next([=](bool selected) {
 		state->selected = selected;
 		state->cache = QImage();
 		result->update();
@@ -61,7 +61,7 @@ not_null<Ui::AbstractButton*> CreateTab(
 			{ .repaint = [=] { result->update(); } });
 
 	result->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto factor = style::DevicePixelRatio();
 		const auto height = stm->height;
 		const auto skip = st::reactionsTabIconSkip;
diff --git a/Telegram/SourceFiles/info/bot/earn/info_bot_earn_list.cpp b/Telegram/SourceFiles/info/bot/earn/info_bot_earn_list.cpp
index 630c507010..935c746b75 100644
--- a/Telegram/SourceFiles/info/bot/earn/info_bot_earn_list.cpp
+++ b/Telegram/SourceFiles/info/bot/earn/info_bot_earn_list.cpp
@@ -75,7 +75,7 @@ void InnerWidget::load() {
 		const auto api = apiLifetime->make_state<Api::CreditsEarnStatistics>(
 			peer()->asUser());
 		api->request(
-		) | rpl::start_with_error_done([show = _show](const QString &error) {
+		) | rpl::on_error_done([show = _show](const QString &error) {
 			show->showToast(error);
 		}, [=] {
 			done(api->data());
@@ -90,14 +90,14 @@ void InnerWidget::load() {
 		_showFinished.events());
 
 	_showFinished.events(
-	) | rpl::take(1) | rpl::start_with_next([=, this, peer = peer()] {
+	) | rpl::take(1) | rpl::on_next([=, this, peer = peer()] {
 		request([=](Data::CreditsEarnStatistics state) {
 			_state = state;
 			_loaded.fire(true);
 			fill();
 
 			peer->session().account().mtpUpdates(
-			) | rpl::start_with_next([=](const MTPUpdates &updates) {
+			) | rpl::on_next([=](const MTPUpdates &updates) {
 				using TL = MTPDupdateStarsRevenueStatus;
 				Api::PerformForUpdate<TL>(updates, [&](const TL &d) {
 					const auto peerId = peerFromMTP(d.vpeer());
@@ -185,7 +185,7 @@ void InnerWidget::fill() {
 			rpl::combine(
 				line->widthValue(),
 				majorLabel->sizeValue()
-			) | rpl::start_with_next([=](int available, const QSize &size) {
+			) | rpl::on_next([=](int available, const QSize &size) {
 				line->resize(line->width(), size.height());
 				majorLabel->moveToLeft(
 					icon->width() + st::channelEarnOverviewMinorLabelSkip,
@@ -354,7 +354,7 @@ void InnerWidget::fillHistory() {
 
 		rpl::single(slider->entity()->activeSection()) | rpl::then(
 			slider->entity()->sectionActivated()
-		) | rpl::start_with_next([=](int index) {
+		) | rpl::on_next([=](int index) {
 			if (index == 0) {
 				fullWrap->toggle(true, anim::type::instant);
 				inWrap->toggle(false, anim::type::instant);
@@ -414,7 +414,7 @@ void InnerWidget::fillHistory() {
 	const auto apiLifetime = history->lifetime().make_state<rpl::lifetime>();
 	rpl::single(rpl::empty) | rpl::then(
 		_stateUpdated.events()
-	) | rpl::start_with_next([=, peer = peer()] {
+	) | rpl::on_next([=, peer = peer()] {
 		using Api = Api::CreditsHistory;
 		const auto apiFull = apiLifetime->make_state<Api>(peer, true, true);
 		const auto apiIn = apiLifetime->make_state<Api>(peer, true, false);
@@ -424,7 +424,7 @@ void InnerWidget::fillHistory() {
 				apiOut->request({}, [=](Data::CreditsStatusSlice outSlice) {
 					::Api::PremiumPeerBot(
 						&_controller->session()
-					) | rpl::start_with_next([=](not_null<PeerData*> bot) {
+					) | rpl::on_next([=](not_null<PeerData*> bot) {
 						fill(bot, fullSlice, inSlice, outSlice);
 						container->resizeToWidth(container->width());
 						while (history->count() > 1) {
diff --git a/Telegram/SourceFiles/info/bot/earn/info_bot_earn_widget.cpp b/Telegram/SourceFiles/info/bot/earn/info_bot_earn_widget.cpp
index 123c8e307c..ed4ef00f83 100644
--- a/Telegram/SourceFiles/info/bot/earn/info_bot_earn_widget.cpp
+++ b/Telegram/SourceFiles/info/bot/earn/info_bot_earn_widget.cpp
@@ -52,10 +52,10 @@ Widget::Widget(
 : ContentWidget(parent, controller)
 , _inner(setInnerWidget(object_ptr<InnerWidget>(this, controller))) {
 	_inner->showRequests(
-	) | rpl::start_with_next([=](InnerWidget::ShowRequest request) {
+	) | rpl::on_next([=](InnerWidget::ShowRequest request) {
 	}, _inner->lifetime());
 	_inner->scrollToRequests(
-	) | rpl::start_with_next([=](const Ui::ScrollToRequest &request) {
+	) | rpl::on_next([=](const Ui::ScrollToRequest &request) {
 		scrollTo(request);
 	}, _inner->lifetime());
 }
diff --git a/Telegram/SourceFiles/info/bot/starref/info_bot_starref_common.cpp b/Telegram/SourceFiles/info/bot/starref/info_bot_starref_common.cpp
index b134eaf526..7157c96d1b 100644
--- a/Telegram/SourceFiles/info/bot/starref/info_bot_starref_common.cpp
+++ b/Telegram/SourceFiles/info/bot/starref/info_bot_starref_common.cpp
@@ -119,7 +119,7 @@ void ConnectStarRef(
 		st::starrefLinkCountFont->height);
 	const auto badgeRect = badge.marginsAdded(st::starrefLinkCountPadding);
 
-	raw->paintRequest() | rpl::start_with_next([=] {
+	raw->paintRequest() | rpl::on_next([=] {
 		auto p = QPainter(raw);
 		p.setPen(Qt::NoPen);
 		p.setBrush(st::windowBgActive);
@@ -285,12 +285,12 @@ not_null<Ui::AbstractButton*> AddViewListButton(
 	dummy->show();
 
 	parent->sizeValue(
-	) | rpl::start_with_next([=](const QSize &s) {
+	) | rpl::on_next([=](const QSize &s) {
 		dummy->resize(s.width(), iconSize.height());
 	}, dummy->lifetime());
 
 	button->geometryValue(
-	) | rpl::start_with_next([=](const QRect &r) {
+	) | rpl::on_next([=](const QRect &r) {
 		dummy->moveToLeft(0, r.y() + (r.height() - iconSize.height()) / 2);
 	}, dummy->lifetime());
 
@@ -303,7 +303,7 @@ not_null<Ui::AbstractButton*> AddViewListButton(
 		parent->widthValue(),
 		label->heightValue(),
 		description->heightValue()
-	) | rpl::start_with_next([=,
+	) | rpl::on_next([=,
 		topPadding = titlePadding,
 		bottomPadding = descriptionPadding](
 			int width,
@@ -319,7 +319,7 @@ not_null<Ui::AbstractButton*> AddViewListButton(
 			+ bottomPadding.bottom());
 	}, button->lifetime());
 	label->topValue(
-	) | rpl::start_with_next([=, padding = titlePadding.top()](int top) {
+	) | rpl::on_next([=, padding = titlePadding.top()](int top) {
 		button->moveToLeft(0, top - padding);
 	}, button->lifetime());
 	const auto arrow = Ui::CreateChild<Ui::IconButton>(
@@ -330,7 +330,7 @@ not_null<Ui::AbstractButton*> AddViewListButton(
 		&st::settingsPremiumArrowOver);
 	arrow->setAttribute(Qt::WA_TransparentForMouseEvents);
 	button->sizeValue(
-	) | rpl::start_with_next([=](const QSize &s) {
+	) | rpl::on_next([=](const QSize &s) {
 		const auto &point = st::settingsPremiumArrowShift;
 		arrow->moveToRight(
 			-point.x(),
@@ -353,7 +353,7 @@ not_null<Ui::RoundButton*> AddFullWidthButton(
 	rpl::combine(
 		box->widthValue(),
 		result->widthValue()
-	) | rpl::start_with_next([=](int width, int buttonWidth) {
+	) | rpl::on_next([=](int width, int buttonWidth) {
 		const auto correct = width
 			- boxSt.buttonPadding.left()
 			- boxSt.buttonPadding.right();
@@ -377,7 +377,7 @@ void AddFullWidthButtonFooter(
 		std::move(text),
 		st::starrefJoinFooter);
 	footer->setTryMakeSimilarLines(true);
-	button->geometryValue() | rpl::start_with_next([=](QRect geometry) {
+	button->geometryValue() | rpl::on_next([=](QRect geometry) {
 		footer->resizeToWidth(geometry.width());
 		const auto &st = box->getDelegate()->style();
 		const auto top = geometry.y() + geometry.height();
@@ -402,7 +402,7 @@ object_ptr<Ui::AbstractButton> MakeLinkLabel(
 	const auto raw = result.data();
 
 	raw->resize(height, height);
-	raw->paintRequest() | rpl::start_with_next([=] {
+	raw->paintRequest() | rpl::on_next([=] {
 		auto p = QPainter(raw);
 		auto hq = PainterHighQualityEnabler(p);
 		p.setPen(Qt::NoPen);
@@ -557,7 +557,7 @@ object_ptr<Ui::BoxContent> JoinStarRefBox(
 			QMargins());
 
 		state->recipient.value(
-		) | rpl::start_with_next([=](not_null<PeerData*> recipient) {
+		) | rpl::on_next([=](not_null<PeerData*> recipient) {
 			while (userpicsWrap->count()) {
 				delete userpicsWrap->widgetAt(0);
 			}
@@ -638,7 +638,7 @@ object_ptr<Ui::BoxContent> JoinStarRefBox(
 				object_ptr<Ui::VerticalLayout>(box),
 				QMargins());
 			state->recipient.value(
-			) | rpl::start_with_next([=](not_null<PeerData*> recipient) {
+			) | rpl::on_next([=](not_null<PeerData*> recipient) {
 				while (recipientWrap->count()) {
 					delete recipientWrap->widgetAt(0);
 				}
@@ -656,7 +656,7 @@ object_ptr<Ui::BoxContent> JoinStarRefBox(
 					const auto height = st::chatGiveawayPeerSize
 						- st::chatGiveawayPeerPadding.top() * 2;
 					right->resize(skip + icon->width(), height);
-					right->paintRequest() | rpl::start_with_next([=] {
+					right->paintRequest() | rpl::on_next([=] {
 						auto p = QPainter(right);
 						icon->paint(
 							p,
@@ -748,7 +748,7 @@ object_ptr<Ui::BoxContent> ConfirmEndBox(Fn<void()> finish) {
 						st::blockUserConfirmation),
 					QMargins(st::boxTextFont->height, 0, 0, 0)),
 				margins);
-			padded->paintRequest() | rpl::start_with_next([=] {
+			padded->paintRequest() | rpl::on_next([=] {
 				auto p = QPainter(padded);
 				auto hq = PainterHighQualityEnabler(p);
 				const auto size = st::starrefEndBulletSize;
@@ -893,7 +893,7 @@ std::unique_ptr<Ui::AbstractButton> MakePeerBubbleButton(
 	rpl::combine(
 		raw->sizeValue(),
 		std::move(rightWidth)
-	) | rpl::start_with_next([=](QSize outer, int rwidth) {
+	) | rpl::on_next([=](QSize outer, int rwidth) {
 		const auto full = outer.width();
 		const auto decorations = size
 			+ padding.left()
@@ -918,7 +918,7 @@ std::unique_ptr<Ui::AbstractButton> MakePeerBubbleButton(
 				outer.width());
 		}
 	}, raw->lifetime());
-	raw->paintRequest() | rpl::start_with_next([=] {
+	raw->paintRequest() | rpl::on_next([=] {
 		auto p = QPainter(raw);
 		const auto left = (raw->width() - *width) / 2;
 		const auto skip = size / 2;
diff --git a/Telegram/SourceFiles/info/bot/starref/info_bot_starref_join_widget.cpp b/Telegram/SourceFiles/info/bot/starref/info_bot_starref_join_widget.cpp
index 87d91dae82..fd2ec5f33e 100644
--- a/Telegram/SourceFiles/info/bot/starref/info_bot_starref_join_widget.cpp
+++ b/Telegram/SourceFiles/info/bot/starref/info_bot_starref_join_widget.cpp
@@ -296,7 +296,7 @@ ListController::ListController(
 
 	if (_type == JoinType::Joined) {
 		setupLinkBadge();
-		style::PaletteChanged() | rpl::start_with_next([=] {
+		style::PaletteChanged() | rpl::on_next([=] {
 			setupLinkBadge();
 		}, lifetime());
 	}
@@ -454,7 +454,7 @@ void ListController::setupAddForBot() {
 		st::starrefAddForBotIcon,
 		QPoint());
 	button->entity()->heightValue(
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		icon->moveToLeft(
 			st::starrefAddForBotIconPosition.x(),
 			(height - st::starrefAddForBotIcon.height()) / 2);
@@ -466,7 +466,7 @@ void ListController::setupAddForBot() {
 	button->entity()->events(
 	) | rpl::filter([=](not_null<QEvent*> e) {
 		return (e->type() == QEvent::Enter);
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		delegate()->peerListMouseLeftGeometry();
 	}, button->lifetime());
 	delegate()->peerListSetAboveWidget(std::move(button));
@@ -762,7 +762,7 @@ not_null<ListController*> InnerWidget::setupMy() {
 	) | rpl::map(rpl::mappers::_1 > 0));
 
 	controller->revoked(
-	) | rpl::start_with_next([=](ConnectedBot row) {
+	) | rpl::on_next([=](ConnectedBot row) {
 		_suggested->process(row);
 	}, content->lifetime());
 
@@ -788,7 +788,7 @@ void InnerWidget::setupSort(not_null<Ui::RpWidget*> label) {
 		label->geometryValue(),
 		widthValue(),
 		sort->widthValue()
-	) | rpl::start_with_next([=](QRect geometry, int outer, int sortWidth) {
+	) | rpl::on_next([=](QRect geometry, int outer, int sortWidth) {
 		const auto skip = st::boxRowPadding.right();
 		const auto top = geometry.y()
 			+ st::defaultSubsectionTitle.style.font->ascent
@@ -846,11 +846,11 @@ not_null<ListController*> InnerWidget::setupSuggested() {
 	) | rpl::map(rpl::mappers::_1 > 0));
 
 	controller->connected(
-	) | rpl::start_with_next([=](ConnectedBot row) {
+	) | rpl::on_next([=](ConnectedBot row) {
 		_my->process(row);
 	}, content->lifetime());
 
-	_sort.value() | rpl::start_with_next([=](SuggestedSort sort) {
+	_sort.value() | rpl::on_next([=](SuggestedSort sort) {
 		controller->setSort(sort);
 	}, content->lifetime());
 
@@ -1013,7 +1013,7 @@ std::unique_ptr<Ui::Premium::TopBarAbstract> Widget::setupTop() {
 	const auto raw = result.get();
 
 	controller->wrapValue(
-	) | rpl::start_with_next([=](Info::Wrap wrap) {
+	) | rpl::on_next([=](Info::Wrap wrap) {
 		raw->setRoundEdges(wrap == Info::Wrap::Layer);
 	}, raw->lifetime());
 
@@ -1021,14 +1021,14 @@ std::unique_ptr<Ui::Premium::TopBarAbstract> Widget::setupTop() {
 	raw->resize(width(), baseHeight);
 
 	raw->additionalHeight(
-	) | rpl::start_with_next([=](int additionalHeight) {
+	) | rpl::on_next([=](int additionalHeight) {
 		raw->setMaximumHeight(baseHeight + additionalHeight);
 		raw->setMinimumHeight(baseHeight + additionalHeight);
 		setPaintPadding({ 0, raw->height(), 0, 0 });
 	}, raw->lifetime());
 
 	controller->wrapValue(
-	) | rpl::start_with_next([=](Info::Wrap wrap) {
+	) | rpl::on_next([=](Info::Wrap wrap) {
 		const auto isLayer = (wrap == Info::Wrap::Layer);
 		_back = base::make_unique_q<Ui::FadeWrap<Ui::IconButton>>(
 			raw,
@@ -1048,7 +1048,7 @@ std::unique_ptr<Ui::Premium::TopBarAbstract> Widget::setupTop() {
 		_back->entity()->setRippleColorOverride(
 			&st::universalRippleAnimation.color);
 		_back->toggledValue(
-		) | rpl::start_with_next([=](bool toggled) {
+		) | rpl::on_next([=](bool toggled) {
 			const auto &st = isLayer ? st::infoLayerTopBar : st::infoTopBar;
 			raw->setTextPosition(
 				toggled ? st.back.width : st.titlePosition.x(),
@@ -1068,14 +1068,14 @@ std::unique_ptr<Ui::Premium::TopBarAbstract> Widget::setupTop() {
 			_close->setRippleColorOverride(
 				&st::universalRippleAnimation.color);
 			raw->widthValue(
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				_close->moveToRight(0, 0);
 			}, _close->lifetime());
 		}
 	}, raw->lifetime());
 
 	raw->move(0, 0);
-	widthValue() | rpl::start_with_next([=](int width) {
+	widthValue() | rpl::on_next([=](int width) {
 		raw->resizeToWidth(width);
 		setScrollTopSkip(raw->height());
 	}, raw->lifetime());
@@ -1117,7 +1117,7 @@ object_ptr<Ui::BoxContent> ProgramsListBox(
 		window,
 		peer,
 		JoinType::Existing);
-	controller->addForBotRequests() | rpl::start_with_next([=] {
+	controller->addForBotRequests() | rpl::on_next([=] {
 		if (const auto strong = weak->get()) {
 			strong->closeBox();
 		}
diff --git a/Telegram/SourceFiles/info/bot/starref/info_bot_starref_setup_widget.cpp b/Telegram/SourceFiles/info/bot/starref/info_bot_starref_setup_widget.cpp
index 30296e9cfa..77d63f69fa 100644
--- a/Telegram/SourceFiles/info/bot/starref/info_bot_starref_setup_widget.cpp
+++ b/Telegram/SourceFiles/info/bot/starref/info_bot_starref_setup_widget.cpp
@@ -219,7 +219,7 @@ private:
 		updateByValue(value);
 		valueFinished(value);
 	};
-	style::PaletteChanged() | rpl::start_with_next([=] {
+	style::PaletteChanged() | rpl::on_next([=] {
 		updatePalette();
 	}, raw->lifetime());
 	updateByValue(value);
@@ -237,10 +237,10 @@ private:
 	if (state->indexMin > 0) {
 		const auto overlay = Ui::CreateChild<Ui::RpWidget>(slider);
 		overlay->setAttribute(Qt::WA_TransparentForMouseEvents);
-		slider->sizeValue() | rpl::start_with_next([=](QSize size) {
+		slider->sizeValue() | rpl::on_next([=](QSize size) {
 			overlay->setGeometry(0, 0, size.width(), size.height());
 		}, slider->lifetime());
-		overlay->paintRequest() | rpl::start_with_next([=] {
+		overlay->paintRequest() | rpl::on_next([=] {
 			auto p = QPainter(overlay);
 			const auto sections = valuesCount - 1;
 			const auto shift = sliderStyle->seekSize.width();
@@ -258,7 +258,7 @@ private:
 		}, overlay->lifetime());
 	}
 
-	raw->widthValue() | rpl::start_with_next([=](int width) {
+	raw->widthValue() | rpl::on_next([=](int width) {
 		labels->resizeToWidth(width);
 		updateByIndex();
 	}, slider->lifetime());
@@ -298,7 +298,7 @@ private:
 			textByValue(valueByIndex(i)),
 			*labelStyle));
 	}
-	labels->widthValue() | rpl::start_with_next([=](int outer) {
+	labels->widthValue() | rpl::on_next([=](int outer) {
 		const auto shift = sliderStyle->seekSize.width() / 2;
 		const auto available = outer - sliderStyle->seekSize.width();
 		for (auto i = 0; i != state->labels.size(); ++i) {
@@ -358,7 +358,7 @@ private:
 		updateByValue(value);
 		valueFinished(value);
 	};
-	style::PaletteChanged() | rpl::start_with_next([=] {
+	style::PaletteChanged() | rpl::on_next([=] {
 		updatePalette();
 	}, raw->lifetime());
 	updateByValue(value);
@@ -376,10 +376,10 @@ private:
 	if (state->indexMin > 0) {
 		const auto overlay = Ui::CreateChild<Ui::RpWidget>(slider);
 		overlay->setAttribute(Qt::WA_TransparentForMouseEvents);
-		slider->sizeValue() | rpl::start_with_next([=](QSize size) {
+		slider->sizeValue() | rpl::on_next([=](QSize size) {
 			overlay->setGeometry(0, 0, size.width(), size.height());
 		}, slider->lifetime());
-		overlay->paintRequest() | rpl::start_with_next([=] {
+		overlay->paintRequest() | rpl::on_next([=] {
 			auto p = QPainter(overlay);
 
 			const auto sections = valuesCount - 1;
@@ -417,7 +417,7 @@ private:
 		}, overlay->lifetime());
 	}
 
-	raw->widthValue() | rpl::start_with_next([=](int width) {
+	raw->widthValue() | rpl::on_next([=](int width) {
 		labels->resizeToWidth(width);
 		updateByIndex();
 	}, slider->lifetime());
@@ -452,7 +452,7 @@ private:
 	rpl::combine(
 		parent->widthValue(),
 		raw->widthValue()
-	) | rpl::start_with_next([=](int outer, int inner) {
+	) | rpl::on_next([=](int outer, int inner) {
 		const auto padding = st::starrefButtonMargin;
 		const auto added = padding.left() + padding.right();
 		if (outer > added && outer - added != inner) {
@@ -487,7 +487,7 @@ private:
 		raw->widthValue(),
 		state->label->widthValue(),
 		state->sublabel->widthValue()
-	) | rpl::start_with_next([=](int outer, int label, int sublabel) {
+	) | rpl::on_next([=](int outer, int label, int sublabel) {
 		if (sublabel > 0) {
 			state->label->moveToLeft(
 				(outer - label) / 2,
@@ -513,7 +513,7 @@ private:
 	};
 	updatePalette();
 	style::PaletteChanged(
-	) | rpl::start_with_next(updatePalette, raw->lifetime());
+	) | rpl::on_next(updatePalette, raw->lifetime());
 
 	state->update = [=] {
 		const auto set = [&](
@@ -532,7 +532,7 @@ private:
 			if (!state->lockedLifetime) {
 				state->lockedLifetime = base::timer_each(
 					100
-				) | rpl::start_with_next([=] {
+				) | rpl::on_next([=] {
 					state->update();
 				});
 				set(
@@ -925,7 +925,7 @@ std::unique_ptr<Ui::Premium::TopBarAbstract> Widget::setupTop() {
 	const auto raw = result.get();
 
 	controller->wrapValue(
-	) | rpl::start_with_next([=](Info::Wrap wrap) {
+	) | rpl::on_next([=](Info::Wrap wrap) {
 		raw->setRoundEdges(wrap == Info::Wrap::Layer);
 	}, raw->lifetime());
 
@@ -933,14 +933,14 @@ std::unique_ptr<Ui::Premium::TopBarAbstract> Widget::setupTop() {
 	raw->resize(width(), baseHeight);
 
 	raw->additionalHeight(
-	) | rpl::start_with_next([=](int additionalHeight) {
+	) | rpl::on_next([=](int additionalHeight) {
 		raw->setMaximumHeight(baseHeight + additionalHeight);
 		raw->setMinimumHeight(baseHeight + additionalHeight);
 		setPaintPadding({ 0, raw->height(), 0, 0 });
 	}, raw->lifetime());
 
 	controller->wrapValue(
-	) | rpl::start_with_next([=](Info::Wrap wrap) {
+	) | rpl::on_next([=](Info::Wrap wrap) {
 		const auto isLayer = (wrap == Info::Wrap::Layer);
 		_back = base::make_unique_q<Ui::FadeWrap<Ui::IconButton>>(
 			raw,
@@ -958,7 +958,7 @@ std::unique_ptr<Ui::Premium::TopBarAbstract> Widget::setupTop() {
 			controller->showBackFromStack();
 		});
 		_back->toggledValue(
-		) | rpl::start_with_next([=](bool toggled) {
+		) | rpl::on_next([=](bool toggled) {
 			const auto &st = isLayer ? st::infoLayerTopBar : st::infoTopBar;
 			raw->setTextPosition(
 				toggled ? st.back.width : st.titlePosition.x(),
@@ -976,14 +976,14 @@ std::unique_ptr<Ui::Premium::TopBarAbstract> Widget::setupTop() {
 				controller->parentController()->hideSpecialLayer();
 			});
 			raw->widthValue(
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				_close->moveToRight(0, 0);
 			}, _close->lifetime());
 		}
 	}, raw->lifetime());
 
 	raw->move(0, 0);
-	widthValue() | rpl::start_with_next([=](int width) {
+	widthValue() | rpl::on_next([=](int width) {
 		raw->resizeToWidth(width);
 		setScrollTopSkip(raw->height());
 	}, raw->lifetime());
@@ -1039,14 +1039,14 @@ std::unique_ptr<Ui::RpWidget> Widget::setupBottom() {
 		});
 	});
 
-	widthValue() | rpl::start_with_next([=](int width) {
+	widthValue() | rpl::on_next([=](int width) {
 		raw->resizeToWidth(width);
 	}, raw->lifetime());
 
 	rpl::combine(
 		raw->heightValue(),
 		heightValue()
-	) | rpl::start_with_next([=](int height, int fullHeight) {
+	) | rpl::on_next([=](int height, int fullHeight) {
 		setScrollBottomSkip(height);
 		raw->move(0, fullHeight - height);
 	}, raw->lifetime());
diff --git a/Telegram/SourceFiles/info/channel_statistics/boosts/create_giveaway_box.cpp b/Telegram/SourceFiles/info/channel_statistics/boosts/create_giveaway_box.cpp
index a04bd064aa..cf1a24e68d 100644
--- a/Telegram/SourceFiles/info/channel_statistics/boosts/create_giveaway_box.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/boosts/create_giveaway_box.cpp
@@ -125,7 +125,7 @@ void AddPremiumTopBarWithDefaultTitleBar(
 
 	std::move(
 		titleText
-	) | rpl::start_with_next([=](const QString &s) {
+	) | rpl::on_next([=](const QString &s) {
 		state->title.setText(st::startGiveawayBox.title.style, s);
 	}, box->lifetime());
 
@@ -142,7 +142,7 @@ void AddPremiumTopBarWithDefaultTitleBar(
 		object_ptr<Ui::RpWidget>(box));
 	closeTopBar->resize(box->width(), st::boxTitleHeight);
 	closeTopBar->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = Painter(closeTopBar);
 		const auto r = closeTopBar->rect();
 		const auto radius = st::boxRadius;
@@ -187,7 +187,7 @@ void AddPremiumTopBarWithDefaultTitleBar(
 			st::startGiveawayBoxTitleClose);
 		close->setClickedCallback([=] { box->closeBox(); });
 		closeTopBar->widthValue(
-		) | rpl::start_with_next([=](int w) {
+		) | rpl::on_next([=](int w) {
 			const auto &pos = st::giveawayGiftCodeCoverClosePosition;
 			close->moveToRight(pos.x(), pos.y());
 		}, box->lifetime());
@@ -222,14 +222,14 @@ void AddPremiumTopBarWithDefaultTitleBar(
 	bar->setMinimumHeight(st::infoLayerTopBarHeight);
 	bar->resize(bar->width(), bar->maximumHeight());
 	box->widthValue(
-	) | rpl::start_with_next([=](int w) {
+	) | rpl::on_next([=](int w) {
 		bar->resizeToWidth(w - hPadding);
 		bar->moveToLeft(st::boxRowPadding.left(), bar->y());
 	}, box->lifetime());
 
 	std::move(
 		showFinished
-	) | rpl::take(1) | rpl::start_with_next([=] {
+	) | rpl::take(1) | rpl::on_next([=] {
 		closeTopBar->raise();
 		if (const auto shadow = FindFirstShadowInBox(box)) {
 			bar->stackUnder(shadow);
@@ -237,7 +237,7 @@ void AddPremiumTopBarWithDefaultTitleBar(
 		bar->setPaused(false);
 		box->scrolls(
 		) | rpl::map(isCloseBarShown) | rpl::distinct_until_changed(
-		) | rpl::start_with_next([=](bool showBar) {
+		) | rpl::on_next([=](bool showBar) {
 			state->animation.stop();
 			state->animation.start(
 				[=] { closeTopBar->update(); },
@@ -246,7 +246,7 @@ void AddPremiumTopBarWithDefaultTitleBar(
 				st::slideWrapDuration);
 		}, box->lifetime());
 		box->scrolls(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			bar->moveToLeft(bar->x(), -box->scrollTop());
 		}, box->lifetime());
 	}, box->lifetime());
@@ -502,7 +502,7 @@ void CreateGiveawayBox(
 			contentWrap,
 			object_ptr<Ui::VerticalLayout>(box)));
 	state->typeValue.value(
-	) | rpl::start_with_next([=](GiveawayType type) {
+	) | rpl::on_next([=](GiveawayType type) {
 		randomWrap->toggle(!isSpecificUsers(), anim::type::instant);
 	}, randomWrap->lifetime());
 
@@ -542,7 +542,7 @@ void CreateGiveawayBox(
 				})),
 			title->positionValue(),
 			content->geometryValue()
-		) | rpl::start_with_next([=](QString s, const QPoint &p, QRect) {
+		) | rpl::on_next([=](QString s, const QPoint &p, QRect) {
 			rightLabel->setText(std::move(s));
 			rightLabel->moveToRight(st::boxRowPadding.right(), p.y());
 		}, rightLabel->lifetime());
@@ -597,7 +597,7 @@ void CreateGiveawayBox(
 				+ (st.nameStyle.font->spacew * 2)
 				+ (stars.width() / style::DevicePixelRatio());
 			state->sliderValue.value(
-			) | rpl::start_with_next([=](int users) {
+			) | rpl::on_next([=](int users) {
 				const auto option = creditsOption(i);
 				buttonState->hasStatus = false;
 				for (const auto &winner : option.winners) {
@@ -615,7 +615,7 @@ void CreateGiveawayBox(
 				inner->update();
 			}, button->lifetime());
 			inner->paintRequest(
-			) | rpl::start_with_next([=](const QRect &rect) {
+			) | rpl::on_next([=](const QRect &rect) {
 				auto p = QPainter(inner);
 				const auto namey = buttonState->hasStatus
 					? st.namePosition.y()
@@ -638,7 +638,7 @@ void CreateGiveawayBox(
 				}
 			}, inner->lifetime());
 			button->widthValue(
-			) | rpl::start_with_next([=](int width) {
+			) | rpl::on_next([=](int width) {
 				price->moveToRight(
 					st::boxRowPadding.right(),
 					(buttonHeight - price->height()) / 2);
@@ -733,7 +733,7 @@ void CreateGiveawayBox(
 		rightLabel->show();
 		rpl::duplicate(
 			creditsValueType
-		) | rpl::start_with_next([=](bool isCredits) {
+		) | rpl::on_next([=](bool isCredits) {
 			rightLabel->setVisible(!isCredits);
 		}, rightLabel->lifetime());
 
@@ -751,7 +751,7 @@ void CreateGiveawayBox(
 				})),
 			title->positionValue(),
 			sliderContainer->geometryValue()
-		) | rpl::start_with_next([=](QString s, const QPoint &p, QRect) {
+		) | rpl::on_next([=](QString s, const QPoint &p, QRect) {
 			rightLabel->setText(std::move(s));
 			rightLabel->moveToRight(st::boxRowPadding.right(), p.y());
 		}, rightLabel->lifetime());
@@ -770,7 +770,7 @@ void CreateGiveawayBox(
 		rpl::combine(
 			rpl::duplicate(creditsValueType),
 			creditsGroup->value()
-		) | rpl::start_with_next([=](bool isCredits, int value) {
+		) | rpl::on_next([=](bool isCredits, int value) {
 			while (sliderParent->count()) {
 				delete sliderParent->widgetAt(0);
 			}
@@ -809,7 +809,7 @@ void CreateGiveawayBox(
 			rpl::duplicate(creditsValueType),
 			creditsGroup->value(),
 			state->sliderValue.value()
-		) | rpl::start_with_next([=](
+		) | rpl::on_next([=](
 				bool isCredits,
 				int credits,
 				int boosts) {
@@ -881,7 +881,7 @@ void CreateGiveawayBox(
 				&listState->controller)));
 		listState->controller.setDelegate(&listState->delegate);
 		listState->controller.channelRemoved(
-		) | rpl::start_with_next([=](not_null<PeerData*> peer) {
+		) | rpl::on_next([=](not_null<PeerData*> peer) {
 			auto &list = state->selectedToSubscribe;
 			list.erase(ranges::remove(list, peer), end(list));
 		}, box->lifetime());
@@ -1087,7 +1087,7 @@ void CreateGiveawayBox(
 		rpl::combine(
 			state->sliderValue.value(),
 			state->typeValue.value()
-		) | rpl::start_with_next([=](int users, GiveawayType type) {
+		) | rpl::on_next([=](int users, GiveawayType type) {
 			typeGroup->setValue(type);
 			rebuildListOptions(
 				type,
@@ -1122,7 +1122,7 @@ void CreateGiveawayBox(
 			state->additionalPrize = additional->getLastText().trimmed();
 		};
 		additionalToggle->toggleOn(rpl::single(false))->toggledChanges(
-		) | rpl::start_with_next([=](bool toggled) {
+		) | rpl::on_next([=](bool toggled) {
 			if (!toggled && Ui::InFocusChain(additional)) {
 				additionalWrap->setFocus();
 				state->additionalPrize = QString();
@@ -1137,7 +1137,7 @@ void CreateGiveawayBox(
 
 		additional->changes() | rpl::filter([=] {
 			return additionalInner->toggled();
-		}) | rpl::start_with_next(
+		}) | rpl::on_next(
 			fillAdditionalPrizeValue,
 			additional->lifetime());
 
@@ -1167,7 +1167,7 @@ void CreateGiveawayBox(
 				return QString::number(count);
 			}),
 			st::giveawayGiftCodeAdditionalLabel);
-		additionalLabel->widthValue() | rpl::start_with_next([=](int width) {
+		additionalLabel->widthValue() | rpl::on_next([=](int width) {
 			const auto min = st::giveawayGiftCodeAdditionalPaddingMin;
 			const auto skip = st::giveawayGiftCodeAdditionalLabelSkip;
 			const auto added = std::max(width + skip - min.left(), 0);
@@ -1382,7 +1382,7 @@ void CreateGiveawayBox(
 
 		button->setTextTransform(Ui::RoundButton::TextTransform::NoTransform);
 		state->typeValue.value(
-		) | rpl::start_with_next([=, raw = button.data()] {
+		) | rpl::on_next([=, raw = button.data()] {
 			raw->resizeToWidth(box->width()
 				- stButton.buttonPadding.left()
 				- stButton.buttonPadding.right());
@@ -1512,7 +1512,7 @@ void CreateGiveawayBox(
 				state->apiOptions.applyPrepaid(
 					invoice,
 					prepaid->id
-				) | rpl::start_with_error_done([=](const QString &error) {
+				) | rpl::on_error_done([=](const QString &error) {
 					if (const auto window = weakWindow.get()) {
 						window->uiShow()->showToast(error);
 						close();
@@ -1545,7 +1545,7 @@ void CreateGiveawayBox(
 
 	std::move(
 		showFinished
-	) | rpl::take(1) | rpl::start_with_next([=] {
+	) | rpl::take(1) | rpl::on_next([=] {
 		if (!loading->toggled()) {
 			return;
 		}
@@ -1566,7 +1566,7 @@ void CreateGiveawayBox(
 		const auto receivedOptions = [=] {
 			state->lifetimeApi.destroy();
 			state->lifetimeApi = state->apiCreditsOptions.request(
-			) | rpl::start_with_error_done([=](const QString &error) {
+			) | rpl::on_error_done([=](const QString &error) {
 				box->uiShow()->showToast(error);
 				box->closeBox();
 			}, done);
@@ -1575,7 +1575,7 @@ void CreateGiveawayBox(
 			return done();
 		}
 		state->lifetimeApi = state->apiOptions.request(
-		) | rpl::start_with_error_done([=](const QString &error) {
+		) | rpl::on_error_done([=](const QString &error) {
 			box->uiShow()->showToast(error);
 			box->closeBox();
 		}, receivedOptions);
diff --git a/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/boost_badge.cpp b/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/boost_badge.cpp
index aea01c5924..625fe22142 100644
--- a/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/boost_badge.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/boost_badge.cpp
@@ -32,7 +32,7 @@ not_null<Ui::RpWidget*> InfiniteRadialAnimationWidget(
 		, _st(st ? st : &st::startGiveawayButtonLoading)
 		, _animation([=] { update(); }, *_st) {
 			resize(size, size);
-			shownValue() | rpl::start_with_next([=](bool v) {
+			shownValue() | rpl::on_next([=](bool v) {
 				return v
 					? _animation.start()
 					: _animation.stop(anim::type::instant);
@@ -61,7 +61,7 @@ void AddChildToWidgetCenter(
 		not_null<Ui::RpWidget*> parent,
 		not_null<Ui::RpWidget*> child) {
 	parent->sizeValue(
-	) | rpl::start_with_next([=](const QSize &s) {
+	) | rpl::on_next([=](const QSize &s) {
 		const auto size = child->size();
 		child->moveToLeft(
 			(s.width() - size.width()) / 2,
@@ -135,18 +135,18 @@ void AddLabelWithBadgeToButton(
 		st::startGiveawayButtonLabelSimple);
 	std::move(
 		text
-	) | rpl::start_with_next([=](const QString &s) {
+	) | rpl::on_next([=](const QString &s) {
 		label->setText(s);
 	}, label->lifetime());
 	const auto count = Ui::CreateChild<Ui::RpWidget>(parent.get());
 	count->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(count);
 		p.drawImage(0, 0, state->badge);
 	}, count->lifetime());
 	std::move(
 		number
-	) | rpl::start_with_next([=](int c) {
+	) | rpl::on_next([=](int c) {
 		state->badge = Info::Statistics::CreateBadge(
 			st::startGiveawayButtonTextStyle,
 			QString::number(c),
@@ -163,7 +163,7 @@ void AddLabelWithBadgeToButton(
 
 	std::move(
 		shown
-	) | rpl::start_with_next([=](bool shown) {
+	) | rpl::on_next([=](bool shown) {
 		count->setVisible(shown);
 		label->setVisible(shown);
 	}, count->lifetime());
@@ -172,7 +172,7 @@ void AddLabelWithBadgeToButton(
 		parent->sizeValue(),
 		label->sizeValue(),
 		count->sizeValue()
-	) | rpl::start_with_next([=](
+	) | rpl::on_next([=](
 			const QSize &s,
 			const QSize &s1,
 			const QSize &s2) {
diff --git a/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/giveaway_list_controllers.cpp b/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/giveaway_list_controllers.cpp
index 22c3680bd5..d060d7b9e8 100644
--- a/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/giveaway_list_controllers.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/giveaway_list_controllers.cpp
@@ -313,7 +313,7 @@ SelectedChannelsListController::SelectedChannelsListController(
 void SelectedChannelsListController::setTopStatus(rpl::producer<QString> s) {
 	_statusLifetime = std::move(
 		s
-	) | rpl::start_with_next([=](const QString &t) {
+	) | rpl::on_next([=](const QString &t) {
 		if (delegate()->peerListFullRowsCount() > 0) {
 			delegate()->peerListRowAt(0)->setCustomStatus(t);
 		}
diff --git a/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/giveaway_type_row.cpp b/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/giveaway_type_row.cpp
index 60c1814ab2..7aa3ade27a 100644
--- a/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/giveaway_type_row.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/giveaway_type_row.cpp
@@ -72,7 +72,7 @@ GiveawayTypeRow::GiveawayTypeRow(
 	}
 	std::move(
 		subtitle
-	) | rpl::start_with_next([=] (QString s) {
+	) | rpl::on_next([=] (QString s) {
 		_status.setText(
 			st::defaultTextStyle,
 			s.replace(QChar('>'), QString()),
@@ -80,7 +80,7 @@ GiveawayTypeRow::GiveawayTypeRow(
 	}, lifetime());
 	std::move(
 		title
-	) | rpl::start_with_next([=] (const QString &s) {
+	) | rpl::on_next([=] (const QString &s) {
 		_name.setText(_st.nameStyle, s, Ui::NameTextOptions());
 	}, lifetime());
 }
diff --git a/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/select_countries_box.cpp b/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/select_countries_box.cpp
index d9cb86645c..4f3ab0d3c6 100644
--- a/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/select_countries_box.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/select_countries_box.cpp
@@ -106,7 +106,7 @@ void SelectCountriesBox(
 			const auto radioSize = radioView->getSize();
 			radio->resize(radioSize);
 			radio->paintRequest(
-			) | rpl::start_with_next([=](const QRect &r) {
+			) | rpl::on_next([=](const QRect &r) {
 				auto p = QPainter(radio);
 				radioView->paint(p, 0, 0, radioSize.width());
 			}, radio->lifetime());
diff --git a/Telegram/SourceFiles/info/channel_statistics/boosts/info_boosts_inner_widget.cpp b/Telegram/SourceFiles/info/channel_statistics/boosts/info_boosts_inner_widget.cpp
index 14f22e85d4..c527b7690d 100644
--- a/Telegram/SourceFiles/info/channel_statistics/boosts/info_boosts_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/boosts/info_boosts_inner_widget.cpp
@@ -106,7 +106,7 @@ void FillOverview(
 		sub->setTextColorOverride(st::windowSubTextFg->c);
 
 		primary->geometryValue(
-		) | rpl::start_with_next([=](const QRect &g) {
+		) | rpl::on_next([=](const QRect &g) {
 			const auto &padding = st::statisticsOverviewSecondValuePadding;
 			second->moveToLeft(
 				rect::right(g) + padding.left(),
@@ -150,7 +150,7 @@ void FillOverview(
 	container->showChildren();
 	container->resize(container->width(), topLeftLabel->height() * 5);
 	container->sizeValue(
-	) | rpl::start_with_next([=](const QSize &s) {
+	) | rpl::on_next([=](const QSize &s) {
 		const auto halfWidth = s.width() / 2;
 		{
 			const auto &p = st::boostsOverviewValuePadding;
@@ -192,7 +192,7 @@ void FillShareLink(
 		st::boostsLinkFieldPadding);
 
 	label->clicks(
-	) | rpl::start_with_next(copyLink, label->lifetime());
+	) | rpl::on_next(copyLink, label->lifetime());
 	{
 		const auto wrap = content->add(
 			object_ptr<Ui::FixedHeightWidget>(
@@ -213,7 +213,7 @@ void FillShareLink(
 		share->setClickedCallback(shareLink);
 
 		wrap->widthValue(
-		) | rpl::start_with_next([=](int width) {
+		) | rpl::on_next([=](int width) {
 			const auto buttonWidth = (width - st::inviteLinkButtonsSkip) / 2;
 			copy->setFullWidth(buttonWidth);
 			share->setFullWidth(buttonWidth);
@@ -286,9 +286,9 @@ void InnerWidget::load() {
 		_showFinished.events());
 
 	_showFinished.events(
-	) | rpl::take(1) | rpl::start_with_next([=] {
+	) | rpl::take(1) | rpl::on_next([=] {
 		api->request(
-		) | rpl::start_with_error_done([](const QString &error) {
+		) | rpl::on_error_done([](const QString &error) {
 		}, [=] {
 			_state = api->boostStatus();
 			_loaded.fire(true);
@@ -464,7 +464,7 @@ void InnerWidget::fill() {
 			const auto shadow = Ui::CreateChild<Ui::PlainShadow>(inner);
 			shadow->show();
 			slider->geometryValue(
-			) | rpl::start_with_next([=](const QRect &r) {
+			) | rpl::on_next([=](const QRect &r) {
 				shadow->setGeometry(
 					inner->x(),
 					rect::bottom(r) - shadow->height(),
@@ -496,7 +496,7 @@ void InnerWidget::fill() {
 
 		rpl::single(hasOneTab ? (hasGifts ? 1 : 0) : 0) | rpl::then(
 			slider->entity()->sectionActivated()
-		) | rpl::start_with_next([=](int index) {
+		) | rpl::on_next([=](int index) {
 			boostsWrap->toggle(!index, anim::type::instant);
 			giftsWrap->toggle(index, anim::type::instant);
 		}, inner->lifetime());
diff --git a/Telegram/SourceFiles/info/channel_statistics/boosts/info_boosts_widget.cpp b/Telegram/SourceFiles/info/channel_statistics/boosts/info_boosts_widget.cpp
index 447897dff3..89d517bf21 100644
--- a/Telegram/SourceFiles/info/channel_statistics/boosts/info_boosts_widget.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/boosts/info_boosts_widget.cpp
@@ -56,10 +56,10 @@ Widget::Widget(
 		controller,
 		controller->statisticsTag().peer))) {
 	_inner->showRequests(
-	) | rpl::start_with_next([=](InnerWidget::ShowRequest request) {
+	) | rpl::on_next([=](InnerWidget::ShowRequest request) {
 	}, _inner->lifetime());
 	_inner->scrollToRequests(
-	) | rpl::start_with_next([=](const Ui::ScrollToRequest &request) {
+	) | rpl::on_next([=](const Ui::ScrollToRequest &request) {
 		scrollTo(request);
 	}, _inner->lifetime());
 }
diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.cpp b/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.cpp
index 681604aa0d..786a5b1ef8 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.cpp
@@ -112,7 +112,7 @@ void ShowMenu(not_null<Ui::GenericBox*> box, const QString &text) {
 			Core::App().iv().show(controller, iv, QString());
 		} else {
 			resolver->resolved(
-			) | rpl::start_with_next([=](const QString &s) {
+			) | rpl::on_next([=](const QString &s) {
 				if (s == url) {
 					if (const auto d = resolver->lookup(url)) {
 						if (const auto iv = (*d)->iv.get()) {
@@ -155,7 +155,7 @@ void AddRecipient(not_null<Ui::GenericBox*> box, const TextWithEntities &t) {
 	label->setTryMakeSimilarLines(true);
 	label->resizeToWidth(container->width());
 	label->sizeValue(
-	) | rpl::start_with_next([=](const QSize &s) {
+	) | rpl::on_next([=](const QSize &s) {
 		const auto padding = QMargins(
 			st::chatGiveawayPeerPadding.right(),
 			st::chatGiveawayPeerPadding.top(),
@@ -246,7 +246,7 @@ void InnerWidget::load() {
 		state->apiCreditsLifetime.destroy();
 
 		_peer->session().account().mtpUpdates(
-		) | rpl::start_with_next([=, peerId = _peer->id](
+		) | rpl::on_next([=, peerId = _peer->id](
 				const MTPUpdates &updates) {
 			using TLCreditsUpdate = MTPDupdateStarsRevenueStatus;
 			using TLNotificationUpdate = MTPDupdateServiceNotification;
@@ -307,17 +307,17 @@ void InnerWidget::load() {
 	};
 
 	_showFinished.events(
-	) | rpl::take(1) | rpl::start_with_next([=] {
+	) | rpl::take(1) | rpl::on_next([=] {
 		const auto nextRequests = [=] {
 			state->apiCreditsHistory.request({}, [=](
 					const Data::CreditsStatusSlice &data) {
 				_state.creditsStatusSlice = data;
 				::Api::PremiumPeerBot(
 					&_peer->session()
-				) | rpl::start_with_next([=](not_null<PeerData*> bot) {
+				) | rpl::on_next([=](not_null<PeerData*> bot) {
 					_state.premiumBotId = bot->id;
 					state->apiCredits.request(
-					) | rpl::start_with_error_done([=](const QString &error) {
+					) | rpl::on_error_done([=](const QString &error) {
 						if (canViewCredits) {
 							fail(error);
 						} else {
@@ -334,7 +334,7 @@ void InnerWidget::load() {
 		};
 		const auto isMegagroup = _peer->isMegagroup();
 		state->api.request(
-		) | rpl::start_with_error_done([=](const QString &error) {
+		) | rpl::on_error_done([=](const QString &error) {
 			if (isMegagroup) {
 				_state.currencyEarn = {};
 				if (error == u"BROADCAST_REQUIRED"_q) {
@@ -452,7 +452,7 @@ void InnerWidget::fill() {
 						std::move(owned),
 						style::al_top);
 					widget->paintRequest(
-					) | rpl::start_with_next([=] {
+					) | rpl::on_next([=] {
 						auto p = Painter(widget);
 						auto hq = PainterHighQualityEnabler(p);
 						p.setPen(Qt::NoPen);
@@ -500,13 +500,13 @@ void InnerWidget::fill() {
 						const auto left = Ui::CreateChild<Ui::RpWidget>(
 							box->verticalLayout().get());
 						left->paintRequest(
-						) | rpl::start_with_next([=] {
+						) | rpl::on_next([=] {
 							auto p = Painter(left);
 							icon.paint(p, 0, 0, left->width());
 						}, left->lifetime());
 						left->resize(icon.size());
 						top->geometryValue(
-						) | rpl::start_with_next([=](const QRect &g) {
+						) | rpl::on_next([=](const QRect &g) {
 							left->moveToLeft(
 								(g.left() - left->width()) / 2,
 								g.top() + st::channelEarnHistoryThreeSkip);
@@ -734,7 +734,7 @@ void InnerWidget::fill() {
 				majorLabel->sizeValue(),
 				creditsLabel->sizeValue(),
 				std::move(creditsValue)
-			) | rpl::start_with_next([=](
+			) | rpl::on_next([=](
 					int available,
 					const QSize &size,
 					const QSize &creditsSize,
@@ -853,7 +853,7 @@ void InnerWidget::fill() {
 		rpl::combine(
 			majorLabel->sizeValue(),
 			minorLabel->sizeValue()
-		) | rpl::start_with_next([=](
+		) | rpl::on_next([=](
 				const QSize &majorSize,
 				const QSize &minorSize) {
 			labels->resize(
@@ -896,7 +896,7 @@ void InnerWidget::fill() {
 		rpl::combine(
 			button->sizeValue(),
 			label->sizeValue()
-		) | rpl::start_with_next([=](const QSize &b, const QSize &l) {
+		) | rpl::on_next([=](const QSize &b, const QSize &l) {
 			label->moveToLeft(
 				(b.width() - l.width()) / 2,
 				(b.height() - l.height()) / 2);
@@ -1048,7 +1048,7 @@ void InnerWidget::fill() {
 
 		rpl::single(slider->entity()->activeSection()) | rpl::then(
 			slider->entity()->sectionActivated()
-		) | rpl::start_with_next([=](int index) {
+		) | rpl::on_next([=](int index) {
 			if (index == 0) {
 				tabCurrencyList->toggle(true, anim::type::instant);
 				tabCreditsList->toggle(false, anim::type::instant);
@@ -1176,7 +1176,7 @@ void InnerWidget::fill() {
 					rpl::combine(
 						majorLabel->sizeValue(),
 						minorLabel->sizeValue()
-					) | rpl::start_with_next([=](
+					) | rpl::on_next([=](
 							const QSize &majorSize,
 							const QSize &minorSize) {
 						labels->resize(
@@ -1263,7 +1263,7 @@ void InnerWidget::fill() {
 					_show->showBox(Box(detailsBox));
 				});
 				wrap->geometryValue(
-				) | rpl::start_with_next([=](const QRect &g) {
+				) | rpl::on_next([=](const QRect &g) {
 					const auto &padding = st::boxRowPadding;
 					const auto majorTop = (g.height() - majorLabel->height())
 						/ 2;
@@ -1377,7 +1377,7 @@ void InnerWidget::fill() {
 		object_ptr<Ui::VerticalLayout>(container));
 	rpl::single(rpl::empty) | rpl::then(
 		_stateUpdated.events()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto listsContainer = historyContainer->add(
 			object_ptr<Ui::VerticalLayout>(container));
 		rebuildLists(_state, listsContainer, historyDividerContainer);
@@ -1415,7 +1415,7 @@ void InnerWidget::fill() {
 		button->setToggleLocked(isLocked);
 
 		button->toggledChanges(
-		) | rpl::start_with_next([=](bool value) {
+		) | rpl::on_next([=](bool value) {
 			if (isLocked && value) {
 				toggled->fire(false);
 				CheckBoostLevel(
@@ -1499,7 +1499,7 @@ void AddEmojiToMajor(
 		: TextWithEntities::Simple((*isIn) ? QChar('+') : kMinus);
 	std::move(
 		value
-	) | rpl::start_with_next([=](CreditsAmount v) {
+	) | rpl::on_next([=](CreditsAmount v) {
 		auto helper = Ui::Text::CustomEmojiHelper();
 		auto icon = helper.paletteDependent({ .factory = [=] {
 			return Ui::Earn::IconCurrencyColored(
diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_widget.cpp b/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_widget.cpp
index 99424a19dd..20bf8b0181 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_widget.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_widget.cpp
@@ -56,10 +56,10 @@ Widget::Widget(
 		controller,
 		controller->statisticsTag().peer))) {
 	_inner->showRequests(
-	) | rpl::start_with_next([=](InnerWidget::ShowRequest request) {
+	) | rpl::on_next([=](InnerWidget::ShowRequest request) {
 	}, _inner->lifetime());
 	_inner->scrollToRequests(
-	) | rpl::start_with_next([=](const Ui::ScrollToRequest &request) {
+	) | rpl::on_next([=](const Ui::ScrollToRequest &request) {
 		scrollTo(request);
 	}, _inner->lifetime());
 }
diff --git a/Telegram/SourceFiles/info/common_groups/info_common_groups_inner_widget.cpp b/Telegram/SourceFiles/info/common_groups/info_common_groups_inner_widget.cpp
index cd5fe0b2e2..4d79306ade 100644
--- a/Telegram/SourceFiles/info/common_groups/info_common_groups_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/common_groups/info_common_groups_inner_widget.cpp
@@ -204,7 +204,7 @@ InnerWidget::InnerWidget(
 	_listController->setDelegate(static_cast<PeerListDelegate*>(this));
 
 	_controller->searchFieldController()->queryValue(
-	) | rpl::start_with_next([this](QString &&query) {
+	) | rpl::on_next([this](QString &&query) {
 		peerListScrollToTop();
 		content()->searchQueryChanged(std::move(query));
 	}, lifetime());
@@ -244,7 +244,7 @@ object_ptr<InnerWidget::ListWidget> InnerWidget::setupList(
 		parent,
 		controller);
 	result->scrollToRequests(
-	) | rpl::start_with_next([this](Ui::ScrollToRequest request) {
+	) | rpl::on_next([this](Ui::ScrollToRequest request) {
 		auto addmin = (request.ymin < 0)
 			? 0
 			: st::infoCommonGroupsMargin.top();
@@ -257,11 +257,11 @@ object_ptr<InnerWidget::ListWidget> InnerWidget::setupList(
 	}, result->lifetime());
 	result->moveToLeft(0, st::infoCommonGroupsMargin.top());
 	parent->widthValue(
-	) | rpl::start_with_next([list = result.data()](int newWidth) {
+	) | rpl::on_next([list = result.data()](int newWidth) {
 		list->resizeToWidth(newWidth);
 	}, result->lifetime());
 	result->heightValue(
-	) | rpl::start_with_next([parent](int listHeight) {
+	) | rpl::on_next([parent](int listHeight) {
 		auto newHeight = st::infoCommonGroupsMargin.top()
 			+ listHeight
 			+ st::infoCommonGroupsMargin.bottom();
diff --git a/Telegram/SourceFiles/info/downloads/info_downloads_inner_widget.cpp b/Telegram/SourceFiles/info/downloads/info_downloads_inner_widget.cpp
index 411dfafc8a..6320be4c78 100644
--- a/Telegram/SourceFiles/info/downloads/info_downloads_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/downloads/info_downloads_inner_widget.cpp
@@ -43,7 +43,7 @@ EmptyWidget::EmptyWidget(QWidget *parent)
 void EmptyWidget::setFullHeight(rpl::producer<int> fullHeightValue) {
 	std::move(
 		fullHeightValue
-	) | rpl::start_with_next([this](int fullHeight) {
+	) | rpl::on_next([this](int fullHeight) {
 		// Make icon center be on 1/3 height.
 		auto iconCenter = fullHeight / 3;
 		auto iconHeight = st::infoEmptyFile.height();
@@ -87,7 +87,7 @@ InnerWidget::InnerWidget(
 , _controller(controller)
 , _empty(this) {
 	_empty->heightValue(
-	) | rpl::start_with_next(
+	) | rpl::on_next(
 		[this] { refreshHeight(); },
 		_empty->lifetime());
 	_list = setupList();
@@ -110,7 +110,7 @@ bool InnerWidget::showInternal(not_null<Memento*> memento) {
 object_ptr<Media::ListWidget> InnerWidget::setupList() {
 	auto result = object_ptr<Media::ListWidget>(this, _controller);
 	result->heightValue(
-	) | rpl::start_with_next(
+	) | rpl::on_next(
 		[this] { refreshHeight(); },
 		result->lifetime());
 	using namespace rpl::mappers;
@@ -126,7 +126,7 @@ object_ptr<Media::ListWidget> InnerWidget::setupList() {
 	_selectedLists.fire(result->selectedListValue());
 	_listTops.fire(result->topValue());
 	_controller->searchQueryValue(
-	) | rpl::start_with_next([this](const QString &query) {
+	) | rpl::on_next([this](const QString &query) {
 		_empty->setSearchQuery(query);
 	}, result->lifetime());
 	return result;
diff --git a/Telegram/SourceFiles/info/downloads/info_downloads_provider.cpp b/Telegram/SourceFiles/info/downloads/info_downloads_provider.cpp
index b9a8149267..974960755c 100644
--- a/Telegram/SourceFiles/info/downloads/info_downloads_provider.cpp
+++ b/Telegram/SourceFiles/info/downloads/info_downloads_provider.cpp
@@ -38,7 +38,7 @@ Provider::Provider(not_null<AbstractController*> controller)
 : _controller(controller)
 , _storiesAddToAlbumId(_controller->storiesAddToAlbumId()) {
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		for (auto &layout : _layouts) {
 			layout.second.item->invalidateCache();
 		}
@@ -123,7 +123,7 @@ void Provider::refreshViewer() {
 	auto &manager = Core::App().downloadManager();
 	rpl::single(rpl::empty) | rpl::then(
 		manager.loadingListChanges() | rpl::to_empty
-	) | rpl::start_with_next([=, &manager] {
+	) | rpl::on_next([=, &manager] {
 		auto copy = _downloading;
 		for (const auto id : manager.loadingList()) {
 			if (!id->done) {
@@ -154,12 +154,12 @@ void Provider::refreshViewer() {
 	}
 
 	manager.loadedAdded(
-	) | rpl::start_with_next([=](not_null<const Data::DownloadedId*> entry) {
+	) | rpl::on_next([=](not_null<const Data::DownloadedId*> entry) {
 		addPostponed(entry);
 	}, _lifetime);
 
 	manager.loadedRemoved(
-	) | rpl::start_with_next([=](not_null<const HistoryItem*> item) {
+	) | rpl::on_next([=](not_null<const HistoryItem*> item) {
 		if (!_downloading.contains(item)) {
 			remove(item);
 		} else {
@@ -171,7 +171,7 @@ void Provider::refreshViewer() {
 	}, _lifetime);
 
 	manager.loadedResolveDone(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (!_fullCount.has_value()) {
 			_fullCount = 0;
 		}
@@ -283,12 +283,12 @@ void Provider::trackItemSession(not_null<const HistoryItem*> item) {
 	auto &lifetime = _trackedSessions.emplace(session).first->second;
 
 	session->data().itemRemoved(
-	) | rpl::start_with_next([this](auto item) {
+	) | rpl::on_next([this](auto item) {
 		itemRemoved(item);
 	}, lifetime);
 
 	session->account().sessionChanges(
-	) | rpl::take(1) | rpl::start_with_next([=] {
+	) | rpl::take(1) | rpl::on_next([=] {
 		_trackedSessions.remove(session);
 	}, lifetime);
 }
diff --git a/Telegram/SourceFiles/info/downloads/info_downloads_widget.cpp b/Telegram/SourceFiles/info/downloads/info_downloads_widget.cpp
index 92f7e19754..553a2953b6 100644
--- a/Telegram/SourceFiles/info/downloads/info_downloads_widget.cpp
+++ b/Telegram/SourceFiles/info/downloads/info_downloads_widget.cpp
@@ -59,7 +59,7 @@ Widget::Widget(
 		controller));
 	_inner->setScrollHeightValue(scrollHeightValue());
 	_inner->scrollToRequests(
-	) | rpl::start_with_next([this](Ui::ScrollToRequest request) {
+	) | rpl::on_next([this](Ui::ScrollToRequest request) {
 		scrollTo(request);
 	}, _inner->lifetime());
 }
diff --git a/Telegram/SourceFiles/info/global_media/info_global_media_inner_widget.cpp b/Telegram/SourceFiles/info/global_media/info_global_media_inner_widget.cpp
index f3e0cad5d7..eac6b76d65 100644
--- a/Telegram/SourceFiles/info/global_media/info_global_media_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/global_media/info_global_media_inner_widget.cpp
@@ -27,7 +27,7 @@ InnerWidget::InnerWidget(
 , _empty(this) {
 	_empty->setType(type());
 	_empty->heightValue(
-	) | rpl::start_with_next(
+	) | rpl::on_next(
 		[this] { refreshHeight(); },
 		_empty->lifetime());
 	_list = setupList();
@@ -38,7 +38,7 @@ object_ptr<Media::ListWidget> InnerWidget::setupList() {
 
 	// Setup list widget connections
 	result->heightValue(
-	) | rpl::start_with_next([this] {
+	) | rpl::on_next([this] {
 		refreshHeight();
 	}, result->lifetime());
 
@@ -54,7 +54,7 @@ object_ptr<Media::ListWidget> InnerWidget::setupList() {
 		result->lifetime());
 
 	_controller->searchQueryValue(
-	) | rpl::start_with_next([this](const QString &query) {
+	) | rpl::on_next([this](const QString &query) {
 		_empty->setSearchQuery(query);
 	}, result->lifetime());
 
diff --git a/Telegram/SourceFiles/info/global_media/info_global_media_provider.cpp b/Telegram/SourceFiles/info/global_media/info_global_media_provider.cpp
index 9f73f58598..debc99aaed 100644
--- a/Telegram/SourceFiles/info/global_media/info_global_media_provider.cpp
+++ b/Telegram/SourceFiles/info/global_media/info_global_media_provider.cpp
@@ -111,12 +111,12 @@ Provider::Provider(not_null<AbstractController*> controller)
 , _type(_controller->section().mediaType())
 , _slice(sliceKey(_aroundId)) {
 	_controller->session().data().itemRemoved(
-	) | rpl::start_with_next([this](auto item) {
+	) | rpl::on_next([this](auto item) {
 		itemRemoved(item);
 	}, _lifetime);
 
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		for (auto &layout : _layouts) {
 			layout.second.item->invalidateCache();
 		}
@@ -341,7 +341,7 @@ void Provider::refreshViewer() {
 			_idsLimit,
 			_idsLimit);
 	}) | rpl::flatten_latest(
-	) | rpl::start_with_next([=](GlobalMediaSlice &&slice) {
+	) | rpl::on_next([=](GlobalMediaSlice &&slice) {
 		if (!slice.fullCount()) {
 			// Don't display anything while full count is unknown.
 			return;
diff --git a/Telegram/SourceFiles/info/global_media/info_global_media_widget.cpp b/Telegram/SourceFiles/info/global_media/info_global_media_widget.cpp
index 69787fbd95..4e75d0fb47 100644
--- a/Telegram/SourceFiles/info/global_media/info_global_media_widget.cpp
+++ b/Telegram/SourceFiles/info/global_media/info_global_media_widget.cpp
@@ -58,7 +58,7 @@ Widget::Widget(QWidget *parent, not_null<Controller*> controller)
 		controller));
 	_inner->setScrollHeightValue(scrollHeightValue());
 	_inner->scrollToRequests(
-	) | rpl::start_with_next([this](Ui::ScrollToRequest request) {
+	) | rpl::on_next([this](Ui::ScrollToRequest request) {
 		scrollTo(request);
 	}, _inner->lifetime());
 }
diff --git a/Telegram/SourceFiles/info/info_content_widget.cpp b/Telegram/SourceFiles/info/info_content_widget.cpp
index 0025ffb999..de6dad657d 100644
--- a/Telegram/SourceFiles/info/info_content_widget.cpp
+++ b/Telegram/SourceFiles/info/info_content_widget.cpp
@@ -85,7 +85,7 @@ ContentWidget::ContentWidget(
 
 	setAttribute(Qt::WA_OpaquePaintEvent);
 	_controller->wrapValue(
-	) | rpl::start_with_next([this](Wrap value) {
+	) | rpl::on_next([this](Wrap value) {
 		if (value != Wrap::Layer) {
 			applyAdditionalScroll(0);
 		}
@@ -100,14 +100,14 @@ ContentWidget::ContentWidget(
 			_controller->searchEnabledByContent(),
 			(_1 == Wrap::Layer) && _2
 		) | rpl::distinct_until_changed(
-		) | rpl::start_with_next([this](bool shown) {
+		) | rpl::on_next([this](bool shown) {
 			refreshSearchField(shown);
 		}, lifetime());
 	}
 	rpl::merge(
 		_scrollTopSkip.changes(),
 		_scrollBottomSkip.changes()
-	) | rpl::start_with_next([this] {
+	) | rpl::on_next([this] {
 		updateControlsGeometry();
 	}, lifetime());
 }
@@ -202,7 +202,7 @@ Ui::RpWidget *ContentWidget::doSetInnerWidget(
 		_scroll->scrollTopValue(),
 		_scroll->heightValue(),
 		_innerWrap->entity()->desiredHeightValue()
-	) | rpl::start_with_next([this](
+	) | rpl::on_next([this](
 			int top,
 			int height,
 			int desired) {
@@ -216,7 +216,7 @@ Ui::RpWidget *ContentWidget::doSetInnerWidget(
 		_scroll->heightValue(),
 		_innerWrap->entity()->heightValue(),
 		_controller->wrapValue()
-	) | rpl::start_with_next([=](
+	) | rpl::on_next([=](
 			int scrollHeight,
 			int innerHeight,
 			Wrap wrap) {
@@ -241,7 +241,7 @@ Ui::RpWidget *ContentWidget::doSetupFlexibleInnerWidget(
 	filler->resize(1, 1);
 
 	flexibleScroll.contentHeightValue.events(
-	) | rpl::start_with_next([=](int h) {
+	) | rpl::on_next([=](int h) {
 		filler->resize(filler->width(), h);
 	}, filler->lifetime());
 
@@ -412,7 +412,7 @@ void ContentWidget::setViewport(
 		rpl::producer<not_null<QEvent*>> &&events) const {
 	std::move(
 		events
-	) | rpl::start_with_next([=](not_null<QEvent*> e) {
+	) | rpl::on_next([=](not_null<QEvent*> e) {
 		_scroll->viewportEvent(e);
 	}, _scroll->lifetime());
 }
@@ -437,7 +437,7 @@ void ContentWidget::refreshSearchField(bool shown) {
 
 		const auto view = _searchWrap.get();
 		widthValue(
-		) | rpl::start_with_next([=](int newWidth) {
+		) | rpl::on_next([=](int newWidth) {
 			view->resizeToWidth(newWidth);
 			view->moveToLeft(0, 0);
 		}, view->lifetime());
@@ -578,7 +578,7 @@ ContentMemento::ContentMemento(
 , _sublist(sublist) {
 	if (_topic) {
 		_peer->owner().itemIdChanged(
-		) | rpl::start_with_next([=](const Data::Session::IdChange &change) {
+		) | rpl::on_next([=](const Data::Session::IdChange &change) {
 			if (_topic->rootId() == change.oldId) {
 				_topic = _topic->forum()->topicFor(change.newId.msg);
 			}
diff --git a/Telegram/SourceFiles/info/info_controller.cpp b/Telegram/SourceFiles/info/info_controller.cpp
index 19b520f95a..b60b739454 100644
--- a/Telegram/SourceFiles/info/info_controller.cpp
+++ b/Telegram/SourceFiles/info/info_controller.cpp
@@ -350,7 +350,7 @@ void Controller::setupMigrationViewer() {
 		Data::PeerUpdate::Flag::Migration
 	) | rpl::filter([=] {
 		return peer->migrateTo() || (peer->migrateFrom() != _migrated);
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		replaceWith(std::make_shared<Memento>(peer, _section));
 	}, lifetime());
 }
@@ -371,7 +371,7 @@ void Controller::replaceWith(std::shared_ptr<Memento> memento) {
 
 void Controller::setupTopicViewer() {
 	session().data().itemIdChanged(
-	) | rpl::start_with_next([=](const Data::Session::IdChange &change) {
+	) | rpl::on_next([=](const Data::Session::IdChange &change) {
 		if (const auto topic = _key.topic()) {
 			if (topic->rootId() == change.oldId
 				|| (topic->peer()->id == change.newId.peer
@@ -453,7 +453,7 @@ void Controller::updateSearchControllers(
 				searchQuery);
 		if (_searchController) {
 			_searchFieldController->queryValue(
-			) | rpl::start_with_next([=](QString &&query) {
+			) | rpl::on_next([=](QString &&query) {
 				_searchController->setQuery(
 					produceSearchQuery(std::move(query)));
 			}, _searchFieldController->lifetime());
diff --git a/Telegram/SourceFiles/info/info_flexible_scroll.cpp b/Telegram/SourceFiles/info/info_flexible_scroll.cpp
index 547353bf1e..24255dae5a 100644
--- a/Telegram/SourceFiles/info/info_flexible_scroll.cpp
+++ b/Telegram/SourceFiles/info/info_flexible_scroll.cpp
@@ -83,7 +83,7 @@ void FlexibleScrollHelper::setupScrollHandling() {
 	rpl::combine(
 		_pinnedToTop->heightValue(),
 		_inner->heightValue()
-	) | rpl::start_with_next([=](int, int h) {
+	) | rpl::on_next([=](int, int h) {
 		_data.contentHeightValue.fire(h + heightDiff());
 	}, _pinnedToTop->lifetime());
 
@@ -99,7 +99,7 @@ void FlexibleScrollHelper::setupScrollHandling() {
 	_scrollTopPrevious = _scroll->scrollTop();
 
 	_scroll->scrollTopValue(
-	) | rpl::start_with_next([=](int top) {
+	) | rpl::on_next([=](int top) {
 		if (_applyingFakeScrollState) {
 			return;
 		}
@@ -198,7 +198,7 @@ void FlexibleScrollHelper::setupScrollHandling() {
 	}, _inner->lifetime());
 
 	_data.fillerWidthValue.events(
-	) | rpl::start_with_next([=](int w) {
+	) | rpl::on_next([=](int w) {
 		_inner->resizeToWidth(w);
 	}, _inner->lifetime());
 
@@ -213,7 +213,7 @@ void FlexibleScrollHelper::setupScrollHandlingWithFilter() {
 	rpl::combine(
 		_pinnedToTop->heightValue(),
 		_inner->heightValue()
-	) | rpl::start_with_next([=](int, int h) {
+	) | rpl::on_next([=](int, int h) {
 		const auto max = _pinnedToTop->maximumHeight();
 		const auto min = _pinnedToTop->minimumHeight();
 		const auto diff = max - min;
@@ -325,12 +325,12 @@ void FlexibleScrollHelper::setupScrollHandlingWithFilter() {
 		return base::EventFilterResult::Cancel;
 	}, _filterLifetime);
 
-	_scroll->scrollTopValue() | rpl::start_with_next([=](int top) {
+	_scroll->scrollTopValue() | rpl::on_next([=](int top) {
 		applyScrollToPinnedLayout(top);
 	}, _inner->lifetime());
 
 	_data.fillerWidthValue.events(
-	) | rpl::start_with_next([=](int w) {
+	) | rpl::on_next([=](int w) {
 		_inner->resizeToWidth(w);
 	}, _inner->lifetime());
 
diff --git a/Telegram/SourceFiles/info/info_layer_widget.cpp b/Telegram/SourceFiles/info/info_layer_widget.cpp
index 3404cf932c..845ab1b778 100644
--- a/Telegram/SourceFiles/info/info_layer_widget.cpp
+++ b/Telegram/SourceFiles/info/info_layer_widget.cpp
@@ -96,12 +96,12 @@ void LayerWidget::setupHeightConsumers() {
 		}
 		_pendingResize = true;
 		return false;
-	}) | rpl::start_with_next([this] {
+	}) | rpl::on_next([this] {
 		resizeToWidth(width());
 	}, lifetime());
 
 	_contentWrap->grabbingForExpanding(
-	) | rpl::start_with_next([=](bool grabbing) {
+	) | rpl::on_next([=](bool grabbing) {
 		if (grabbing) {
 			_savedHeight = _contentWrapHeight;
 			_savedHeightAnimation = base::take(_heightAnimation);
@@ -113,7 +113,7 @@ void LayerWidget::setupHeightConsumers() {
 	}, lifetime());
 
 	_contentWrap->desiredHeightValue(
-	) | rpl::start_with_next([this](int height) {
+	) | rpl::on_next([this](int height) {
 		if (!height) {
 			// New content arrived.
 			_heightAnimated = _heightAnimation.animating();
diff --git a/Telegram/SourceFiles/info/info_memento.cpp b/Telegram/SourceFiles/info/info_memento.cpp
index 48d883590b..51be6a159b 100644
--- a/Telegram/SourceFiles/info/info_memento.cpp
+++ b/Telegram/SourceFiles/info/info_memento.cpp
@@ -85,7 +85,7 @@ Memento::Memento(std::vector<std::shared_ptr<ContentMemento>> stack)
 	}
 	for (const auto &topic : topics) {
 		topic->destroyed(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			for (auto i = begin(_stack); i != end(_stack);) {
 				if (i->get()->topic() == topic) {
 					i = _stack.erase(i);
@@ -100,7 +100,7 @@ Memento::Memento(std::vector<std::shared_ptr<ContentMemento>> stack)
 	}
 	for (const auto &sublist : sublists) {
 		sublist->destroyed(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			for (auto i = begin(_stack); i != end(_stack);) {
 				if (i->get()->sublist() == sublist) {
 					i = _stack.erase(i);
diff --git a/Telegram/SourceFiles/info/info_section_widget.cpp b/Telegram/SourceFiles/info/info_section_widget.cpp
index 0a7b7da678..fe7687a041 100644
--- a/Telegram/SourceFiles/info/info_section_widget.cpp
+++ b/Telegram/SourceFiles/info/info_section_widget.cpp
@@ -48,7 +48,7 @@ void SectionWidget::init() {
 		_content->desiredHeightValue()
 	) | rpl::filter([=] {
 		return (_content != nullptr);
-	}) | rpl::start_with_next([=](QSize size, int) {
+	}) | rpl::on_next([=](QSize size, int) {
 		const auto expanding = false;
 		const auto full = !_content->scrollBottomSkip();
 		const auto additionalScroll = (full ? st::boxRadius : 0);
@@ -67,7 +67,7 @@ void SectionWidget::init() {
 		controller()->adaptive().oneColumnValue());
 
 	_content->contentChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_connecting->raise();
 	}, _connecting->lifetime());
 }
diff --git a/Telegram/SourceFiles/info/info_top_bar.cpp b/Telegram/SourceFiles/info/info_top_bar.cpp
index af7006b382..3ebf9a613b 100644
--- a/Telegram/SourceFiles/info/info_top_bar.cpp
+++ b/Telegram/SourceFiles/info/info_top_bar.cpp
@@ -188,7 +188,7 @@ Ui::FadeWrap<Ui::RpWidget> *TopBar::pushButton(
 		!selectionMode() && !_searchModeEnabled,
 		anim::type::instant);
 	weak->widthValue(
-	) | rpl::start_with_next([this] {
+	) | rpl::on_next([this] {
 		updateControlsGeometry(width());
 	}, lifetime());
 	return weak;
@@ -257,7 +257,7 @@ void TopBar::createSearchView(
 			*focusLifetime = field->shownValue()
 				| rpl::filter([](bool shown) { return shown; })
 				| rpl::take(1)
-				| rpl::start_with_next([=] { field->setFocus(); });
+				| rpl::on_next([=] { field->setFocus(); });
 		} else {
 			focusLifetime->destroy();
 		}
@@ -290,7 +290,7 @@ void TopBar::createSearchView(
 	});
 
 	wrap->widthValue(
-	) | rpl::start_with_next([=](int newWidth) {
+	) | rpl::on_next([=](int newWidth) {
 		auto availableWidth = newWidth
 			- _st.searchRow.fieldCancelSkip;
 		fieldWrap->resizeToWidth(availableWidth);
@@ -301,7 +301,7 @@ void TopBar::createSearchView(
 	}, wrap->lifetime());
 
 	widthValue(
-	) | rpl::start_with_next([=](int newWidth) {
+	) | rpl::on_next([=](int newWidth) {
 		auto left = _back
 			? _st.back.width
 			: _st.titlePosition.x();
@@ -314,7 +314,7 @@ void TopBar::createSearchView(
 	}, wrap->lifetime());
 
 	field->alive(
-	) | rpl::start_with_done([=] {
+	) | rpl::on_done([=] {
 		field->setParent(nullptr);
 		removeButton(search);
 		clearSearchField();
@@ -325,7 +325,7 @@ void TopBar::createSearchView(
 
 	std::move(
 		shown
-	) | rpl::start_with_next([=](bool visible) {
+	) | rpl::on_next([=](bool visible) {
 		auto alreadyInSearch = !field->getLastText().isEmpty();
 		_searchModeAvailable = visible || alreadyInSearch;
 		updateControlsVisibility(anim::type::instant);
@@ -534,7 +534,7 @@ void TopBar::setStories(rpl::producer<Dialogs::Stories::Content> content) {
 		stories->setAttribute(Qt::WA_TransparentForMouseEvents);
 		label->setAttribute(Qt::WA_TransparentForMouseEvents);
 		stories->geometryValue(
-		) | rpl::start_with_next([=](QRect geometry) {
+		) | rpl::on_next([=](QRect geometry) {
 			const auto skip = _st.title.style.font->spacew;
 			label->move(
 				geometry.x() + geometry.width() + skip,
@@ -543,7 +543,7 @@ void TopBar::setStories(rpl::producer<Dialogs::Stories::Content> content) {
 		rpl::combine(
 			_storiesWrap->positionValue(),
 			label->geometryValue()
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			button->resize(
 				label->x() + label->width() + _st.titlePosition.x(),
 				_st.height);
@@ -559,7 +559,7 @@ void TopBar::setStories(rpl::producer<Dialogs::Stories::Content> content) {
 
 		rpl::duplicate(
 			last
-		) | rpl::start_with_next([=](const Content &content) {
+		) | rpl::on_next([=](const Content &content) {
 			const auto count = content.total;
 			if (_storiesCount != count) {
 				const auto was = (_storiesCount > 0);
@@ -681,7 +681,7 @@ void TopBar::createSelectionControls() {
 	_selectionText->setDuration(st::infoTopBarDuration);
 	_selectionText->entity()->resize(0, _st.height);
 	_selectionText->naturalWidthValue(
-	) | rpl::skip(1) | rpl::start_with_next([=] {
+	) | rpl::skip(1) | rpl::on_next([=] {
 		updateSelectionControlsGeometry(width());
 	}, _selectionText->lifetime());
 
diff --git a/Telegram/SourceFiles/info/info_wrap_widget.cpp b/Telegram/SourceFiles/info/info_wrap_widget.cpp
index da9f5178bd..4a59252659 100644
--- a/Telegram/SourceFiles/info/info_wrap_widget.cpp
+++ b/Telegram/SourceFiles/info/info_wrap_widget.cpp
@@ -129,12 +129,12 @@ WrapWidget::WrapWidget(
 		) | rpl::flatten_latest() | rpl::distinct_until_changed());
 
 	_wrap.changes(
-	) | rpl::start_with_next([this] {
+	) | rpl::on_next([this] {
 		setupTop();
 		finishShowContent();
 	}, lifetime());
 	selectedListValue(
-	) | rpl::start_with_next([this](SelectedItems &&items) {
+	) | rpl::on_next([this](SelectedItems &&items) {
 		InvokeQueued(this, [this, items = std::move(items)]() mutable {
 			if (_topBar) {
 				_topBar->setSelectedItems(std::move(items));
@@ -145,7 +145,7 @@ WrapWidget::WrapWidget(
 
 	if (const auto topic = _controller->topic()) {
 		topic->destroyed(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			if (_wrap.current() == Wrap::Layer) {
 				_controller->parentController()->hideSpecialLayer();
 			} else if (_wrap.current() == Wrap::Narrow) {
@@ -166,7 +166,7 @@ void WrapWidget::setupShortcuts() {
 		return requireTopBarSearch()
 			&& (Core::App().activeWindow()
 				== &_controller->parentController()->window());
-	}) | rpl::start_with_next([=](not_null<Shortcuts::Request*> request) {
+	}) | rpl::on_next([=](not_null<Shortcuts::Request*> request) {
 		using Command = Shortcuts::Command;
 		request->check(Command::Search) && request->handle([=] {
 			_topBar->showSearch();
@@ -205,7 +205,7 @@ void WrapWidget::startInjectingActivePeerProfiles() {
 		(_1 == Wrap::Side) && _2
 	) | rpl::map(
 		_2
-	) | rpl::start_with_next([this](Dialogs::Key key) {
+	) | rpl::on_next([this](Dialogs::Key key) {
 		injectActiveProfile(key);
 	}, lifetime());
 
@@ -346,14 +346,14 @@ void WrapWidget::createTopBar() {
 		TopBarStyle(wrapValue),
 		std::move(selectedItems));
 	_topBar->selectionActionRequests(
-	) | rpl::start_with_next([=](SelectionAction action) {
+	) | rpl::on_next([=](SelectionAction action) {
 		_content->selectionAction(action);
 	}, _topBar->lifetime());
 
 	if (hasBackButton()) {
 		_topBar->enableBackButton();
 		_topBar->backRequest(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			checkBeforeClose([=] { _controller->showBackFromStack(); });
 		}, _topBar->lifetime());
 	} else if (wrapValue == Wrap::Side) {
@@ -365,7 +365,7 @@ void WrapWidget::createTopBar() {
 			_controller->parentController()->closeThirdSection();
 		});
 	}
-	_topBar->storyClicks() | rpl::start_with_next([=] {
+	_topBar->storyClicks() | rpl::on_next([=] {
 		if (const auto peer = _controller->key().peer()) {
 			_controller->parentController()->openPeerStories(peer->id);
 		}
@@ -443,7 +443,7 @@ void WrapWidget::setupTopBarMenuToggle() {
 			manager.loadingListChanges() | rpl::map_to(false),
 			manager.loadedAdded() | rpl::map_to(true),
 			manager.loadedRemoved() | rpl::map_to(false)
-		) | rpl::start_with_next([=, &manager](bool definitelyHas) {
+		) | rpl::on_next([=, &manager](bool definitelyHas) {
 			const auto has = [&] {
 				for ([[maybe_unused]] const auto id : manager.loadingList()) {
 					return true;
@@ -510,7 +510,7 @@ void WrapWidget::addTopBarMenuButton() {
 	Shortcuts::Requests(
 	) | rpl::filter([=] {
 		return (_controller->section().type() == Section::Type::Profile);
-	}) | rpl::start_with_next([=](not_null<Shortcuts::Request*> request) {
+	}) | rpl::on_next([=](not_null<Shortcuts::Request*> request) {
 		using Command = Shortcuts::Command;
 
 		request->check(Command::ShowChatMenu, 1) && request->handle([=] {
@@ -541,7 +541,7 @@ void WrapWidget::addProfileCallsButton() {
 		return user->hasCalls();
 	}) | rpl::take(
 		1
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_topBar->addButton(
 			base::make_unique_q<Ui::IconButton>(
 				_topBar,
@@ -689,7 +689,7 @@ void WrapWidget::finishShowContent() {
 	_contentChanges.fire({});
 
 	_content->scrollBottomSkipValue(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateContentGeometry();
 	}, _content->lifetime());
 }
diff --git a/Telegram/SourceFiles/info/media/info_media_buttons.cpp b/Telegram/SourceFiles/info/media/info_media_buttons.cpp
index cc2212ff46..a4ad07931e 100644
--- a/Telegram/SourceFiles/info/media/info_media_buttons.cpp
+++ b/Telegram/SourceFiles/info/media/info_media_buttons.cpp
@@ -369,7 +369,7 @@ not_null<Ui::SettingsButton*> AddPeerGiftsButton(
 
 	rpl::duplicate(forked) | rpl::filter(
 		rpl::mappers::_1 > 0
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		state->appearedLifetime.destroy();
 		const auto requestDone = crl::guard(wrap, [=](
 				std::vector<Data::SavedStarGift> gifts) {
diff --git a/Telegram/SourceFiles/info/media/info_media_empty_widget.cpp b/Telegram/SourceFiles/info/media/info_media_empty_widget.cpp
index 07f07af852..a6d1db394d 100644
--- a/Telegram/SourceFiles/info/media/info_media_empty_widget.cpp
+++ b/Telegram/SourceFiles/info/media/info_media_empty_widget.cpp
@@ -22,7 +22,7 @@ EmptyWidget::EmptyWidget(QWidget *parent)
 void EmptyWidget::setFullHeight(rpl::producer<int> fullHeightValue) {
 	std::move(
 		fullHeightValue
-	) | rpl::start_with_next([this](int fullHeight) {
+	) | rpl::on_next([this](int fullHeight) {
 		// Make icon center be on 1/3 height.
 		auto iconCenter = fullHeight / 3;
 		auto iconHeight = st::infoEmptyFile.height();
diff --git a/Telegram/SourceFiles/info/media/info_media_inner_widget.cpp b/Telegram/SourceFiles/info/media/info_media_inner_widget.cpp
index faccefcd74..2e6a62506a 100644
--- a/Telegram/SourceFiles/info/media/info_media_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/media/info_media_inner_widget.cpp
@@ -37,7 +37,7 @@ InnerWidget::InnerWidget(
 , _controller(controller)
 , _empty(this) {
 	_empty->heightValue(
-	) | rpl::start_with_next(
+	) | rpl::on_next(
 		[this] { refreshHeight(); },
 		_empty->lifetime());
 	_list = setupList();
@@ -63,7 +63,7 @@ void InnerWidget::createOtherTypes() {
 
 	_otherTypes->resizeToWidth(width());
 	_otherTypes->heightValue(
-	) | rpl::start_with_next(
+	) | rpl::on_next(
 		[this] { refreshHeight(); },
 		_otherTypes->lifetime());
 }
@@ -147,7 +147,7 @@ bool InnerWidget::showInternal(not_null<Memento*> memento) {
 object_ptr<ListWidget> InnerWidget::setupList() {
 	auto result = object_ptr<ListWidget>(this, _controller);
 	result->heightValue(
-	) | rpl::start_with_next(
+	) | rpl::on_next(
 		[this] { refreshHeight(); },
 		result->lifetime());
 	using namespace rpl::mappers;
@@ -164,7 +164,7 @@ object_ptr<ListWidget> InnerWidget::setupList() {
 	_listTops.fire(result->topValue());
 	_empty->setType(_controller->section().mediaType());
 	_controller->mediaSourceQueryValue(
-	) | rpl::start_with_next([this](const QString &query) {
+	) | rpl::on_next([this](const QString &query) {
 		_empty->setSearchQuery(query);
 	}, result->lifetime());
 	return result;
diff --git a/Telegram/SourceFiles/info/media/info_media_list_widget.cpp b/Telegram/SourceFiles/info/media/info_media_list_widget.cpp
index 87a20772c9..61fd18a36a 100644
--- a/Telegram/SourceFiles/info/media/info_media_list_widget.cpp
+++ b/Telegram/SourceFiles/info/media/info_media_list_widget.cpp
@@ -183,7 +183,7 @@ void ListWidget::start() {
 	_controller->setSearchEnabledByContent(false);
 
 	_provider->layoutRemoved(
-	) | rpl::start_with_next([=](not_null<BaseLayout*> layout) {
+	) | rpl::on_next([=](not_null<BaseLayout*> layout) {
 		if (_overLayout == layout) {
 			_overLayout = nullptr;
 		}
@@ -191,7 +191,7 @@ void ListWidget::start() {
 	}, lifetime());
 
 	_provider->refreshed(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		refreshRows();
 	}, lifetime());
 
@@ -199,7 +199,7 @@ void ListWidget::start() {
 		_provider->refreshViewer();
 
 		_controller->searchQueryValue(
-		) | rpl::start_with_next([this](QString &&query) {
+		) | rpl::on_next([this](QString &&query) {
 			_provider->setSearchQuery(std::move(query));
 		}, lifetime());
 	} else if (_controller->storiesPeer()) {
@@ -215,7 +215,7 @@ void ListWidget::start() {
 		(_controller->key().isGlobalMedia()
 			? _controller->searchQueryValue()
 			: _controller->mediaSourceQueryValue()
-		) | rpl::start_with_next([this] {
+		) | rpl::on_next([this] {
 			restart();
 		}, lifetime());
 
@@ -226,7 +226,7 @@ void ListWidget::start() {
 					const Data::Session::ItemVisibilityQuery &query) {
 				return _provider->isPossiblyMyItem(query.item)
 					&& isVisible();
-			}) | rpl::start_with_next([=](
+			}) | rpl::on_next([=](
 					const Data::Session::ItemVisibilityQuery &query) {
 				if (const auto found = findItemByItem(query.item)) {
 					if (itemVisible(found->layout)) {
@@ -244,27 +244,27 @@ void ListWidget::subscribeToSession(
 		not_null<Main::Session*> session,
 		rpl::lifetime &lifetime) {
 	session->downloaderTaskFinished(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		update();
 	}, lifetime);
 
 	session->data().itemLayoutChanged(
-	) | rpl::start_with_next([this](auto item) {
+	) | rpl::on_next([this](auto item) {
 		itemLayoutChanged(item);
 	}, lifetime);
 
 	session->data().itemRemoved(
-	) | rpl::start_with_next([this](auto item) {
+	) | rpl::on_next([this](auto item) {
 		itemRemoved(item);
 	}, lifetime);
 
 	session->data().itemRepaintRequest(
-	) | rpl::start_with_next([this](auto item) {
+	) | rpl::on_next([this](auto item) {
 		repaintItem(item);
 	}, lifetime);
 
 	session->data().itemDataChanges(
-	) | rpl::start_with_next([=](not_null<HistoryItem*> item) {
+	) | rpl::on_next([=](not_null<HistoryItem*> item) {
 		if (const auto found = findItemByItem(item)) {
 			found->layout->itemDataChanged();
 		}
@@ -275,7 +275,7 @@ void ListWidget::setupSelectRestriction() {
 	_provider->hasSelectRestrictionChanges(
 	) | rpl::filter([=] {
 		return _provider->hasSelectRestriction() && hasSelectedItems();
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		clearSelected();
 		if (_mouseAction == MouseAction::PrepareSelect) {
 			mouseActionCancel();
@@ -296,7 +296,7 @@ void ListWidget::setupStoriesTrackIds() {
 		stories->albumIdsChanged() | rpl::filter(
 			rpl::mappers::_1 == key
 		) | rpl::to_empty
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto albumId = _storiesAddToAlbumId;
 		const auto &ids = stories->albumKnownInArchive(peerId, albumId);
 		if (_storiesInAlbum != ids) {
@@ -328,7 +328,7 @@ void ListWidget::setupStoriesTrackIds() {
 		stories->albumIdsChanged() | rpl::filter(
 			rpl::mappers::_1 == akey
 		) | rpl::to_empty
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_storiesAddToAlbumTotal = stories->albumIdsCount(
 			peerId,
 			_storiesAddToAlbumId);
@@ -646,7 +646,7 @@ void ListWidget::trackSession(not_null<Main::Session*> session) {
 	auto &lifetime = _trackedSessions.emplace(session).first->second;
 	subscribeToSession(session, lifetime);
 	session->account().sessionChanges(
-	) | rpl::take(1) | rpl::start_with_next([=] {
+	) | rpl::take(1) | rpl::on_next([=] {
 		_trackedSessions.remove(session);
 	}, lifetime);
 }
@@ -1625,7 +1625,7 @@ void ListWidget::deleteItems(SelectedItems &&items, Fn<void()> confirmed) {
 void ListWidget::setActionBoxWeak(base::weak_qptr<Ui::BoxContent> box) {
 	if ((_actionBoxWeak = box)) {
 		_actionBoxWeakLifetime = _actionBoxWeak->alive(
-		) | rpl::start_with_done([weak = base::make_weak(this)]{
+		) | rpl::on_done([weak = base::make_weak(this)]{
 			if (weak) {
 				weak->_checkForHide.fire({});
 			}
diff --git a/Telegram/SourceFiles/info/media/info_media_provider.cpp b/Telegram/SourceFiles/info/media/info_media_provider.cpp
index 81359358f9..25b9a4806b 100644
--- a/Telegram/SourceFiles/info/media/info_media_provider.cpp
+++ b/Telegram/SourceFiles/info/media/info_media_provider.cpp
@@ -50,19 +50,19 @@ Provider::Provider(not_null<AbstractController*> controller)
 , _type(_controller->section().mediaType())
 , _slice(sliceKey(_universalAroundId)) {
 	_controller->session().data().itemRemoved(
-	) | rpl::start_with_next([this](auto item) {
+	) | rpl::on_next([this](auto item) {
 		itemRemoved(item);
 	}, _lifetime);
 
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		for (auto &layout : _layouts) {
 			layout.second.item->invalidateCache();
 		}
 	}, _lifetime);
 
 	_controller->session().appConfig().ignoredRestrictionReasonsChanges(
-	) | rpl::start_with_next([=](std::vector<QString> &&changed) {
+	) | rpl::on_next([=](std::vector<QString> &&changed) {
 		const auto sensitive = Data::UnavailableReason::Sensitive();
 		if (ranges::contains(changed, sensitive.reason)) {
 			for (auto &[id, layout] : _layouts) {
@@ -257,7 +257,7 @@ void Provider::refreshViewer() {
 		idForViewer,
 		_idsLimit,
 		_idsLimit
-	) | rpl::start_with_next([=](SparseIdsMergedSlice &&slice) {
+	) | rpl::on_next([=](SparseIdsMergedSlice &&slice) {
 		if (!slice.fullCount()) {
 			// Don't display anything while full count is unknown.
 			return;
diff --git a/Telegram/SourceFiles/info/media/info_media_widget.cpp b/Telegram/SourceFiles/info/media/info_media_widget.cpp
index 56ae02709e..9197c0ae02 100644
--- a/Telegram/SourceFiles/info/media/info_media_widget.cpp
+++ b/Telegram/SourceFiles/info/media/info_media_widget.cpp
@@ -139,7 +139,7 @@ Widget::Widget(QWidget *parent, not_null<Controller*> controller)
 		controller));
 	_inner->setScrollHeightValue(scrollHeightValue());
 	_inner->scrollToRequests(
-	) | rpl::start_with_next([this](Ui::ScrollToRequest request) {
+	) | rpl::on_next([this](Ui::ScrollToRequest request) {
 		scrollTo(request);
 	}, _inner->lifetime());
 }
diff --git a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_collections.cpp b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_collections.cpp
index a237403e60..4e03351829 100644
--- a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_collections.cpp
+++ b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_collections.cpp
@@ -121,7 +121,7 @@ void EditCollectionBox(
 			)).done(done).fail(fail).send();
 		}
 	};
-	title->submits() | rpl::start_with_next(submit, title->lifetime());
+	title->submits() | rpl::on_next(submit, title->lifetime());
 	auto text = id
 		? tr::lng_settings_save()
 		: tr::lng_gift_collection_new_create();
diff --git a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp
index 215fb11d79..6970cc3a45 100644
--- a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp
+++ b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp
@@ -123,7 +123,7 @@ rpl::producer<std::vector<GiftTypeStars>> GiftsStars(
 		using namespace Api;
 		const auto api = lifetime.make_state<PremiumGiftCodeOptions>(peer);
 		api->requestStarGifts(
-		) | rpl::start_with_error_done([=](QString error) {
+		) | rpl::on_error_done([=](QString error) {
 			consumer.put_next({});
 		}, [=] {
 			auto list = std::vector<GiftTypeStars>();
@@ -313,7 +313,7 @@ void GiftButton::setDescriptor(const GiftDescriptor &descriptor, Mode mode) {
 	_resolvedDocument = nullptr;
 	_documentLifetime = _delegate->sticker(
 		descriptor
-	) | rpl::start_with_next([=](not_null<DocumentData*> document) {
+	) | rpl::on_next([=](not_null<DocumentData*> document) {
 		_documentLifetime.destroy();
 		setDocument(document);
 	});
@@ -384,7 +384,7 @@ void GiftButton::setDocument(not_null<DocumentData*> document) {
 		document->session().downloaderTaskFinished()
 	) | rpl::filter([=] {
 		return media->loaded();
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		_mediaLifetime.destroy();
 
 		auto result = std::unique_ptr<HistoryView::StickerPlayer>();
@@ -1312,12 +1312,12 @@ void SelectGiftToUnpin(
 
 		state->selected.value(
 		) | rpl::combine_previous(
-		) | rpl::start_with_next([=](int old, int now) {
+		) | rpl::on_next([=](int old, int now) {
 			if (old >= 0) state->buttons[old]->toggleSelected(false);
 			if (now >= 0) state->buttons[now]->toggleSelected(true);
 		}, gifts->lifetime());
 
-		gifts->widthValue() | rpl::start_with_next([=](int width) {
+		gifts->widthValue() | rpl::on_next([=](int width) {
 			const auto singleMin = state->delegate.buttonSize();
 			if (width < singleMin.width()) {
 				return;
@@ -1371,7 +1371,7 @@ void SelectGiftToUnpin(
 			st::creditsBoxButtonLabel,
 			&st::giftTooManyPinnedBox.button.textFg);
 
-		state->selected.value() | rpl::start_with_next([=](int value) {
+		state->selected.value() | rpl::on_next([=](int value) {
 			const auto has = (value >= 0);
 			label->setOpacity(has ? 1. : 0.5);
 			button->setAttribute(Qt::WA_TransparentForMouseEvents, !has);
@@ -1382,7 +1382,7 @@ void SelectGiftToUnpin(
 			- buttonPadding.left()
 			- buttonPadding.right();
 		button->resizeToWidth(buttonWidth);
-		button->widthValue() | rpl::start_with_next([=](int width) {
+		button->widthValue() | rpl::on_next([=](int width) {
 			if (width != buttonWidth) {
 				button->resizeToWidth(buttonWidth);
 			}
diff --git a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp
index 576f550f96..2d0d54933a 100644
--- a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp
+++ b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp
@@ -358,7 +358,7 @@ InnerWidget::InnerWidget(
 	loadCollections();
 
 	_window->session().data().giftsUpdates(
-	) | rpl::start_with_next([=](const Data::GiftsUpdate &update) {
+	) | rpl::on_next([=](const Data::GiftsUpdate &update) {
 		if (update.peer != _peer) {
 			return;
 		}
@@ -389,7 +389,7 @@ InnerWidget::InnerWidget(
 	}, lifetime());
 
 	_descriptor.value(
-	) | rpl::start_with_next([=](Descriptor now) {
+	) | rpl::on_next([=](Descriptor now) {
 		const auto id = now.collectionId;
 		_collectionsLoadedCallback = nullptr;
 		_api.request(base::take(_loadMoreRequestId)).cancel();
@@ -430,7 +430,7 @@ void InnerWidget::loadCollections() {
 
 void InnerWidget::subscribeToUpdates() {
 	_peer->owner().giftUpdates(
-	) | rpl::start_with_next([=](const Data::GiftUpdate &update) {
+	) | rpl::on_next([=](const Data::GiftUpdate &update) {
 		applyUpdateTo(_all, update);
 		using Action = Data::GiftUpdate::Action;
 		if (update.action == Action::Pin || update.action == Action::Unpin) {
@@ -749,12 +749,12 @@ std::unique_ptr<GiftButton> InnerWidget::createGiftButton() {
 	auto button = std::make_unique<GiftButton>(this, &_delegate);
 	const auto raw = button.get();
 	raw->contextMenuRequests(
-	) | rpl::start_with_next([=](QPoint point) {
+	) | rpl::on_next([=](QPoint point) {
 		showMenuFor(raw, point);
 	}, raw->lifetime());
 
 	raw->mouseEvents(
-	) | rpl::start_with_next([=](QMouseEvent *e) {
+	) | rpl::on_next([=](QMouseEvent *e) {
 		switch (e->type()) {
 		case QEvent::MouseButtonPress:
 			raw->raise();
@@ -1380,11 +1380,11 @@ void InnerWidget::editCollectionGifts(int id) {
 		state->changes = content->changes();
 
 		content->descriptorChanges(
-		) | rpl::start_with_next([=](Descriptor now) {
+		) | rpl::on_next([=](Descriptor now) {
 			state->descriptor = now;
 		}, content->lifetime());
 
-		content->scrollToTop() | rpl::start_with_next([=] {
+		content->scrollToTop() | rpl::on_next([=] {
 			box->scrollToY(0);
 		}, content->lifetime());
 
@@ -1519,7 +1519,7 @@ void InnerWidget::refreshCollectionsTabs() {
 		_collectionsTabs->show();
 
 		_collectionsTabs->activated(
-		) | rpl::start_with_next([=](const QString &id) {
+		) | rpl::on_next([=](const QString &id) {
 			if (id == u"add"_q) {
 				const auto added = [=](MTPStarGiftCollection result) {
 					collectionAdded(result);
@@ -1540,7 +1540,7 @@ void InnerWidget::refreshCollectionsTabs() {
 		}, _collectionsTabs->lifetime());
 
 		_collectionsTabs->contextMenuRequests(
-		) | rpl::start_with_next([=](const QString &id) {
+		) | rpl::on_next([=](const QString &id) {
 			if (id == u"add"_q
 				|| id == u"all"_q
 				|| !_peer->canManageGifts()) {
@@ -1551,7 +1551,7 @@ void InnerWidget::refreshCollectionsTabs() {
 
 		using ReorderUpdate = Ui::SubTabs::ReorderUpdate;
 		_collectionsTabs->reorderUpdates(
-		) | rpl::start_with_next([=](const ReorderUpdate &update) {
+		) | rpl::on_next([=](const ReorderUpdate &update) {
 			if (update.state == ReorderUpdate::State::Applied) {
 				reorderCollectionsLocally(update);
 			}
@@ -2427,22 +2427,22 @@ Widget::Widget(QWidget *parent, not_null<Controller*> controller)
 			scroll()));
 	_emptyCollectionShown = _inner->collectionEmptyValue();
 	_inner->notifyEnabled(
-	) | rpl::take(1) | rpl::start_with_next([=](bool enabled) {
+	) | rpl::take(1) | rpl::on_next([=](bool enabled) {
 		_notifyEnabled = enabled;
 		refreshBottom();
 	}, _inner->lifetime());
 	_inner->descriptorChanges(
-	) | rpl::start_with_next([=](Descriptor descriptor) {
+	) | rpl::on_next([=](Descriptor descriptor) {
 		_descriptor = descriptor;
 	}, _inner->lifetime());
-	_inner->scrollToTop() | rpl::start_with_next([=] {
+	_inner->scrollToTop() | rpl::on_next([=] {
 		scrollTo({ 0, 0 });
 	}, _inner->lifetime());
 
 	rpl::combine(
 		_descriptor.value(),
 		_emptyCollectionShown.value()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		refreshBottom();
 	}, _inner->lifetime());
 }
@@ -2497,14 +2497,14 @@ void Widget::setupBottomButton(int wasBottomHeight) {
 	});
 
 	const auto buttonTop = st::boxRadius;
-	bottom->widthValue() | rpl::start_with_next([=](int width) {
+	bottom->widthValue() | rpl::on_next([=](int width) {
 		const auto normal = width - 2 * buttonTop;
 		button->resizeToWidth(normal);
 		const auto buttonLeft = (width - normal) / 2;
 		button->moveToLeft(buttonLeft, buttonTop);
 	}, button->lifetime());
 
-	button->heightValue() | rpl::start_with_next([=](int height) {
+	button->heightValue() | rpl::on_next([=](int height) {
 		bottom->resize(bottom->width(), st::boxRadius + height);
 	}, button->lifetime());
 
@@ -2514,7 +2514,7 @@ void Widget::setupBottomButton(int wasBottomHeight) {
 	};
 
 	_inner->sizeValue(
-	) | rpl::start_with_next([=](const QSize &s) {
+	) | rpl::on_next([=](const QSize &s) {
 		wrap->resizeToWidth(s.width());
 		crl::on_main(wrap, processHeight);
 	}, wrap->lifetime());
@@ -2522,7 +2522,7 @@ void Widget::setupBottomButton(int wasBottomHeight) {
 	rpl::combine(
 		wrap->heightValue(),
 		heightValue()
-	) | rpl::start_with_next(processHeight, wrap->lifetime());
+	) | rpl::on_next(processHeight, wrap->lifetime());
 
 	if (_shown) {
 		wrap->toggle(
@@ -2554,7 +2554,7 @@ void Widget::setupNotifyCheckbox(int wasBottomHeight, bool enabled) {
 		enabled);
 	notify->show();
 
-	notify->checkedChanges() | rpl::start_with_next([=](bool checked) {
+	notify->checkedChanges() | rpl::on_next([=](bool checked) {
 		const auto api = &controller()->session().api();
 		const auto show = controller()->uiShow();
 		using Flag = MTPpayments_ToggleChatStarGiftNotifications::Flag;
@@ -2569,7 +2569,7 @@ void Widget::setupNotifyCheckbox(int wasBottomHeight, bool enabled) {
 
 	const auto &checkSt = st::defaultCheckbox;
 	const auto checkTop = st::boxRadius + checkSt.margin.top();
-	bottom->widthValue() | rpl::start_with_next([=](int width) {
+	bottom->widthValue() | rpl::on_next([=](int width) {
 		const auto normal = notify->naturalWidth()
 			- checkSt.margin.left()
 			- checkSt.margin.right();
@@ -2578,7 +2578,7 @@ void Widget::setupNotifyCheckbox(int wasBottomHeight, bool enabled) {
 		notify->moveToLeft(checkLeft, checkTop);
 	}, notify->lifetime());
 
-	notify->heightValue() | rpl::start_with_next([=](int height) {
+	notify->heightValue() | rpl::on_next([=](int height) {
 		bottom->resize(bottom->width(), st::boxRadius + height);
 	}, notify->lifetime());
 
@@ -2588,7 +2588,7 @@ void Widget::setupNotifyCheckbox(int wasBottomHeight, bool enabled) {
 	};
 
 	_inner->sizeValue(
-	) | rpl::start_with_next([=](const QSize &s) {
+	) | rpl::on_next([=](const QSize &s) {
 		wrap->resizeToWidth(s.width());
 		crl::on_main(wrap, processHeight);
 	}, wrap->lifetime());
@@ -2596,7 +2596,7 @@ void Widget::setupNotifyCheckbox(int wasBottomHeight, bool enabled) {
 	rpl::combine(
 		wrap->heightValue(),
 		heightValue()
-	) | rpl::start_with_next(processHeight, wrap->lifetime());
+	) | rpl::on_next(processHeight, wrap->lifetime());
 
 	if (_shown) {
 		wrap->toggle(
diff --git a/Telegram/SourceFiles/info/polls/info_polls_results_inner_widget.cpp b/Telegram/SourceFiles/info/polls/info_polls_results_inner_widget.cpp
index 24afb84377..c6e64dc428 100644
--- a/Telegram/SourceFiles/info/polls/info_polls_results_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/polls/info_polls_results_inner_widget.cpp
@@ -449,7 +449,7 @@ ListController *CreateAnswerRows(
 		st::infoCommonGroupsList));
 
 	controller->count(
-	) | rpl::filter(_1 > 0) | rpl::start_with_next([=] {
+	) | rpl::filter(_1 > 0) | rpl::on_next([=] {
 		delete placeholder;
 	}, placeholder->lifetime());
 
@@ -488,7 +488,7 @@ ListController *CreateAnswerRows(
 	rpl::combine(
 		controller->fullCount(),
 		controller->count()
-	) | rpl::start_with_next([=](int fullCount, int count) {
+	) | rpl::on_next([=](int fullCount, int count) {
 		const auto many = (fullCount > kFirstPage)
 			&& (count > kFirstPage - kLeavePreloaded);
 		collapse->setVisible(many);
@@ -496,7 +496,7 @@ ListController *CreateAnswerRows(
 	}, collapse->lifetime());
 
 	headerWrap->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		header->resizeToWidth(width);
 		votes->moveToRight(
 			st::pollResultsHeaderPadding.right(),
@@ -509,7 +509,7 @@ ListController *CreateAnswerRows(
 	}, header->lifetime());
 
 	header->heightValue(
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		headerWrap->resize(headerWrap->width(), height);
 	}, header->lifetime());
 
@@ -530,7 +530,7 @@ ListController *CreateAnswerRows(
 		controller->allowLoadMore();
 	});
 	controller->loadMoreCount(
-	) | rpl::map(_1 > 0) | rpl::start_with_next([=](bool visible) {
+	) | rpl::map(_1 > 0) | rpl::on_next([=](bool visible) {
 		more->toggle(visible, anim::type::instant);
 	}, more->lifetime());
 
@@ -544,7 +544,7 @@ ListController *CreateAnswerRows(
 		moreTop->topValue()
 	) | rpl::filter([=](int, QRect headerRect, int moreTop) {
 		return moreTop >= headerRect.y() + headerRect.height();
-	}) | rpl::start_with_next([=](
+	}) | rpl::on_next([=](
 			int visibleTop,
 			QRect headerRect,
 			int moreTop) {
@@ -644,19 +644,19 @@ void InnerWidget::setupContent() {
 			_showPeerInfoRequests,
 			lifetime());
 		controller->scrollToRequests(
-		) | rpl::start_with_next([=](int y) {
+		) | rpl::on_next([=](int y) {
 			_scrollToRequests.fire({ y, -1 });
 		}, lifetime());
 		_sections.emplace(answer.option, controller);
 	}
 
 	widthValue(
-	) | rpl::start_with_next([=](int newWidth) {
+	) | rpl::on_next([=](int newWidth) {
 		_content->resizeToWidth(newWidth);
 	}, _content->lifetime());
 
 	_content->heightValue(
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		resize(width(), height);
 	}, _content->lifetime());
 }
diff --git a/Telegram/SourceFiles/info/polls/info_polls_results_widget.cpp b/Telegram/SourceFiles/info/polls/info_polls_results_widget.cpp
index 056eb35cf7..2dbc18025b 100644
--- a/Telegram/SourceFiles/info/polls/info_polls_results_widget.cpp
+++ b/Telegram/SourceFiles/info/polls/info_polls_results_widget.cpp
@@ -54,11 +54,11 @@ Widget::Widget(QWidget *parent, not_null<Controller*> controller)
 		controller->poll(),
 		controller->pollContextId()))) {
 	_inner->showPeerInfoRequests(
-	) | rpl::start_with_next([=](not_null<PeerData*> peer) {
+	) | rpl::on_next([=](not_null<PeerData*> peer) {
 		controller->showPeerInfo(peer);
 	}, _inner->lifetime());
 	_inner->scrollToRequests(
-	) | rpl::start_with_next([=](const Ui::ScrollToRequest &request) {
+	) | rpl::on_next([=](const Ui::ScrollToRequest &request) {
 		scrollTo(request);
 	}, _inner->lifetime());
 }
diff --git a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
index 586aadb6c8..5f3dfc6d34 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
@@ -396,12 +396,12 @@ base::options::toggle ShowChannelJoinedBelowAbout({
 		st::infoProfileLabeledPadding - st::infoHoursOuterMargin);
 	const auto button = result->entity();
 	const auto inner = Ui::CreateChild<Ui::VerticalLayout>(button);
-	button->widthValue() | rpl::start_with_next([=](int width) {
+	button->widthValue() | rpl::on_next([=](int width) {
 		const auto margin = st::infoHoursOuterMargin;
 		inner->resizeToWidth(width - margin.left() - margin.right());
 		inner->move(margin.left(), margin.top());
 	}, inner->lifetime());
-	inner->heightValue() | rpl::start_with_next([=](int height) {
+	inner->heightValue() | rpl::on_next([=](int height) {
 		const auto margin = st::infoHoursOuterMargin;
 		height += margin.top() + margin.bottom();
 		button->resize(button->width(), height);
@@ -558,7 +558,7 @@ base::options::toggle ShowChannelJoinedBelowAbout({
 	const auto timingArrow = Ui::CreateChild<Ui::RpWidget>(openedWrap);
 	timingArrow->resize(Size(timing->st().style.font->height));
 	timing->setAttribute(Qt::WA_TransparentForMouseEvents);
-	state->opened.value() | rpl::start_with_next([=](bool value) {
+	state->opened.value() | rpl::on_next([=](bool value) {
 		opened->setTextColorOverride(value
 			? st::boxTextFgGood->c
 			: st::boxTextFgError->c);
@@ -568,7 +568,7 @@ base::options::toggle ShowChannelJoinedBelowAbout({
 		openedWrap->widthValue(),
 		opened->heightValue(),
 		timing->sizeValue()
-	) | rpl::start_with_next([=](int width, int h1, QSize size) {
+	) | rpl::on_next([=](int width, int h1, QSize size) {
 		opened->moveToLeft(0, 0, width);
 		timingArrow->moveToRight(0, 0, width);
 		timing->moveToRight(timingArrow->width(), 0, width);
@@ -614,7 +614,7 @@ base::options::toggle ShowChannelJoinedBelowAbout({
 		labelWrap->widthValue(),
 		label->heightValue(),
 		link->sizeValue()
-	) | rpl::start_with_next([=](int width, int h1, QSize size) {
+	) | rpl::on_next([=](int width, int h1, QSize size) {
 		label->moveToLeft(0, 0, width);
 		link->moveToRight(0, 0, width);
 
@@ -639,7 +639,7 @@ base::options::toggle ShowChannelJoinedBelowAbout({
 				arrowAnimation->stop();
 			}
 		});
-		timingArrow->paintRequest() | rpl::start_with_next([=] {
+		timingArrow->paintRequest() | rpl::on_next([=] {
 			auto p = QPainter(timingArrow);
 			const auto progress = other->animating()
 				? (crl::now() - arrowAnimation->started()) / kSlideDuration
@@ -655,7 +655,7 @@ base::options::toggle ShowChannelJoinedBelowAbout({
 			auto hq = PainterHighQualityEnabler(p);
 			p.fillPath(path, timing->st().textFg);
 		}, timingArrow->lifetime());
-		state->expanded.value() | rpl::start_with_next([=] {
+		state->expanded.value() | rpl::on_next([=] {
 			arrowAnimation->start();
 		}, other->lifetime());
 	}
@@ -694,7 +694,7 @@ base::options::toggle ShowChannelJoinedBelowAbout({
 			dayWrap->widthValue(),
 			dayLabel->heightValue(),
 			dayHours->sizeValue()
-		) | rpl::start_with_next([=](int width, int h1, QSize size) {
+		) | rpl::on_next([=](int width, int h1, QSize size) {
 			dayLabel->moveToLeft(0, 0, width);
 			dayHours->moveToRight(0, 0, width);
 
@@ -775,7 +775,7 @@ void DeleteContactNote(
 
 	std::move(
 		notesText
-	) | rpl::start_with_next([=, raw = notesLine.text](
+	) | rpl::on_next([=, raw = notesLine.text](
 			TextWithEntities note) {
 		TextUtilities::ParseEntities(note, TextParseLinks);
 		raw->setMarkedText(note, context);
@@ -807,7 +807,7 @@ void DeleteContactNote(
 	rpl::merge(
 		notesLine.wrap->events(),
 		notesLine.subtext->events()
-	) | rpl::start_with_next([=, raw = notesLine.text](not_null<QEvent*> e) {
+	) | rpl::on_next([=, raw = notesLine.text](not_null<QEvent*> e) {
 		if (e->type() == QEvent::ContextMenu) {
 			const auto ce = static_cast<QContextMenuEvent*>(e.get());
 			QCoreApplication::postEvent(
@@ -828,7 +828,7 @@ void DeleteContactNote(
 	rpl::combine(
 		notesLine.wrap->entity()->widthValue(),
 		notesLine.subtext->geometryValue()
-	) | rpl::start_with_next([=, skip = st::lineWidth * 5](
+	) | rpl::on_next([=, skip = st::lineWidth * 5](
 			int width,
 			const QRect &subtextGeometry) {
 		subtextLabel->moveToRight(
@@ -876,13 +876,13 @@ void DeleteContactNote(
 
 	const auto giftIcon = Ui::CreateChild<Ui::RpWidget>(layout);
 	giftIcon->resize(st::birthdayTodayIcon.size());
-	layout->sizeValue() | rpl::start_with_next([=](QSize size) {
+	layout->sizeValue() | rpl::on_next([=](QSize size) {
 		giftIcon->moveToRight(
 			0,
 			(size.height() - giftIcon->height()) / 2,
 			size.width());
 	}, giftIcon->lifetime());
-	giftIcon->paintRequest() | rpl::start_with_next([=] {
+	giftIcon->paintRequest() | rpl::on_next([=] {
 		auto p = QPainter(giftIcon);
 		st::birthdayTodayIcon.paint(p, 0, 0, giftIcon->width());
 	}, giftIcon->lifetime());
@@ -893,7 +893,7 @@ void DeleteContactNote(
 		return Data::IsBirthdayTodayValue(value);
 	}) | rpl::flatten_latest(
 	) | rpl::distinct_until_changed(
-	) | rpl::start_with_next([=](bool today) {
+	) | rpl::on_next([=](bool today) {
 		const auto disable = !today && user->session().premiumCanBuy();
 		button->setDisabled(disable);
 		button->setAttribute(Qt::WA_TransparentForMouseEvents, disable);
@@ -1014,13 +1014,13 @@ rpl::producer<CreditsAmount> AddCurrencyAction(
 		const auto icon = Ui::CreateChild<Ui::RpWidget>(button);
 		icon->resize(st::infoIconReport.size());
 		const auto image = Ui::Earn::MenuIconCurrency(icon->size());
-		icon->paintRequest() | rpl::start_with_next([=] {
+		icon->paintRequest() | rpl::on_next([=] {
 			auto p = QPainter(icon);
 			p.drawImage(0, 0, image);
 		}, icon->lifetime());
 
 		button->sizeValue(
-		) | rpl::start_with_next([=](const QSize &size) {
+		) | rpl::on_next([=](const QSize &size) {
 			icon->move(st::infoEarnCurrencyIconPosition);
 		}, icon->lifetime());
 	}
@@ -1040,7 +1040,7 @@ rpl::producer<CreditsAmount> AddCurrencyAction(
 				currencyLoadLifetime->destroy();
 			}
 		};
-		currencyLoad->request() | rpl::start_with_error_done(
+		currencyLoad->request() | rpl::on_error_done(
 			[=](const QString &error) {
 				done(CreditsAmount(0, CreditsType::Ton));
 			},
@@ -1060,7 +1060,7 @@ rpl::producer<CreditsAmount> AddCurrencyAction(
 		button->widthValue(),
 		tr::lng_manage_peer_bot_balance_currency(),
 		state->balance.value()
-	) | rpl::start_with_next([=, &st](
+	) | rpl::on_next([=, &st](
 			int width,
 			const QString &button,
 			CreditsAmount balance) {
@@ -1103,13 +1103,13 @@ rpl::producer<CreditsAmount> AddCreditsAction(
 		const auto icon = Ui::CreateChild<Ui::RpWidget>(button);
 		const auto image = Ui::Earn::MenuIconCredits();
 		icon->resize(image.size() / style::DevicePixelRatio());
-		icon->paintRequest() | rpl::start_with_next([=] {
+		icon->paintRequest() | rpl::on_next([=] {
 			auto p = QPainter(icon);
 			p.drawImage(0, 0, image);
 		}, icon->lifetime());
 
 		button->sizeValue(
-		) | rpl::start_with_next([=](const QSize &size) {
+		) | rpl::on_next([=](const QSize &size) {
 			icon->move(st::infoEarnCreditsIconPosition);
 		}, icon->lifetime());
 	}
@@ -1135,7 +1135,7 @@ rpl::producer<CreditsAmount> AddCreditsAction(
 		button->widthValue(),
 		tr::lng_manage_peer_bot_balance_credits(),
 		state->balance.value()
-	) | rpl::start_with_next([=, &st](
+	) | rpl::on_next([=, &st](
 			int width,
 			const QString &button,
 			CreditsAmount balance) {
@@ -1518,7 +1518,7 @@ object_ptr<Ui::RpWidget> DetailsFiller::setupInfo() {
 			label->geometryValue(),
 			button->sizeValue(),
 			button->shownValue()
-		) | rpl::start_with_next([=](
+		) | rpl::on_next([=](
 				int width,
 				QRect,
 				QSize buttonSize,
@@ -1649,7 +1649,7 @@ object_ptr<Ui::RpWidget> DetailsFiller::setupInfo() {
 		const auto qrButton = Ui::CreateChild<Ui::IconButton>(
 			usernameLine.text->parentWidget(),
 			st::infoProfileLabeledButtonQr);
-		UsernamesValue(_peer) | rpl::start_with_next([=](const auto &u) {
+		UsernamesValue(_peer) | rpl::on_next([=](const auto &u) {
 			qrButton->setVisible(!u.empty());
 		}, qrButton->lifetime());
 		const auto rightSkip = st::infoProfileLabeledButtonQrRightSkip;
@@ -1729,7 +1729,7 @@ object_ptr<Ui::RpWidget> DetailsFiller::setupInfo() {
 			const auto qr = Ui::CreateChild<Ui::IconButton>(
 				linkLine.text->parentWidget(),
 				st::infoProfileLabeledButtonQr);
-			UsernamesValue(_peer) | rpl::start_with_next([=](const auto &u) {
+			UsernamesValue(_peer) | rpl::on_next([=](const auto &u) {
 				qr->setVisible(!u.empty());
 			}, qr->lifetime());
 			const auto rightSkip = st::infoProfileLabeledButtonQrRightSkip;
@@ -1864,7 +1864,7 @@ object_ptr<Ui::RpWidget> DetailsFiller::setupPersonalChannel(
 		}));
 		messageChannelWrap->finishAnimating();
 		messageChannelWrap->toggledValue(
-		) | rpl::filter(rpl::mappers::_1) | rpl::start_with_next([=] {
+		) | rpl::filter(rpl::mappers::_1) | rpl::on_next([=] {
 			messageChannelWrap->resizeToWidth(messageChannelWrap->width());
 		}, messageChannelWrap->lifetime());
 
@@ -1925,7 +1925,7 @@ object_ptr<Ui::RpWidget> DetailsFiller::setupPersonalChannel(
 			state->item = item;
 			item->history()->session().changes().realtimeMessageUpdates(
 				Data::MessageUpdate::Flag::Destroyed
-			) | rpl::start_with_next([=](const Data::MessageUpdate &update) {
+			) | rpl::on_next([=](const Data::MessageUpdate &update) {
 				if (update.item == state->item) {
 					state->lifetime.destroy();
 					state->item = nullptr;
@@ -1935,7 +1935,7 @@ object_ptr<Ui::RpWidget> DetailsFiller::setupPersonalChannel(
 
 			preview->resize(0, st::infoLabeled.style.font->height);
 			preview->paintRequest(
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				auto p = Painter(preview);
 				const auto item = state->item;
 				if (!item) {
@@ -1964,7 +1964,7 @@ object_ptr<Ui::RpWidget> DetailsFiller::setupPersonalChannel(
 			}, preview->lifetime());
 
 			line->sizeValue() | rpl::filter_size(
-			) | rpl::start_with_next([=](const QSize &size) {
+			) | rpl::on_next([=](const QSize &size) {
 				const auto left = stLabeled.left();
 				const auto right = st::infoPersonalChannelDateSkip;
 				const auto top = stLabeled.top();
@@ -2003,7 +2003,7 @@ object_ptr<Ui::RpWidget> DetailsFiller::setupPersonalChannel(
 					messageChannelWrap->entity(),
 					st::defaultRippleAnimation);
 				inner->geometryValue(
-				) | rpl::start_with_next([=](const QRect &rect) {
+				) | rpl::on_next([=](const QRect &rect) {
 					button->setGeometry(rect);
 				}, button->lifetime());
 				button->setClickedCallback([=, msg = item->fullId().msg] {
@@ -2027,7 +2027,7 @@ object_ptr<Ui::RpWidget> DetailsFiller::setupPersonalChannel(
 
 		rpl::duplicate(
 			channel
-		) | rpl::start_with_next([=](ChannelData *channel) {
+		) | rpl::on_next([=](ChannelData *channel) {
 			clear();
 			if (!channel) {
 				return;
@@ -2116,7 +2116,7 @@ void DetailsFiller::setupBotPermissions() {
 		rpl::single(bool(user->botInfo->canManageEmojiStatus))
 	)->toggledValue() | rpl::filter([=](bool allowed) {
 		return allowed != user->botInfo->canManageEmojiStatus;
-	}) | rpl::start_with_next([=](bool allowed) {
+	}) | rpl::on_next([=](bool allowed) {
 		user->botInfo->canManageEmojiStatus = allowed;
 		const auto session = &user->session();
 		session->api().request(MTPbots_ToggleUserEmojiStatusPermission(
@@ -2180,7 +2180,7 @@ void DetailsFiller::addReportReaction(
 		*forceHidden = true;
 	};
 	wrap->toggleOn(rpl::duplicate(shown));
-	rpl::duplicate(shown) | rpl::start_with_next([=](bool shown) {
+	rpl::duplicate(shown) | rpl::on_next([=](bool shown) {
 		if (shown) {
 			_dividerOverridden.force_assign(false);
 		}
@@ -2472,7 +2472,7 @@ void ActionsFiller::addFastButtonsMode(not_null<UserData*> user) {
 	button->toggledValue(
 	) | rpl::filter([=](bool value) {
 		return value != bots->enabled(user);
-	}) | rpl::start_with_next([=](bool value) {
+	}) | rpl::on_next([=](bool value) {
 		bots->setEnabled(user, value);
 	}, button->lifetime());
 }
@@ -2800,7 +2800,7 @@ void SetupAddChannelMember(
 		Window::PeerMenuAddChannelMembers(navigation, channel);
 	});
 	parent->widthValue(
-	) | rpl::start_with_next([add](int newWidth) {
+	) | rpl::on_next([add](int newWidth) {
 		auto availableWidth = newWidth
 			- st::infoMembersButtonPosition.x();
 		add->moveToLeft(
@@ -3026,7 +3026,7 @@ Cover *AddCover(
 			shown,
 			[=] { return controller->wrapWidget(); }));
 	result->showSection(
-	) | rpl::start_with_next([=](Section section) {
+	) | rpl::on_next([=](Section section) {
 		controller->showSection(topic
 			? std::make_shared<Info::Memento>(topic, section)
 			: std::make_shared<Info::Memento>(shown, section));
diff --git a/Telegram/SourceFiles/info/profile/info_profile_badge.cpp b/Telegram/SourceFiles/info/profile/info_profile_badge.cpp
index a73a8c8248..fbafdeb280 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_badge.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_badge.cpp
@@ -50,7 +50,7 @@ Badge::Badge(
 , _animationPaused(std::move(animationPaused)) {
 	std::move(
 		content
-	) | rpl::start_with_next([=](Content content) {
+	) | rpl::on_next([=](Content content) {
 		setContent(content);
 	}, _lifetime);
 }
@@ -118,7 +118,7 @@ void Badge::setContent(Content content) {
 		const auto height = std::max(emoji, icon ? icon->height() : 0);
 		_view->resize(width, height);
 		_view->paintRequest(
-		) | rpl::start_with_next([=, check = _view.data()]{
+		) | rpl::on_next([=, check = _view.data()]{
 			if (_emojiStatus) {
 				auto args = Ui::Text::CustomEmoji::Context{
 					.textColor = style.premiumFg->c,
@@ -173,7 +173,7 @@ void Badge::setContent(Content content) {
 			size.width() + 2 * skip,
 			size.height() + 2 * skip);
 		_view->paintRequest(
-		) | rpl::start_with_next([=, badge = _view.data()]{
+		) | rpl::on_next([=, badge = _view.data()]{
 			Painter p(badge);
 			Ui::DrawTextBadge(
 				type,
diff --git a/Telegram/SourceFiles/info/profile/info_profile_cover.cpp b/Telegram/SourceFiles/info/profile/info_profile_cover.cpp
index 893d6bd707..b0cd437b16 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_cover.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_cover.cpp
@@ -197,7 +197,7 @@ void TopicIconView::setupPlayer(not_null<Data::ForumTopic*> topic) {
 			return result;
 		});
 	}) | rpl::flatten_latest(
-	) | rpl::start_with_next([=](std::shared_ptr<StickerPlayer> player) {
+	) | rpl::on_next([=](std::shared_ptr<StickerPlayer> player) {
 		_player = std::move(player);
 		if (!_player) {
 			_update();
@@ -210,7 +210,7 @@ void TopicIconView::setupImage(not_null<Data::ForumTopic*> topic) {
 	if (topic->isGeneral()) {
 		rpl::single(rpl::empty) | rpl::then(
 			style::PaletteChanged()
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			_image = ForumTopicGeneralIconFrame(
 				st::infoForumTopicIcon.size,
 				_generalIconFg->c);
@@ -223,7 +223,7 @@ void TopicIconView::setupImage(not_null<Data::ForumTopic*> topic) {
 		ColorIdValue(topic)
 	) | rpl::map([=](const QString &title, int32 colorId) {
 		return ForumTopicIconFrame(colorId, title, st::infoForumTopicIcon);
-	}) | rpl::start_with_next([=](QImage &&image) {
+	}) | rpl::on_next([=](QImage &&image) {
 		_image = std::move(image);
 		_update();
 	}, _lifetime);
@@ -246,7 +246,7 @@ TopicIconButton::TopicIconButton(
 , _view(topic, paused, [=] { update(); }) {
 	resize(st::infoTopicCover.photo.size);
 	paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(this);
 		_view.paintInRect(p, rect());
 	}, lifetime());
@@ -399,7 +399,7 @@ Cover::Cover(
 		_status->setAttribute(Qt::WA_TransparentForMouseEvents);
 		if (const auto rating = _starsRating.get()) {
 			_statusShift = rating->widthValue();
-			_statusShift.changes() | rpl::start_with_next([=] {
+			_statusShift.changes() | rpl::on_next([=] {
 				refreshStatusGeometry(width());
 			}, _status->lifetime());
 			rating->raise();
@@ -433,7 +433,7 @@ Cover::Cover(
 			std::move(badgeUpdates),
 			_botVerify->updated());
 	}
-	std::move(badgeUpdates) | rpl::start_with_next([=] {
+	std::move(badgeUpdates) | rpl::on_next([=] {
 		refreshNameGeometry(width());
 	}, _name->lifetime());
 
@@ -476,7 +476,7 @@ void Cover::setupShowLastSeen() {
 				user,
 				Data::PeerUpdate::Flag::OnlineStatus),
 			Data::AmPremiumValue(&user->session())
-		) | rpl::start_with_next([=](auto, bool premium) {
+		) | rpl::on_next([=](auto, bool premium) {
 			const auto wasShown = !_showLastSeen->isHidden();
 			const auto hiddenByMe = user->lastseen().isHiddenByMe();
 			const auto shown = hiddenByMe
@@ -493,7 +493,7 @@ void Cover::setupShowLastSeen() {
 			Api::UserPrivacy::Key::LastSeen
 		) | rpl::filter([=](Api::UserPrivacy::Rule rule) {
 			return (rule.option == Api::UserPrivacy::Option::Everyone);
-		}) | rpl::start_with_next([=] {
+		}) | rpl::on_next([=] {
 			if (user->lastseen().isHiddenByMe()) {
 				user->updateFullForced();
 			}
@@ -521,7 +521,7 @@ void Cover::setupShowLastSeen() {
 
 void Cover::setupChildGeometry() {
 	widthValue(
-	) | rpl::start_with_next([this](int newWidth) {
+	) | rpl::on_next([this](int newWidth) {
 		if (_userpic) {
 			_userpic->moveToLeft(_st.photoLeft, _st.photoTop, newWidth);
 		} else {
@@ -543,7 +543,7 @@ void Cover::setupChildGeometry() {
 }
 
 Cover *Cover::setOnlineCount(rpl::producer<int> &&count) {
-	std::move(count) | rpl::start_with_next([=](int value) {
+	std::move(count) | rpl::on_next([=](int value) {
 		if (_statusLabel) {
 			_statusLabel->setOnlineCount(value);
 			refreshStatusGeometry(width());
@@ -560,7 +560,7 @@ void Cover::initViewers(rpl::producer<QString> title) {
 	using Flag = Data::PeerUpdate::Flag;
 	std::move(
 		title
-	) | rpl::start_with_next([=](const QString &title) {
+	) | rpl::on_next([=](const QString &title) {
 		_name->setText(title);
 		refreshNameGeometry(width());
 	}, lifetime());
@@ -572,7 +572,7 @@ void Cover::initViewers(rpl::producer<QString> title) {
 	_peer->session().changes().peerFlagsValue(
 		_peer,
 		Flag::OnlineStatus | Flag::Members
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_statusLabel->refresh();
 		refreshStatusGeometry(width());
 	}, lifetime());
@@ -580,7 +580,7 @@ void Cover::initViewers(rpl::producer<QString> title) {
 	_peer->session().changes().peerFlagsValue(
 		_peer,
 		(_peer->isUser() ? Flag::IsContact : Flag::Rights)
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		refreshUploadPhotoOverlay();
 	}, lifetime());
 
@@ -683,7 +683,7 @@ void Cover::refreshUploadPhotoOverlay() {
 
 	if (const auto user = _peer->asUser()) {
 		_userpic->resetPersonalRequests(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			user->session().api().peerPhoto().clearPersonal(user);
 			_userpic->showSource(Ui::UserpicButton::Source::PeerPhoto);
 		}, lifetime());
@@ -696,7 +696,7 @@ void Cover::setupChangePersonal() {
 	}
 
 	_changePersonal->chosenImages(
-	) | rpl::start_with_next([=](Ui::UserpicButton::ChosenImage &&chosen) {
+	) | rpl::on_next([=](Ui::UserpicButton::ChosenImage &&chosen) {
 		if (chosen.type == Ui::UserpicButton::ChosenType::Suggest) {
 			_peer->session().api().peerPhoto().suggest(
 				_peer,
@@ -715,7 +715,7 @@ void Cover::setupChangePersonal() {
 	}, _changePersonal->lifetime());
 
 	_changePersonal->resetPersonalRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_personalChosen = QImage();
 		_userpic->showSource(
 			Ui::UserpicButton::Source::NonPersonalPhoto);
@@ -797,7 +797,7 @@ void Cover::hideBadgeTooltip() {
 		raw->shownValue(
 		) | rpl::filter(
 			!rpl::mappers::_1
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			const auto i = ranges::find(
 				_badgeOldTooltips,
 				raw,
@@ -815,7 +815,7 @@ void Cover::setupUniqueBadgeTooltip() {
 	}
 	base::timer_once(kWaitBeforeGiftBadge) | rpl::then(
 		_badge->updated()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto widget = _badge->widget();
 		const auto &content = _badgeContent.current();
 		const auto &collectible = content.emojiStatusId.collectible;
diff --git a/Telegram/SourceFiles/info/profile/info_profile_emoji_status_panel.cpp b/Telegram/SourceFiles/info/profile/info_profile_emoji_status_panel.cpp
index de39c8ed1b..e85f1866ee 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_emoji_status_panel.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_emoji_status_panel.cpp
@@ -95,7 +95,7 @@ void EmojiStatusPanel::show(Descriptor &&descriptor) {
 		_panel->shownValue(
 		) | rpl::filter([=] {
 			return (_panelButton != nullptr);
-		}) | rpl::start_with_next([=](bool shown) {
+		}) | rpl::on_next([=](bool shown) {
 			if (shown) {
 				_panelButton->installEventFilter(_panel.get());
 			} else {
@@ -122,7 +122,7 @@ void EmojiStatusPanel::show(Descriptor &&descriptor) {
 	if (descriptor.backgroundEmojiMode) {
 		controller->session().api().peerPhoto().emojiListValue(
 			Api::PeerPhoto::EmojiListType::Background
-		) | rpl::start_with_next([=](std::vector<DocumentId> &&list) {
+		) | rpl::on_next([=](std::vector<DocumentId> &&list) {
 			auto tmp = std::vector<EmojiStatusId>();
 			for (const auto &id : list) {
 				tmp.push_back(EmojiStatusId{ .documentId = id });
@@ -237,7 +237,7 @@ void EmojiStatusPanel::create(const Descriptor &descriptor) {
 	};
 
 	_panel->selector()->contextMenuRequested(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_panel->selector()->showMenuWithDetails({});
 	}, _panel->lifetime());
 
@@ -262,7 +262,7 @@ void EmojiStatusPanel::create(const Descriptor &descriptor) {
 		rpl::merge(
 			std::move(statusChosen),
 			std::move(emojiChosen)
-		) | rpl::start_with_next([=](const Chosen &chosen) {
+		) | rpl::on_next([=](const Chosen &chosen) {
 			const auto owner = &controller->session().data();
 			startAnimation(owner, body, chosen.id, chosen.animation);
 			_someCustomChosen.fire({ chosen.id, chosen.until });
@@ -286,7 +286,7 @@ void EmojiStatusPanel::create(const Descriptor &descriptor) {
 			std::move(emojiChosen)
 		) | rpl::filter([=](const Chosen &chosen) {
 			return filter(controller, chosen.id);
-		}) | rpl::start_with_next([=](const Chosen &chosen) {
+		}) | rpl::on_next([=](const Chosen &chosen) {
 			if (chosen.until == Selector::kPickCustomTimeId) {
 				_panel->hideAnimated();
 				controller->show(Box(PickUntilBox, [=](TimeId seconds) {
diff --git a/Telegram/SourceFiles/info/profile/info_profile_inner_widget.cpp b/Telegram/SourceFiles/info/profile/info_profile_inner_widget.cpp
index 970f4847c8..1cf9298335 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_inner_widget.cpp
@@ -57,7 +57,7 @@ void AddAboutVerification(
 	peer->session().changes().peerFlagsValue(
 		peer,
 		Data::PeerUpdate::Flag::VerifyInfo
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto info = peer->botVerifyDetails();
 		while (inner->count()) {
 			delete inner->widgetAt(0);
@@ -93,7 +93,7 @@ InnerWidget::InnerWidget(
 , _sublist(_controller->key().sublist())
 , _content(setupContent(this, origin)) {
 	_content->heightValue(
-	) | rpl::start_with_next([this](int height) {
+	) | rpl::on_next([this](int height) {
 		if (!_inResize) {
 			resizeToWidth(width());
 			updateDesiredHeight();
@@ -112,7 +112,7 @@ object_ptr<Ui::RpWidget> InnerWidget::setupContent(
 		user->session().changes().peerFlagsValue(
 			user,
 			Data::PeerUpdate::Flag::FullInfo
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			auto &photos = user->session().api().peerPhoto();
 			if (const auto original = photos.nonPersonalPhoto(user)) {
 				// Preload it for the edit contact box.
@@ -195,7 +195,7 @@ void InnerWidget::setupMembers(
 	addAboutVerificationOrDivider(inner, std::move(showDivider));
 	_members = inner->add(object_ptr<Members>(inner, _controller));
 	_members->scrollToRequests(
-	) | rpl::start_with_next([this](Ui::ScrollToRequest request) {
+	) | rpl::on_next([this](Ui::ScrollToRequest request) {
 		auto min = (request.ymin < 0)
 			? request.ymin
 			: MapFrom(this, _members, QPoint(0, request.ymin)).y();
@@ -207,7 +207,7 @@ void InnerWidget::setupMembers(
 		_scrollToRequests.fire({ min, max });
 	}, _members->lifetime());
 	_members->onlineCountValue(
-	) | rpl::start_with_next([=](int count) {
+	) | rpl::on_next([=](int count) {
 		_onlineCount.fire_copy(count);
 	}, _members->lifetime());
 
diff --git a/Telegram/SourceFiles/info/profile/info_profile_members.cpp b/Telegram/SourceFiles/info/profile/info_profile_members.cpp
index 0574dd6da7..729b1a365d 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_members.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_members.cpp
@@ -57,13 +57,13 @@ Members::Members(
 	_listController->setDelegate(static_cast<PeerListDelegate*>(this));
 
 	_controller->searchFieldController()->queryValue(
-	) | rpl::start_with_next([this](QString &&query) {
+	) | rpl::on_next([this](QString &&query) {
 		peerListScrollToTop();
 		content()->searchQueryChanged(std::move(query));
 	}, lifetime());
 	MembersCountValue(
 		_peer
-	) | rpl::start_with_next([this](int count) {
+	) | rpl::on_next([this](int count) {
 		const auto enabled = (count >= kEnableSearchMembersAfterCount);
 		_controller->setSearchEnabledByContent(enabled);
 	}, lifetime());
@@ -156,12 +156,12 @@ void Members::setupHeader() {
 	setupButtons();
 
 	//_controller->wrapValue(
-	//) | rpl::start_with_next([this](Wrap wrap) {
+	//) | rpl::on_next([this](Wrap wrap) {
 	//	_wrap = wrap;
 	//	updateSearchOverrides();
 	//}, lifetime());
 	widthValue(
-	) | rpl::start_with_next([this](int width) {
+	) | rpl::on_next([this](int width) {
 		_header->resizeToWidth(width);
 	}, _header->lifetime());
 }
@@ -197,7 +197,7 @@ void Members::setupButtons() {
 	auto visible = _peer->isMegagroup()
 		? CanViewParticipantsValue(_peer->asMegagroup())
 		: rpl::single(true);
-	rpl::duplicate(visible) | rpl::start_with_next([=](bool visible) {
+	rpl::duplicate(visible) | rpl::on_next([=](bool visible) {
 		_openMembers->setVisible(visible);
 	}, lifetime());
 
@@ -225,7 +225,7 @@ void Members::setupButtons() {
 		std::move(addMemberShown),
 		std::move(searchShown),
 		std::move(visible)
-	) | rpl::start_with_next([this] {
+	) | rpl::on_next([this] {
 		updateHeaderControlsGeometry(width());
 	}, lifetime());
 }
@@ -238,7 +238,7 @@ void Members::setupList() {
 		this,
 		_listController.get());
 	_list->scrollToRequests(
-	) | rpl::start_with_next([this](Ui::ScrollToRequest request) {
+	) | rpl::on_next([this](Ui::ScrollToRequest request) {
 		auto addmin = (request.ymin < 0 || !_header)
 			? 0
 			: _header->height();
@@ -250,11 +250,11 @@ void Members::setupList() {
 			request.ymax + addmax });
 	}, _list->lifetime());
 	widthValue(
-	) | rpl::start_with_next([this](int newWidth) {
+	) | rpl::on_next([this](int newWidth) {
 		_list->resizeToWidth(newWidth);
 	}, _list->lifetime());
 	_list->heightValue(
-	) | rpl::start_with_next([=](int listHeight) {
+	) | rpl::on_next([=](int listHeight) {
 		auto newHeight = (listHeight > st::membersMarginBottom)
 			? (topSkip
 				+ listHeight
diff --git a/Telegram/SourceFiles/info/profile/info_profile_phone_menu.cpp b/Telegram/SourceFiles/info/profile/info_profile_phone_menu.cpp
index 85fde827f3..0457cb1d33 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_phone_menu.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_phone_menu.cpp
@@ -84,7 +84,7 @@ TextItem::TextItem(
 	setMinWidth(std::max(min1, min2) + added);
 
 	sizeValue(
-	) | rpl::start_with_next([=](const QSize &s) {
+	) | rpl::on_next([=](const QSize &s) {
 		if (s.width() <= added) {
 			return;
 		}
diff --git a/Telegram/SourceFiles/info/profile/info_profile_text.cpp b/Telegram/SourceFiles/info/profile/info_profile_text.cpp
index bfca3d053f..bea4e93dcb 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_text.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_text.cpp
@@ -48,7 +48,7 @@ TextWithLabel CreateTextWithLabel(
 		layout,
 		std::move(nonEmptyText),
 		textSt));
-	std::move(text) | rpl::start_with_next([=] {
+	std::move(text) | rpl::on_next([=] {
 		labeled->resizeToWidth(layout->width());
 	}, labeled->lifetime());
 	labeled->setSelectable(true);
diff --git a/Telegram/SourceFiles/info/profile/info_profile_top_bar.cpp b/Telegram/SourceFiles/info/profile/info_profile_top_bar.cpp
index bbf587bab6..828f906a45 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_top_bar.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_top_bar.cpp
@@ -388,7 +388,7 @@ TopBar::TopBar(
 	_peer->session().changes().peerFlagsValue(
 		_peer,
 		Data::PeerUpdate::Flag::OnlineStatus | Data::PeerUpdate::Flag::Members
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_statusLabel->refresh();
 	}, lifetime());
 
@@ -415,14 +415,14 @@ TopBar::TopBar(
 			std::move(badgeUpdates),
 			_botVerify->updated());
 	}
-	_title->naturalWidthValue() | rpl::start_with_next([=](int w) {
+	_title->naturalWidthValue() | rpl::on_next([=](int w) {
 		_title->resizeToWidth(w);
 	}, _title->lifetime());
 	badgeUpdates = rpl::merge(
 		std::move(badgeUpdates),
 		nameValue() | rpl::to_empty,
 		_backToggles.value() | rpl::to_empty);
-	std::move(badgeUpdates) | rpl::start_with_next([=] {
+	std::move(badgeUpdates) | rpl::on_next([=] {
 		updateLabelsPosition();
 	}, _title->lifetime());
 
@@ -434,7 +434,7 @@ TopBar::TopBar(
 			_peer,
 			Data::PeerUpdate::Flag::FullInfo
 				| Data::PeerUpdate::Flag::ChannelAmIn
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			setupActions(controller);
 		}, lifetime());
 	}
@@ -473,7 +473,7 @@ TopBar::TopBar(
 			_peer,
 			Data::PeerUpdate::Flag::EmojiStatus
 				| Data::PeerUpdate::Flag::ColorProfile) | rpl::to_empty
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (_pinnedToTopGiftsFirstTimeShowed) {
 			_peer->session().recentSharedGifts().clearLastRequestTime(_peer);
 			setupPinnedToTopGifts(controller);
@@ -484,7 +484,7 @@ TopBar::TopBar(
 
 	std::move(
 		descriptor.showFinished
-	) | rpl::take(1) | rpl::start_with_next([=] {
+	) | rpl::take(1) | rpl::on_next([=] {
 		setupPinnedToTopGifts(controller);
 	}, lifetime());
 
@@ -539,7 +539,7 @@ void TopBar::adjustColors(const std::optional<QColor> &edgeColor) {
 		if (!_peer->isMegagroup() && !_topic) {
 			setupStatusWithRating();
 		}
-		_status->widthValue() | rpl::start_with_next([=] {
+		_status->widthValue() | rpl::on_next([=] {
 			updateStatusPosition(_progress.current());
 		}, _status->lifetime());
 		_statusLabel = std::make_unique<StatusLabel>(_status.data(), _peer);
@@ -697,20 +697,20 @@ void TopBar::setupActions(not_null<Window::SessionController*> controller) {
 	const auto guard = gsl::finally([&] {
 		addMore();
 		style::PaletteChanged(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			const auto current = _edgeColor.current();
 			_edgeColor.force_assign(current);
 		}, _actions->lifetime());
 		_edgeColor.value() | rpl::map([=](std::optional<QColor> c) {
 			return mapActionStyle(c);
-		}) | rpl::start_with_next([=](
+		}) | rpl::on_next([=](
 				TopBarActionButtonStyle st) {
 			for (const auto &button : buttons) {
 				button->setStyle(st);
 			}
 		}, _actions->lifetime());
 		const auto padding = st::infoProfileTopBarActionButtonsPadding;
-		sizeValue() | rpl::start_with_next([=](const QSize &size) {
+		sizeValue() | rpl::on_next([=](const QSize &size) {
 			const auto ratio = float64(size.height())
 				/ (st::infoProfileTopBarActionButtonsHeight
 					+ st::infoLayerTopBarHeight);
@@ -785,7 +785,7 @@ void TopBar::setupActions(not_null<Window::SessionController*> controller) {
 		(topic
 			? NotificationsEnabledValue(topic)
 			: NotificationsEnabledValue(peer)
-		) | rpl::start_with_next([=](bool enabled) {
+		) | rpl::on_next([=](bool enabled) {
 			notifications->toggle(enabled);
 			notifications->setText(enabled
 				? tr::lng_profile_action_short_mute(tr::now)
@@ -828,7 +828,7 @@ void TopBar::setupActions(not_null<Window::SessionController*> controller) {
 				});
 		buttons.push_back(notifications);
 		_actions->add(notifications);
-		_edgeColor.value() | rpl::start_with_next([=](
+		_edgeColor.value() | rpl::on_next([=](
 				std::optional<QColor> c) {
 			notifications->setLottieColor(c
 				? (const style::color*)(nullptr)
@@ -1052,7 +1052,7 @@ void TopBar::setupUserpicButton(
 		_peer->session().downloaderTaskFinished(
 		) | rpl::filter([=] {
 			return !Ui::PeerUserpicLoading(_userpicView);
-		}) | rpl::start_with_next([=] {
+		}) | rpl::on_next([=] {
 			update();
 			_userpicLoadingLifetime.destroy();
 		}, _userpicLoadingLifetime);
@@ -1068,14 +1068,14 @@ void TopBar::setupUserpicButton(
 			_peer,
 			Data::PeerUpdate::Flag::Photo
 				| Data::PeerUpdate::Flag::FullInfo) | rpl::to_empty
-	) | rpl::start_with_next(invalidate, lifetime());
+	) | rpl::on_next(invalidate, lifetime());
 
 	if (const auto broadcast = _peer->monoforumBroadcast()) {
 		_peer->session().changes().peerFlagsValue(
 			broadcast,
 			Data::PeerUpdate::Flag::Photo
 				| Data::PeerUpdate::Flag::FullInfo
-		) | rpl::to_empty | rpl::start_with_next(invalidate, lifetime());
+		) | rpl::to_empty | rpl::on_next(invalidate, lifetime());
 	}
 
 	using ChosenType = Ui::UserpicButton::ChosenType;
@@ -1158,7 +1158,7 @@ void TopBar::setupUserpicButton(
 		}
 	};
 
-	_userpicButton->clicks() | rpl::start_with_next([=](
+	_userpicButton->clicks() | rpl::on_next([=](
 			Qt::MouseButton button) {
 		if (button == Qt::RightButton && hasMenu()) {
 			*menu = base::make_unique_q<Ui::PopupMenu>(
@@ -1297,7 +1297,7 @@ void TopBar::setupUniqueBadgeTooltip() {
 	}
 	base::timer_once(kWaitBeforeGiftBadge) | rpl::then(
 		_badge->updated()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto widget = _badge->widget();
 		const auto &content = _badgeContent.current();
 		const auto &collectible = content.emojiStatusId.collectible;
@@ -1339,7 +1339,7 @@ void TopBar::hideBadgeTooltip() {
 		raw->shownValue(
 		) | rpl::filter(
 			!rpl::mappers::_1
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			const auto i = ranges::find(
 				_badgeOldTooltips,
 				raw,
@@ -1361,7 +1361,7 @@ rpl::producer<> TopBar::backRequest() const {
 }
 
 void TopBar::setOnlineCount(rpl::producer<int> &&count) {
-	std::move(count) | rpl::start_with_next([=](int v) {
+	std::move(count) | rpl::on_next([=](int v) {
 		if (_statusLabel) {
 			_statusLabel->setOnlineCount(v);
 		}
@@ -1829,7 +1829,7 @@ void TopBar::setupButtons(
 	rpl::combine(
 		_wrap.value(),
 		_edgeColor.value()
-	) | rpl::start_with_next([=](
+	) | rpl::on_next([=](
 			Wrap wrap,
 			std::optional<QColor> edgeColor) mutable {
 		const auto isLayer = (wrap == Wrap::Layer);
@@ -1877,7 +1877,7 @@ void TopBar::setupButtons(
 					controller->hideLayer();
 					controller->hideSpecialLayer();
 				}));
-			widthValue() | rpl::start_with_next([=] {
+			widthValue() | rpl::on_next([=] {
 				_close->moveToRight(0, 0);
 			}, _close->lifetime());
 		}
@@ -1908,7 +1908,7 @@ void TopBar::addTopBarEditButton(
 		controller->showSettings(::Settings::Information::Id());
 	});
 
-	widthValue() | rpl::start_with_next([=] {
+	widthValue() | rpl::on_next([=] {
 		if (_close) {
 			_topBarButton->moveToRight(_close->width(), 0);
 		} else {
@@ -2021,7 +2021,7 @@ void TopBar::setupShowLastSeen(
 			user,
 			Data::PeerUpdate::Flag::OnlineStatus),
 		Data::AmPremiumValue(&user->session())
-	) | rpl::start_with_next([=](auto, bool premium) {
+	) | rpl::on_next([=](auto, bool premium) {
 		const auto wasShown = !_showLastSeen->isHidden();
 		const auto hiddenByMe = user->lastseen().isHiddenByMe();
 		const auto shown = hiddenByMe
@@ -2038,7 +2038,7 @@ void TopBar::setupShowLastSeen(
 		Api::UserPrivacy::Key::LastSeen
 	) | rpl::filter([=](Api::UserPrivacy::Rule rule) {
 		return (rule.option == Api::UserPrivacy::Option::Everyone);
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		if (user->lastseen().isHiddenByMe()) {
 			user->updateFullForced();
 		}
@@ -2264,7 +2264,7 @@ void TopBar::setupNewGifts(
 	} else if (!_lottiePlayer) {
 		_lottiePlayer = std::make_unique<Lottie::MultiPlayer>(
 			Lottie::Quality::Default);
-		_lottiePlayer->updates() | rpl::start_with_next([=] {
+		_lottiePlayer->updates() | rpl::on_next([=] {
 			update();
 		}, lifetime());
 	}
@@ -2316,7 +2316,7 @@ void TopBar::setupNewGifts(
 		rpl::empty_value()
 	) | rpl::then(
 		_peer->session().downloaderTaskFinished()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto allLoaded = true;
 		for (auto &entry : _pinnedToTopGifts) {
 			if (!entry.animation && !entry.lastFrame.isNull()) {
@@ -2527,7 +2527,7 @@ void TopBar::setupStoryOutline(const QRect &geometry) {
 			) | rpl::filter([=](const Data::PeerUpdate &update) {
 				return update.peer == _peer;
 			}) | rpl::to_empty)
-	) | rpl::start_with_next([=](
+	) | rpl::on_next([=](
 			std::optional<QColor> edgeColor,
 			rpl::empty_value) {
 		const auto geometry = QRectF(userpicGeometry());
@@ -2680,7 +2680,7 @@ void TopBar::setupStatusWithRating() {
 	_status->setAttribute(Qt::WA_TransparentForMouseEvents);
 	if (const auto rating = _starsRating.get()) {
 		_statusShift = rating->widthValue();
-		_statusShift.changes() | rpl::start_with_next([=] {
+		_statusShift.changes() | rpl::on_next([=] {
 			updateLabelsPosition();
 		}, _status->lifetime());
 		rating->raise();
diff --git a/Telegram/SourceFiles/info/profile/info_profile_widget.cpp b/Telegram/SourceFiles/info/profile/info_profile_widget.cpp
index 5460adec45..d9d24bed01 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_widget.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_widget.cpp
@@ -106,7 +106,7 @@ Widget::Widget(
 
 	_inner->move(0, 0);
 	_inner->scrollToRequests(
-	) | rpl::start_with_next([this](Ui::ScrollToRequest request) {
+	) | rpl::on_next([this](Ui::ScrollToRequest request) {
 		if (request.ymin < 0) {
 			scrollTopRestore(
 				qMin(scrollTopSave(), request.ymax));
@@ -115,19 +115,19 @@ Widget::Widget(
 		}
 	}, lifetime());
 
-	_inner->backRequest() | rpl::start_with_next([=] {
+	_inner->backRequest() | rpl::on_next([=] {
 		checkBeforeClose([=] { controller->showBackFromStack(); });
 	}, _inner->lifetime());
 
 	if (_pinnedToTop) {
 		_inner->widthValue(
-		) | rpl::start_with_next([=](int w) {
+		) | rpl::on_next([=](int w) {
 			_pinnedToTop->resizeToWidth(w);
 			setScrollTopSkip(_pinnedToTop->height());
 		}, _pinnedToTop->lifetime());
 
 		_pinnedToTop->heightValue(
-		) | rpl::start_with_next([=](int h) {
+		) | rpl::on_next([=](int h) {
 			setScrollTopSkip(h);
 		}, _pinnedToTop->lifetime());
 	}
@@ -141,14 +141,14 @@ Widget::Widget(
 		};
 
 		_inner->sizeValue(
-		) | rpl::start_with_next([=](const QSize &s) {
+		) | rpl::on_next([=](const QSize &s) {
 			_pinnedToBottom->resizeToWidth(s.width());
 		}, _pinnedToBottom->lifetime());
 
 		rpl::combine(
 			_pinnedToBottom->heightValue(),
 			heightValue()
-		) | rpl::start_with_next(processHeight, _pinnedToBottom->lifetime());
+		) | rpl::on_next(processHeight, _pinnedToBottom->lifetime());
 	}
 
 	if (_pinnedToTop
diff --git a/Telegram/SourceFiles/info/reactions_list/info_reactions_list_widget.cpp b/Telegram/SourceFiles/info/reactions_list/info_reactions_list_widget.cpp
index 9b0f4ad0e8..7448c4492b 100644
--- a/Telegram/SourceFiles/info/reactions_list/info_reactions_list_widget.cpp
+++ b/Telegram/SourceFiles/info/reactions_list/info_reactions_list_widget.cpp
@@ -107,7 +107,7 @@ InnerWidget::InnerWidget(
 	setContent(_list.data());
 	_full.controller->setDelegate(static_cast<PeerListDelegate*>(this));
 	_tabs->changes(
-	) | rpl::start_with_next([=](Data::ReactionId reaction) {
+	) | rpl::on_next([=](Data::ReactionId reaction) {
 		_selected = reaction;
 		_full.switchTab(reaction);
 	}, _list->lifetime());
@@ -156,7 +156,7 @@ object_ptr<InnerWidget::ListWidget> InnerWidget::setupList(
 	const auto raw = result.data();
 
 	raw->scrollToRequests(
-	) | rpl::start_with_next([this](Ui::ScrollToRequest request) {
+	) | rpl::on_next([this](Ui::ScrollToRequest request) {
 		const auto skip = _tabsHeight.current()
 			+ st::infoCommonGroupsMargin.top();
 		auto addmin = (request.ymin < 0) ? 0 : skip;
@@ -167,12 +167,12 @@ object_ptr<InnerWidget::ListWidget> InnerWidget::setupList(
 	}, raw->lifetime());
 
 	_tabs->move(0, 0);
-	_tabsHeight.value() | rpl::start_with_next([=](int tabs) {
+	_tabsHeight.value() | rpl::on_next([=](int tabs) {
 		raw->moveToLeft(0, tabs + st::infoCommonGroupsMargin.top());
 	}, raw->lifetime());
 
 	parent->widthValue(
-	) | rpl::start_with_next([=](int newWidth) {
+	) | rpl::on_next([=](int newWidth) {
 		_tabs->resizeToWidth(newWidth);
 		raw->resizeToWidth(newWidth);
 	}, raw->lifetime());
@@ -180,7 +180,7 @@ object_ptr<InnerWidget::ListWidget> InnerWidget::setupList(
 	rpl::combine(
 		_tabsHeight.value(),
 		raw->heightValue()
-	) | rpl::start_with_next([parent](int tabsHeight, int listHeight) {
+	) | rpl::on_next([parent](int tabsHeight, int listHeight) {
 		const auto newHeight = tabsHeight
 			+ st::infoCommonGroupsMargin.top()
 			+ listHeight
diff --git a/Telegram/SourceFiles/info/requests_list/info_requests_list_widget.cpp b/Telegram/SourceFiles/info/requests_list/info_requests_list_widget.cpp
index b006dbbe28..ded41619b3 100644
--- a/Telegram/SourceFiles/info/requests_list/info_requests_list_widget.cpp
+++ b/Telegram/SourceFiles/info/requests_list/info_requests_list_widget.cpp
@@ -89,7 +89,7 @@ InnerWidget::InnerWidget(
 	_listController->setDelegate(static_cast<PeerListDelegate*>(this));
 
 	controller->searchFieldController()->queryValue(
-	) | rpl::start_with_next([this](QString &&query) {
+	) | rpl::on_next([this](QString &&query) {
 		peerListScrollToTop();
 		content()->searchQueryChanged(std::move(query));
 	}, lifetime());
@@ -124,7 +124,7 @@ object_ptr<InnerWidget::ListWidget> InnerWidget::setupList(
 		not_null<RequestsBoxController*> controller) {
 	auto result = object_ptr<ListWidget>(parent, controller);
 	result->scrollToRequests(
-	) | rpl::start_with_next([this](Ui::ScrollToRequest request) {
+	) | rpl::on_next([this](Ui::ScrollToRequest request) {
 		auto addmin = (request.ymin < 0) ? 0 : st::infoCommonGroupsMargin.top();
 		auto addmax = (request.ymax < 0) ? 0 : st::infoCommonGroupsMargin.top();
 		_scrollToRequests.fire({
@@ -134,12 +134,12 @@ object_ptr<InnerWidget::ListWidget> InnerWidget::setupList(
 	result->moveToLeft(0, st::infoCommonGroupsMargin.top());
 
 	parent->widthValue(
-	) | rpl::start_with_next([list = result.data()](int newWidth) {
+	) | rpl::on_next([list = result.data()](int newWidth) {
 		list->resizeToWidth(newWidth);
 	}, result->lifetime());
 
 	result->heightValue(
-	) | rpl::start_with_next([parent](int listHeight) {
+	) | rpl::on_next([parent](int listHeight) {
 		auto newHeight = st::infoCommonGroupsMargin.top()
 			+ listHeight
 			+ st::infoCommonGroupsMargin.bottom();
diff --git a/Telegram/SourceFiles/info/saved/info_saved_music_common.cpp b/Telegram/SourceFiles/info/saved/info_saved_music_common.cpp
index 9fd915d7fc..9a6c21b3b3 100644
--- a/Telegram/SourceFiles/info/saved/info_saved_music_common.cpp
+++ b/Telegram/SourceFiles/info/saved/info_saved_music_common.cpp
@@ -55,7 +55,7 @@ void SetupSavedMusic(
 	rpl::combine(
 		std::move(musicValue),
 		std::move(topBarColor)
-	) | rpl::start_with_next([=](
+	) | rpl::on_next([=](
 			HistoryItem *item,
 			std::optional<QColor> color) {
 		while (divider->entity()->count()) {
diff --git a/Telegram/SourceFiles/info/saved/info_saved_music_provider.cpp b/Telegram/SourceFiles/info/saved/info_saved_music_provider.cpp
index be311ea595..1fd89502bf 100644
--- a/Telegram/SourceFiles/info/saved/info_saved_music_provider.cpp
+++ b/Telegram/SourceFiles/info/saved/info_saved_music_provider.cpp
@@ -44,12 +44,12 @@ MusicProvider::MusicProvider(not_null<AbstractController*> controller)
 , _peer(controller->key().musicPeer())
 , _history(_peer->owner().history(_peer)) {
 	_controller->session().data().itemRemoved(
-	) | rpl::start_with_next([this](auto item) {
+	) | rpl::on_next([this](auto item) {
 		itemRemoved(item);
 	}, _lifetime);
 
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		for (auto &layout : _layouts) {
 			layout.second.item->invalidateCache();
 		}
@@ -168,7 +168,7 @@ void MusicProvider::refreshViewer() {
  	auto ids = Data::SavedMusicList(_peer, aroundId, _idsLimit);
 	std::move(
 		ids
-	) | rpl::start_with_next([=](Data::SavedMusicSlice &&slice) {
+	) | rpl::on_next([=](Data::SavedMusicSlice &&slice) {
 		if (!slice.fullCount()) {
 			// Don't display anything while full count is unknown.
 			return;
diff --git a/Telegram/SourceFiles/info/saved/info_saved_music_widget.cpp b/Telegram/SourceFiles/info/saved/info_saved_music_widget.cpp
index 46bfd26a9e..eb672f599f 100644
--- a/Telegram/SourceFiles/info/saved/info_saved_music_widget.cpp
+++ b/Telegram/SourceFiles/info/saved/info_saved_music_widget.cpp
@@ -154,7 +154,7 @@ void MusicInner::setupEmpty() {
 			) | rpl::to_empty
 		),
 		_list->heightValue()
-	) | rpl::start_with_next([=](auto, int listHeight) {
+	) | rpl::on_next([=](auto, int listHeight) {
 		const auto padding = st::infoMediaMargin;
 		if (const auto raw = _empty.release()) {
 			raw->hide();
@@ -288,7 +288,7 @@ MusicWidget::MusicWidget(
 	_inner = setInnerWidget(object_ptr<MusicInner>(this, controller));
 	_inner->setScrollHeightValue(scrollHeightValue());
 	_inner->scrollToRequests(
-	) | rpl::start_with_next([this](Ui::ScrollToRequest request) {
+	) | rpl::on_next([this](Ui::ScrollToRequest request) {
 		scrollTo(request);
 	}, _inner->lifetime());
 }
diff --git a/Telegram/SourceFiles/info/saved/info_saved_sublists_widget.cpp b/Telegram/SourceFiles/info/saved/info_saved_sublists_widget.cpp
index 298ef5f3e1..9fb177964d 100644
--- a/Telegram/SourceFiles/info/saved/info_saved_sublists_widget.cpp
+++ b/Telegram/SourceFiles/info/saved/info_saved_sublists_widget.cpp
@@ -61,7 +61,7 @@ SublistsWidget::SublistsWidget(
 	_list->showSavedSublists();
 	_list->setNarrowRatio(0.);
 
-	_list->chosenRow() | rpl::start_with_next([=](Dialogs::ChosenRow row) {
+	_list->chosenRow() | rpl::on_next([=](Dialogs::ChosenRow row) {
 		if (const auto sublist = row.key.sublist()) {
 			using namespace Window;
 			using namespace HistoryView;
@@ -77,7 +77,7 @@ SublistsWidget::SublistsWidget(
 	}, _list->lifetime());
 
 	const auto saved = &controller->session().data().savedMessages();
-	_list->heightValue() | rpl::start_with_next([=] {
+	_list->heightValue() | rpl::on_next([=] {
 		if (!saved->supported()) {
 			crl::on_main(controller, [=] {
 				controller->showSection(
diff --git a/Telegram/SourceFiles/info/settings/info_settings_widget.cpp b/Telegram/SourceFiles/info/settings/info_settings_widget.cpp
index 8707fe5dc9..8684d54687 100644
--- a/Telegram/SourceFiles/info/settings/info_settings_widget.cpp
+++ b/Telegram/SourceFiles/info/settings/info_settings_widget.cpp
@@ -62,19 +62,19 @@ Widget::Widget(
 , _pinnedToTop(_inner->createPinnedToTop(this))
 , _pinnedToBottom(_inner->createPinnedToBottom(this)) {
 	_inner->sectionShowOther(
-	) | rpl::start_with_next([=](Type type) {
+	) | rpl::on_next([=](Type type) {
 		controller->showSettings(type);
 	}, _inner->lifetime());
 
 	_inner->sectionShowBack(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		controller->showBackFromStack();
 	}, _inner->lifetime());
 
 	_inner->setStepDataReference(controller->stepDataReference());
 
 	_removesFromStack.events(
-	) | rpl::start_with_next([=](const std::vector<Type> &types) {
+	) | rpl::on_next([=](const std::vector<Type> &types) {
 		const auto sections = ranges::views::all(
 			types
 		) | ranges::views::transform([](Type type) {
@@ -85,13 +85,13 @@ Widget::Widget(
 
 	if (_pinnedToTop) {
 		_inner->widthValue(
-		) | rpl::start_with_next([=](int w) {
+		) | rpl::on_next([=](int w) {
 			_pinnedToTop->resizeToWidth(w);
 			setScrollTopSkip(_pinnedToTop->height());
 		}, _pinnedToTop->lifetime());
 
 		_pinnedToTop->heightValue(
-		) | rpl::start_with_next([=](int h) {
+		) | rpl::on_next([=](int h) {
 			setScrollTopSkip(h);
 		}, _pinnedToTop->lifetime());
 	}
@@ -105,7 +105,7 @@ Widget::Widget(
 		};
 
 		_inner->sizeValue(
-		) | rpl::start_with_next([=](const QSize &s) {
+		) | rpl::on_next([=](const QSize &s) {
 			_pinnedToBottom->resizeToWidth(s.width());
 			//processHeight();
 		}, _pinnedToBottom->lifetime());
@@ -113,7 +113,7 @@ Widget::Widget(
 		rpl::combine(
 			_pinnedToBottom->heightValue(),
 			heightValue()
-		) | rpl::start_with_next(processHeight, _pinnedToBottom->lifetime());
+		) | rpl::on_next(processHeight, _pinnedToBottom->lifetime());
 	}
 
 	if (_pinnedToTop
@@ -127,12 +127,12 @@ Widget::Widget(
 		rpl::combine(
 			_pinnedToTop->heightValue(),
 			_inner->heightValue()
-		) | rpl::start_with_next([=](int, int h) {
+		) | rpl::on_next([=](int, int h) {
 			_flexibleScroll.contentHeightValue.fire(h + heightDiff());
 		}, _pinnedToTop->lifetime());
 
 		scrollTopValue(
-		) | rpl::start_with_next([=](int top) {
+		) | rpl::on_next([=](int top) {
 			if (!_pinnedToTop) {
 				return;
 			}
@@ -144,7 +144,7 @@ Widget::Widget(
 		}, _inner->lifetime());
 
 		_flexibleScroll.fillerWidthValue.events(
-		) | rpl::start_with_next([=](int w) {
+		) | rpl::on_next([=](int w) {
 			_inner->resizeToWidth(w);
 		}, _inner->lifetime());
 
diff --git a/Telegram/SourceFiles/info/similar_peers/info_similar_peers_widget.cpp b/Telegram/SourceFiles/info/similar_peers/info_similar_peers_widget.cpp
index 003166ff98..77b6045dec 100644
--- a/Telegram/SourceFiles/info/similar_peers/info_similar_peers_widget.cpp
+++ b/Telegram/SourceFiles/info/similar_peers/info_similar_peers_widget.cpp
@@ -104,7 +104,7 @@ void ListController::prepare() {
 
 	Data::AmPremiumValue(
 		&_peer->session()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		participants->loadSimilarPeers(_peer);
 		rebuild();
 	}, lifetime());
@@ -112,7 +112,7 @@ void ListController::prepare() {
 	participants->similarLoaded(
 	) | rpl::filter(
 		rpl::mappers::_1 == _peer
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		rebuild();
 	}, lifetime());
 }
@@ -187,7 +187,7 @@ void ListController::setupUnlock() {
 		(_peer->isBroadcast()
 			? tr::lng_similar_channels_show_more()
 			: tr::lng_similar_bots_show_more())
-	) | rpl::start_with_next([=](QSize size, const auto &) {
+	) | rpl::on_next([=](QSize size, const auto &) {
 		auto top = st::similarChannelsLockFade
 			+ st::similarChannelsLockPadding.top();
 		button->setGeometry(
@@ -223,7 +223,7 @@ void ListController::setupUnlock() {
 	_unlockHeight = _unlock->heightValue();
 
 	_unlock->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(_unlock);
 		const auto width = _unlock->width();
 		const auto fade = st::similarChannelsLockFade;
@@ -369,7 +369,7 @@ object_ptr<InnerWidget::ListWidget> InnerWidget::setupList(
 		controller);
 	controller->setContentWidget(this);
 	result->scrollToRequests(
-	) | rpl::start_with_next([this](Ui::ScrollToRequest request) {
+	) | rpl::on_next([this](Ui::ScrollToRequest request) {
 		auto addmin = (request.ymin < 0)
 			? 0
 			: st::infoCommonGroupsMargin.top();
@@ -382,13 +382,13 @@ object_ptr<InnerWidget::ListWidget> InnerWidget::setupList(
 	}, result->lifetime());
 	result->moveToLeft(0, st::infoCommonGroupsMargin.top());
 	parent->widthValue(
-	) | rpl::start_with_next([list = result.data()](int newWidth) {
+	) | rpl::on_next([list = result.data()](int newWidth) {
 		list->resizeToWidth(newWidth);
 	}, result->lifetime());
 	rpl::combine(
 		result->heightValue(),
 		controller->unlockHeightValue()
-	) | rpl::start_with_next([=](int listHeight, int unlockHeight) {
+	) | rpl::on_next([=](int listHeight, int unlockHeight) {
 		auto newHeight = st::infoCommonGroupsMargin.top()
 			+ listHeight
 			+ (unlockHeight
diff --git a/Telegram/SourceFiles/info/statistics/info_statistics_inner_widget.cpp b/Telegram/SourceFiles/info/statistics/info_statistics_inner_widget.cpp
index b9f07e68dd..0b047b69a4 100644
--- a/Telegram/SourceFiles/info/statistics/info_statistics_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/statistics/info_statistics_inner_widget.cpp
@@ -93,11 +93,11 @@ void ProcessZoom(
 		return;
 	}
 	widget->zoomRequests(
-	) | rpl::start_with_next([=](float64 x) {
+	) | rpl::on_next([=](float64 x) {
 		d.api->requestZoom(
 			zoomToken,
 			x
-		) | rpl::start_with_next_error_done([=](
+		) | rpl::on_next_error_done([=](
 				const Data::StatisticalGraph &graph) {
 			if (graph.chart) {
 				widget->setZoomedChartData(graph.chart, x, type);
@@ -165,7 +165,7 @@ void FillStatistic(
 			descriptor.api->requestZoom(
 				graphData.zoomToken,
 				0
-			) | rpl::start_with_next_error_done([=, graphPtr = &graphData](
+			) | rpl::on_next_error_done([=, graphPtr = &graphData](
 					const Data::StatisticalGraph &graph) mutable {
 				{
 					// Save the loaded async data to cache.
@@ -393,7 +393,7 @@ void FillOverview(
 		sub->setTextColorOverride(st::windowSubTextFg->c);
 
 		primary->geometryValue(
-		) | rpl::start_with_next([=](const QRect &g) {
+		) | rpl::on_next([=](const QRect &g) {
 			const auto &padding = st::statisticsOverviewSecondValuePadding;
 			second->moveToLeft(
 				rect::right(g) + padding.left(),
@@ -539,7 +539,7 @@ void FillOverview(
 	}
 	container->showChildren();
 	container->sizeValue() | rpl::distinct_until_changed(
-	) | rpl::start_with_next([=](const QSize &s) {
+	) | rpl::on_next([=](const QSize &s) {
 		const auto halfWidth = s.width() / 2;
 		{
 			const auto &p = st::statisticsOverviewValuePadding;
@@ -584,7 +584,7 @@ void FillLoading(
 
 	(
 		std::move(showFinished) | rpl::take(1)
-	) | rpl::start_with_next([animate = std::move(icon.animate)] {
+	) | rpl::on_next([animate = std::move(icon.animate)] {
 		animate(anim::repeat::loop);
 	}, icon.widget->lifetime());
 	content->add(std::move(icon.widget));
@@ -646,10 +646,10 @@ void InnerWidget::load() {
 		_showFinished.events());
 
 	_showFinished.events(
-	) | rpl::take(1) | rpl::start_with_next([=] {
+	) | rpl::take(1) | rpl::on_next([=] {
 		if (!_contextId && !_storyId) {
 			descriptor.api->request(
-			) | rpl::start_with_done([=] {
+			) | rpl::on_done([=] {
 				_state.stats = Data::AnyStatistics{
 					descriptor.api->channelStats(),
 					descriptor.api->supergroupStats(),
@@ -839,7 +839,7 @@ void InnerWidget::fillRecentPosts(not_null<Ui::VerticalLayout*> container) {
 		_messagePreviews.push_back(raw);
 		raw->show();
 		button->sizeValue(
-		) | rpl::start_with_next([=](const QSize &s) {
+		) | rpl::on_next([=](const QSize &s) {
 			if (!s.isNull()) {
 				raw->setGeometry(Rect(s)
 					- st::statisticsRecentPostButton.padding);
diff --git a/Telegram/SourceFiles/info/statistics/info_statistics_recent_message.cpp b/Telegram/SourceFiles/info/statistics/info_statistics_recent_message.cpp
index 1a5da3a0da..e79502e4b8 100644
--- a/Telegram/SourceFiles/info/statistics/info_statistics_recent_message.cpp
+++ b/Telegram/SourceFiles/info/statistics/info_statistics_recent_message.cpp
@@ -199,7 +199,7 @@ void MessagePreview::processPreview() {
 
 	rpl::single(rpl::empty) | rpl::then(
 		session->downloaderTaskFinished()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto computed = computeThumbInfo();
 		const auto guard = gsl::finally([&] { update(); });
 		if (!computed.image) {
diff --git a/Telegram/SourceFiles/info/statistics/info_statistics_widget.cpp b/Telegram/SourceFiles/info/statistics/info_statistics_widget.cpp
index 087d3dd11e..ca88853300 100644
--- a/Telegram/SourceFiles/info/statistics/info_statistics_widget.cpp
+++ b/Telegram/SourceFiles/info/statistics/info_statistics_widget.cpp
@@ -65,7 +65,7 @@ Widget::Widget(
 		controller->statisticsTag().contextId,
 		controller->statisticsTag().storyId))) {
 	_inner->showRequests(
-	) | rpl::start_with_next([=](InnerWidget::ShowRequest request) {
+	) | rpl::on_next([=](InnerWidget::ShowRequest request) {
 		if (request.history) {
 			controller->showPeerHistory(
 				request.history.peer,
@@ -88,7 +88,7 @@ Widget::Widget(
 		}
 	}, _inner->lifetime());
 	_inner->scrollToRequests(
-	) | rpl::start_with_next([this](const Ui::ScrollToRequest &request) {
+	) | rpl::on_next([this](const Ui::ScrollToRequest &request) {
 		scrollTo(request);
 	}, _inner->lifetime());
 }
diff --git a/Telegram/SourceFiles/info/stories/info_stories_albums.cpp b/Telegram/SourceFiles/info/stories/info_stories_albums.cpp
index b8751c8db6..9ac995aa23 100644
--- a/Telegram/SourceFiles/info/stories/info_stories_albums.cpp
+++ b/Telegram/SourceFiles/info/stories/info_stories_albums.cpp
@@ -113,7 +113,7 @@ void EditAlbumBox(
 				fail);
 		}
 	};
-	title->submits() | rpl::start_with_next(submit, title->lifetime());
+	title->submits() | rpl::on_next(submit, title->lifetime());
 	auto text = id
 		? tr::lng_settings_save()
 		: tr::lng_stories_album_new_create();
diff --git a/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp b/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp
index 5e3ef2a9c7..6a88274fe4 100644
--- a/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp
@@ -99,7 +99,7 @@ EditAlbumBox::EditAlbumBox(
 , _changes(Data::StoryAlbumUpdate{ .peer = peer, .albumId = albumId })
 , _reload(std::move(reload)) {
 	_content->selectedListValue(
-	) | rpl::start_with_next([=](const SelectedItems &selection) {
+	) | rpl::on_next([=](const SelectedItems &selection) {
 		const auto stories = &_window->session().data().stories();
 		auto ids = stories->albumKnownInArchive(peer->id, albumId);
 		auto now = _changes.current();
@@ -125,7 +125,7 @@ void EditAlbumBox::prepare() {
 	setStyle(st::collectionEditBox);
 
 	_content->desiredHeightValue(
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		setDimensions(st::boxWideWidth, height);
 	}, _content->lifetime());
 
@@ -217,7 +217,7 @@ InnerWidget::InnerWidget(
 	preloadArchiveCount();
 
 	_albumId.value(
-	) | rpl::start_with_next([=](int albumId) {
+	) | rpl::on_next([=](int albumId) {
 		if (_albumsTabs
 			&& (albumId == Data::kStoriesAlbumIdSaved
 				|| ranges::contains(
@@ -246,7 +246,7 @@ void InnerWidget::preloadArchiveCount() {
 		rpl::mappers::_1 == key
 	) | rpl::take_while([=] {
 		return !stories->albumIdsCountKnown(_peer->id, kArchive);
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		refreshAlbumsTabs();
 	}, lifetime());
 }
@@ -257,7 +257,7 @@ void InnerWidget::setupAlbums() {
 
 	_peer->owner().stories().albumsListValue(
 		_peer->id
-	) | rpl::start_with_next([=](std::vector<Data::StoryAlbum> &&albums) {
+	) | rpl::on_next([=](std::vector<Data::StoryAlbum> &&albums) {
 		_albums = std::move(albums);
 		refreshAlbumsTabs();
 	}, lifetime());
@@ -430,7 +430,7 @@ void InnerWidget::addRecentButton(Ui::MultiSlideTracker &tracker) {
 	rpl::combine(
 		recent->sizeValue(),
 		rpl::duplicate(last)
-	) | rpl::start_with_next([=](QSize size, const Content &content) {
+	) | rpl::on_next([=](QSize size, const Content &content) {
 		if (content.elements.empty()) {
 			return;
 		}
@@ -554,7 +554,7 @@ void InnerWidget::finalizeTop() {
 	_top->resizeToWidth(width());
 
 	_top->heightValue(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		refreshHeight();
 	}, _top->lifetime());
 }
@@ -654,7 +654,7 @@ void InnerWidget::setupEmpty() {
 			) | rpl::to_empty
 		),
 		_list->heightValue()
-	) | rpl::start_with_next([=](auto, int listHeight) {
+	) | rpl::on_next([=](auto, int listHeight) {
 		const auto padding = st::infoMediaMargin;
 		if (const auto raw = _empty.release()) {
 			raw->hide();
@@ -793,13 +793,13 @@ void InnerWidget::refreshAlbumsTabs() {
 		_albumsWrap->resize(
 			_albumsWrap->width(),
 			padding.top() + _albumsTabs->height() + padding.top());
-		_albumsWrap->widthValue() | rpl::start_with_next([=](int width) {
+		_albumsWrap->widthValue() | rpl::on_next([=](int width) {
 			_albumsTabs->resizeToWidth(width);
 		}, _albumsTabs->lifetime());
 		_albumsTabs->move(0, padding.top());
 
 		_albumsTabs->activated(
-		) | rpl::start_with_next([=](const QString &id) {
+		) | rpl::on_next([=](const QString &id) {
 			if (id == u"add"_q) {
 				const auto added = [=](Data::StoryAlbum album) {
 					albumAdded(album);
@@ -816,7 +816,7 @@ void InnerWidget::refreshAlbumsTabs() {
 		}, _albumsTabs->lifetime());
 
 		_albumsTabs->contextMenuRequests(
-		) | rpl::start_with_next([=](const QString &id) {
+		) | rpl::on_next([=](const QString &id) {
 			if (id == u"add"_q || id == u"all"_q) {
 				return;
 			}
@@ -825,7 +825,7 @@ void InnerWidget::refreshAlbumsTabs() {
 
 		using ReorderUpdate = Ui::SubTabsReorderUpdate;
 		_albumsTabs->reorderUpdates(
-		) | rpl::start_with_next([=](const ReorderUpdate &update) {
+		) | rpl::on_next([=](const ReorderUpdate &update) {
 			if (update.state == ReorderUpdate::State::Applied) {
 				reorderAlbumsLocally(update);
 			}
diff --git a/Telegram/SourceFiles/info/stories/info_stories_provider.cpp b/Telegram/SourceFiles/info/stories/info_stories_provider.cpp
index e0e07fdadd..7bf322d334 100644
--- a/Telegram/SourceFiles/info/stories/info_stories_provider.cpp
+++ b/Telegram/SourceFiles/info/stories/info_stories_provider.cpp
@@ -51,7 +51,7 @@ Provider::Provider(not_null<AbstractController*> controller)
 , _albumId(controller->key().storiesAlbumId())
 , _addingToAlbumId(controller->key().storiesAddToAlbumId()) {
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		for (auto &layout : _layouts) {
 			layout.second.item->invalidateCache();
 		}
@@ -61,7 +61,7 @@ Provider::Provider(not_null<AbstractController*> controller)
 		Data::StoryUpdate::Flag::Destroyed
 	) | rpl::filter([=](const Data::StoryUpdate &update) {
 		return update.story->peer() == _peer;
-	}) | rpl::start_with_next([=](const Data::StoryUpdate &update) {
+	}) | rpl::on_next([=](const Data::StoryUpdate &update) {
 		storyRemoved(update.story);
 	}, _lifetime);
 }
@@ -183,7 +183,7 @@ void Provider::refreshViewer() {
 	auto ids = Data::AlbumStoriesIds(_peer, _albumId, aroundId, _idsLimit);
 	std::move(
 		ids
-	) | rpl::start_with_next([=](Data::StoriesIdsSlice &&slice) {
+	) | rpl::on_next([=](Data::StoriesIdsSlice &&slice) {
 		if (!slice.fullCount()) {
 			// Don't display anything while full count is unknown.
 			return;
diff --git a/Telegram/SourceFiles/info/stories/info_stories_widget.cpp b/Telegram/SourceFiles/info/stories/info_stories_widget.cpp
index 891d28da37..4c7f98689e 100644
--- a/Telegram/SourceFiles/info/stories/info_stories_widget.cpp
+++ b/Telegram/SourceFiles/info/stories/info_stories_widget.cpp
@@ -73,14 +73,14 @@ Widget::Widget(
 		_flexibleScroll))
 , _pinnedToTop(_inner->createPinnedToTop(this)) {
 	_emptyAlbumShown = _inner->albumEmptyValue();
-	_inner->albumIdChanges() | rpl::start_with_next([=](int id) {
+	_inner->albumIdChanges() | rpl::on_next([=](int id) {
 		controller->showSection(
 			Make(controller->storiesPeer(), id),
 			Window::SectionShow::Way::Backward);
 	}, _inner->lifetime());
 	_inner->setScrollHeightValue(scrollHeightValue());
 	_inner->scrollToRequests(
-	) | rpl::start_with_next([this](Ui::ScrollToRequest request) {
+	) | rpl::on_next([this](Ui::ScrollToRequest request) {
 		if (request.ymin < 0) {
 			scrollTopRestore(
 				qMin(scrollTopSave(), request.ymax));
@@ -91,13 +91,13 @@ Widget::Widget(
 
 	if (_pinnedToTop) {
 		_inner->widthValue(
-		) | rpl::start_with_next([=](int w) {
+		) | rpl::on_next([=](int w) {
 			_pinnedToTop->resizeToWidth(w);
 			setScrollTopSkip(_pinnedToTop->height());
 		}, _pinnedToTop->lifetime());
 
 		_pinnedToTop->heightValue(
-		) | rpl::start_with_next([=](int h) {
+		) | rpl::on_next([=](int h) {
 			setScrollTopSkip(h);
 		}, _pinnedToTop->lifetime());
 	}
@@ -121,11 +121,11 @@ Widget::Widget(
 	rpl::combine(
 		_albumId.value(),
 		_emptyAlbumShown.value()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		refreshBottom();
 	}, _inner->lifetime());
 
-	_inner->backRequest() | rpl::start_with_next([=] {
+	_inner->backRequest() | rpl::on_next([=] {
 		checkBeforeClose([=] { controller->showBackFromStack(); });
 	}, _inner->lifetime());
 }
@@ -206,14 +206,14 @@ void Widget::refreshBottom() {
 		};
 
 		_inner->sizeValue(
-		) | rpl::start_with_next([=](const QSize &s) {
+		) | rpl::on_next([=](const QSize &s) {
 			_pinnedToBottom->resizeToWidth(s.width());
 		}, _pinnedToBottom->lifetime());
 
 		rpl::combine(
 			_pinnedToBottom->heightValue(),
 			heightValue()
-		) | rpl::start_with_next(processHeight, _pinnedToBottom->lifetime());
+		) | rpl::on_next(processHeight, _pinnedToBottom->lifetime());
 	}
 }
 
@@ -248,14 +248,14 @@ void Widget::setupBottomButton(int wasBottomHeight) {
 	});
 
 	const auto buttonTop = st::boxRadius;
-	bottom->widthValue() | rpl::start_with_next([=](int width) {
+	bottom->widthValue() | rpl::on_next([=](int width) {
 		const auto normal = width - 2 * buttonTop;
 		button->resizeToWidth(normal);
 		const auto buttonLeft = (width - normal) / 2;
 		button->moveToLeft(buttonLeft, buttonTop);
 	}, button->lifetime());
 
-	button->heightValue() | rpl::start_with_next([=](int height) {
+	button->heightValue() | rpl::on_next([=](int height) {
 		bottom->resize(bottom->width(), st::boxRadius + height);
 	}, button->lifetime());
 
diff --git a/Telegram/SourceFiles/info/userpic/info_userpic_bubble_wrap.cpp b/Telegram/SourceFiles/info/userpic/info_userpic_bubble_wrap.cpp
index afeb8584df..dfac8ec479 100644
--- a/Telegram/SourceFiles/info/userpic/info_userpic_bubble_wrap.cpp
+++ b/Telegram/SourceFiles/info/userpic/info_userpic_bubble_wrap.cpp
@@ -76,7 +76,7 @@ not_null<Ui::RpWidget*> AddBubbleWrap(
 	}
 
 	bubble->paintRequest(
-	) | rpl::start_with_next([bubble, cached = std::move(cached)] {
+	) | rpl::on_next([bubble, cached = std::move(cached)] {
 		auto p = QPainter(bubble);
 		p.drawImage(0, 0, cached);
 	}, bubble->lifetime());
diff --git a/Telegram/SourceFiles/info/userpic/info_userpic_colors_editor.cpp b/Telegram/SourceFiles/info/userpic/info_userpic_colors_editor.cpp
index cb7846dfae..5a23e17895 100644
--- a/Telegram/SourceFiles/info/userpic/info_userpic_colors_editor.cpp
+++ b/Telegram/SourceFiles/info/userpic/info_userpic_colors_editor.cpp
@@ -94,7 +94,7 @@ void ColorsLine::fillButtons() {
 	_container = base::make_unique_q<Ui::RpWidget>(this);
 	const auto container = _container.get();
 	sizeValue(
-	) | rpl::start_with_next([=](const QSize &s) {
+	) | rpl::on_next([=](const QSize &s) {
 		container->setGeometry(Rect(s));
 	}, container->lifetime());
 
@@ -278,7 +278,7 @@ object_ptr<Ui::RpWidget> CreateGradientEditor(
 	const auto editor = container->add(std::move(ownedEditor));
 
 	buttonsContainer->chosenChanges(
-	) | rpl::start_with_next([=](ColorsLine::Chosen *chosen) {
+	) | rpl::on_next([=](ColorsLine::Chosen *chosen) {
 		if (chosen) {
 			const auto color = state->colors[chosen->index()];
 			editor->showColor(color);
@@ -290,10 +290,10 @@ object_ptr<Ui::RpWidget> CreateGradientEditor(
 		communication.result(state->colors);
 	});
 	// editor->submitRequests(
-	// ) | rpl::start_with_next([=] {
+	// ) | rpl::on_next([=] {
 	// }, editor->lifetime());
 	editor->colorValue(
-	) | rpl::start_with_next([=](QColor c) {
+	) | rpl::on_next([=](QColor c) {
 		if (const auto chosen = buttonsContainer->chosen()) {
 			chosen->setBrush(c);
 			state->colors[chosen->index()] = c;
@@ -303,7 +303,7 @@ object_ptr<Ui::RpWidget> CreateGradientEditor(
 
 	base::take(
 		communication.triggers
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		save();
 	}, container->lifetime());
 
diff --git a/Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder.cpp b/Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder.cpp
index 24fc13e4b0..cb725eb0d1 100644
--- a/Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder.cpp
+++ b/Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder.cpp
@@ -47,7 +47,7 @@ void ShowLayer(
 			st::userpicBuilderEmojiButton);
 		save->setTextTransform(Ui::RoundButton::TextTransform::NoTransform);
 		content->sizeValue(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			const auto &p = st::userpicBuilderEmojiSavePosiiton;
 			save->moveToRight(p.x(), p.y());
 		}, save->lifetime());
@@ -63,7 +63,7 @@ void ShowLayer(
 			layerRaw->closeLayer();
 		});
 		content->sizeValue(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			const auto &p = st::userpicBuilderEmojiBackPosiiton;
 			back->moveToLeft(p.x(), p.y());
 		}, back->lifetime());
diff --git a/Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder_menu_item.cpp b/Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder_menu_item.cpp
index 64be5312a0..835dd03126 100644
--- a/Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder_menu_item.cpp
+++ b/Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder_menu_item.cpp
@@ -97,7 +97,7 @@ void StickerProvider::processDocumentIndex(int documentIndex) {
 		_resolvingLifetime.destroy();
 		_owner->customEmojiManager().resolve(
 			document->id
-		) | rpl::start_with_next([=](not_null<DocumentData*> d) {
+		) | rpl::on_next([=](not_null<DocumentData*> d) {
 			_resolvingLifetime.destroy();
 			_downloadFinishedLifetime.destroy();
 
@@ -111,7 +111,7 @@ void StickerProvider::processDocumentIndex(int documentIndex) {
 				rpl::empty_value()
 			) | rpl::then(
 				_owner->session().downloaderTaskFinished()
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				if (mediaView->loaded()) {
 					_timer.callOnce(kTimeout);
 					_documentChanged.fire_copy(mediaView->owner());
@@ -203,7 +203,7 @@ void AddEmojiBuilderAction(
 
 	rpl::duplicate(
 		documents
-	) | rpl::start_with_next([=](std::vector<DocumentId> documents) {
+	) | rpl::on_next([=](std::vector<DocumentId> documents) {
 		state->manager.setDocuments(std::move(documents));
 	}, item->lifetime());
 
diff --git a/Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder_preview.cpp b/Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder_preview.cpp
index de89ec82b9..b78c7c89f7 100644
--- a/Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder_preview.cpp
+++ b/Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder_preview.cpp
@@ -77,7 +77,7 @@ void PreviewPainter::setDocument(
 
 	rpl::single() | rpl::then(
 		document->session().downloaderTaskFinished()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (!_media->loaded()) {
 			return;
 		}
diff --git a/Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder_widget.cpp b/Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder_widget.cpp
index 2bed5f5620..40f19bd7f0 100644
--- a/Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder_widget.cpp
+++ b/Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder_widget.cpp
@@ -223,7 +223,7 @@ EmojiSelector::EmojiSelector(
 , _controller(controller) {
 	std::move(
 		recent
-	) | rpl::start_with_next([=](std::vector<DocumentId> ids) {
+	) | rpl::on_next([=](std::vector<DocumentId> ids) {
 		_lastRecent = std::move(ids);
 		_recentChanges.fire({});
 	}, lifetime());
@@ -254,11 +254,11 @@ EmojiSelector::Selector EmojiSelector::createEmojiList(
 	const auto footer = list->createFooter().data();
 	list->refreshEmoji();
 	list->customChosen(
-	) | rpl::start_with_next([=](const ChatHelpers::FileChosen &chosen) {
+	) | rpl::on_next([=](const ChatHelpers::FileChosen &chosen) {
 		_chosen.fire_copy(chosen.document);
 	}, list->lifetime());
 	_recentChanges.events(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		createSelector(Type::Emoji);
 	}, list->lifetime());
 	list->setAllowWithoutPremium(true);
@@ -276,7 +276,7 @@ EmojiSelector::Selector EmojiSelector::createStickersList(
 	const auto footer = list->createFooter().data();
 	list->refreshRecent();
 	list->chosen(
-	) | rpl::start_with_next([=](const ChatHelpers::FileChosen &chosen) {
+	) | rpl::on_next([=](const ChatHelpers::FileChosen &chosen) {
 		_chosen.fire_copy(chosen.document);
 	}, list->lifetime());
 	return { list, footer };
@@ -292,7 +292,7 @@ void EmojiSelector::createSelector(Type type) {
 	const auto container = _container.get();
 	container->show();
 	sizeValue(
-	) | rpl::start_with_next([=](const QSize &s) {
+	) | rpl::on_next([=](const QSize &s) {
 		container->setGeometry(Rect(s));
 	}, container->lifetime());
 
@@ -312,7 +312,7 @@ void EmojiSelector::createSelector(Type type) {
 			+ QSize(pos.x() * 2, pos.y() * 2));
 		toggleButton->show();
 		toggleButton->paintRequest(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			auto p = QPainter(toggleButton);
 			const auto r = toggleButton->rect()
 				- QMargins(pos.x(), pos.y(), pos.x(), pos.y());
@@ -332,20 +332,20 @@ void EmojiSelector::createSelector(Type type) {
 	rpl::combine(
 		scroll->scrollTopValue(),
 		scroll->heightValue()
-	) | rpl::start_with_next([=](int scrollTop, int scrollHeight) {
+	) | rpl::on_next([=](int scrollTop, int scrollHeight) {
 		const auto scrollBottom = scrollTop + scrollHeight;
 		selector.list->setVisibleTopBottom(scrollTop, scrollBottom);
 	}, selector.list->lifetime());
 
 	selector.list->scrollToRequests(
-	) | rpl::start_with_next([=](int y) {
+	) | rpl::on_next([=](int y) {
 		scroll->scrollToY(y);
 		// _shadow->update();
 	}, selector.list->lifetime());
 
 	const auto separator = Ui::CreateChild<Ui::RpWidget>(container);
 	separator->paintRequest(
-	) | rpl::start_with_next([=](const QRect &r) {
+	) | rpl::on_next([=](const QRect &r) {
 		auto p = QPainter(separator);
 		p.fillRect(r, st::shadowFg);
 	}, separator->lifetime());
@@ -356,7 +356,7 @@ void EmojiSelector::createSelector(Type type) {
 
 	const auto scrollWidth = stScroll.width;
 	sizeValue(
-	) | rpl::start_with_next([=](const QSize &s) {
+	) | rpl::on_next([=](const QSize &s) {
 		const auto left = st::userpicBuilderEmojiSelectorLeft;
 		const auto mostTop = st::userpicBuilderEmojiSelectorLeft;
 
@@ -506,7 +506,7 @@ not_null<Ui::VerticalLayout*> CreateUserpicBuilder(
 		state->circleButtons[current]->clicked({}, Qt::LeftButton);
 	}
 	paletteBg->sizeValue(
-	) | rpl::start_with_next([=](const QSize &s) {
+	) | rpl::on_next([=](const QSize &s) {
 		palette->setGeometry(Ui::BubbleWrapInnerRect(Rect(s))
 			- st::userpicBuilderEmojiBubblePalettePadding);
 		AlignChildren(palette, palette->width());
@@ -530,18 +530,18 @@ not_null<Ui::VerticalLayout*> CreateUserpicBuilder(
 		controller,
 		base::take(data.documents));
 	selector->chosen(
-	) | rpl::start_with_next([=](not_null<DocumentData*> document) {
+	) | rpl::on_next([=](not_null<DocumentData*> document) {
 		state->gradientEditorStartData.documentId = document->id;
 		preview->setDocument(document);
 	}, preview->lifetime());
 	selectorBg->sizeValue(
-	) | rpl::start_with_next([=](const QSize &s) {
+	) | rpl::on_next([=](const QSize &s) {
 		selector->setGeometry(Ui::BubbleWrapInnerRect(Rect(s)));
 	}, selector->lifetime());
 
 	base::take(
 		communication.triggers
-	) | rpl::start_with_next([=, done = base::take(communication.result)] {
+	) | rpl::on_next([=, done = base::take(communication.result)] {
 		preview->result(Editor::kProfilePhotoSize, [=](Result result) {
 			done(std::move(result));
 		});
@@ -563,12 +563,12 @@ not_null<Ui::RpWidget*> CreateEmojiUserpic(
 		isForum);
 	std::move(
 		document
-	) | rpl::start_with_next([=](not_null<DocumentData*> d) {
+	) | rpl::on_next([=](not_null<DocumentData*> d) {
 		widget->setDocument(d);
 	}, widget->lifetime());
 	std::move(
 		colorIndex
-	) | rpl::start_with_next([=](int index) {
+	) | rpl::on_next([=](int index) {
 		widget->setGradientColors(
 			paletteGradients[index % paletteGradients.size()]);
 	}, widget->lifetime());
diff --git a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
index 3b1f921bff..d5f5fb5501 100644
--- a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
+++ b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
@@ -420,12 +420,12 @@ void FillBotUsepic(
 		titleLabel->width() + (icon ? icon->width() : 0),
 		titleLabel->height());
 	title->widthValue(
-	) | rpl::distinct_until_changed() | rpl::start_with_next([=](int w) {
+	) | rpl::distinct_until_changed() | rpl::on_next([=](int w) {
 		titleLabel->resizeToWidth(w
 			- (icon ? icon->width() + st::lineWidth : 0));
 	}, title->lifetime());
 	if (icon) {
-		title->paintRequest() | rpl::start_with_next([=] {
+		title->paintRequest() | rpl::on_next([=] {
 			auto p = Painter(title);
 			p.fillRect(title->rect(), Qt::transparent);
 			const auto x = std::min(
@@ -600,7 +600,7 @@ void ConfirmEmojiStatusBox(
 	box->addButton(tr::lng_cancel(), [=] {
 		box->closeBox();
 	});
-	box->boxClosing() | rpl::start_with_next([=] {
+	box->boxClosing() | rpl::on_next([=] {
 		if (!*set) {
 			done(false);
 		}
@@ -672,7 +672,7 @@ BotAction::BotAction(
 	_icon.move(_st.itemIconPosition);
 
 	paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		Painter p(this);
 		paint(p);
 	}, lifetime());
@@ -778,7 +778,7 @@ MenuBotIcon::MenuBotIcon(
 : RpWidget(parent)
 , _media(std::move(media)) {
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_image = QImage();
 		update();
 	}, lifetime());
@@ -899,7 +899,7 @@ void WebViewInstance::requestFullBot() {
 	_bot->session().changes().peerUpdates(
 		_bot,
 		Data::PeerUpdate::Flag::FullInfo
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (_botFullWaitingArgs.has_value()) {
 			auto args = *base::take(_botFullWaitingArgs);
 			if (args.url.isEmpty()) {
@@ -1346,7 +1346,7 @@ void WebViewInstance::show(ShowArgs &&args) {
 		: nullptr;
 	if (titleBadge) {
 		const auto raw = titleBadge.data();
-		raw->paintRequest() | rpl::start_with_next([=] {
+		raw->paintRequest() | rpl::on_next([=] {
 			auto p = Painter(raw);
 			const auto w = raw->width();
 			st::infoVerifiedStar.paint(p, st::lineWidth, 0, w);
@@ -1436,14 +1436,14 @@ void WebViewInstance::started(uint64 queryId) {
 	_session->data().webViewResultSent(
 	) | rpl::filter([=](const Data::Session::WebViewResultSent &sent) {
 		return (sent.queryId == queryId);
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		close();
 	}, _panel->lifetime());
 
 	const auto action = *_context.action;
 	base::timer_each(
 		kProlongTimeout
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		using Flag = MTPmessages_ProlongWebView::Flag;
 		_session->api().request(base::take(_prolongId)).cancel();
 		_prolongId = _session->api().request(MTPmessages_ProlongWebView(
@@ -1960,7 +1960,7 @@ void WebViewInstance::botSendPreparedMessage(
 			};
 			state->send({});
 		});
-		box->boxClosing() | rpl::start_with_next([=] {
+		box->boxClosing() | rpl::on_next([=] {
 			if (!state->sent) {
 				callback("USER_DECLINED");
 			}
@@ -1984,7 +1984,7 @@ void WebViewInstance::botSetEmojiStatus(
 	}
 	_session->data().customEmojiManager().resolve(
 		request.customEmojiId
-	) | rpl::start_with_next_error([=](not_null<DocumentData*> document) {
+	) | rpl::on_next_error([=](not_null<DocumentData*> document) {
 		const auto sticker = document->sticker();
 		if (!sticker || sticker->setType != Data::StickersType::Emoji) {
 			callback(u"SUGGESTED_EMOJI_INVALID"_q);
@@ -2727,7 +2727,7 @@ std::unique_ptr<Ui::DropdownMenu> MakeAttachBotsMenu(
 			bot,
 			callback);
 		action->forceShown(
-		) | rpl::start_with_next([=](bool shown) {
+		) | rpl::on_next([=](bool shown) {
 			if (shown) {
 				raw->setAutoHiding(false);
 			} else {
diff --git a/Telegram/SourceFiles/inline_bots/inline_bot_confirm_prepared.cpp b/Telegram/SourceFiles/inline_bots/inline_bot_confirm_prepared.cpp
index 8deb49908f..a3c7fefc06 100644
--- a/Telegram/SourceFiles/inline_bots/inline_bot_confirm_prepared.cpp
+++ b/Telegram/SourceFiles/inline_bots/inline_bot_confirm_prepared.cpp
@@ -109,13 +109,13 @@ PreviewWrap::PreviewWrap(
 
 	using namespace HistoryView;
 	_history->owner().viewRepaintRequest(
-	) | rpl::start_with_next([=](not_null<const Element*> view) {
+	) | rpl::on_next([=](not_null<const Element*> view) {
 		if (view == _item.get()) {
 			update();
 		}
 	}, lifetime());
 
-	_history->session().downloaderTaskFinished() | rpl::start_with_next([=] {
+	_history->session().downloaderTaskFinished() | rpl::on_next([=] {
 		update();
 	}, lifetime());
 
@@ -135,7 +135,7 @@ void PreviewWrap::prepare(not_null<HistoryItem*> item) {
 	widthValue(
 	) | rpl::filter([=](int width) {
 		return width >= st::msgMinWidth;
-	}) | rpl::start_with_next([=](int width) {
+	}) | rpl::on_next([=](int width) {
 		resizeTo(width);
 	}, lifetime());
 }
@@ -211,7 +211,7 @@ void PreparedPreviewBox(
 	const auto lifetime = box->lifetime().make_state<rpl::lifetime>();
 	std::move(
 		recipient
-	) | rpl::start_with_next([=](not_null<Data::Thread*> thread) {
+	) | rpl::on_next([=](not_null<Data::Thread*> thread) {
 		info->hide(anim::type::instant);
 		while (row->count()) {
 			delete row->widgetAt(0);
@@ -219,7 +219,7 @@ void PreparedPreviewBox(
 		AddSkip(row);
 		AddSinglePeerRow(row, thread, nullptr, choose);
 		if (const auto topic = thread->asTopic()) {
-			*lifetime = topic->destroyed() | rpl::start_with_next(reset);
+			*lifetime = topic->destroyed() | rpl::on_next(reset);
 		} else {
 			*lifetime = rpl::lifetime();
 		}
@@ -230,7 +230,7 @@ void PreparedPreviewBox(
 	}, info->lifetime());
 
 	item->history()->owner().itemRemoved(
-	) | rpl::start_with_next([=](not_null<const HistoryItem*> removed) {
+	) | rpl::on_next([=](not_null<const HistoryItem*> removed) {
 		if (removed == item) {
 			box->closeBox();
 		}
diff --git a/Telegram/SourceFiles/inline_bots/inline_bot_downloads.cpp b/Telegram/SourceFiles/inline_bots/inline_bot_downloads.cpp
index d1c82d54af..901c61a4c6 100644
--- a/Telegram/SourceFiles/inline_bots/inline_bot_downloads.cpp
+++ b/Telegram/SourceFiles/inline_bots/inline_bot_downloads.cpp
@@ -79,7 +79,7 @@ void Downloads::load(
 	applyProgress(botId, id, 0, 0);
 
 	loader.loader->updates(
-	) | rpl::start_with_next_error_done([=] {
+	) | rpl::on_next_error_done([=] {
 		progress(botId, id);
 	}, [=](FileLoader::Error) {
 		fail(botId, id);
@@ -411,7 +411,7 @@ void DownloadFileBox(not_null<Ui::GenericBox*> box, DownloadBoxArgs args) {
 	box->addButton(tr::lng_cancel(), [=] {
 		box->closeBox();
 	});
-	box->boxClosing() | rpl::start_with_next([=] {
+	box->boxClosing() | rpl::on_next([=] {
 		if (!*chosen) {
 			done(QString());
 		}
diff --git a/Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.cpp b/Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.cpp
index 3778522acb..c84fa2e9f6 100644
--- a/Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.cpp
+++ b/Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.cpp
@@ -589,7 +589,7 @@ void Sticker::setupLottie() const {
 		boundingBox() * style::DevicePixelRatio());
 
 	_lottie->updates(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		update();
 	}, _lifetime);
 }
diff --git a/Telegram/SourceFiles/inline_bots/inline_results_inner.cpp b/Telegram/SourceFiles/inline_bots/inline_results_inner.cpp
index 41ee7f4268..0125a7d778 100644
--- a/Telegram/SourceFiles/inline_bots/inline_results_inner.cpp
+++ b/Telegram/SourceFiles/inline_bots/inline_results_inner.cpp
@@ -66,12 +66,12 @@ Inner::Inner(
 	setAttribute(Qt::WA_OpaquePaintEvent);
 
 	_controller->session().downloaderTaskFinished(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateInlineItems();
 	}, lifetime());
 
 	controller->gifPauseLevelChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (!_controller->isGifPausedAtLeastFor(
 				Window::GifPauseReason::InlineResults)) {
 			updateInlineItems();
@@ -82,7 +82,7 @@ Inner::Inner(
 		Data::PeerUpdate::Flag::Rights
 	) | rpl::filter([=](const Data::PeerUpdate &update) {
 		return (update.peer.get() == _inlineQueryPeer);
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		auto isRestricted = (_restrictedLabel != nullptr);
 		if (isRestricted != isRestrictedView()) {
 			auto h = countHeight();
@@ -91,7 +91,7 @@ Inner::Inner(
 	}, lifetime());
 
 	sizeValue(
-	) | rpl::start_with_next([=](const QSize &s) {
+	) | rpl::on_next([=](const QSize &s) {
 		_mosaic.setFullWidth(s.width());
 	}, lifetime());
 
diff --git a/Telegram/SourceFiles/inline_bots/inline_results_widget.cpp b/Telegram/SourceFiles/inline_bots/inline_results_widget.cpp
index c5cf41ce8b..f06076595b 100644
--- a/Telegram/SourceFiles/inline_bots/inline_results_widget.cpp
+++ b/Telegram/SourceFiles/inline_bots/inline_results_widget.cpp
@@ -53,18 +53,18 @@ Widget::Widget(
 	_inner->moveToLeft(0, 0, _scroll->width());
 
 	_scroll->scrolls(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		onScroll();
 	}, lifetime());
 
 	_inner->inlineRowsCleared(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		hideAnimated();
 		_inner->clearInlineRowsPanel();
 	}, lifetime());
 
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_innerRounding = Ui::PrepareCornerPixmaps(
 			ImageRoundRadius::Small,
 			st::emojiPanBg);
@@ -73,7 +73,7 @@ Widget::Widget(
 	macWindowDeactivateEvents(
 	) | rpl::filter([=] {
 		return !isHidden();
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		leaveEvent(nullptr);
 	}, lifetime());
 
diff --git a/Telegram/SourceFiles/intro/intro_code.cpp b/Telegram/SourceFiles/intro/intro_code.cpp
index 386a4dd213..c1058a180f 100644
--- a/Telegram/SourceFiles/intro/intro_code.cpp
+++ b/Telegram/SourceFiles/intro/intro_code.cpp
@@ -40,7 +40,7 @@ CodeWidget::CodeWidget(
 , _callLabel(this, st::introDescription)
 , _checkRequestTimer([=] { checkRequest(); }) {
 	Lang::Updated(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		refreshLang();
 	}, lifetime());
 
@@ -62,7 +62,7 @@ CodeWidget::CodeWidget(
 	});
 
 	_code->codeCollected(
-	) | rpl::start_with_next([=](const QString &code) {
+	) | rpl::on_next([=](const QString &code) {
 		hideError();
 		submitCode(code);
 	}, lifetime());
diff --git a/Telegram/SourceFiles/intro/intro_email.cpp b/Telegram/SourceFiles/intro/intro_email.cpp
index 890f7b6958..ecc8d7d636 100644
--- a/Telegram/SourceFiles/intro/intro_email.cpp
+++ b/Telegram/SourceFiles/intro/intro_email.cpp
@@ -34,7 +34,7 @@ EmailWidget::EmailWidget(
 : Step(parent, account, data)
 , _inner(this) {
 	const auto content = _inner.get();
-	widthValue() | rpl::start_with_next([=](int w) {
+	widthValue() | rpl::on_next([=](int w) {
 		content->resizeToWidth(st::introNextButton.width);
 		content->moveToLeft((w - content->width()) / 2, contentTop());
 	}, content->lifetime());
@@ -64,7 +64,7 @@ EmailWidget::EmailWidget(
 			style::margins());
 		content->add(std::move(icon.widget));
 		_showFinished.events(
-		) | rpl::start_with_next([animate = std::move(icon.animate)] {
+		) | rpl::on_next([animate = std::move(icon.animate)] {
 			animate(anim::repeat::once);
 		}, lifetime());
 	}
@@ -75,17 +75,17 @@ EmailWidget::EmailWidget(
 		QString());
 	Ui::AddSkip(content);
 	const auto error = Settings::CloudPassword::AddError(content, nullptr);
-	newInput->changes() | rpl::start_with_next([=] {
+	newInput->changes() | rpl::on_next([=] {
 		error->hide();
 	}, newInput->lifetime());
-	newInput->submits() | rpl::start_with_next([=] {
+	newInput->submits() | rpl::on_next([=] {
 		submit();
 	}, newInput->lifetime());
 	newInput->setText(getData()->email);
 	if (newInput->hasText()) {
 		newInput->selectAll();
 	}
-	_setFocus.events() | rpl::start_with_next([=] {
+	_setFocus.events() | rpl::on_next([=] {
 		newInput->setFocus();
 	}, newInput->lifetime());
 
diff --git a/Telegram/SourceFiles/intro/intro_password_check.cpp b/Telegram/SourceFiles/intro/intro_password_check.cpp
index 748e304fe1..55caa72c8c 100644
--- a/Telegram/SourceFiles/intro/intro_password_check.cpp
+++ b/Telegram/SourceFiles/intro/intro_password_check.cpp
@@ -40,7 +40,7 @@ PasswordCheckWidget::PasswordCheckWidget(
 	Expects(_passwordState.hasPassword);
 
 	Lang::Updated(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		refreshLang();
 	}, lifetime());
 
@@ -48,7 +48,7 @@ PasswordCheckWidget::PasswordCheckWidget(
 	_toPassword->addClickHandler([=] { toPassword(); });
 	connect(_pwdField, &Ui::PasswordInput::changed, [=] { hideError(); });
 	_codeField->changes(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		hideError();
 	}, _codeField->lifetime());
 
@@ -233,7 +233,7 @@ void PasswordCheckWidget::codeSubmitDone(
 	const auto boxShared = std::make_shared<base::weak_qptr<PasscodeBox>>();
 
 	box->newAuthorization(
-	) | rpl::start_with_next([=](const MTPauth_Authorization &result) {
+	) | rpl::on_next([=](const MTPauth_Authorization &result) {
 		if (boxShared) {
 			(*boxShared)->closeBox();
 		}
@@ -316,7 +316,7 @@ void PasswordCheckWidget::toRecover() {
 		const auto box = Ui::show(
 			Ui::MakeInformBox(tr::lng_signin_no_email_forgot()));
 		box->boxClosing(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			showReset();
 		}, box->lifetime());
 	}
@@ -326,7 +326,7 @@ void PasswordCheckWidget::toPassword() {
 	const auto box = Ui::show(
 		Ui::MakeInformBox(tr::lng_signin_cant_email_forgot()));
 	box->boxClosing(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		showReset();
 	}, box->lifetime());
 }
diff --git a/Telegram/SourceFiles/intro/intro_phone.cpp b/Telegram/SourceFiles/intro/intro_phone.cpp
index 356ba687a0..3f21283037 100644
--- a/Telegram/SourceFiles/intro/intro_phone.cpp
+++ b/Telegram/SourceFiles/intro/intro_phone.cpp
@@ -65,25 +65,25 @@ PhoneWidget::PhoneWidget(
 	_code->setAccessibleName(tr::lng_country_code(tr::now));
 	_phone->setAccessibleName(tr::lng_phone_number(tr::now));
 	_phone->frontBackspaceEvent(
-	) | rpl::start_with_next([=](not_null<QKeyEvent*> e) {
+	) | rpl::on_next([=](not_null<QKeyEvent*> e) {
 		_code->startErasing(e);
 	}, _code->lifetime());
 
 	_country->codeChanged(
-	) | rpl::start_with_next([=](const QString &code) {
+	) | rpl::on_next([=](const QString &code) {
 		_code->codeSelected(code);
 		_phone->chooseCode(code);
 	}, _country->lifetime());
 	_code->codeChanged(
-	) | rpl::start_with_next([=](const QString &code) {
+	) | rpl::on_next([=](const QString &code) {
 		_country->onChooseCode(code);
 		_phone->chooseCode(code);
 	}, _code->lifetime());
 	_code->addedToNumber(
-	) | rpl::start_with_next([=](const QString &added) {
+	) | rpl::on_next([=](const QString &added) {
 		_phone->addedToNumber(added);
 	}, _phone->lifetime());
-	_code->spacePressed() | rpl::start_with_next([=] {
+	_code->spacePressed() | rpl::on_next([=] {
 		submit();
 	}, _code->lifetime());
 	connect(_phone, &Ui::PhonePartInput::changed, [=] { phoneChanged(); });
@@ -92,7 +92,7 @@ PhoneWidget::PhoneWidget(
 	setTitleText(tr::lng_phone_title());
 	setDescriptionText(tr::lng_phone_desc());
 	getData()->updated.events(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		countryChanged();
 	}, lifetime());
 	setErrorCentered(true);
@@ -119,7 +119,7 @@ void PhoneWidget::setupQrLogin() {
 	rpl::combine(
 		sizeValue(),
 		qrLogin->widthValue()
-	) | rpl::start_with_next([=](QSize size, int qrLoginWidth) {
+	) | rpl::on_next([=](QSize size, int qrLoginWidth) {
 		qrLogin->moveToLeft(
 			(size.width() - qrLoginWidth) / 2,
 			contentTop() + st::introQrLoginLinkTop);
diff --git a/Telegram/SourceFiles/intro/intro_qr.cpp b/Telegram/SourceFiles/intro/intro_qr.cpp
index 57f8d8af0a..22e64a7981 100644
--- a/Telegram/SourceFiles/intro/intro_qr.cpp
+++ b/Telegram/SourceFiles/intro/intro_qr.cpp
@@ -105,7 +105,7 @@ namespace {
 		rpl::duplicate(palettes)
 	) | rpl::map([](const Qr::Data &code, const auto &) {
 		return TelegramQr(code, st::introQrPixel, st::introQrMaxSize);
-	}) | rpl::start_with_next([=](QImage &&image) {
+	}) | rpl::on_next([=](QImage &&image) {
 		state->previous = std::move(state->qr);
 		state->qr = std::move(image);
 		state->waiting.stop();
@@ -120,11 +120,11 @@ namespace {
 		palettes
 	) | rpl::map([] {
 		return TelegramLogoImage();
-	}) | rpl::start_with_next([=](QImage &&image) {
+	}) | rpl::on_next([=](QImage &&image) {
 		state->center = std::move(image);
 	}, result->lifetime());
 	result->paintRequest(
-	) | rpl::start_with_next([=](QRect clip) {
+	) | rpl::on_next([=](QRect clip) {
 		auto p = QPainter(result);
 		const auto has = !state->qr.isNull();
 		const auto shown = has ? state->shown.value(1.) : 0.;
@@ -200,13 +200,13 @@ QrWidget::QrWidget(
 	cancelNearestDcRequest();
 
 	account->mtpUpdates(
-	) | rpl::start_with_next([=](const MTPUpdates &updates) {
+	) | rpl::on_next([=](const MTPUpdates &updates) {
 		checkForTokenUpdate(updates);
 	}, lifetime());
 
 	setupControls();
 	account->mtp().mainDcIdValue(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		api().request(base::take(_requestId)).cancel();
 		refreshCode();
 	}, lifetime());
@@ -214,7 +214,7 @@ QrWidget::QrWidget(
 	account->appConfig().value(
 	) | rpl::filter([=] {
 		return !_passkey;
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		setupPasskeyLink();
 	}, lifetime());
 }
@@ -279,7 +279,7 @@ void QrWidget::setupControls() {
 	rpl::combine(
 		sizeValue(),
 		code->widthValue()
-	) | rpl::start_with_next([=](QSize size, int codeWidth) {
+	) | rpl::on_next([=](QSize size, int codeWidth) {
 		code->moveToLeft(
 			(size.width() - codeWidth) / 2,
 			contentTop() + st::introQrTop);
@@ -292,7 +292,7 @@ void QrWidget::setupControls() {
 	rpl::combine(
 		sizeValue(),
 		title->widthValue()
-	) | rpl::start_with_next([=](QSize size, int titleWidth) {
+	) | rpl::on_next([=](QSize size, int titleWidth) {
 		title->resizeToWidth(st::introQrTitleWidth);
 		const auto oneLine = st::introQrTitle.style.font->height;
 		const auto topDelta = (title->height() - oneLine);
@@ -322,7 +322,7 @@ void QrWidget::setupControls() {
 		rpl::combine(
 			number->widthValue(),
 			label->positionValue()
-		) | rpl::start_with_next([=](int width, QPoint position) {
+		) | rpl::on_next([=](int width, QPoint position) {
 			number->moveToLeft(
 				position.x() - width - st::normalFont->spacew,
 				position.y());
@@ -332,7 +332,7 @@ void QrWidget::setupControls() {
 	rpl::combine(
 		sizeValue(),
 		steps->widthValue()
-	) | rpl::start_with_next([=](QSize size, int stepsWidth) {
+	) | rpl::on_next([=](QSize size, int stepsWidth) {
 		steps->moveToLeft(
 			(size.width() - stepsWidth) / 2,
 			contentTop() + st::introQrStepsTop);
@@ -344,7 +344,7 @@ void QrWidget::setupControls() {
 	rpl::combine(
 		sizeValue(),
 		_skip->widthValue()
-	) | rpl::start_with_next([=](QSize size, int skipWidth) {
+	) | rpl::on_next([=](QSize size, int skipWidth) {
 		_skip->moveToLeft(
 			(size.width() - skipWidth) / 2,
 			contentTop() + st::introQrSkipTop);
@@ -367,7 +367,7 @@ void QrWidget::setupPasskeyLink() {
 	rpl::combine(
 		sizeValue(),
 		_passkey->widthValue()
-	) | rpl::start_with_next([=](QSize size, int passkeyWidth) {
+	) | rpl::on_next([=](QSize size, int passkeyWidth) {
 		_passkey->moveToLeft(
 			(size.width() - passkeyWidth) / 2,
 			(contentTop()
diff --git a/Telegram/SourceFiles/intro/intro_signup.cpp b/Telegram/SourceFiles/intro/intro_signup.cpp
index 32831ea47e..9261e4ceed 100644
--- a/Telegram/SourceFiles/intro/intro_signup.cpp
+++ b/Telegram/SourceFiles/intro/intro_signup.cpp
@@ -38,7 +38,7 @@ SignupWidget::SignupWidget(
 	_photo->showCustomOnChosen();
 
 	Lang::Updated(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		refreshLang();
 	}, lifetime());
 
diff --git a/Telegram/SourceFiles/intro/intro_step.cpp b/Telegram/SourceFiles/intro/intro_step.cpp
index 417bd3e35c..3f4d8936b8 100644
--- a/Telegram/SourceFiles/intro/intro_step.cpp
+++ b/Telegram/SourceFiles/intro/intro_step.cpp
@@ -79,7 +79,7 @@ Step::Step(
 			: st::introDescription)) {
 	hide();
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (!_coverMask.isNull()) {
 			_coverMask = QPixmap();
 			prepareCoverMask();
@@ -87,19 +87,19 @@ Step::Step(
 	}, lifetime());
 
 	_errorText.value(
-	) | rpl::start_with_next([=](const QString &text) {
+	) | rpl::on_next([=](const QString &text) {
 		refreshError(text);
 	}, lifetime());
 
 	_titleText.value(
-	) | rpl::start_with_next([=](const QString &text) {
+	) | rpl::on_next([=](const QString &text) {
 		_title->setText(text);
 		accessibilityNameChanged();
 		updateLabelsPosition();
 	}, lifetime());
 
 	_descriptionText.value(
-	) | rpl::start_with_next([=](const TextWithEntities &text) {
+	) | rpl::on_next([=](const TextWithEntities &text) {
 		const auto label = _description->entity();
 		const auto hasSpoiler = ranges::contains(
 			text.entities,
diff --git a/Telegram/SourceFiles/intro/intro_widget.cpp b/Telegram/SourceFiles/intro/intro_widget.cpp
index 79d4f66cf5..1b5444a608 100644
--- a/Telegram/SourceFiles/intro/intro_widget.cpp
+++ b/Telegram/SourceFiles/intro/intro_widget.cpp
@@ -97,7 +97,7 @@ Widget::Widget(
 	getData()->country = ComputeNewAccountCountry();
 
 	_account->mtpValue(
-	) | rpl::start_with_next([=](not_null<MTP::Instance*> instance) {
+	) | rpl::on_next([=](not_null<MTP::Instance*> instance) {
 		_api.emplace(instance);
 		crl::on_main(this, [=] { createLanguageLink(); });
 	}, lifetime());
@@ -132,12 +132,12 @@ Widget::Widget(
 	}
 
 	Lang::CurrentCloudManager().firstLanguageSuggestion(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		createLanguageLink();
 	}, lifetime());
 
 	_account->mtpUpdates(
-	) | rpl::start_with_next([=](const MTPUpdates &updates) {
+	) | rpl::on_next([=](const MTPUpdates &updates) {
 		handleUpdates(updates);
 	}, lifetime());
 
@@ -150,7 +150,7 @@ Widget::Widget(
 	}
 
 	Lang::Updated(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		refreshLang();
 	}, lifetime());
 
@@ -169,7 +169,7 @@ Widget::Widget(
 			checker.isLatest(),
 			checker.failed(),
 			checker.ready()
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			checkUpdateStatus();
 		}, lifetime());
 	}
@@ -345,7 +345,7 @@ void Widget::setInnerFocus() {
 
 void Widget::setupStep() {
 	getStep()->nextButtonStyle(
-	) | rpl::start_with_next([=](const style::RoundButton *st) {
+	) | rpl::on_next([=](const style::RoundButton *st) {
 		const auto nextStyle = st ? st : &st::introNextButton;
 		if (_nextStyle != nextStyle) {
 			_nextStyle = nextStyle;
@@ -360,7 +360,7 @@ void Widget::setupStep() {
 		}
 	}, getStep()->lifetime());
 
-	getStep()->nextButtonFocusRequests() | rpl::start_with_next([=] {
+	getStep()->nextButtonFocusRequests() | rpl::on_next([=] {
 		if (_next && !_next->isHidden()) {
 			_next->entity()->setFocus(Qt::OtherFocusReason);
 		}
@@ -432,7 +432,7 @@ void Widget::hideAndDestroy(object_ptr<Ui::FadeWrap<Ui::RpWidget>> widget) {
 	const auto weak = base::make_weak(widget.data());
 	widget->hide(anim::type::normal);
 	widget->shownValue(
-	) | rpl::start_with_next([=](bool shown) {
+	) | rpl::on_next([=](bool shown) {
 		if (!shown && weak) {
 			weak->deleteLater();
 		}
@@ -666,7 +666,7 @@ void Widget::showTerms(Fn<void()> callback) {
 	box->setCloseByOutsideClick(false);
 
 	box->agreeClicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (callback) {
 			callback();
 		}
@@ -676,19 +676,19 @@ void Widget::showTerms(Fn<void()> callback) {
 	}, box->lifetime());
 
 	box->cancelClicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto box = Ui::show(Box<Window::TermsBox>(
 			TextWithEntities{ tr::lng_terms_signup_sorry(tr::now) },
 			tr::lng_intro_finish(),
 			tr::lng_terms_decline()));
 		box->agreeClicks(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			if (weak) {
 				showTerms(callback);
 			}
 		}, box->lifetime());
 		box->cancelClicks(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			if (box) {
 				box->closeBox();
 			}
@@ -735,7 +735,7 @@ void Widget::setupNextButton() {
 		return !text.isEmpty();
 	}) | rpl::filter([=](bool visible) {
 		return visible != _nextShown;
-	}) | rpl::start_with_next([=](bool visible) {
+	}) | rpl::on_next([=](bool visible) {
 		_next->toggle(visible, anim::type::normal);
 		_nextShown = visible;
 		if (_changeLanguage) {
diff --git a/Telegram/SourceFiles/iv/iv_controller.cpp b/Telegram/SourceFiles/iv/iv_controller.cpp
index 8b99e51bbc..13022bc706 100644
--- a/Telegram/SourceFiles/iv/iv_controller.cpp
+++ b/Telegram/SourceFiles/iv/iv_controller.cpp
@@ -85,7 +85,7 @@ public:
 		AbstractButton::setDisabled(true);
 
 		const auto processTooltip = [=](not_null<Ui::RpWidget*> w) {
-			w->events() | rpl::start_with_next([=](not_null<QEvent*> e) {
+			w->events() | rpl::on_next([=](not_null<QEvent*> e) {
 				if (e->type() == QEvent::Enter) {
 					Ui::Tooltip::Show(1000, this);
 				} else if (e->type() == QEvent::Leave) {
@@ -113,7 +113,7 @@ public:
 			this,
 			st::defaultRippleAnimationBgOver);
 		plus->resize(Size(st::ivZoomButtonsSize));
-		plus->paintRequest() | rpl::start_with_next([=, fg = _st.itemFg] {
+		plus->paintRequest() | rpl::on_next([=, fg = _st.itemFg] {
 			auto p = QPainter(plus);
 			p.setPen(fg);
 			p.setFont(st::normalFont);
@@ -135,7 +135,7 @@ public:
 			this,
 			st::defaultRippleAnimationBgOver);
 		minus->resize(Size(st::ivZoomButtonsSize));
-		minus->paintRequest() | rpl::start_with_next([=, fg = _st.itemFg] {
+		minus->paintRequest() | rpl::on_next([=, fg = _st.itemFg] {
 			auto p = QPainter(minus);
 			const auto r = minus->rect();
 			p.setPen(fg);
@@ -164,7 +164,7 @@ public:
 		}
 
 		_delegate->ivZoomValue(
-		) | rpl::start_with_next([this](int value) {
+		) | rpl::on_next([this](int value) {
 			_text.setText(_st.itemStyle, QString::number(value) + '%');
 			update();
 		}, lifetime());
@@ -172,7 +172,7 @@ public:
 		rpl::combine(
 			sizeValue(),
 			reset->sizeValue()
-		) | rpl::start_with_next([=](const QSize &size, const QSize &) {
+		) | rpl::on_next([=](const QSize &size, const QSize &) {
 			reset->setFullWidth(0
 				+ resetLabel->width()
 				+ st::ivResetZoomInnerPadding);
@@ -420,7 +420,7 @@ void Controller::updateTitleGeometry(int newWidth) const {
 		0,
 		newWidth,
 		st::ivSubtitleHeight);
-	_subtitleWrap->paintRequest() | rpl::start_with_next([=](QRect clip) {
+	_subtitleWrap->paintRequest() | rpl::on_next([=](QRect clip) {
 		QPainter(_subtitleWrap.get()).fillRect(clip, st::windowBg);
 	}, _subtitleWrap->lifetime());
 
@@ -462,7 +462,7 @@ void Controller::initControls() {
 		return prefix + ' ' + QChar(0x2014) + ' ' + subtitle;
 	});
 	_windowTitleText.value(
-	) | rpl::start_with_next([=](const QString &title) {
+	) | rpl::on_next([=](const QString &title) {
 		_window->setWindowTitle(title);
 	}, _subtitle->lifetime());
 
@@ -491,7 +491,7 @@ void Controller::initControls() {
 	});
 
 	_back->toggledValue(
-	) | rpl::start_with_next([=](bool toggled) {
+	) | rpl::on_next([=](bool toggled) {
 		_subtitleBackShift.start(
 			[=] { updateTitleGeometry(_window->body()->width()); },
 			toggled ? 0. : 1.,
@@ -501,7 +501,7 @@ void Controller::initControls() {
 	_back->hide(anim::type::instant);
 
 	_forward->toggledValue(
-	) | rpl::start_with_next([=](bool toggled) {
+	) | rpl::on_next([=](bool toggled) {
 		_subtitleForwardShift.start(
 			[=] { updateTitleGeometry(_window->body()->width()); },
 			toggled ? 0. : 1.,
@@ -573,7 +573,7 @@ QByteArray Controller::fillInChannelValuesScript(
 	auto result = QByteArray();
 	for (auto &[id, in] : inChannelValues) {
 		if (_inChannelSubscribed.emplace(id).second) {
-			std::move(in) | rpl::start_with_next([=](bool in) {
+			std::move(in) | rpl::on_next([=](bool in) {
 				if (_ready) {
 					_webview->eval(toggleInChannelScript(id, in));
 				} else {
@@ -605,13 +605,13 @@ void Controller::createWindow() {
 	) | rpl::filter([=](QWindow *focused) {
 		const auto handle = window->window()->windowHandle();
 		return _webview && handle && (focused == handle);
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		setInnerFocus();
 	}, window->lifetime());
 
 	initControls();
 
-	window->body()->widthValue() | rpl::start_with_next([=](int width) {
+	window->body()->widthValue() | rpl::on_next([=](int width) {
 		updateTitleGeometry(width);
 	}, _subtitle->lifetime());
 
@@ -620,7 +620,7 @@ void Controller::createWindow() {
 
 	window->geometryValue(
 	) | rpl::distinct_until_changed(
-	) | rpl::skip(1) | rpl::start_with_next([=] {
+	) | rpl::skip(1) | rpl::on_next([=] {
 		_delegate->ivSaveGeometry(window);
 	}, window->lifetime());
 
@@ -628,12 +628,12 @@ void Controller::createWindow() {
 	rpl::combine(
 		window->body()->sizeValue(),
 		_subtitleWrap->heightValue()
-	) | rpl::start_with_next([=](QSize size, int title) {
+	) | rpl::on_next([=](QSize size, int title) {
 		_container->setGeometry(QRect(QPoint(), size).marginsRemoved(
 			{ 0, title, 0, 0 }));
 	}, _container->lifetime());
 
-	_container->paintRequest() | rpl::start_with_next([=](QRect clip) {
+	_container->paintRequest() | rpl::on_next([=](QRect clip) {
 		QPainter(_container).fillRect(clip, st::windowBg);
 	}, _container->lifetime());
 
@@ -656,13 +656,13 @@ void Controller::createWebview(const Webview::StorageId &storageId) {
 
 	if (const auto webviewZoomController = raw->zoomController()) {
 		webviewZoomController->zoomValue(
-		) | rpl::start_with_next([this](int value) {
+		) | rpl::on_next([this](int value) {
 			if (value > 0) {
 				_delegate->ivSetZoom(value);
 			}
 		}, lifetime());
 		_delegate->ivZoomValue(
-		) | rpl::start_with_next([=](int value) {
+		) | rpl::on_next([=](int value) {
 			webviewZoomController->setZoom(value);
 		}, lifetime());
 	}
@@ -673,7 +673,7 @@ void Controller::createWebview(const Webview::StorageId &storageId) {
 	});
 
 	window->events(
-	) | rpl::start_with_next([=](not_null<QEvent*> e) {
+	) | rpl::on_next([=](not_null<QEvent*> e) {
 		if (e->type() == QEvent::Close) {
 			close();
 		} else if (e->type() == QEvent::KeyPress) {
@@ -728,7 +728,7 @@ void Controller::createWebview(const Webview::StorageId &storageId) {
 	});
 
 	_container->sizeValue(
-	) | rpl::start_with_next([=](QSize size) {
+	) | rpl::on_next([=](QSize size) {
 		if (const auto widget = raw->widget()) {
 			widget->setGeometry(QRect(QPoint(), size));
 		}
@@ -817,7 +817,7 @@ void Controller::createWebview(const Webview::StorageId &storageId) {
 					Lang::Updated(),
 					style::PaletteChanged(),
 					_delegate->ivZoomValue() | rpl::to_empty
-				) | rpl::start_with_next([=] {
+				) | rpl::on_next([=] {
 					_updateStyles.call();
 				}, _webview->lifetime());
 			}
@@ -876,7 +876,7 @@ void Controller::createWebview(const Webview::StorageId &storageId) {
 	});
 
 	raw->navigationHistoryState(
-	) | rpl::start_with_next([=](Webview::NavigationHistoryState state) {
+	) | rpl::on_next([=](Webview::NavigationHistoryState state) {
 		_back->toggle(
 			state.canGoBack || state.canGoForward,
 			anim::type::normal);
@@ -925,12 +925,12 @@ void Controller::showWebviewError(TextWithEntities text) {
 	});
 	wrap->show();
 
-	wrap->widthValue() | rpl::start_with_next([=](int width) {
+	wrap->widthValue() | rpl::on_next([=](int width) {
 		error->resizeToWidth(width);
 		wrap->resize(width, error->height());
 	}, wrap->lifetime());
 
-	_container->sizeValue() | rpl::start_with_next([=](QSize size) {
+	_container->sizeValue() | rpl::on_next([=](QSize size) {
 		wrap->setGeometry(0, 0, size.width(), size.height() * 2 / 3);
 	}, wrap->lifetime());
 }
@@ -1210,7 +1210,7 @@ void Controller::showShareMenu() {
 			_window->body().get(),
 			Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint));
 	}
-	_window->body()->sizeValue() | rpl::start_with_next([=](QSize size) {
+	_window->body()->sizeValue() | rpl::on_next([=](QSize size) {
 		const auto widget = _shareHidesContent
 			? _shareWrap.get()
 			: _shareContainer.get();
@@ -1224,7 +1224,7 @@ void Controller::showShareMenu() {
 	_shareFocus = result.focus;
 	_shareHide = result.hide;
 
-	std::move(result.destroyRequests) | rpl::start_with_next([=] {
+	std::move(result.destroyRequests) | rpl::on_next([=] {
 		destroyShareMenu();
 	}, _shareWrap->lifetime());
 
diff --git a/Telegram/SourceFiles/iv/iv_instance.cpp b/Telegram/SourceFiles/iv/iv_instance.cpp
index dec3f36cf9..caab6362be 100644
--- a/Telegram/SourceFiles/iv/iv_instance.cpp
+++ b/Telegram/SourceFiles/iv/iv_instance.cpp
@@ -326,13 +326,13 @@ ShareBoxResult Shown::shareBox(ShareBoxDescriptor &&descriptor) {
 	layer->setHideByBackgroundClick(false);
 	layer->move(0, 0);
 	wrap->sizeValue(
-	) | rpl::start_with_next([=](QSize size) {
+	) | rpl::on_next([=](QSize size) {
 		layer->resize(size);
 	}, layer->lifetime());
 	layer->hideFinishEvents(
 	) | rpl::filter([=] {
 		return !!lookup(); // Last hide finish is sent from destructor.
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		state->destroyRequests.fire({});
 	}, wrap->lifetime());
 
@@ -357,7 +357,7 @@ ShareBoxResult Shown::shareBox(ShareBoxDescriptor &&descriptor) {
 			) | rpl::filter([=](QWindow *focused) {
 				const auto handle = layer->window()->windowHandle();
 				return handle && (focused == handle);
-			}) | rpl::start_with_next([=] {
+			}) | rpl::on_next([=] {
 				waiting->destroy();
 				set();
 			});
@@ -388,7 +388,7 @@ void Shown::createController() {
 	) | rpl::start_to_stream(_events, _controller->lifetime());
 
 	_controller->dataRequests(
-	) | rpl::start_with_next([=](Webview::DataRequest request) {
+	) | rpl::on_next([=](Webview::DataRequest request) {
 		const auto requested = QString::fromStdString(request.id);
 		const auto id = QStringView(requested);
 		if (id.startsWith(u"photo/")) {
@@ -507,7 +507,7 @@ void Shown::streamFile(
 		}).first->second;
 
 	file.loader->parts(
-	) | rpl::start_with_next([=](Media::Streaming::LoadedPart &&part) {
+	) | rpl::on_next([=](Media::Streaming::LoadedPart &&part) {
 		const auto i = _streams.find(documentId);
 		Assert(i != end(_streams));
 		processPartInFile(i->second, std::move(part));
@@ -552,7 +552,7 @@ void Shown::subscribeToDocuments() {
 	_documentLifetime = _session->data().documentLoadProgress(
 	) | rpl::filter([=](not_null<DocumentData*> document) {
 		return !document->loading();
-	}) | rpl::start_with_next([=](not_null<DocumentData*> document) {
+	}) | rpl::on_next([=](not_null<DocumentData*> document) {
 		const auto i = _files.find(document->id);
 		if (i == end(_files)) {
 			return;
@@ -858,7 +858,7 @@ void Instance::show(
 	}
 	_shown = std::make_unique<Shown>(_delegate, session, data, hash);
 	_shownSession = session;
-	_shown->events() | rpl::start_with_next([=](Controller::Event event) {
+	_shown->events() | rpl::on_next([=](Controller::Event event) {
 		using Type = Controller::Event::Type;
 		const auto lower = event.url.toLower();
 		const auto urlChecked = lower.startsWith("http://")
@@ -966,7 +966,7 @@ void Instance::show(
 
 	session->changes().peerUpdates(
 		::Data::PeerUpdate::Flag::ChannelAmIn
-	) | rpl::start_with_next([=](const ::Data::PeerUpdate &update) {
+	) | rpl::on_next([=](const ::Data::PeerUpdate &update) {
 		if (const auto channel = update.peer->asChannel()) {
 			if (channel->amIn()) {
 				const auto i = _joining.find(session);
@@ -1092,7 +1092,7 @@ void Instance::showTonSite(
 		return;
 	}
 	_tonSite = std::make_unique<TonSite>(_delegate, uri);
-	_tonSite->events() | rpl::start_with_next([=](Controller::Event event) {
+	_tonSite->events() | rpl::on_next([=](Controller::Event event) {
 		using Type = Controller::Event::Type;
 		const auto lower = event.url.toLower();
 		const auto urlChecked = lower.startsWith("http://")
diff --git a/Telegram/SourceFiles/lang/lang_cloud_manager.cpp b/Telegram/SourceFiles/lang/lang_cloud_manager.cpp
index a23ec848ef..90bcfac412 100644
--- a/Telegram/SourceFiles/lang/lang_cloud_manager.cpp
+++ b/Telegram/SourceFiles/lang/lang_cloud_manager.cpp
@@ -103,7 +103,7 @@ void ConfirmSwitchBox::prepare() {
 
 	content->resizeToWidth(st::boxWideWidth);
 	content->heightValue(
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		setDimensions(st::boxWideWidth, height);
 	}, lifetime());
 }
@@ -137,7 +137,7 @@ void NotReadyBox::prepare() {
 
 	content->resizeToWidth(st::boxWidth);
 	content->heightValue(
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		setDimensions(st::boxWidth, height);
 	}, lifetime());
 }
@@ -162,9 +162,9 @@ CloudManager::CloudManager(Instance &langpack)
 	Core::App().domain().activeValue(
 	) | rpl::filter([=](Main::Account *account) {
 		return (account != nullptr);
-	}) | rpl::start_with_next_done([=](Main::Account *account) {
+	}) | rpl::on_next_done([=](Main::Account *account) {
 		*mtpLifetime = account->mtpMainSessionValue(
-		) | rpl::start_with_next([=](not_null<MTP::Instance*> instance) {
+		) | rpl::on_next([=](not_null<MTP::Instance*> instance) {
 			_api.emplace(instance);
 			resendRequests();
 		});
@@ -333,7 +333,7 @@ void CloudManager::offerSwitchLangPack() {
 
 	if (!showOfferSwitchBox()) {
 		languageListChanged(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			showOfferSwitchBox();
 		}, _lifetime);
 		requestLanguageList();
diff --git a/Telegram/SourceFiles/main/main_account.cpp b/Telegram/SourceFiles/main/main_account.cpp
index c8d65d9a7c..4a2fe29ea0 100644
--- a/Telegram/SourceFiles/main/main_account.cpp
+++ b/Telegram/SourceFiles/main/main_account.cpp
@@ -95,7 +95,7 @@ void Account::watchProxyChanges() {
 	using ProxyChange = Core::Application::ProxyChange;
 
 	Core::App().proxyChanges(
-	) | rpl::start_with_next([=](const ProxyChange &change) {
+	) | rpl::on_next([=](const ProxyChange &change) {
 		const auto key = [&](const MTP::ProxyData &proxy) {
 			return (proxy.type == MTP::ProxyData::Type::Mtproto)
 				? std::make_pair(proxy.host, proxy.port)
@@ -115,7 +115,7 @@ void Account::watchProxyChanges() {
 
 void Account::watchSessionChanges() {
 	sessionChanges(
-	) | rpl::start_with_next([=](Session *session) {
+	) | rpl::on_next([=](Session *session) {
 		if (!session && _mtp) {
 			_mtp->setUserPhone(QString());
 		}
@@ -427,7 +427,7 @@ void Account::startMtp(std::unique_ptr<MTP::Config> config) {
 	_mtp->writeKeysRequests(
 	) | rpl::filter([=] {
 		return !*writingKeys;
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		*writingKeys = true;
 		Ui::PostponeCall(_mtp.get(), [=] {
 			local().writeMtpData();
@@ -441,7 +441,7 @@ void Account::startMtp(std::unique_ptr<MTP::Config> config) {
 		_mtp->dcOptions().changed() | rpl::to_empty
 	) | rpl::filter([=] {
 		return !*writingConfig;
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		*writingConfig = true;
 		Ui::PostponeCall(_mtp.get(), [=] {
 			local().writeMtpConfig();
@@ -569,11 +569,11 @@ void Account::destroyMtpKeys(MTP::AuthKeysList &&keys) {
 		MTP::Instance::Mode::KeysDestroyer,
 		std::move(destroyFields));
 	_mtpForKeysDestroy->writeKeysRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		local().writeMtpData();
 	}, _mtpForKeysDestroy->lifetime());
 	_mtpForKeysDestroy->allKeysDestroyed(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		LOG(("MTP Info: all keys scheduled for destroy are destroyed."));
 		crl::on_main(this, [=] {
 			_mtpForKeysDestroy = nullptr;
diff --git a/Telegram/SourceFiles/main/main_app_config.cpp b/Telegram/SourceFiles/main/main_app_config.cpp
index e8a2de5cc4..944538aba4 100644
--- a/Telegram/SourceFiles/main/main_app_config.cpp
+++ b/Telegram/SourceFiles/main/main_app_config.cpp
@@ -27,7 +27,7 @@ AppConfig::AppConfig(not_null<Account*> account) : _account(account) {
 	account->sessionChanges(
 	) | rpl::filter([=](Session *session) {
 		return (session != nullptr);
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		_lastFrozenRefresh = 0;
 		refresh();
 	}, _lifetime);
@@ -37,13 +37,13 @@ AppConfig::~AppConfig() = default;
 
 void AppConfig::start() {
 	_account->mtpMainSessionValue(
-	) | rpl::start_with_next([=](not_null<MTP::Instance*> instance) {
+	) | rpl::on_next([=](not_null<MTP::Instance*> instance) {
 		_api.emplace(instance);
 		_requestId = 0;
 		refresh();
 
 		_frozenTrackLifetime = instance->frozenErrorReceived(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			if (!get<int>(u"freeze_since_date"_q, 0)) {
 				const auto now = crl::now();
 				if (!_lastFrozenRefresh
diff --git a/Telegram/SourceFiles/main/main_domain.cpp b/Telegram/SourceFiles/main/main_domain.cpp
index 714f7e2919..554bd6ae45 100644
--- a/Telegram/SourceFiles/main/main_domain.cpp
+++ b/Telegram/SourceFiles/main/main_domain.cpp
@@ -32,7 +32,7 @@ Domain::Domain(const QString &dataName)
 : _dataName(dataName)
 , _local(std::make_unique<Storage::Domain>(this, dataName)) {
 	_active.changes(
-	) | rpl::take(1) | rpl::start_with_next([=] {
+	) | rpl::take(1) | rpl::on_next([=] {
 		// In case we had a legacy passcoded app we start settings here.
 		Core::App().startSettingsAndBackground();
 
@@ -52,7 +52,7 @@ Domain::Domain(const QString &dataName)
 				Data::PeerUpdate::Flag::Username)
 			: rpl::never<Data::PeerUpdate>();
 	}) | rpl::flatten_latest(
-	) | rpl::start_with_next([](const Data::PeerUpdate &update) {
+	) | rpl::on_next([](const Data::PeerUpdate &update) {
 		CrashReports::SetAnnotation("Username", update.peer->username());
 	}, _lifetime);
 }
@@ -343,15 +343,15 @@ void Domain::watchSession(not_null<Account*> account) {
 	account->sessionValue(
 	) | rpl::filter([=](Session *session) {
 		return session != nullptr;
-	}) | rpl::start_with_next([=](Session *session) {
+	}) | rpl::on_next([=](Session *session) {
 		session->data().unreadBadgeChanges(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			scheduleUpdateUnreadBadge();
 		}, session->lifetime());
 
 		Data::AmPremiumValue(
 			session
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			_lastMaxAccounts = maxAccounts();
 		}, session->lifetime());
 	}, account->lifetime());
@@ -359,7 +359,7 @@ void Domain::watchSession(not_null<Account*> account) {
 	account->sessionChanges(
 	) | rpl::filter([=](Session *session) {
 		return !session;
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		scheduleUpdateUnreadBadge();
 		closeAccountWindows(account);
 		crl::on_main(&Core::App(), [=] {
diff --git a/Telegram/SourceFiles/main/main_session.cpp b/Telegram/SourceFiles/main/main_session.cpp
index 2a3d87f433..263a1aff55 100644
--- a/Telegram/SourceFiles/main/main_session.cpp
+++ b/Telegram/SourceFiles/main/main_session.cpp
@@ -137,7 +137,7 @@ Session::Session(
 			_promoSuggestions->setupEmailStateValue(
 			) | rpl::filter([](Data::SetupEmailState s) {
 				return s == Data::SetupEmailState::None;
-			}) | rpl::take(1) | rpl::start_with_next(crl::guard(this, [=] {
+			}) | rpl::take(1) | rpl::on_next(crl::guard(this, [=] {
 				Core::App().unlockSetupEmail();
 				_settings->setSetupEmailState(State::None);
 				saveSettingsDelayed(200);
@@ -173,7 +173,7 @@ Session::Session(
 	changes().peerFlagsValue(
 		_user,
 		Data::PeerUpdate::Flag::Photo
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto view = Ui::PeerUserpicView{ .cloud = _selfUserpicView };
 		[[maybe_unused]] const auto image = _user->userpicCloudImage(view);
 		_selfUserpicView = view.cloud;
@@ -188,7 +188,7 @@ Session::Session(
 			| Flag::Photo
 			| Flag::About
 			| Flag::PhoneNumber
-		) | rpl::start_with_next([=](const Data::PeerUpdate &update) {
+		) | rpl::on_next([=](const Data::PeerUpdate &update) {
 			local().writeSelf();
 
 			if (update.flags & Flag::PhoneNumber) {
@@ -238,7 +238,7 @@ Session::Session(
 	Core::App().downloadManager().trackSession(this);
 
 	appConfig().value(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		appConfigRefreshed();
 	}, _lifetime);
 }
diff --git a/Telegram/SourceFiles/main/session/send_as_peers.cpp b/Telegram/SourceFiles/main/session/send_as_peers.cpp
index 568ae2e98b..85a6538b9e 100644
--- a/Telegram/SourceFiles/main/session/send_as_peers.cpp
+++ b/Telegram/SourceFiles/main/session/send_as_peers.cpp
@@ -39,7 +39,7 @@ SendAsPeers::SendAsPeers(not_null<Session*> session)
 	}) | rpl::distinct_until_changed(
 	) | rpl::filter([=](not_null<PeerData*> peer, int) {
 		return _lists.contains(peer) || _lastRequestTime.contains(peer);
-	}) | rpl::start_with_next([=](not_null<PeerData*> peer, int) {
+	}) | rpl::on_next([=](not_null<PeerData*> peer, int) {
 		refresh(peer, true);
 	}, _lifetime);
 }
diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp
index bebb6f5669..6f12aff903 100644
--- a/Telegram/SourceFiles/mainwidget.cpp
+++ b/Telegram/SourceFiles/mainwidget.cpp
@@ -266,16 +266,16 @@ MainWidget::MainWidget(
 	}
 
 	_history->cancelRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		handleHistoryBack();
 	}, lifetime());
 
 	Core::App().calls().currentCallValue(
-	) | rpl::start_with_next([=](Calls::Call *call) {
+	) | rpl::on_next([=](Calls::Call *call) {
 		setCurrentCall(call);
 	}, lifetime());
 	Core::App().calls().currentGroupCallValue(
-	) | rpl::start_with_next([=](Calls::GroupCall *call) {
+	) | rpl::on_next([=](Calls::GroupCall *call) {
 		setCurrentGroupCall(call);
 	}, lifetime());
 	if (_callTopBar) {
@@ -286,12 +286,12 @@ MainWidget::MainWidget(
 		floatPlayerDelegate());
 
 	Core::App().floatPlayerClosed(
-	) | rpl::start_with_next([=](FullMsgId itemId) {
+	) | rpl::on_next([=](FullMsgId itemId) {
 		floatPlayerClosed(itemId);
 	}, lifetime());
 
 	Core::App().exportManager().currentView(
-	) | rpl::start_with_next([=](Export::View::PanelController *view) {
+	) | rpl::on_next([=](Export::View::PanelController *view) {
 		setCurrentExportView(view);
 	}, lifetime());
 	if (_exportTopBar) {
@@ -299,12 +299,12 @@ MainWidget::MainWidget(
 	}
 
 	Media::Player::instance()->closePlayerRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		closeBothPlayers();
 	}, lifetime());
 
 	Media::Player::instance()->updatedNotifier(
-	) | rpl::start_with_next([=](const Media::Player::TrackState &state) {
+	) | rpl::on_next([=](const Media::Player::TrackState &state) {
 		handleAudioUpdate(state);
 	}, lifetime());
 	handleAudioUpdate(Media::Player::instance()->getState(AudioMsgId::Type::Song));
@@ -314,7 +314,7 @@ MainWidget::MainWidget(
 	}
 
 	_controller->chatsForceDisplayWideChanges(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		crl::on_main(this, [=] {
 			updateDialogsWidthAnimated();
 		});
@@ -331,13 +331,13 @@ MainWidget::MainWidget(
 		Core::App().settings().dialogsNoChatWidthRatioChanges(
 		) | filter(false) | rpl::to_empty,
 		Core::App().settings().thirdColumnWidthChanges() | rpl::to_empty
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateControlsGeometry();
 	}, lifetime());
 
 	session().changes().historyUpdates(
 		Data::HistoryUpdate::Flag::MessageSent
-	) | rpl::start_with_next([=](const Data::HistoryUpdate &update) {
+	) | rpl::on_next([=](const Data::HistoryUpdate &update) {
 		const auto history = update.history;
 		history->forgetScrollState();
 		if (const auto from = history->peer->migrateFrom()) {
@@ -350,7 +350,7 @@ MainWidget::MainWidget(
 
 	session().changes().entryUpdates(
 		Data::EntryUpdate::Flag::LocalDraftSet
-	) | rpl::start_with_next([=](const Data::EntryUpdate &update) {
+	) | rpl::on_next([=](const Data::EntryUpdate &update) {
 		auto params = Window::SectionShow();
 		params.reapplyLocalDraft = true;
 		controller->showThread(
@@ -381,14 +381,14 @@ MainWidget::MainWidget(
 			return std::make_tuple(key, can);
 		});
 	}) | rpl::flatten_latest(
-	) | rpl::start_with_next([this](Dialogs::Key key, bool canWrite) {
+	) | rpl::on_next([this](Dialogs::Key key, bool canWrite) {
 		updateThirdColumnToCurrentChat(key, canWrite);
 	}, lifetime());
 
 	QCoreApplication::instance()->installEventFilter(this);
 
 	Media::Player::instance()->tracksFinished(
-	) | rpl::start_with_next([=](AudioMsgId::Type type) {
+	) | rpl::on_next([=](AudioMsgId::Type type) {
 		if (type == AudioMsgId::Type::Voice) {
 			const auto songState = Media::Player::instance()->getState(
 				AudioMsgId::Type::Song);
@@ -405,7 +405,7 @@ MainWidget::MainWidget(
 	}, lifetime());
 
 	_controller->adaptive().changes(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		handleAdaptiveLayoutUpdate();
 	}, lifetime());
 
@@ -446,7 +446,7 @@ void MainWidget::setupConnectingWidget() {
 		&session().account(),
 		_controller->adaptive().oneColumnValue() | rpl::map(!_1));
 	_controller->connectingBottomSkipValue(
-	) | rpl::start_with_next([=](int skip) {
+	) | rpl::on_next([=](int skip) {
 		_connecting->setBottomSkip(skip);
 	}, lifetime());
 }
@@ -721,7 +721,7 @@ void MainWidget::hiderLayer(base::unique_qptr<Window::HistoryHider> hider) {
 	_hider->setParent(this);
 
 	_hider->hidden(
-	) | rpl::start_with_next([=, instance = _hider.get()] {
+	) | rpl::on_next([=, instance = _hider.get()] {
 		clearHider(instance);
 		instance->hide();
 		instance->deleteLater();
@@ -874,7 +874,7 @@ void MainWidget::createPlayer() {
 		rpl::merge(
 			_player->heightValue() | rpl::map_to(true),
 			_player->shownValue()
-		) | rpl::start_with_next(
+		) | rpl::on_next(
 			[this] { playerHeightUpdated(); },
 			_player->lifetime());
 		_player->entity()->setCloseCallback([=] {
@@ -893,7 +893,7 @@ void MainWidget::createPlayer() {
 		});
 
 		_player->entity()->togglePlaylistRequests(
-		) | rpl::start_with_next([=](bool shown) {
+		) | rpl::on_next([=](bool shown) {
 			if (!shown) {
 				_playerPlaylist->hideFromOther();
 				return;
@@ -953,7 +953,7 @@ void MainWidget::setCurrentCall(Calls::Call *call) {
 	if (call) {
 		_callTopBar.destroy();
 		call->stateValue(
-		) | rpl::start_with_next([=](Calls::Call::State state) {
+		) | rpl::on_next([=](Calls::Call::State state) {
 			using State = Calls::Call::State;
 			if (state != State::Established) {
 				destroyCallTopBar();
@@ -975,7 +975,7 @@ void MainWidget::setCurrentGroupCall(Calls::GroupCall *call) {
 	if (call) {
 		_callTopBar.destroy();
 		_currentGroupCall->stateValue(
-		) | rpl::start_with_next([=](Calls::GroupCall::State state) {
+		) | rpl::on_next([=](Calls::GroupCall::State state) {
 			using State = Calls::GroupCall::State;
 			if (state != State::Creating
 				&& state != State::Waiting
@@ -1005,7 +1005,7 @@ void MainWidget::createCallTopBar(
 			: object_ptr<Calls::TopBar>(this, group, show)));
 	_callTopBar->entity()->initBlobsUnder(this, _callTopBar->geometryValue());
 	_callTopBar->heightValue(
-	) | rpl::start_with_next([this](int value) {
+	) | rpl::on_next([this](int value) {
 		callTopBarHeightUpdated(value);
 	}, lifetime());
 	orderWidgets();
@@ -1041,7 +1041,7 @@ void MainWidget::setCurrentExportView(Export::View::PanelController *view) {
 	_currentExportView = view;
 	if (_currentExportView) {
 		_currentExportView->progressState(
-		) | rpl::start_with_next([=](Export::View::Content &&data) {
+		) | rpl::on_next([=](Export::View::Content &&data) {
 			if (!data.rows.empty()
 				&& data.rows[0].id == Export::View::Content::kDoneId) {
 				LOG(("Export Info: Destroy top bar by Done."));
@@ -1067,7 +1067,7 @@ void MainWidget::createExportTopBar(Export::View::Content &&data) {
 		object_ptr<Export::View::TopBar>(this, std::move(data)),
 		_controller->adaptive().oneColumnValue());
 	_exportTopBar->entity()->clicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (_currentExportView) {
 			_currentExportView->activatePanel();
 		}
@@ -1085,7 +1085,7 @@ void MainWidget::createExportTopBar(Export::View::Content &&data) {
 	rpl::merge(
 		_exportTopBar->heightValue() | rpl::map_to(true),
 		_exportTopBar->shownValue()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		exportTopBarHeightUpdated();
 	}, _exportTopBar->lifetime());
 }
@@ -1636,7 +1636,7 @@ bool MainWidget::saveSectionInStack(
 	const auto raw = _stack.back().get();
 	raw->setThirdSectionWeak(_thirdSection.data());
 	raw->removeRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		for (auto i = begin(_stack); i != end(_stack); ++i) {
 			if (i->get() == raw) {
 				_stack.erase(i);
@@ -1858,7 +1858,7 @@ void MainWidget::showNewSection(
 	if (newThirdSection) {
 		_thirdSection = std::move(newThirdSection);
 		_thirdSection->removeRequests(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			destroyThirdSection();
 			_thirdShadow.destroy();
 			updateControlsGeometry();
diff --git a/Telegram/SourceFiles/mainwindow.cpp b/Telegram/SourceFiles/mainwindow.cpp
index 7c9f52eab1..0bfe98a19d 100644
--- a/Telegram/SourceFiles/mainwindow.cpp
+++ b/Telegram/SourceFiles/mainwindow.cpp
@@ -90,17 +90,17 @@ MainWindow::MainWindow(not_null<Window::Controller*> controller)
 
 	using Window::Theme::BackgroundUpdate;
 	Window::Theme::Background()->updates(
-	) | rpl::start_with_next([=](const BackgroundUpdate &data) {
+	) | rpl::on_next([=](const BackgroundUpdate &data) {
 		themeUpdated(data);
 	}, lifetime());
 
 	Core::App().passcodeLockChanges(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateGlobalMenu();
 	}, lifetime());
 
 	Ui::Emoji::Updated(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		Ui::ForceFullRepaint(this);
 	}, lifetime());
 
@@ -144,7 +144,7 @@ void MainWindow::finishFirstShow() {
 	windowActiveValue(
 	) | rpl::skip(1) | rpl::filter(
 		!rpl::mappers::_1
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		Ui::Tooltip::Hide();
 	}, lifetime());
 
@@ -289,7 +289,7 @@ void MainWindow::setupIntro(
 		&account(),
 		point);
 	created->showSettingsRequested(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		showSettings();
 	}, created->lifetime());
 
@@ -415,7 +415,7 @@ void MainWindow::ensureLayerCreated() {
 	_layer->hideFinishEvents(
 	) | rpl::filter([=] {
 		return _layer != nullptr; // Last hide finish is sent from destructor.
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		destroyLayer();
 	}, _layer->lifetime());
 
diff --git a/Telegram/SourceFiles/media/audio/media_audio.cpp b/Telegram/SourceFiles/media/audio/media_audio.cpp
index 86fe5ce21d..c0de2bb26c 100644
--- a/Telegram/SourceFiles/media/audio/media_audio.cpp
+++ b/Telegram/SourceFiles/media/audio/media_audio.cpp
@@ -472,14 +472,14 @@ Mixer::Mixer(not_null<Audio::Instance*> instance)
 	connect(this, SIGNAL(suppressAll(qint64)), _fader, SLOT(onSuppressAll(qint64)));
 
 	Core::App().settings().songVolumeChanges(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		InvokeQueued(_fader, [fader = _fader] {
 			fader->songVolumeChanged();
 		});
 	}, _lifetime);
 
 	Core::App().settings().videoVolumeChanges(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		InvokeQueued(_fader, [fader = _fader] {
 			fader->videoVolumeChanged();
 		});
diff --git a/Telegram/SourceFiles/media/audio/media_audio_track.cpp b/Telegram/SourceFiles/media/audio/media_audio_track.cpp
index 4cef903464..4b80750c7a 100644
--- a/Telegram/SourceFiles/media/audio/media_audio_track.cpp
+++ b/Telegram/SourceFiles/media/audio/media_audio_track.cpp
@@ -278,7 +278,7 @@ Instance::Instance()
 	});
 
 	_playbackDeviceId.changes(
-	) | rpl::start_with_next([=](Webrtc::DeviceResolvedId id) {
+	) | rpl::on_next([=](Webrtc::DeviceResolvedId id) {
 		if (Player::internal::DetachIfDeviceChanged(this, id)) {
 			_detachFromDeviceForce = false;
 		}
diff --git a/Telegram/SourceFiles/media/player/media_player_dropdown.cpp b/Telegram/SourceFiles/media/player/media_player_dropdown.cpp
index 27a29d7791..f7874321fb 100644
--- a/Telegram/SourceFiles/media/player/media_player_dropdown.cpp
+++ b/Telegram/SourceFiles/media/player/media_player_dropdown.cpp
@@ -106,7 +106,7 @@ SpeedSliderItem::SpeedSliderItem(
 	_slider->setAlwaysDisplayMarker(true);
 
 	sizeValue(
-	) | rpl::start_with_next([=](const QSize &size) {
+	) | rpl::on_next([=](const QSize &size) {
 		const auto geometry = QRect(QPoint(), size);
 		const auto padding = _st.sliderPadding;
 		const auto inner = geometry - padding;
@@ -118,7 +118,7 @@ SpeedSliderItem::SpeedSliderItem(
 	}, lifetime());
 
 	paintRequest(
-	) | rpl::start_with_next([=](const QRect &clip) {
+	) | rpl::on_next([=](const QRect &clip) {
 		auto p = Painter(this);
 
 		p.fillRect(clip, _st.dropdown.menu.itemBg);
@@ -148,12 +148,12 @@ SpeedSliderItem::SpeedSliderItem(
 
 	std::move(
 		value
-	) | rpl::start_with_next([=](float64 external) {
+	) | rpl::on_next([=](float64 external) {
 		setExternalValue(external);
 	}, lifetime());
 
 	_last.value(
-	) | rpl::start_with_next([=](float64 value) {
+	) | rpl::on_next([=](float64 value) {
 		const auto text = QString::number(value, 'f', 1) + 'x';
 		if (_text.toString() != text) {
 			_text.setText(_st.sliderStyle, text);
@@ -185,7 +185,7 @@ void FillSpeedMenu(
 		rpl::duplicate(value));
 
 	slider->debouncedChanges(
-	) | rpl::start_with_next(callback, slider->lifetime());
+	) | rpl::on_next(callback, slider->lifetime());
 
 	struct State {
 		rpl::variable<float64> realtime;
@@ -259,12 +259,12 @@ void FillSpeedMenu(
 		const auto check = Ui::CreateChild<Ui::RpWidget>(raw);
 		check->resize(st.activeCheck.size());
 		check->paintRequest(
-		) | rpl::start_with_next([check, icon = &st.activeCheck] {
+		) | rpl::on_next([check, icon = &st.activeCheck] {
 			auto p = QPainter(check);
 			icon->paint(p, 0, 0, check->width());
 		}, check->lifetime());
 		raw->sizeValue(
-		) | rpl::start_with_next([=, skip = st.activeCheckSkip](QSize size) {
+		) | rpl::on_next([=, skip = st.activeCheckSkip](QSize size) {
 			check->moveToRight(
 				skip,
 				(size.height() - check->height()) / 2,
@@ -272,7 +272,7 @@ void FillSpeedMenu(
 		}, check->lifetime());
 		check->setAttribute(Qt::WA_TransparentForMouseEvents);
 		state->realtime.value(
-		) | rpl::start_with_next([=](float64 now) {
+		) | rpl::on_next([=](float64 now) {
 			const auto chosen = EqualSpeeds(speed, now);
 			const auto overriden = chosen ? iconActive : icon;
 			raw->setIcon(overriden, overriden);
@@ -335,7 +335,7 @@ Dropdown::Dropdown(QWidget *parent)
 	macWindowDeactivateEvents(
 	) | rpl::filter([=] {
 		return !isHidden();
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		leaveEvent(nullptr);
 	}, lifetime());
 
@@ -505,7 +505,7 @@ WithDropdownController::WithDropdownController(
 	) | rpl::filter([=](not_null<QEvent*> e) {
 		return (e->type() == QEvent::Enter)
 			|| (e->type() == QEvent::Leave);
-	}) | rpl::start_with_next([=](not_null<QEvent*> e) {
+	}) | rpl::on_next([=](not_null<QEvent*> e) {
 		_overButton = (e->type() == QEvent::Enter);
 		if (_overButton) {
 			InvokeQueued(button, [=] {
@@ -585,7 +585,7 @@ void WithDropdownController::showMenu() {
 	_menu.emplace(_menuParent, _menuSt);
 	const auto raw = _menu.get();
 	_menu->events(
-	) | rpl::start_with_next([this](not_null<QEvent*> e) {
+	) | rpl::on_next([this](not_null<QEvent*> e) {
 		const auto type = e->type();
 		if (type == QEvent::Enter) {
 			_menuOverCallback(true);
@@ -645,7 +645,7 @@ OrderController::OrderController(
 	});
 
 	_appOrder.value(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateIcon();
 	}, button->lifetime());
 }
@@ -829,12 +829,12 @@ void SpeedController::fillMenu(not_null<Ui::DropdownMenu*> menu) {
 		const auto check = Ui::CreateChild<Ui::RpWidget>(raw);
 		check->resize(st.activeCheck.size());
 		check->paintRequest(
-		) | rpl::start_with_next([check, icon = &st.activeCheck] {
+		) | rpl::on_next([check, icon = &st.activeCheck] {
 			auto p = QPainter(check);
 			icon->paint(p, 0, 0, check->width());
 		}, check->lifetime());
 		raw->sizeValue(
-		) | rpl::start_with_next([=, skip = st.activeCheckSkip](QSize size) {
+		) | rpl::on_next([=, skip = st.activeCheckSkip](QSize size) {
 			check->moveToRight(
 				skip,
 				(size.height() - check->height()) / 2,
@@ -842,7 +842,7 @@ void SpeedController::fillMenu(not_null<Ui::DropdownMenu*> menu) {
 		}, check->lifetime());
 		check->setAttribute(Qt::WA_TransparentForMouseEvents);
 		_quality.value(
-		) | rpl::start_with_next([=](VideoQuality now) {
+		) | rpl::on_next([=](VideoQuality now) {
 			const auto chosen = now.manual
 				? (now.height == quality)
 				: !quality;
diff --git a/Telegram/SourceFiles/media/player/media_player_float.cpp b/Telegram/SourceFiles/media/player/media_player_float.cpp
index 755eef4dcf..2fa095e364 100644
--- a/Telegram/SourceFiles/media/player/media_player_float.cpp
+++ b/Telegram/SourceFiles/media/player/media_player_float.cpp
@@ -110,21 +110,21 @@ Float::Float(
 	prepareShadow();
 
 	document->session().data().itemRepaintRequest(
-	) | rpl::start_with_next([this](auto item) {
+	) | rpl::on_next([this](auto item) {
 		if (_item == item) {
 			repaintItem();
 		}
 	}, lifetime());
 
 	document->session().data().itemRemoved(
-	) | rpl::start_with_next([this](auto item) {
+	) | rpl::on_next([this](auto item) {
 		if (_item == item) {
 			detach();
 		}
 	}, lifetime());
 
 	document->session().account().sessionChanges(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		detach();
 	}, lifetime());
 
@@ -320,7 +320,7 @@ FloatController::FloatController(not_null<FloatDelegate*> delegate)
 	Media::Player::instance()->trackChanged(
 	) | rpl::filter([=](AudioMsgId::Type type) {
 		return (type == AudioMsgId::Type::Voice);
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		checkCurrent();
 	}, _lifetime);
 
@@ -343,38 +343,38 @@ void FloatController::replaceDelegate(not_null<FloatDelegate*> delegate) {
 
 void FloatController::startDelegateHandling() {
 	_delegate->floatPlayerCheckVisibilityRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		checkVisibility();
 	}, _delegateLifetime);
 
 	_delegate->floatPlayerHideAllRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		hideAll();
 	}, _delegateLifetime);
 
 	_delegate->floatPlayerShowVisibleRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		showVisible();
 	}, _delegateLifetime);
 
 	_delegate->floatPlayerRaiseAllRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		raiseAll();
 	}, _delegateLifetime);
 
 	_delegate->floatPlayerUpdatePositionsRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updatePositions();
 	}, _delegateLifetime);
 
 	_delegate->floatPlayerFilterWheelEventRequests(
-	) | rpl::start_with_next([=](
+	) | rpl::on_next([=](
 			const FloatDelegate::FloatPlayerFilterWheelEventRequest &request) {
 		*request.result = filterWheelEvent(request.object, request.event);
 	}, _delegateLifetime);
 
 	_delegate->floatPlayerAreaUpdates(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		checkVisibility();
 	}, _delegateLifetime);
 }
diff --git a/Telegram/SourceFiles/media/player/media_player_instance.cpp b/Telegram/SourceFiles/media/player/media_player_instance.cpp
index 51e30ce824..739ce3c721 100644
--- a/Telegram/SourceFiles/media/player/media_player_instance.cpp
+++ b/Telegram/SourceFiles/media/player/media_player_instance.cpp
@@ -149,13 +149,13 @@ Instance::Instance()
 : _songData(AudioMsgId::Type::Song, SharedMediaType::MusicFile)
 , _voiceData(AudioMsgId::Type::Voice, SharedMediaType::RoundVoiceFile) {
 	Media::Player::Updated(
-	) | rpl::start_with_next([=](const AudioMsgId &audioId) {
+	) | rpl::on_next([=](const AudioMsgId &audioId) {
 		handleSongUpdate(audioId);
 	}, _lifetime);
 
 	repeatChanges(
 		&_songData
-	) | rpl::start_with_next([=](RepeatMode mode) {
+	) | rpl::on_next([=](RepeatMode mode) {
 		if (mode == RepeatMode::All) {
 			refreshPlaylist(&_songData);
 		}
@@ -163,7 +163,7 @@ Instance::Instance()
 
 	orderChanges(
 		&_songData
-	) | rpl::start_with_next([=](OrderMode mode) {
+	) | rpl::on_next([=](OrderMode mode) {
 		if (mode == OrderMode::Shuffle) {
 			validateShuffleData(&_songData);
 		} else {
@@ -176,7 +176,7 @@ Instance::Instance()
 		Core::App().calls().currentCallValue(),
 		Core::App().calls().currentGroupCallValue(),
 		_1 || _2
-	) | rpl::start_with_next([=](bool call) {
+	) | rpl::on_next([=](bool call) {
 		if (call) {
 			pauseOnCall(AudioMsgId::Type::Voice);
 			pauseOnCall(AudioMsgId::Type::Song);
@@ -268,7 +268,7 @@ void Instance::setSession(not_null<Data*> data, Main::Session *session) {
 	data->session = session;
 	if (session) {
 		session->account().sessionChanges(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			setSession(data, nullptr);
 		}, data->sessionLifetime);
 
@@ -276,7 +276,7 @@ void Instance::setSession(not_null<Data*> data, Main::Session *session) {
 		) | rpl::filter([=](not_null<DocumentData*> document) {
 			// Before refactoring it was called only for audio files.
 			return document->isAudioFile();
-		}) | rpl::start_with_next([=](not_null<DocumentData*> document) {
+		}) | rpl::on_next([=](not_null<DocumentData*> document) {
 			const auto type = AudioMsgId::Type::Song;
 			emitUpdate(type, [&](const AudioMsgId &audioId) {
 				return (audioId.audio() == document);
@@ -286,7 +286,7 @@ void Instance::setSession(not_null<Data*> data, Main::Session *session) {
 		session->data().itemRemoved(
 		) | rpl::filter([=](not_null<const HistoryItem*> item) {
 			return (data->current.contextId() == item->fullId());
-		}) | rpl::start_with_next([=] {
+		}) | rpl::on_next([=] {
 			stopAndClear(data);
 		}, data->sessionLifetime);
 	} else {
@@ -396,7 +396,7 @@ void Instance::validatePlaylist(not_null<Data*> data) {
 			SharedMediaMergedKey(*key, data->overview),
 			kIdsLimit,
 			kIdsLimit
-		) | rpl::start_with_next([=](SparseIdsMergedSlice &&update) {
+		) | rpl::on_next([=](SparseIdsMergedSlice &&update) {
 			data->playlistSlice = std::move(update);
 			data->playlistSliceKey = key;
 			refreshOtherPlaylist(data);
@@ -456,7 +456,7 @@ void Instance::validateOtherPlaylist(not_null<Data*> data) {
 			SharedMediaMergedKey(*key, data->overview),
 			kIdsLimit,
 			kIdsLimit
-		) | rpl::start_with_next([=](SparseIdsMergedSlice &&update) {
+		) | rpl::on_next([=](SparseIdsMergedSlice &&update) {
 			data->playlistOtherSlice = std::move(update);
 			playlistUpdated(data);
 		}, data->playlistOtherLifetime);
@@ -840,7 +840,7 @@ void Instance::playStreamed(
 	data->streamed->instance.lockPlayer();
 
 	data->streamed->instance.player().updates(
-	) | rpl::start_with_next_error([=](Streaming::Update &&update) {
+	) | rpl::on_next_error([=](Streaming::Update &&update) {
 		handleStreamingUpdate(data, std::move(update));
 	}, [=](Streaming::Error &&error) {
 		handleStreamingError(data, std::move(error));
@@ -986,7 +986,7 @@ void Instance::validateShuffleData(not_null<Data*> data) {
 			data->overview),
 		kIdsLimit,
 		kIdsLimit
-	) | rpl::start_with_next([=](SparseIdsMergedSlice &&update) {
+	) | rpl::on_next([=](SparseIdsMergedSlice &&update) {
 		raw->nextSliceLifetime.destroy();
 
 		const auto size = update.size();
@@ -1026,7 +1026,7 @@ void Instance::setupShuffleData(not_null<Data*> data) {
 			: MsgId(0);
 	}) | rpl::filter(
 		rpl::mappers::_1 != MsgId(0)
-	) | rpl::start_with_next([=](MsgId id) {
+	) | rpl::on_next([=](MsgId id) {
 		const auto i = ranges::find(raw->playlist, id);
 		if (i != end(raw->playlist)) {
 			raw->playlist.erase(i);
@@ -1283,7 +1283,7 @@ void Instance::emitUpdate(AudioMsgId::Type type, CheckCallback check) {
 
 void Instance::setupShortcuts() {
 	Shortcuts::Requests(
-	) | rpl::start_with_next([=](not_null<Shortcuts::Request*> request) {
+	) | rpl::on_next([=](not_null<Shortcuts::Request*> request) {
 		using Command = Shortcuts::Command;
 		request->check(Command::MediaPlay) && request->handle([=] {
 			playPause();
diff --git a/Telegram/SourceFiles/media/player/media_player_panel.cpp b/Telegram/SourceFiles/media/player/media_player_panel.cpp
index 73c9556d44..551a1aa3cf 100644
--- a/Telegram/SourceFiles/media/player/media_player_panel.cpp
+++ b/Telegram/SourceFiles/media/player/media_player_panel.cpp
@@ -210,7 +210,7 @@ void Panel::ensureCreated() {
 
 	_refreshListLifetime = instance()->playlistChanges(
 		AudioMsgId::Type::Song
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		refreshList();
 	});
 	refreshList();
@@ -218,7 +218,7 @@ void Panel::ensureCreated() {
 	macWindowDeactivateEvents(
 	) | rpl::filter([=] {
 		return !isHidden();
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		leaveEvent(nullptr);
 	}, _refreshListLifetime);
 
@@ -277,19 +277,19 @@ void Panel::refreshList() {
 		updateControlsGeometry();
 
 		weak->checkForHide(
-		) | rpl::start_with_next([this] {
+		) | rpl::on_next([this] {
 			if (!rect().contains(mapFromGlobal(QCursor::pos()))) {
 				_hideTimer.callOnce(kDelayedHideTimeout);
 			}
 		}, weak->lifetime());
 
 		weak->heightValue(
-		) | rpl::start_with_next([this](int newHeight) {
+		) | rpl::on_next([this](int newHeight) {
 			listHeightUpdated(newHeight);
 		}, weak->lifetime());
 
 		weak->scrollToRequests(
-		) | rpl::start_with_next([this](int newScrollTop) {
+		) | rpl::on_next([this](int newScrollTop) {
 			_scroll->scrollToY(newScrollTop);
 		}, weak->lifetime());
 
@@ -298,7 +298,7 @@ void Panel::refreshList() {
 		rpl::combine(
 			_scroll->scrollTopValue(),
 			_scroll->heightValue()
-		) | rpl::start_with_next([=](int top, int height) {
+		) | rpl::on_next([=](int top, int height) {
 			const auto bottom = top + height;
 			weak->setVisibleTopBottom(top, bottom);
 		}, weak->lifetime());
diff --git a/Telegram/SourceFiles/media/player/media_player_volume_controller.cpp b/Telegram/SourceFiles/media/player/media_player_volume_controller.cpp
index c8e4af7967..a2dc29e819 100644
--- a/Telegram/SourceFiles/media/player/media_player_volume_controller.cpp
+++ b/Telegram/SourceFiles/media/player/media_player_volume_controller.cpp
@@ -43,7 +43,7 @@ VolumeController::VolumeController(
 		Core::App().saveSettingsDelayed();
 	});
 	Core::App().settings().songVolumeChanges(
-	) | rpl::start_with_next([=](float64 volume) {
+	) | rpl::on_next([=](float64 volume) {
 		if (!_slider->isChanging()) {
 			_slider->setValue(volume);
 		}
@@ -93,7 +93,7 @@ void PrepareVolumeDropdown(
 	volume->setIsVertical(true);
 
 	dropdown->sizeValue(
-	) | rpl::start_with_next([=](QSize size) {
+	) | rpl::on_next([=](QSize size) {
 		const auto rect = QRect(QPoint(), size);
 		const auto inner = rect.marginsRemoved(dropdown->getMargin());
 		volume->setGeometry(
@@ -108,7 +108,7 @@ void PrepareVolumeDropdown(
 
 	std::move(
 		outerWheelEvents
-	) | rpl::start_with_next([=](not_null<QWheelEvent*> e) {
+	) | rpl::on_next([=](not_null<QWheelEvent*> e) {
 		volume->outerWheelEvent(e);
 	}, volume->lifetime());
 }
diff --git a/Telegram/SourceFiles/media/player/media_player_widget.cpp b/Telegram/SourceFiles/media/player/media_player_widget.cpp
index 89d85a5454..45c4ab5d09 100644
--- a/Telegram/SourceFiles/media/player/media_player_widget.cpp
+++ b/Telegram/SourceFiles/media/player/media_player_widget.cpp
@@ -79,7 +79,7 @@ Widget::Widget(
 		[=](bool lastNonDefault) { return speedLookup(lastNonDefault); },
 		[=](float64 speed) { saveSpeed(speed); })) {
 	_speedController->realtimeValue(
-	) | rpl::start_with_next([=](float64 speed) {
+	) | rpl::on_next([=](float64 speed) {
 		_speedToggle->setSpeed(speed);
 	}, _speedToggle->lifetime());
 	_speedToggle->finishAnimating();
@@ -127,12 +127,12 @@ Widget::Widget(
 		mixer()->setSongVolume(volume);
 	});
 	Core::App().settings().songVolumeChanges(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateVolumeToggleIcon();
 	}, lifetime());
 
 	Core::App().settings().playerRepeatModeValue(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateRepeatToggleIcon();
 	}, lifetime());
 
@@ -150,14 +150,14 @@ Widget::Widget(
 	});
 
 	_speedController->saved(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		instance()->updateVoicePlaybackSpeed();
 	}, lifetime());
 
 	instance()->trackChanged(
 	) | rpl::filter([=](AudioMsgId::Type type) {
 		return (type == _type);
-	}) | rpl::start_with_next([=](AudioMsgId::Type type) {
+	}) | rpl::on_next([=](AudioMsgId::Type type) {
 		handleSongChange();
 		updateControlsVisibility();
 		updateLabelsGeometry();
@@ -166,7 +166,7 @@ Widget::Widget(
 	instance()->tracksFinished(
 	) | rpl::filter([=](AudioMsgId::Type type) {
 		return (type == AudioMsgId::Type::Voice);
-	}) | rpl::start_with_next([=](AudioMsgId::Type type) {
+	}) | rpl::on_next([=](AudioMsgId::Type type) {
 		_voiceIsActive = false;
 		const auto currentSong = instance()->current(AudioMsgId::Type::Song);
 		const auto songState = instance()->getState(AudioMsgId::Type::Song);
@@ -176,7 +176,7 @@ Widget::Widget(
 	}, lifetime());
 
 	instance()->updatedNotifier(
-	) | rpl::start_with_next([=](const TrackState &state) {
+	) | rpl::on_next([=](const TrackState &state) {
 		handleSongUpdate(state);
 	}, lifetime());
 
@@ -188,7 +188,7 @@ Widget::Widget(
 	}));
 	_volumeToggle->installEventFilter(_volume.get());
 	_volume->events(
-	) | rpl::start_with_next([=](not_null<QEvent*> e) {
+	) | rpl::on_next([=](not_null<QEvent*> e) {
 		if (e->type() == QEvent::Enter) {
 			markOver(true);
 		} else if (e->type() == QEvent::Leave) {
@@ -207,7 +207,7 @@ void Widget::hidePlaylistOn(not_null<Ui::RpWidget*> widget) {
 	widget->events(
 	) | rpl::filter([=](not_null<QEvent*> e) {
 		return (e->type() == QEvent::Enter);
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		updateOverLabelsState(false);
 	}, widget->lifetime());
 }
@@ -215,7 +215,7 @@ void Widget::hidePlaylistOn(not_null<Ui::RpWidget*> widget) {
 void Widget::setupRightControls() {
 	const auto raw = rightControls();
 	raw->paintRequest(
-	) | rpl::start_with_next([=](QRect clip) {
+	) | rpl::on_next([=](QRect clip) {
 		auto p = QPainter(raw);
 		const auto &icon = st::mediaPlayerControlsFade;
 		const auto fade = QRect(0, 0, icon.width(), raw->height());
@@ -600,7 +600,7 @@ void Widget::setType(AudioMsgId::Type type) {
 		updateOverLabelsState(_labelsOver);
 		_playlistChangesLifetime = instance()->playlistChanges(
 			_type
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			handlePlaylistUpdate();
 		});
 		// maybe the type change causes a change of the button layout
diff --git a/Telegram/SourceFiles/media/stories/media_stories_caption_full_view.cpp b/Telegram/SourceFiles/media/stories/media_stories_caption_full_view.cpp
index 218add3402..14b52d36c3 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_caption_full_view.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_caption_full_view.cpp
@@ -36,7 +36,7 @@ CaptionFullView::CaptionFullView(not_null<Controller*> controller)
 
 	startAnimation();
 	_controller->layoutValue(
-	) | rpl::start_with_next([=](const Layout &layout) {
+	) | rpl::on_next([=](const Layout &layout) {
 		if (_outer != layout.content) {
 			const auto skip = layout.header.y()
 				+ layout.header.height()
@@ -108,7 +108,7 @@ CaptionFullView::CaptionFullView(not_null<Controller*> controller)
 		_scroll->movementValue()
 	) | rpl::filter([=] {
 		return !_closing;
-	}) | rpl::start_with_next([=](
+	}) | rpl::on_next([=](
 			Ui::ElasticScrollPosition position,
 			Ui::ElasticScrollMovement movement) {
 		const auto overscrollTop = std::max(-position.overscroll, 0);
@@ -132,7 +132,7 @@ CaptionFullView::CaptionFullView(not_null<Controller*> controller)
 		}
 	}, _scroll->lifetime());
 
-	_wrap->paintRequest() | rpl::start_with_next([=] {
+	_wrap->paintRequest() | rpl::on_next([=] {
 		if (_controller->repost()) {
 			auto p = Painter(_wrap.get());
 			_controller->drawRepostInfo(
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
index 055d259127..9ca1aa79f7 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
@@ -246,13 +246,13 @@ void Controller::Unsupported::setup(not_null<PeerData*> peer) {
 
 	_bg = std::make_unique<Ui::RpWidget>(wrap);
 	_bg->show();
-	_bg->paintRequest() | rpl::start_with_next([=] {
+	_bg->paintRequest() | rpl::on_next([=] {
 		auto p = QPainter(_bg.get());
 		_bgRound.paint(p, _bg->rect());
 	}, _bg->lifetime());
 
 	_controller->layoutValue(
-	) | rpl::start_with_next([=](const Layout &layout) {
+	) | rpl::on_next([=](const Layout &layout) {
 		_bg->setGeometry(layout.content);
 	}, _bg->lifetime());
 
@@ -273,7 +273,7 @@ void Controller::Unsupported::setup(not_null<PeerData*> peer) {
 		_controller->layoutValue(),
 		_text->sizeValue(),
 		_button->sizeValue()
-	) | rpl::start_with_next([=](
+	) | rpl::on_next([=](
 			const Layout &layout,
 			QSize text,
 			QSize button) {
@@ -321,7 +321,7 @@ Controller::Controller(not_null<Delegate*> delegate)
 		_reactions->activeValue(),
 		_1 || _2
 	) | rpl::distinct_until_changed(
-	) | rpl::start_with_next([=](bool active) {
+	) | rpl::on_next([=](bool active) {
 		_replyActive = active;
 		updateContentFaded();
 	}, _lifetime);
@@ -334,14 +334,14 @@ Controller::Controller(not_null<Delegate*> delegate)
 	}
 
 	_reactions->chosen(
-	) | rpl::start_with_next([=](Reactions::Chosen chosen) {
+	) | rpl::on_next([=](Reactions::Chosen chosen) {
 		if (reactionChosen(chosen.mode, chosen.reaction)) {
 			_reactions->animateAndProcess(std::move(chosen));
 		}
 	}, _lifetime);
 
 	_delegate->storiesLayerShown(
-	) | rpl::start_with_next([=](bool shown) {
+	) | rpl::on_next([=](bool shown) {
 		if (_layerShown != shown) {
 			_layerShown = shown;
 			updatePlayingAllowed();
@@ -349,7 +349,7 @@ Controller::Controller(not_null<Delegate*> delegate)
 	}, _lifetime);
 
 	_header->tooltipShownValue(
-	) | rpl::start_with_next([=](bool shown) {
+	) | rpl::on_next([=](bool shown) {
 		if (_tooltipShown != shown) {
 			_tooltipShown = shown;
 			updatePlayingAllowed();
@@ -357,7 +357,7 @@ Controller::Controller(not_null<Delegate*> delegate)
 	}, _lifetime);
 
 	_wrap->windowActiveValue(
-	) | rpl::start_with_next([=](bool active) {
+	) | rpl::on_next([=](bool active) {
 		_windowActive = active;
 		updatePlayingAllowed();
 	}, _lifetime);
@@ -867,7 +867,7 @@ void Controller::show(
 	const auto subscribeToSource = [&] {
 		stories.sourceChanged() | rpl::filter(
 			rpl::mappers::_1 == storyId.peer
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			rebuildFromContext(peer, storyId);
 		}, _contextLifetime);
 	};
@@ -878,7 +878,7 @@ void Controller::show(
 		const auto key = Data::StoryAlbumIdsKey{ storyId.peer, album.id };
 		stories.albumIdsChanged() | rpl::filter(
 			rpl::mappers::_1 == key
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			rebuildFromContext(peer, storyId);
 			checkMoveByDelta();
 		}, _contextLifetime);
@@ -1024,13 +1024,13 @@ void Controller::subscribeToSession() {
 	}
 	_session->changes().storyUpdates(
 		Data::StoryUpdate::Flag::Destroyed
-	) | rpl::start_with_next([=](Data::StoryUpdate update) {
+	) | rpl::on_next([=](Data::StoryUpdate update) {
 		if (update.story->fullId() == _shown) {
 			_delegate->storiesClose();
 		}
 	}, _sessionLifetime);
 	_session->data().stories().itemsChanged(
-	) | rpl::start_with_next([=](PeerId peerId) {
+	) | rpl::on_next([=](PeerId peerId) {
 		if (_waitingForId.peer == peerId) {
 			checkWaitingFor();
 		}
@@ -1041,7 +1041,7 @@ void Controller::subscribeToSession() {
 		| Data::StoryUpdate::Flag::Reaction
 	) | rpl::filter([=](const Data::StoryUpdate &update) {
 		return (update.story == this->story());
-	}) | rpl::start_with_next([=](const Data::StoryUpdate &update) {
+	}) | rpl::on_next([=](const Data::StoryUpdate &update) {
 		if (update.flags & Data::StoryUpdate::Flag::Edited) {
 			show(update.story, _context);
 			_delegate->storiesRedisplay(update.story);
@@ -1787,7 +1787,7 @@ auto Controller::starsReactionsEffects() const
 void Controller::setStarsReactionIncrements(rpl::producer<int> increments) {
 	std::move(
 		increments
-	) | rpl::start_with_next([=](int count) {
+	) | rpl::on_next([=](int count) {
 		if (const auto call = _videoStreamCall.get()) {
 			const auto show = _delegate->storiesShow();
 			Payments::TryAddingPaidReaction(call, count, show);
@@ -1889,7 +1889,7 @@ void Controller::updateVideoStream(not_null<Calls::GroupCall*> videoStream) {
 
 	using namespace Calls::Group;
 	videoStream->messages()->listValue(
-	) | rpl::start_with_next([=](const std::vector<Message> &messages) {
+	) | rpl::on_next([=](const std::vector<Message> &messages) {
 		if (_commentsState.current() == CommentsState::Shown
 			|| _commentsState.current() == CommentsState::Empty) {
 			for (const auto &message : messages | ranges::views::reverse) {
@@ -1942,7 +1942,7 @@ void Controller::updateVideoStream(not_null<Calls::GroupCall*> videoStream) {
 		return videoStream->messages()->starsLocalState().total;
 	});
 	_paidReactionToast->shownForCall(
-	) | rpl::start_with_next([=](Calls::GroupCall *call) {
+	) | rpl::on_next([=](Calls::GroupCall *call) {
 		_starsReactionHighlighted = (call == videoStream);
 	}, _videoStreamLifetime);
 
diff --git a/Telegram/SourceFiles/media/stories/media_stories_header.cpp b/Telegram/SourceFiles/media/stories/media_stories_header.cpp
index 1ec02aa115..5ee7f49255 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_header.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_header.cpp
@@ -364,13 +364,13 @@ void Header::show(HeaderData data, rpl::producer<int> videoStreamViewers) {
 		rpl::combine(
 			_name->widthValue(),
 			raw->heightValue()
-		) | rpl::start_with_next(updateInfoGeometry, _name->lifetime());
+		) | rpl::on_next(updateInfoGeometry, _name->lifetime());
 
 		raw->show();
 		_widget = std::move(widget);
 
 		_controller->layoutValue(
-		) | rpl::start_with_next([=](const Layout &layout) {
+		) | rpl::on_next([=](const Layout &layout) {
 			raw->setGeometry(layout.header);
 			_contentGeometry = layout.content;
 			updateTooltipGeometry();
@@ -387,7 +387,7 @@ void Header::show(HeaderData data, rpl::producer<int> videoStreamViewers) {
 	setVideoStreamViewers(std::move(videoStreamViewers));
 
 	_date->widthValue(
-	) | rpl::start_with_next(updateInfoGeometry, _date->lifetime());
+	) | rpl::on_next(updateInfoGeometry, _date->lifetime());
 
 	if (!data.fromPeer && data.repostFrom.isEmpty()) {
 		_repost = nullptr;
@@ -413,7 +413,7 @@ void Header::show(HeaderData data, rpl::producer<int> videoStreamViewers) {
 		}
 		_repost->show();
 		_repost->widthValue(
-		) | rpl::start_with_next(updateInfoGeometry, _repost->lifetime());
+		) | rpl::on_next(updateInfoGeometry, _repost->lifetime());
 	}
 
 	auto counter = ComposeCounter(data);
@@ -448,7 +448,7 @@ void Header::show(HeaderData data, rpl::producer<int> videoStreamViewers) {
 				&& _privacyBadgeGeometry.contains(
 					static_cast<QMouseEvent*>(e.get())->pos());
 			return (_privacyBadgeOver != over);
-		}) | rpl::start_with_next([=] {
+		}) | rpl::on_next([=] {
 			_privacyBadgeOver = !_privacyBadgeOver;
 			toggleTooltip(Tooltip::Privacy, _privacyBadgeOver);
 		}, _privacy->lifetime());
@@ -460,7 +460,7 @@ void Header::show(HeaderData data, rpl::producer<int> videoStreamViewers) {
 		}
 		createVolumeToggle();
 
-		_widget->widthValue() | rpl::start_with_next([=](int width) {
+		_widget->widthValue() | rpl::on_next([=](int width) {
 			if (_playPause) {
 				const auto playPause = st::storiesPlayButtonPosition;
 				_playPause->moveToRight(playPause.x(), playPause.y(), width);
@@ -484,7 +484,7 @@ void Header::show(HeaderData data, rpl::producer<int> videoStreamViewers) {
 		_widget->widthValue(),
 		_counter ? _counter->widthValue() : rpl::single(0),
 		_dateUpdated.events_starting_with_copy(rpl::empty)
-	) | rpl::start_with_next([=](int outer, int counter, auto) {
+	) | rpl::on_next([=](int outer, int counter, auto) {
 		const auto right = _playPause
 			? _playPause->x()
 			: (outer - st::storiesHeaderMargin.right());
@@ -555,7 +555,7 @@ void Header::setVideoStreamViewers(rpl::producer<int> viewers) {
 	const auto context = helper.context();
 	_videoStreamViewersLifetime = std::move(
 		viewers
-	) | rpl::start_with_next([=](int count) {
+	) | rpl::on_next([=](int count) {
 		auto text = badge;
 		if (count) {
 			text.append(' ').append(tr::lng_group_call_rtmp_viewers(
@@ -579,7 +579,7 @@ void Header::createPlayPause() {
 	const auto state = lifetime.make_state<PlayPauseState>();
 
 	_playPause->events(
-	) | rpl::start_with_next([=](not_null<QEvent*> e) {
+	) | rpl::on_next([=](not_null<QEvent*> e) {
 		const auto type = e->type();
 		if (type == QEvent::Enter || type == QEvent::Leave) {
 			const auto over = (e->type() == QEvent::Enter);
@@ -603,7 +603,7 @@ void Header::createPlayPause() {
 		}
 	}, lifetime);
 
-	_playPause->paintRequest() | rpl::start_with_next([=] {
+	_playPause->paintRequest() | rpl::on_next([=] {
 		auto p = QPainter(_playPause.get());
 		const auto paused = (_pauseState == PauseState::Paused)
 			|| (_pauseState == PauseState::InactivePaused);
@@ -649,7 +649,7 @@ void Header::createVolumeToggle() {
 	});
 
 	_volumeToggle->events(
-	) | rpl::start_with_next([=](not_null<QEvent*> e) {
+	) | rpl::on_next([=](not_null<QEvent*> e) {
 		const auto type = e->type();
 		if (type == QEvent::Enter || type == QEvent::Leave) {
 			const auto over = (e->type() == QEvent::Enter);
@@ -667,7 +667,7 @@ void Header::createVolumeToggle() {
 		}
 	}, lifetime);
 
-	_volumeToggle->paintRequest() | rpl::start_with_next([=] {
+	_volumeToggle->paintRequest() | rpl::on_next([=] {
 		auto p = QPainter(_volumeToggle.get());
 		p.setOpacity(state->silent
 			? kControlOpacityDisabled
@@ -681,7 +681,7 @@ void Header::createVolumeToggle() {
 
 	_volume->toggle(false, anim::type::instant);
 	_volume->events(
-	) | rpl::start_with_next([=](not_null<QEvent*> e) {
+	) | rpl::on_next([=](not_null<QEvent*> e) {
 		const auto type = e->type();
 		if (type == QEvent::Enter || type == QEvent::Leave) {
 			const auto over = (e->type() == QEvent::Enter);
@@ -702,7 +702,7 @@ void Header::createVolumeToggle() {
 		_widget->positionValue(),
 		_volumeToggle->positionValue(),
 		rpl::mappers::_1 + rpl::mappers::_2
-	) | rpl::start_with_next([=](QPoint position) {
+	) | rpl::on_next([=](QPoint position) {
 		_volume->move(position);
 	}, _volume->lifetime());
 
@@ -851,7 +851,7 @@ void Header::rebuildVolumeControls(
 		dropdown.get(),
 		st::storiesVolumeButton);
 	_volumeIcon.value(
-	) | rpl::start_with_next([=](const style::icon *icon) {
+	) | rpl::on_next([=](const style::icon *icon) {
 		button->setIconOverride(icon, icon);
 	}, button->lifetime());
 
@@ -902,7 +902,7 @@ void Header::rebuildVolumeControls(
 	}
 
 	dropdown->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(dropdown);
 		auto hq = PainterHighQualityEnabler(p);
 		const auto radius = button->width() / 2.;
diff --git a/Telegram/SourceFiles/media/stories/media_stories_reactions.cpp b/Telegram/SourceFiles/media/stories/media_stories_reactions.cpp
index 49347fd187..dbe343615d 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_reactions.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_reactions.cpp
@@ -221,7 +221,7 @@ ReactionView::ReactionView(
 	GenerateFakeItem(
 		delegate(),
 		session->data().history(PeerData::kServiceNotificationsId))) {
-	style::PaletteChanged() | rpl::start_with_next([=] {
+	style::PaletteChanged() | rpl::on_next([=] {
 		_background = QImage();
 	}, lifetime());
 
@@ -256,7 +256,7 @@ ReactionView::ReactionView(
 		- st::msgMargin.bottom();
 
 	session->data().viewRepaintRequest(
-	) | rpl::start_with_next([=](not_null<const Element*> element) {
+	) | rpl::on_next([=](not_null<const Element*> element) {
 		if (element == view) {
 			update();
 		}
@@ -374,7 +374,7 @@ void ReactionView::createEffectCanvas() {
 	const auto raw = _effectCanvas.get();
 	raw->setAttribute(Qt::WA_TransparentForMouseEvents);
 	raw->show();
-	raw->paintRequest() | rpl::start_with_next([=] {
+	raw->paintRequest() | rpl::on_next([=] {
 		if (!_effect || _effect->finished()) {
 			crl::on_main(_effectCanvas.get(), [=] {
 				_effect = nullptr;
@@ -544,7 +544,7 @@ WeatherView::WeatherView(
 	setAttribute(Qt::WA_TransparentForMouseEvents);
 	show();
 
-	std::move(weatherInCelsius) | rpl::start_with_next([=](bool celsius) {
+	std::move(weatherInCelsius) | rpl::on_next([=](bool celsius) {
 		_celsius = celsius;
 		_background = {};
 		update();
@@ -565,7 +565,7 @@ void WeatherView::watchForSticker() {
 			return document != nullptr;
 		}) | rpl::take(
 			1
-		) | rpl::start_with_next([=](not_null<DocumentData*> document) {
+		) | rpl::on_next([=](not_null<DocumentData*> document) {
 			setStickerFrom(document);
 			update();
 		}, lifetime());
@@ -659,7 +659,7 @@ void WeatherView::setStickerFrom(not_null<DocumentData*> document) {
 		document->session().downloaderTaskFinished()
 	) | rpl::filter([=] {
 		return media->loaded();
-	}) | rpl::take(1) | rpl::start_with_next([=] {
+	}) | rpl::take(1) | rpl::on_next([=] {
 		const auto sticker = document->sticker();
 		if (sticker->isLottie()) {
 			_sticker = std::make_shared<HistoryView::LottiePlayer>(
@@ -891,7 +891,7 @@ void Reactions::Panel::create() {
 
 	const auto mode = _mode.current();
 
-	_parent->events() | rpl::start_with_next([=](not_null<QEvent*> e) {
+	_parent->events() | rpl::on_next([=](not_null<QEvent*> e) {
 		if (e->type() == QEvent::MouseButtonPress) {
 			const auto event = static_cast<QMouseEvent*>(e.get());
 			if (event->button() == Qt::LeftButton) {
@@ -921,7 +921,7 @@ void Reactions::Panel::create() {
 		true);
 
 	_selector->chosen(
-	) | rpl::start_with_next([=](
+	) | rpl::on_next([=](
 			HistoryView::Reactions::ChosenReaction reaction) {
 		_chosen.fire({ .reaction = reaction, .mode = mode });
 		hide(mode);
@@ -939,7 +939,7 @@ void Reactions::Panel::create() {
 	rpl::combine(
 		_controller->layoutValue(),
 		_shownValue.value()
-	) | rpl::start_with_next([=](const Layout &layout, float64 shown) {
+	) | rpl::on_next([=](const Layout &layout, float64 shown) {
 		const auto story = _controller->story();
 		const auto viewsReactionsMode = story && story->peer()->isChannel();
 		const auto width = margins.left()
@@ -970,11 +970,11 @@ void Reactions::Panel::create() {
 	}, _selector->lifetime());
 
 	_selector->willExpand(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_expanded = true;
 	}, _selector->lifetime());
 
-	_selector->escapes() | rpl::start_with_next([=] {
+	_selector->escapes() | rpl::on_next([=] {
 		if (mode == Mode::Message) {
 			collapse(mode);
 		} else {
@@ -995,7 +995,7 @@ void Reactions::Panel::fadeOutSelector() {
 	raw->widget.setGeometry(geometry);
 	raw->widget.show();
 	raw->widget.paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (const auto opacity = raw->animation.value(0.)) {
 			auto p = QPainter(&raw->widget);
 			p.setOpacity(opacity);
@@ -1031,7 +1031,7 @@ void Reactions::Panel::updateShowState() {
 Reactions::Reactions(not_null<Controller*> controller)
 : _controller(controller)
 , _panel(std::make_unique<Panel>(_controller)) {
-	_panel->chosen() | rpl::start_with_next([=](Chosen &&chosen) {
+	_panel->chosen() | rpl::on_next([=](Chosen &&chosen) {
 		_chosen.fire(std::move(chosen));
 	}, _lifetime);
 }
@@ -1075,7 +1075,7 @@ void Reactions::setReplyFieldState(
 		rpl::producer<bool> hasSendText) {
 	std::move(
 		focused
-	) | rpl::start_with_next([=](bool focused) {
+	) | rpl::on_next([=](bool focused) {
 		_replyFocused = focused;
 		if (!_replyFocused) {
 			_panel->hideIfCollapsed(Reactions::Mode::Message);
@@ -1086,7 +1086,7 @@ void Reactions::setReplyFieldState(
 
 	std::move(
 		hasSendText
-	) | rpl::start_with_next([=](bool has) {
+	) | rpl::on_next([=](bool has) {
 		_hasSendText = has;
 		if (_replyFocused) {
 			if (_hasSendText) {
@@ -1134,7 +1134,7 @@ auto Reactions::attachToMenu(
 	}
 	const auto selector = *result;
 
-	selector->chosen() | rpl::start_with_next([=](ChosenReaction reaction) {
+	selector->chosen() | rpl::on_next([=](ChosenReaction reaction) {
 		menu->hideMenu();
 		_chosen.fire({ reaction, ReactionsMode::Reaction });
 	}, selector->lifetime());
@@ -1160,7 +1160,7 @@ void Reactions::showLikeFrom(Data::Story *story) {
 	_likeFromLifetime = story->session().changes().storyUpdates(
 		story,
 		Data::StoryUpdate::Flag::Reaction
-	) | rpl::start_with_next([=](const Data::StoryUpdate &update) {
+	) | rpl::on_next([=](const Data::StoryUpdate &update) {
 		setLikedIdFrom(update.story);
 	});
 }
@@ -1259,7 +1259,7 @@ void Reactions::initLikeIcon(
 	_likeIcon = std::make_unique<Ui::RpWidget>(_likeIconWidget);
 	const auto icon = _likeIcon.get();
 	icon->show();
-	_likeIconWidget->sizeValue() | rpl::start_with_next([=](QSize size) {
+	_likeIconWidget->sizeValue() | rpl::on_next([=](QSize size) {
 		icon->setGeometry(QRect(QPoint(), size));
 	}, icon->lifetime());
 
@@ -1326,7 +1326,7 @@ void Reactions::initLikeIcon(
 			});
 		}
 	};
-	icon->paintRequest() | rpl::start_with_next([=] {
+	icon->paintRequest() | rpl::on_next([=] {
 		auto p = QPainter(icon);
 		if (!fly->cache.isNull()) {
 			p.drawImage(0, 0, fly->cache);
@@ -1380,7 +1380,7 @@ void Reactions::waitForLikeIcon(
 	}) | rpl::flatten_latest(
 	) | rpl::filter(
 		rpl::mappers::_1
-	) | rpl::take(1) | rpl::start_with_next([=] {
+	) | rpl::take(1) | rpl::on_next([=] {
 		setLikedId(owner, id, true);
 
 		crl::on_main(&_likeIconGuard, [=] {
@@ -1428,7 +1428,7 @@ void Reactions::startReactionAnimation(
 		[] { return st::storiesComposeWhiteText->c; },
 		Data::CustomEmojiSizeTag::Isolated);
 	const auto layer = _reactionAnimation->layer();
-	wrap->paintRequest() | rpl::start_with_next([=] {
+	wrap->paintRequest() | rpl::on_next([=] {
 		if (!_reactionAnimation->paintBadgeFrame(target)) {
 			InvokeQueued(layer, [=] {
 				_reactionAnimation = nullptr;
diff --git a/Telegram/SourceFiles/media/stories/media_stories_recent_views.cpp b/Telegram/SourceFiles/media/stories/media_stories_recent_views.cpp
index 940ed39c5b..2e3e36acf1 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_recent_views.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_recent_views.cpp
@@ -107,7 +107,7 @@ constexpr auto kLoadViewsPages = 2;
 			list.front()->session().downloaderTaskFinished(
 			) | rpl::filter([=] {
 				return state->someUserpicsNotLoaded && !state->scheduled;
-			}) | rpl::start_with_next([=] {
+			}) | rpl::on_next([=] {
 				for (const auto &userpic : state->userpics) {
 					if (userpic.peer->userpicUniqueKey(userpic.view)
 						!= userpic.uniqueKey) {
@@ -173,7 +173,7 @@ void RecentViews::show(
 				likedValue
 			) | rpl::map([](const Data::ReactionId &id) {
 				return !id.empty();
-			}) | rpl::start_with_next([=](bool liked) {
+			}) | rpl::on_next([=](bool liked) {
 				const auto icon = liked
 					? &st::storiesComposeControls.liked
 					: &st::storiesLikesIcon;
@@ -259,7 +259,7 @@ void RecentViews::refreshClickHandler() {
 				&& (e->type() == QEvent::MouseButtonPress)
 				&& (static_cast<QMouseEvent*>(e.get())->button()
 					== Qt::LeftButton);
-		}) | rpl::start_with_next([=] {
+		}) | rpl::on_next([=] {
 			showMenu();
 		});
 	}
@@ -271,7 +271,7 @@ void RecentViews::refreshClickHandler() {
 void RecentViews::updateUserpics() {
 	_userpicsLifetime = ContentByUsers(
 		_data.list
-	) | rpl::start_with_next([=](
+	) | rpl::on_next([=](
 			const std::vector<Ui::GroupCallUser> &list) {
 		_userpics->update(list, true);
 	});
@@ -284,7 +284,7 @@ void RecentViews::setupUserpics() {
 		rpl::single(true),
 		[=] { _widget->update(); });
 
-	_userpics->widthValue() | rpl::start_with_next([=](int width) {
+	_userpics->widthValue() | rpl::on_next([=](int width) {
 		if (_userpicsWidth != width) {
 			_userpicsWidth = width;
 			updatePartsGeometry();
@@ -298,13 +298,13 @@ void RecentViews::setupWidget() {
 	raw->show();
 
 	_controller->layoutValue(
-	) | rpl::start_with_next([=](const Layout &layout) {
+	) | rpl::on_next([=](const Layout &layout) {
 		_outer = layout.views;
 		updatePartsGeometry();
 	}, raw->lifetime());
 
 	raw->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = Painter(raw);
 		_userpics->paint(
 			p,
@@ -329,7 +329,7 @@ void RecentViews::setupViewsReactions() {
 	_likeIcon->setAttribute(Qt::WA_TransparentForMouseEvents);
 
 	_controller->layoutValue(
-	) | rpl::start_with_next([=](const Layout &layout) {
+	) | rpl::on_next([=](const Layout &layout) {
 		_outer = QRect(
 			layout.content.x(),
 			layout.views.y(),
@@ -346,7 +346,7 @@ void RecentViews::setupViewsReactions() {
 	views->setAttribute(Qt::WA_TransparentForMouseEvents);
 
 	views->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		const auto left = (_data.type == RecentViewsType::Changelog)
 			? st::mediaviewCaptionPadding.left()
 			: st::storiesViewsTextPosition.x();
@@ -356,7 +356,7 @@ void RecentViews::setupViewsReactions() {
 	}, _viewsWrap->lifetime());
 	_viewsWrap->paintRequest() | rpl::filter([=] {
 		return (_data.type != RecentViewsType::Changelog);
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		auto p = QPainter(_viewsWrap.get());
 		const auto &icon = st::storiesViewsIcon;
 		const auto top = (_viewsWrap->height() - icon.height()) / 2;
@@ -373,7 +373,7 @@ void RecentViews::setupViewsReactions() {
 	likes->move(st::storiesLikesTextPosition);
 
 	likes->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		width += width
 			? st::storiesLikesTextRightSkip
 			: st::storiesLikesEmptyRightSkip;
@@ -480,7 +480,7 @@ void RecentViews::showMenu() {
 				< (scrollTop
 					+ st::storiesViewsMenu.maxHeight * kLoadViewsPages);
 		}) | rpl::to_empty
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		rebuildMenuTail();
 	}, _menuShortLifetime);
 
@@ -630,7 +630,7 @@ void RecentViews::subscribeToMenuUserpicsLoading(
 			}
 			return true;
 		})
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_waitingUserpicsCheck = false;
 		for (auto i = begin(_waitingForUserpics)
 			; i != end(_waitingForUserpics)
diff --git a/Telegram/SourceFiles/media/stories/media_stories_reply.cpp b/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
index 73e422bc27..726a4803d0 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
@@ -197,7 +197,7 @@ void ReplyArea::initGeometry() {
 	rpl::combine(
 		_controller->layoutValue(),
 		_controls->height()
-	) | rpl::start_with_next([=](const Layout &layout, int height) {
+	) | rpl::on_next([=](const Layout &layout, int height) {
 		const auto content = layout.content;
 		_controls->resizeToWidth(layout.controlsWidth);
 		if (_controls->heightCurrent() == height) {
@@ -800,24 +800,24 @@ bool ReplyArea::confirmSendingFiles(
 
 void ReplyArea::initActions() {
 	_controls->cancelRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_controller->unfocusReply();
 	}, _lifetime);
 
 	_controls->sendRequests(
-	) | rpl::start_with_next([=](Api::SendOptions options) {
+	) | rpl::on_next([=](Api::SendOptions options) {
 		send(options);
 	}, _lifetime);
 
 	_controls->sendVoiceRequests(
-	) | rpl::start_with_next([=](const VoiceToSend &data) {
+	) | rpl::on_next([=](const VoiceToSend &data) {
 		sendVoice(data);
 	}, _lifetime);
 
 	_controls->attachRequests(
 	) | rpl::filter([=] {
 		return !_chooseAttachRequest;
-	}) | rpl::start_with_next([=](std::optional<bool> overrideCompress) {
+	}) | rpl::on_next([=](std::optional<bool> overrideCompress) {
 		_chooseAttachRequest = true;
 		base::call_delayed(
 			st::storiesAttach.ripple.hideDuration,
@@ -826,7 +826,7 @@ void ReplyArea::initActions() {
 	}, _lifetime);
 
 	_controls->fileChosen(
-	) | rpl::start_with_next([=](ChatHelpers::FileChosen data) {
+	) | rpl::on_next([=](ChatHelpers::FileChosen data) {
 		_controller->uiShow()->hideLayer();
 		auto messageToSend = Api::MessageToSend(
 			prepareSendAction(data.options));
@@ -838,18 +838,18 @@ void ReplyArea::initActions() {
 	}, _lifetime);
 
 	_controls->photoChosen(
-	) | rpl::start_with_next([=](ChatHelpers::PhotoChosen chosen) {
+	) | rpl::on_next([=](ChatHelpers::PhotoChosen chosen) {
 		sendExistingPhoto(chosen.photo, chosen.options);
 	}, _lifetime);
 
 	_controls->inlineResultChosen(
-	) | rpl::start_with_next([=](ChatHelpers::InlineChosen chosen) {
+	) | rpl::on_next([=](ChatHelpers::InlineChosen chosen) {
 		const auto localId = chosen.messageSendingFrom.localId;
 		sendInlineResult(chosen.result, chosen.bot, chosen.options, localId);
 	}, _lifetime);
 
 	_controls->likeToggled(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_controller->toggleLiked();
 	}, _lifetime);
 
@@ -868,7 +868,7 @@ void ReplyArea::initActions() {
 	});
 
 	_controls->lockShowStarts(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 	}, _lifetime);
 
 	_controls->show();
@@ -980,7 +980,7 @@ void ReplyArea::show(
 		if (cant) {
 			_cant = std::make_unique<Cant>(_controller->wrap());
 			_controller->layoutValue(
-			) | rpl::start_with_next([=](const Layout &layout) {
+			) | rpl::on_next([=](const Layout &layout) {
 				const auto height = st::storiesComposeControls.attach.height;
 				const auto position = layout.controlsBottomPosition
 					- QPoint(0, height);
diff --git a/Telegram/SourceFiles/media/stories/media_stories_repost_view.cpp b/Telegram/SourceFiles/media/stories/media_stories_repost_view.cpp
index f7f58094d2..d157ab1cdf 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_repost_view.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_repost_view.cpp
@@ -46,7 +46,7 @@ RepostView::RepostView(
 	}
 
 	_story->session().colorIndicesValue(
-	) | rpl::start_with_next([=](Ui::ColorIndicesCompressed &&indices) {
+	) | rpl::on_next([=](Ui::ColorIndicesCompressed &&indices) {
 		_colorIndices = std::move(indices);
 		if (_maxWidth) {
 			_controller->repaint();
diff --git a/Telegram/SourceFiles/media/stories/media_stories_sibling.cpp b/Telegram/SourceFiles/media/stories/media_stories_sibling.cpp
index 5739b4c0b8..37fb107e46 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_sibling.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_sibling.cpp
@@ -128,7 +128,7 @@ QImage Sibling::LoaderPhoto::good() {
 		return image->original();
 	} else if (!_waitingLoading) {
 		_photo->session().downloaderTaskFinished(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			if (_media->loaded()) {
 				_update();
 			}
@@ -184,7 +184,7 @@ void Sibling::LoaderVideo::createStreamedPlayer() {
 		[] {}); // waitingCallback
 	_streamed->lockPlayer();
 	_streamed->player().updates(
-	) | rpl::start_with_next_error([=](Streaming::Update &&update) {
+	) | rpl::on_next_error([=](Streaming::Update &&update) {
 		v::match(update.data, [&](Streaming::Information &update) {
 			_update();
 		}, [](const auto &update) {
@@ -219,7 +219,7 @@ void Sibling::LoaderVideo::waitForGoodThumbnail() {
 			if (const auto strong = weak.get()) {
 				if (!strong->updateAfterGoodCheck()) {
 					strong->_video->session().downloaderTaskFinished(
-					) | rpl::start_with_next([=] {
+					) | rpl::on_next([=] {
 						strong->updateAfterGoodCheck();
 					}, strong->_waitingGoodGeneration);
 				}
diff --git a/Telegram/SourceFiles/media/stories/media_stories_slider.cpp b/Telegram/SourceFiles/media/stories/media_stories_slider.cpp
index 08d7b92d7c..81697eaa2c 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_slider.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_slider.cpp
@@ -49,7 +49,7 @@ void Slider::show(SliderData data) {
 
 	raw->widthValue() | rpl::filter([=](int width) {
 		return (width >= st::storiesSliderWidth);
-	}) | rpl::start_with_next([=](int width) {
+	}) | rpl::on_next([=](int width) {
 		layout(width);
 	}, raw->lifetime());
 
@@ -57,7 +57,7 @@ void Slider::show(SliderData data) {
 	) | rpl::filter([=] {
 		return !_data.videoStream
 			&& (raw->width() >= st::storiesSliderWidth);
-	}) | rpl::start_with_next([=](QRect clip) {
+	}) | rpl::on_next([=](QRect clip) {
 		paint(QRectF(clip));
 	}, raw->lifetime());
 
@@ -69,7 +69,7 @@ void Slider::show(SliderData data) {
 	});
 
 	_controller->layoutValue(
-	) | rpl::start_with_next([=](const Layout &layout) {
+	) | rpl::on_next([=](const Layout &layout) {
 		raw->setGeometry(layout.slider - st::storiesSliderMargin);
 	}, raw->lifetime());
 }
diff --git a/Telegram/SourceFiles/media/stories/media_stories_stealth.cpp b/Telegram/SourceFiles/media/stories/media_stories_stealth.cpp
index 731b57c8f9..9d3785ac59 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_stealth.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_stealth.cpp
@@ -167,7 +167,7 @@ struct State {
 	const auto inner = result->entity();
 	inner->resize(size);
 	inner->paintRequest(
-	) | rpl::start_with_next([=, &st] {
+	) | rpl::on_next([=, &st] {
 		auto p = QPainter(inner);
 		auto hq = PainterHighQualityEnabler(p);
 		p.setBrush(st.logoBg);
@@ -254,7 +254,7 @@ struct State {
 	lock->setAttribute(Qt::WA_TransparentForMouseEvents);
 	lock->resize(st.lockIcon.size());
 	lock->paintRequest(
-	) | rpl::start_with_next([=, &st] {
+	) | rpl::on_next([=, &st] {
 		auto p = QPainter(lock);
 		st.lockIcon.paintInCenter(p, lock->rect());
 	}, lock->lifetime());
@@ -274,7 +274,7 @@ struct State {
 		lock->move(right + lockLeft, top + lockTop);
 	};
 
-	std::move(state) | rpl::start_with_next([=](const State &state) {
+	std::move(state) | rpl::on_next([=](const State &state) {
 		const auto cooldown = state.premium
 			&& (state.mode.cooldownTill > state.now);
 		label->setOpacity(cooldown ? kCooldownButtonLabelOpacity : 1.);
@@ -283,7 +283,7 @@ struct State {
 	}, label->lifetime());
 
 	raw->widthValue(
-	) | rpl::start_with_next(updateLabelLockGeometry, label->lifetime());
+	) | rpl::on_next(updateLabelLockGeometry, label->lifetime());
 
 	return result;
 }
@@ -348,7 +348,7 @@ struct State {
 		});
 		data->state.value() | rpl::filter([](const State &state) {
 			return state.mode.enabledTill > state.now;
-		}) | rpl::start_with_next([=] {
+		}) | rpl::on_next([=] {
 			box->closeBox();
 			show->showToast(ToastActivated());
 			if (onActivated) {
diff --git a/Telegram/SourceFiles/media/streaming/media_streaming_audio_track.cpp b/Telegram/SourceFiles/media/streaming/media_streaming_audio_track.cpp
index ff18b6777c..7d89c447fc 100644
--- a/Telegram/SourceFiles/media/streaming/media_streaming_audio_track.cpp
+++ b/Telegram/SourceFiles/media/streaming/media_streaming_audio_track.cpp
@@ -197,7 +197,7 @@ rpl::producer<crl::time> AudioTrack::playPosition() {
 
 	if (!_subscription) {
 		_subscription = Media::Player::Updated(
-		) | rpl::start_with_next([=](const AudioMsgId &id) {
+		) | rpl::on_next([=](const AudioMsgId &id) {
 			using State = Media::Player::State;
 			if (id != _audioId) {
 				return;
diff --git a/Telegram/SourceFiles/media/streaming/media_streaming_document.cpp b/Telegram/SourceFiles/media/streaming/media_streaming_document.cpp
index 5ba5ff5e9c..abe2a7a9c1 100644
--- a/Telegram/SourceFiles/media/streaming/media_streaming_document.cpp
+++ b/Telegram/SourceFiles/media/streaming/media_streaming_document.cpp
@@ -40,7 +40,7 @@ Document::Document(
 	std::vector<QualityDescriptor> otherQualities)
 : Document(std::move(reader), document, {}, std::move(otherQualities)) {
 	_player.fullInCache(
-	) | rpl::start_with_next([=](bool fullInCache) {
+	) | rpl::on_next([=](bool fullInCache) {
 		_document->setLoadedInMediaCache(fullInCache);
 	}, _player.lifetime());
 }
@@ -73,7 +73,7 @@ Document::Document(
 
 void Document::resubscribe() {
 	_subscription = _player.updates(
-	) | rpl::start_with_next_error([=](Update &&update) {
+	) | rpl::on_next_error([=](Update &&update) {
 		handleUpdate(std::move(update));
 	}, [=](Streaming::Error &&error) {
 		handleError(std::move(error));
diff --git a/Telegram/SourceFiles/media/streaming/media_streaming_player.cpp b/Telegram/SourceFiles/media/streaming/media_streaming_player.cpp
index 0005d17546..b8168c84d8 100644
--- a/Telegram/SourceFiles/media/streaming/media_streaming_player.cpp
+++ b/Telegram/SourceFiles/media/streaming/media_streaming_player.cpp
@@ -715,7 +715,7 @@ void Player::start() {
 	_stage = Stage::Started;
 	const auto guard = base::make_weak(&_sessionGuard);
 
-	_file->speedEstimate() | rpl::start_with_next([=](SpeedEstimate value) {
+	_file->speedEstimate() | rpl::on_next([=](SpeedEstimate value) {
 		_updates.fire({ value });
 	}, _sessionLifetime);
 
@@ -724,7 +724,7 @@ void Player::start() {
 		_video ? _video->waitingForData() : nullptr
 	) | rpl::filter([=] {
 		return !bothReceivedEnough(kBufferFor);
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		_pausedByWaitingForData = true;
 		updatePausedState();
 		_updates.fire({ WaitingForData{ true } });
@@ -732,7 +732,7 @@ void Player::start() {
 
 	if (guard && _audio && !_audioFinished) {
 		_audio->playPosition(
-		) | rpl::start_with_next_done([=](crl::time position) {
+		) | rpl::on_next_done([=](crl::time position) {
 			audioPlayedTill(position);
 		}, [=] {
 			Expects(_stage == Stage::Started);
@@ -746,7 +746,7 @@ void Player::start() {
 
 	if (guard && _video) {
 		_video->checkNextFrame(
-		) | rpl::start_with_next_done([=] {
+		) | rpl::on_next_done([=] {
 			checkVideoStep();
 		}, [=] {
 			Assert(_stage == Stage::Started);
@@ -760,7 +760,7 @@ void Player::start() {
 		crl::on_main_update_requests(
 		) | rpl::filter([=] {
 			return !_videoFinished;
-		}) | rpl::start_with_next([=] {
+		}) | rpl::on_next([=] {
 			checkVideoStep();
 		}, _sessionLifetime);
 	}
diff --git a/Telegram/SourceFiles/media/streaming/media_streaming_reader.cpp b/Telegram/SourceFiles/media/streaming/media_streaming_reader.cpp
index 807492b5a1..7839a783bc 100644
--- a/Telegram/SourceFiles/media/streaming/media_streaming_reader.cpp
+++ b/Telegram/SourceFiles/media/streaming/media_streaming_reader.cpp
@@ -857,7 +857,7 @@ Reader::Reader(
 , _cacheHelper(cache ? InitCacheHelper(_loader->baseCacheKey()) : nullptr)
 , _slices(_loader->size(), _cacheHelper != nullptr) {
 	_loader->parts(
-	) | rpl::start_with_next([=](LoadedPart &&part) {
+	) | rpl::on_next([=](LoadedPart &&part) {
 		if (_attachedDownloader) {
 			_partsForDownloader.fire_copy(part);
 		}
diff --git a/Telegram/SourceFiles/media/system_media_controls_manager.cpp b/Telegram/SourceFiles/media/system_media_controls_manager.cpp
index 91f016aa56..bcdd9cc06e 100644
--- a/Telegram/SourceFiles/media/system_media_controls_manager.cpp
+++ b/Telegram/SourceFiles/media/system_media_controls_manager.cpp
@@ -79,14 +79,14 @@ SystemMediaControlsManager::SystemMediaControlsManager()
 		}
 		return PlaybackStatus::Playing;
 	}) | rpl::distinct_until_changed(
-	) | rpl::start_with_next([=](PlaybackStatus status) {
+	) | rpl::on_next([=](PlaybackStatus status) {
 		_controls->setPlaybackStatus(status);
 	}, _lifetime);
 
 	rpl::merge(
 		mediaPlayer->stops(type) | rpl::map_to(false),
 		mediaPlayer->startsPlay(type) | rpl::map_to(true)
-	) | rpl::distinct_until_changed() | rpl::start_with_next([=](bool audio) {
+	) | rpl::distinct_until_changed() | rpl::on_next([=](bool audio) {
 		_controls->setEnabled(audio);
 		if (audio) {
 			_controls->setIsNextEnabled(mediaPlayer->nextAvailable(type));
@@ -122,7 +122,7 @@ SystemMediaControlsManager::SystemMediaControlsManager()
 	rpl::merge(
 		std::move(trackChanged),
 		std::move(unlocked)
-	) | rpl::start_with_next([=](AudioMsgId::Type audioType) {
+	) | rpl::on_next([=](AudioMsgId::Type audioType) {
 		_lifetimeDownload.destroy();
 
 		const auto current = mediaPlayer->current(audioType);
@@ -171,7 +171,7 @@ SystemMediaControlsManager::SystemMediaControlsManager()
 				_controls->setThumbnail(imagePtr->original());
 			} else {
 				document->session().downloaderTaskFinished(
-				) | rpl::start_with_next([=] {
+				) | rpl::on_next([=] {
 					if (const auto imagePtr = view->thumbnail()) {
 						_controls->setThumbnail(imagePtr->original());
 						_lifetimeDownload.destroy();
@@ -188,7 +188,7 @@ SystemMediaControlsManager::SystemMediaControlsManager()
 
 	mediaPlayer->playlistChanges(
 		type
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_controls->setIsNextEnabled(mediaPlayer->nextAvailable(type));
 		_controls->setIsPreviousEnabled(mediaPlayer->previousAvailable(type));
 	}, _lifetime);
@@ -197,12 +197,12 @@ SystemMediaControlsManager::SystemMediaControlsManager()
 	using Media::OrderMode;
 
 	Core::App().settings().playerRepeatModeValue(
-	) | rpl::start_with_next([=](RepeatMode mode) {
+	) | rpl::on_next([=](RepeatMode mode) {
 		_controls->setLoopStatus(RepeatModeToLoopStatus(mode));
 	}, _lifetime);
 
 	Core::App().settings().playerOrderModeValue(
-	) | rpl::start_with_next([=](OrderMode mode) {
+	) | rpl::on_next([=](OrderMode mode) {
 		if (mode != OrderMode::Shuffle) {
 			_lastOrderMode = mode;
 		}
@@ -210,7 +210,7 @@ SystemMediaControlsManager::SystemMediaControlsManager()
 	}, _lifetime);
 
 	_controls->commandRequests(
-	) | rpl::start_with_next([=](Command command) {
+	) | rpl::on_next([=](Command command) {
 		switch (command) {
 		case Command::PlayPause: mediaPlayer->playPause(type); break;
 		case Command::Play: mediaPlayer->play(type); break;
@@ -257,18 +257,18 @@ SystemMediaControlsManager::SystemMediaControlsManager()
 		}) | rpl::map([=] {
 			return mediaPlayer->getState(type).position;
 		}) | rpl::distinct_until_changed(
-		) | rpl::start_with_next([=](int position) {
+		) | rpl::on_next([=](int position) {
 			_controls->setPosition(position);
 			_controls->updateDisplay();
 		}, _lifetime);
 
 		_controls->seekRequests(
-		) | rpl::start_with_next([=](float64 progress) {
+		) | rpl::on_next([=](float64 progress) {
 			mediaPlayer->finishSeeking(type, progress);
 		}, _lifetime);
 
 		_controls->updatePositionRequests(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			_controls->setPosition(mediaPlayer->getState(type).position);
 		}, _lifetime);
 	}
@@ -276,7 +276,7 @@ SystemMediaControlsManager::SystemMediaControlsManager()
 	Core::App().passcodeLockValue(
 	) | rpl::filter([=](bool locked) {
 		return locked && Core::App().maybePrimarySession();
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		_controls->setEnabled(false);
 	}, _lifetime);
 
@@ -285,12 +285,12 @@ SystemMediaControlsManager::SystemMediaControlsManager()
 			Core::App().settings().songVolume()
 		) | rpl::then(
 			Core::App().settings().songVolumeChanges()
-		) | rpl::start_with_next([=](float64 volume) {
+		) | rpl::on_next([=](float64 volume) {
 			_controls->setVolume(volume);
 		}, _lifetime);
 
 		_controls->volumeChangeRequests(
-		) | rpl::start_with_next([](float64 volume) {
+		) | rpl::on_next([](float64 volume) {
 			Player::mixer()->setSongVolume(volume);
 			if (volume > 0) {
 				Core::App().settings().setRememberedSongVolume(volume);
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_opengl.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_opengl.cpp
index a9d2e5b25d..2f9aa48dc7 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_opengl.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_opengl.cpp
@@ -110,7 +110,7 @@ float roundedCorner() {
 OverlayWidget::RendererGL::RendererGL(not_null<OverlayWidget*> owner)
 : _owner(owner) {
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_controlsFadeImage.invalidate();
 		_radialImage.invalidate();
 		_documentBubbleImage.invalidate();
@@ -123,11 +123,11 @@ OverlayWidget::RendererGL::RendererGL(not_null<OverlayWidget*> owner)
 
 	crl::on_main(this, [=] {
 		_owner->_storiesChanged.events(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			if (_owner->_storiesSession) {
 				Data::AmPremiumValue(
 					_owner->_storiesSession
-				) | rpl::start_with_next([=] {
+				) | rpl::on_next([=] {
 					invalidateControls();
 				}, _storiesLifetime);
 			} else {
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index 74212b58ba..438bff9e5d 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -548,7 +548,7 @@ OverlayWidget::OverlayWidget()
 	CrashReports::SetAnnotation("OpenGL Renderer", "[not-initialized]");
 
 	Lang::Updated(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		refreshLang();
 	}, lifetime());
 
@@ -566,7 +566,7 @@ OverlayWidget::OverlayWidget()
 	_docRectImage.setDevicePixelRatio(style::DevicePixelRatio());
 
 	Shortcuts::Requests(
-	) | rpl::start_with_next([=](not_null<Shortcuts::Request*> request) {
+	) | rpl::on_next([=](not_null<Shortcuts::Request*> request) {
 		request->check(
 			Shortcuts::Command::MediaViewerFullscreen
 		) && request->handle([=] {
@@ -703,7 +703,7 @@ OverlayWidget::OverlayWidget()
 		return base::EventFilterResult::Continue;
 	});
 	_helper->mouseEvents(
-	) | rpl::start_with_next([=](not_null<QMouseEvent*> e) {
+	) | rpl::on_next([=](not_null<QMouseEvent*> e) {
 		if (_helper->skipTitleHitTest(e->windowPos().toPoint())) {
 			return;
 		}
@@ -723,13 +723,13 @@ OverlayWidget::OverlayWidget()
 	}, lifetime());
 	_topShadowRight = _helper->controlsSideRightValue();
 	_topShadowRight.changes(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateControlsGeometry();
 		update();
 	}, lifetime());
 
 	_helper->topNotchSkipValue(
-	) | rpl::start_with_next([=](int notch) {
+	) | rpl::on_next([=](int notch) {
 		if (_topNotchSize != notch) {
 			_topNotchSize = notch;
 			if (_fullscreen) {
@@ -751,7 +751,7 @@ OverlayWidget::OverlayWidget()
 	_widget->setMouseTracking(true);
 
 	_window->screenValue(
-	) | rpl::skip(1) | rpl::start_with_next([=](not_null<QScreen*> screen) {
+	) | rpl::skip(1) | rpl::on_next([=](not_null<QScreen*> screen) {
 		handleScreenChanged(screen);
 	}, lifetime());
 	subscribeToScreenGeometry();
@@ -772,7 +772,7 @@ OverlayWidget::OverlayWidget()
 		Core::App().calls().currentCallValue(),
 		Core::App().calls().currentGroupCallValue(),
 		_1 || _2
-	) | rpl::start_with_next([=](bool call) {
+	) | rpl::on_next([=](bool call) {
 		if (!_streamed
 			|| !_document
 			|| (_document->isAnimation() && !_document->isVideoMessage())) {
@@ -789,7 +789,7 @@ OverlayWidget::OverlayWidget()
 
 	_controlsHideTimer.setCallback([=] { hideControls(); });
 	_helper->controlsActivations(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		activateControls();
 	}, lifetime());
 
@@ -883,7 +883,7 @@ void OverlayWidget::setupWindow() {
 		{ st::mediaviewMinWidth, st::mediaviewMinHeight });
 
 	_window->shownValue(
-	) | rpl::start_with_next([=](bool shown) {
+	) | rpl::on_next([=](bool shown) {
 		toggleApplicationEventFilter(shown);
 		if (!shown) {
 			clearAfterHide();
@@ -1734,7 +1734,7 @@ void OverlayWidget::fillContextMenuActions(
 			) | rpl::then(
 				base::timer_each(120)
 			) | rpl::map(now);
-			state->text.changes() | rpl::start_with_next([=](QString value) {
+			state->text.changes() | rpl::on_next([=](QString value) {
 				action->setText(value);
 			}, state->lifetime);
 		}
@@ -1818,7 +1818,7 @@ void OverlayWidget::fillContextMenuActions(
 			peer->session().changes().peerFlagsValue(
 				peer,
 				Data::PeerUpdate::Flag::Photo
-			) | rpl::start_with_next([=]() mutable {
+			) | rpl::on_next([=]() mutable {
 				if (lifetime) {
 					base::take(lifetime)->destroy();
 				}
@@ -2456,7 +2456,7 @@ void OverlayWidget::assignMediaPointer(
 		std::move(call),
 		_callLinkSlug,
 		_callJoinMessageId);
-	_videoStream->closeRequests() | rpl::start_with_next([=] {
+	_videoStream->closeRequests() | rpl::on_next([=] {
 		close();
 	}, _videoStream->lifetime());
 	if (const auto stories = _stories.get()) {
@@ -2620,7 +2620,7 @@ void OverlayWidget::subscribeToScreenGeometry() {
 		&QScreen::geometryChanged
 	) | rpl::filter([=] {
 		return !isHidden() && !isMinimized() && _fullscreen;
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		updateGeometry();
 	}, _screenGeometryLifetime);
 }
@@ -3237,7 +3237,7 @@ void OverlayWidget::validateSharedMedia() {
 			*key,
 			kIdsLimit,
 			kIdsLimit
-		) | rpl::start_with_next([this](
+		) | rpl::on_next([this](
 				SharedMediaWithLastSlice &&update) {
 			handleSharedMediaUpdate(std::move(update));
 		}, _sharedMedia->lifetime);
@@ -3300,7 +3300,7 @@ void OverlayWidget::validateUserPhotos() {
 			*key,
 			kIdsLimit,
 			kIdsLimit
-		) | rpl::start_with_next([this](
+		) | rpl::on_next([this](
 				UserPhotosSlice &&update) {
 			handleUserPhotosUpdate(std::move(update));
 		}, _userPhotos->lifetime);
@@ -3521,7 +3521,7 @@ void OverlayWidget::initGroupThumbs() {
 	Expects(_groupThumbs != nullptr);
 
 	_groupThumbs->updateRequests(
-	) | rpl::start_with_next([this](QRect rect) {
+	) | rpl::on_next([this](QRect rect) {
 		const auto shift = (width() / 2);
 		_groupThumbsRect = QRect(
 			shift + rect.x(),
@@ -3532,7 +3532,7 @@ void OverlayWidget::initGroupThumbs() {
 	}, _groupThumbs->lifetime());
 
 	_groupThumbs->activateRequests(
-	) | rpl::start_with_next([this](View::GroupThumbs::Key key) {
+	) | rpl::on_next([this](View::GroupThumbs::Key key) {
 		using CollageKey = View::GroupThumbs::CollageKey;
 		if (const auto photoId = std::get_if<PhotoId>(&key)) {
 			const auto photo = _session->data().photo(*photoId);
@@ -4117,7 +4117,7 @@ bool OverlayWidget::initStreaming(const StartStreaming &startStreaming) {
 	Core::App().updateNonIdle();
 
 	_streamed->instance.player().updates(
-	) | rpl::start_with_next_error([=](Streaming::Update &&update) {
+	) | rpl::on_next_error([=](Streaming::Update &&update) {
 		handleStreamingUpdate(std::move(update));
 	}, [=](Streaming::Error &&error) {
 		handleStreamingError(std::move(error));
@@ -4126,7 +4126,7 @@ bool OverlayWidget::initStreaming(const StartStreaming &startStreaming) {
 	_streamed->instance.switchQualityRequests(
 	) | rpl::filter([=](int quality) {
 		return !_quality.manual && _quality.height != quality;
-	}) | rpl::start_with_next([=](int quality) {
+	}) | rpl::on_next([=](int quality) {
 		applyVideoQuality({
 			.manual = 0,
 			.height = uint32(quality),
@@ -4326,7 +4326,7 @@ bool OverlayWidget::createStreamingObjects() {
 			: nullptr;
 		if (const auto sponsored = _streamed->sponsored.get()) {
 			_layerBg->layerShownValue(
-			) | rpl::start_with_next([=](bool shown) {
+			) | rpl::on_next([=](bool shown) {
 				sponsored->setPaused(shown);
 			}, sponsored->lifetime());
 		}
@@ -4859,14 +4859,14 @@ void OverlayWidget::switchToPip() {
 		raw->history()->owner().itemRemoved(
 		) | rpl::filter([=](not_null<const HistoryItem*> item) {
 			return (raw == item);
-		}) | rpl::start_with_next([=] {
+		}) | rpl::on_next([=] {
 			_pip = nullptr;
 		}, _pip->lifetime);
 
 		Core::App().passcodeLockChanges(
 		) | rpl::filter(
 			rpl::mappers::_1
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			_pip = nullptr;
 		}, _pip->lifetime);
 	}
@@ -6044,7 +6044,7 @@ void OverlayWidget::setStoriesPeer(PeerData *peer) {
 		const auto delegate = static_cast<Stories::Delegate*>(this);
 		_stories = std::make_unique<Stories::View>(delegate);
 		_stories->finalShownGeometryValue(
-		) | rpl::skip(1) | rpl::start_with_next([=] {
+		) | rpl::skip(1) | rpl::on_next([=] {
 			updateControlsGeometry();
 		}, _stories->lifetime());
 		_storiesChanged.fire({});
@@ -6061,7 +6061,7 @@ void OverlayWidget::setSession(not_null<Main::Session*> session) {
 	_window->setWindowIcon(Window::CreateIcon(session));
 
 	session->downloaderTaskFinished(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (!isHidden()) {
 			updateControls();
 			checkForSaveLoaded();
@@ -6071,25 +6071,25 @@ void OverlayWidget::setSession(not_null<Main::Session*> session) {
 	session->data().documentLoadProgress(
 	) | rpl::filter([=] {
 		return !isHidden();
-	}) | rpl::start_with_next([=](not_null<DocumentData*> document) {
+	}) | rpl::on_next([=](not_null<DocumentData*> document) {
 		documentUpdated(document);
 	}, _sessionLifetime);
 
 	session->data().itemIdChanged(
-	) | rpl::start_with_next([=](const Data::Session::IdChange &change) {
+	) | rpl::on_next([=](const Data::Session::IdChange &change) {
 		changingMsgId(change.newId, change.oldId);
 	}, _sessionLifetime);
 
 	session->data().itemRemoved(
 	) | rpl::filter([=](not_null<const HistoryItem*> item) {
 		return (_message == item);
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		close();
 		clearSession();
 	}, _sessionLifetime);
 
 	session->account().sessionChanges(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		clearSession();
 	}, _sessionLifetime);
 }
@@ -6821,7 +6821,7 @@ void OverlayWidget::applyHideWindowWorkaround() {
 		raw->setGeometry(_window->rect());
 		raw->show();
 		raw->paintRequest(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			if (_hideWorkaround.get() == raw) {
 				_hideWorkaround.release();
 			}
diff --git a/Telegram/SourceFiles/media/view/media_view_pip.cpp b/Telegram/SourceFiles/media/view/media_view_pip.cpp
index 9fcd16cbaa..0563bf099a 100644
--- a/Telegram/SourceFiles/media/view/media_view_pip.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_pip.cpp
@@ -363,24 +363,24 @@ void PipPanel::init() {
 		return widget()->windowHandle()
 			&& widget()->windowHandle()->isExposed();
 	}) | rpl::distinct_until_changed(
-	) | rpl::filter(rpl::mappers::_1) | rpl::start_with_next([=] {
+	) | rpl::filter(rpl::mappers::_1) | rpl::on_next([=] {
 		// Workaround Qt's forced transient parent.
 		Ui::Platform::ClearTransientParent(widget());
 	}, rp()->lifetime());
 
 	rp()->shownValue(
-	) | rpl::filter(rpl::mappers::_1) | rpl::start_with_next([=] {
+	) | rpl::filter(rpl::mappers::_1) | rpl::on_next([=] {
 		Ui::Platform::SetWindowMargins(widget(), _padding);
 	}, rp()->lifetime());
 
 	rp()->screenValue(
-	) | rpl::skip(1) | rpl::start_with_next([=](not_null<QScreen*> screen) {
+	) | rpl::skip(1) | rpl::on_next([=](not_null<QScreen*> screen) {
 		handleScreenChanged(screen);
 	}, rp()->lifetime());
 
 	if (Platform::IsWayland()) {
 		rp()->sizeValue(
-		) | rpl::skip(1) | rpl::start_with_next([=](QSize size) {
+		) | rpl::skip(1) | rpl::on_next([=](QSize size) {
 			handleWaylandResize(size);
 		}, rp()->lifetime());
 	}
@@ -932,13 +932,13 @@ Pip::Pip(
 	setupStreaming();
 
 	_data->session().account().sessionChanges(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_destroy();
 	}, _panel.rp()->lifetime());
 
 	if (_context) {
 		_data->owner().itemRemoved(
-		) | rpl::start_with_next([=](not_null<const HistoryItem*> data) {
+		) | rpl::on_next([=](not_null<const HistoryItem*> data) {
 			if (_context != data) {
 				_context = nullptr;
 			}
@@ -971,12 +971,12 @@ void Pip::setupPanel() {
 	_panel.widget()->show();
 
 	_panel.saveGeometryRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		saveGeometry();
 	}, _panel.rp()->lifetime());
 
 	_panel.rp()->events(
-	) | rpl::start_with_next([=](not_null<QEvent*> e) {
+	) | rpl::on_next([=](not_null<QEvent*> e) {
 		const auto mousePosition = [&] {
 			return static_cast<QMouseEvent*>(e.get())->pos();
 		};
@@ -1234,7 +1234,7 @@ void Pip::setupButtons() {
 	_panel.rp()->sizeValue(
 	) | rpl::map([=] {
 		return _panel.inner();
-	}) | rpl::start_with_next([=](QRect rect) {
+	}) | rpl::on_next([=](QRect rect) {
 		const auto skip = st::pipControlSkip;
 		_close.area = QRect(
 			rect.x(),
@@ -1338,7 +1338,7 @@ void Pip::setupStreaming() {
 	_instance->switchQualityRequests(
 	) | rpl::filter([=](int quality) {
 		return !_quality.manual && _quality.height != quality;
-	}) | rpl::start_with_next([=](int quality) {
+	}) | rpl::on_next([=](int quality) {
 		applyVideoQuality({
 			.manual = 0,
 			.height = uint32(quality),
@@ -1346,7 +1346,7 @@ void Pip::setupStreaming() {
 	}, _instance->lifetime());
 
 	_instance->player().updates(
-	) | rpl::start_with_next_error([=](Streaming::Update &&update) {
+	) | rpl::on_next_error([=](Streaming::Update &&update) {
 		handleStreamingUpdate(std::move(update));
 	}, [=](Streaming::Error &&error) {
 		handleStreamingError(std::move(error));
diff --git a/Telegram/SourceFiles/media/view/media_view_pip_opengl.cpp b/Telegram/SourceFiles/media/view/media_view_pip_opengl.cpp
index a056f5f7ea..e50f832c07 100644
--- a/Telegram/SourceFiles/media/view/media_view_pip_opengl.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_pip_opengl.cpp
@@ -148,7 +148,7 @@ vec4 shadow() {
 Pip::RendererGL::RendererGL(not_null<Pip*> owner)
 : _owner(owner) {
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_radialImage.invalidate();
 		_playbackImage.invalidate();
 		_volumeControllerImage.invalidate();
diff --git a/Telegram/SourceFiles/media/view/media_view_playback_controls.cpp b/Telegram/SourceFiles/media/view/media_view_playback_controls.cpp
index 5ecb20da4c..b3f5718739 100644
--- a/Telegram/SourceFiles/media/view/media_view_playback_controls.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_playback_controls.cpp
@@ -77,7 +77,7 @@ PlaybackControls::PlaybackControls(
 
 	if (const auto controller = _speedController.get()) {
 		controller->menuToggledValue(
-		) | rpl::start_with_next([=](bool toggled) {
+		) | rpl::on_next([=](bool toggled) {
 			_speedToggle->setActive(toggled);
 		}, _speedToggle->lifetime());
 	}
diff --git a/Telegram/SourceFiles/media/view/media_view_playback_sponsored.cpp b/Telegram/SourceFiles/media/view/media_view_playback_sponsored.cpp
index 895b4c70b4..b099efb4cd 100644
--- a/Telegram/SourceFiles/media/view/media_view_playback_sponsored.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_playback_sponsored.cpp
@@ -95,7 +95,7 @@ Close::Close(
 
 	std::move(
 		allowCloseAt
-	) | rpl::start_with_next([=](crl::time at) {
+	) | rpl::on_next([=](crl::time at) {
 		const auto now = crl::now();
 		if (!at) {
 			updateProgress(now);
@@ -358,7 +358,7 @@ void PlaybackSponsored::Message::fadeIn() {
 	_photo->owner()->session().downloaderTaskFinished(
 	) | rpl::filter([=] {
 		return _photo->loaded();
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		_photoLifetime.destroy();
 		startFadeIn();
 	}, _photoLifetime);
@@ -694,14 +694,14 @@ void PlaybackSponsored::show(const Data::SponsoredMessage &data) {
 		_allowCloseAt.value());
 	const auto raw = _widget.get();
 
-	_controlsGeometry.value() | rpl::start_with_next([=](QRect controls) {
+	_controlsGeometry.value() | rpl::on_next([=](QRect controls) {
 		raw->resizeToWidth(controls.width());
 		raw->setFinalPosition(
 			controls.x(),
 			controls.y() - st::mediaSponsoredSkip - raw->height());
 	}, raw->lifetime());
 
-	raw->actions() | rpl::start_with_next([=](Action action) {
+	raw->actions() | rpl::on_next([=](Action action) {
 		switch (action) {
 		case Action::Close: hide(crl::now()); break;
 		case Action::PromotePremium: showPremiumPromo(); break;
diff --git a/Telegram/SourceFiles/media/view/media_view_video_stream.cpp b/Telegram/SourceFiles/media/view/media_view_video_stream.cpp
index a68607b41b..ca6c25e01c 100644
--- a/Telegram/SourceFiles/media/view/media_view_video_stream.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_video_stream.cpp
@@ -160,7 +160,7 @@ void VideoStream::Loading::setup(not_null<QWidget*> parent) {
 		[=] { _bg->update(); });
 
 	_bg->show();
-	_bg->paintRequest() | rpl::start_with_next([=] {
+	_bg->paintRequest() | rpl::on_next([=] {
 		auto p = QPainter(_bg.get());
 		auto hq = PainterHighQualityEnabler(p);
 
@@ -320,7 +320,7 @@ void VideoStream::setupVideo() {
 		setupTile(endpoint, track);
 	}
 	_call->videoStreamActiveUpdates(
-	) | rpl::start_with_next([=](const Calls::VideoStateToggle &update) {
+	) | rpl::on_next([=](const Calls::VideoStateToggle &update) {
 		if (update.value) {
 			// Add async (=> the participant row is definitely in Members).
 			const auto endpoint = update.endpoint;
@@ -338,7 +338,7 @@ void VideoStream::setupVideo() {
 	}, _viewport->lifetime());
 
 	_viewport->qualityRequests(
-	) | rpl::start_with_next([=](const Calls::VideoQualityRequest &request) {
+	) | rpl::on_next([=](const Calls::VideoQualityRequest &request) {
 		_call->requestVideoQuality(request.endpoint, request.quality);
 	}, _viewport->lifetime());
 
@@ -347,7 +347,7 @@ void VideoStream::setupVideo() {
 	_viewport->setControlsShown(0.);
 
 	_call->hasVideoWithFramesValue(
-	) | rpl::start_with_next([=](bool has) {
+	) | rpl::on_next([=](bool has) {
 		if (has) {
 			_loading = nullptr;
 		}
@@ -357,13 +357,13 @@ void VideoStream::setupVideo() {
 }
 
 void VideoStream::setupMessages() {
-	_messages->hiddenShowRequested() | rpl::start_with_next([=] {
+	_messages->hiddenShowRequested() | rpl::on_next([=] {
 		_call->messages()->requestHiddenShow();
 	}, _messages->lifetime());
 
 
 	_messages->deleteRequests(
-	) | rpl::start_with_next([=](Calls::Group::MessageDeleteRequest event) {
+	) | rpl::on_next([=](Calls::Group::MessageDeleteRequest event) {
 		_call->messages()->deleteConfirmed(event);
 	}, _messages->lifetime());
 }
diff --git a/Telegram/SourceFiles/menu/menu_antispam_validator.cpp b/Telegram/SourceFiles/menu/menu_antispam_validator.cpp
index 16c183a6c9..ab9e12e7ab 100644
--- a/Telegram/SourceFiles/menu/menu_antispam_validator.cpp
+++ b/Telegram/SourceFiles/menu/menu_antispam_validator.cpp
@@ -93,10 +93,10 @@ object_ptr<Ui::RpWidget> AntiSpamValidator::createButton() const {
 	_channel->session().changes().peerUpdates(
 		_channel,
 		UpdateFlag::Members | UpdateFlag::Admins
-	) | rpl::start_with_next(updateLocked, button->lifetime());
+	) | rpl::on_next(updateLocked, button->lifetime());
 	updateLocked();
 	button->toggledValue(
-	) | rpl::start_with_next([=, controller = _controller](bool toggled) {
+	) | rpl::on_next([=, controller = _controller](bool toggled) {
 		if (state->locked.current() && toggled) {
 			state->toggled.fire(false);
 			controller->showToast(tr::lng_manage_peer_antispam_not_enough(
diff --git a/Telegram/SourceFiles/menu/menu_check_item.cpp b/Telegram/SourceFiles/menu/menu_check_item.cpp
index f76e5d3b9b..e7cb08fcc2 100644
--- a/Telegram/SourceFiles/menu/menu_check_item.cpp
+++ b/Telegram/SourceFiles/menu/menu_check_item.cpp
@@ -19,13 +19,13 @@ void ItemWithCheck::init(bool checked) {
 
 	_checkView = std::make_unique<Ui::CheckView>(st::defaultCheck, false);
 	_checkView->checkedChanges(
-	) | rpl::start_with_next([=](bool checked) {
+	) | rpl::on_next([=](bool checked) {
 		setIcon(checked ? &st::mediaPlayerMenuCheck : nullptr);
 	}, lifetime());
 
 	_checkView->setChecked(checked, anim::type::normal);
 	AbstractButton::clicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_checkView->setChecked(
 			!_checkView->checked(),
 			anim::type::normal);
diff --git a/Telegram/SourceFiles/menu/menu_item_download_files.cpp b/Telegram/SourceFiles/menu/menu_item_download_files.cpp
index 540f2ebb71..a4f3c21bf4 100644
--- a/Telegram/SourceFiles/menu/menu_item_download_files.cpp
+++ b/Telegram/SourceFiles/menu/menu_item_download_files.cpp
@@ -150,7 +150,7 @@ void AddAction(
 		} else {
 			auto lifetime = std::make_shared<rpl::lifetime>();
 			session->downloaderTaskFinished(
-			) | rpl::start_with_next([=]() mutable {
+			) | rpl::on_next([=]() mutable {
 				if (finalCheck()) {
 					saveToFiles();
 					base::take(lifetime)->destroy();
diff --git a/Telegram/SourceFiles/menu/menu_item_rate_transcribe.cpp b/Telegram/SourceFiles/menu/menu_item_rate_transcribe.cpp
index 75567c7692..1561924487 100644
--- a/Telegram/SourceFiles/menu/menu_item_rate_transcribe.cpp
+++ b/Telegram/SourceFiles/menu/menu_item_rate_transcribe.cpp
@@ -53,7 +53,7 @@ RateTranscribe::RateTranscribe(
 	setMinWidth(
 		label->st().style.font->width(
 			tr::lng_context_rate_transcription(tr::now)));
-	widthValue() | rpl::start_with_next([=](int w) {
+	widthValue() | rpl::on_next([=](int w) {
 		content->resizeToWidth(parentWidget()->width());
 	}, content->lifetime());
 	Ui::AddSkip(content);
@@ -73,7 +73,7 @@ RateTranscribe::RateTranscribe(
 			leftButton,
 			QString::fromUtf8("\U0001F44D"));
 		label->setAttribute(Qt::WA_TransparentForMouseEvents, true);
-		leftButton->sizeValue() | rpl::start_with_next([=](QSize s) {
+		leftButton->sizeValue() | rpl::on_next([=](QSize s) {
 			label->moveToLeft(
 				(s.width() - label->width()) / 2,
 				(s.height() - label->height()) / 2);
@@ -88,7 +88,7 @@ RateTranscribe::RateTranscribe(
 			rightButton,
 			QString::fromUtf8("\U0001F44E"));
 		label->setAttribute(Qt::WA_TransparentForMouseEvents, true);
-		rightButton->sizeValue() | rpl::start_with_next([=](QSize s) {
+		rightButton->sizeValue() | rpl::on_next([=](QSize s) {
 			label->moveToLeft(
 				(s.width() - label->width()) / 2,
 				(s.height() - label->height()) / 2);
@@ -134,7 +134,7 @@ RateTranscribe::RateTranscribe(
 	rpl::combine(
 		content->geometryValue(),
 		label->geometryValue()
-	) | rpl::start_with_next([=](
+	) | rpl::on_next([=](
 			const QRect &contentRect,
 			const QRect &labelRect) {
 		leftButton->moveToLeft(
diff --git a/Telegram/SourceFiles/menu/menu_mute.cpp b/Telegram/SourceFiles/menu/menu_mute.cpp
index 1a36307afb..409360e37f 100644
--- a/Telegram/SourceFiles/menu/menu_mute.cpp
+++ b/Telegram/SourceFiles/menu/menu_mute.cpp
@@ -96,7 +96,7 @@ MuteItem::MuteItem(
 	nullptr)
 , _itemIconPosition(st.itemIconPosition) {
 	descriptor.isMutedValue(
-	) | rpl::start_with_next([=](bool isMuted) {
+	) | rpl::on_next([=](bool isMuted) {
 		action()->setText(isMuted
 			? tr::lng_mute_menu_duration_unmute(tr::now)
 			: tr::lng_mute_menu_duration_forever(tr::now));
@@ -376,7 +376,7 @@ void SetupMuteMenu(
 	const auto state = parent->lifetime().make_state<State>();
 	std::move(
 		triggers
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (state->menu) {
 			return;
 		} else if (const auto descriptor = makeDescriptor()) {
diff --git a/Telegram/SourceFiles/menu/menu_send.cpp b/Telegram/SourceFiles/menu/menu_send.cpp
index e612ece51a..8b40d5ebea 100644
--- a/Telegram/SourceFiles/menu/menu_send.cpp
+++ b/Telegram/SourceFiles/menu/menu_send.cpp
@@ -406,7 +406,7 @@ void EffectPreview::setupBackground() {
 		QImage::Format_ARGB32_Premultiplied);
 	_bg.setDevicePixelRatio(ratio);
 	repaintBackground();
-	_theme->repaintBackgroundRequests() | rpl::start_with_next([=] {
+	_theme->repaintBackgroundRequests() | rpl::on_next([=] {
 		repaintBackground();
 		update();
 	}, lifetime());
@@ -485,7 +485,7 @@ void EffectPreview::setupLottie() {
 	}
 	rpl::single(rpl::empty) | rpl::then(
 		_show->session().downloaderTaskFinished()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (checkLoaded()) {
 			_readyCheckLifetime.destroy();
 			createLottie();
@@ -501,7 +501,7 @@ void EffectPreview::createLottie() {
 		Stickers::EffectType::MessageEffect);
 	const auto raw = _lottie.get();
 	raw->updates(
-	) | rpl::start_with_next([=](Lottie::Update update) {
+	) | rpl::on_next([=](Lottie::Update update) {
 		v::match(update.data, [&](const Lottie::Information &information) {
 		}, [&](const Lottie::DisplayFrameRequest &request) {
 			this->update();
@@ -641,7 +641,7 @@ FillMenuResult AttachSendMenuEffect(
 	}
 
 	(*selector)->chosen(
-	) | rpl::start_with_next([=](ChosenReaction chosen) {
+	) | rpl::on_next([=](ChosenReaction chosen) {
 		const auto &reactions = show->session().data().reactions();
 		const auto &effects = reactions.list(Data::Reactions::Type::Effects);
 		const auto i = ranges::find(effects, chosen.id, &Data::Reaction::id);
@@ -846,7 +846,7 @@ void SetupMenuAndShortcuts(
 	Shortcuts::Requests(
 	) | rpl::filter([=] {
 		return button->isActiveWindow();
-	}) | rpl::start_with_next([=](not_null<Shortcuts::Request*> request) {
+	}) | rpl::on_next([=](not_null<Shortcuts::Request*> request) {
 		using Command = Shortcuts::Command;
 
 		const auto now = details().type;
diff --git a/Telegram/SourceFiles/menu/menu_sponsored.cpp b/Telegram/SourceFiles/menu/menu_sponsored.cpp
index 67ad0580e0..d747ecdbf1 100644
--- a/Telegram/SourceFiles/menu/menu_sponsored.cpp
+++ b/Telegram/SourceFiles/menu/menu_sponsored.cpp
@@ -77,7 +77,7 @@ void AboutBox(
 		owned->setNaturalWidth(rect.width());
 		const auto widget = box->addRow(std::move(owned), style::al_top);
 		widget->paintRequest(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			auto p = Painter(widget);
 			auto hq = PainterHighQualityEnabler(p);
 			p.setPen(Qt::NoPen);
@@ -129,13 +129,13 @@ void AboutBox(
 			const auto left = Ui::CreateChild<Ui::RpWidget>(
 				box->verticalLayout().get());
 			left->paintRequest(
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				auto p = Painter(left);
 				icon.paint(p, 0, 0, left->width());
 			}, left->lifetime());
 			left->resize(icon.size());
 			top->geometryValue(
-			) | rpl::start_with_next([=](const QRect &g) {
+			) | rpl::on_next([=](const QRect &g) {
 				left->moveToLeft(
 					(g.left() - left->width()) / 2,
 					g.top() + st::channelEarnHistoryThreeSkip);
@@ -261,7 +261,7 @@ void AboutBox(
 			box,
 			st::infoTopBarMenu);
 		box->widthValue(
-		) | rpl::start_with_next([=](int width) {
+		) | rpl::on_next([=](int width) {
 			top->raise();
 			top->moveToLeft(
 				width - top->width() - st::defaultScrollArea.width,
@@ -275,7 +275,7 @@ void AboutBox(
 				st::popupMenuWithIcons);
 			const auto raw = menu->get();
 			raw->animatePhaseValue(
-			) | rpl::start_with_next([=](Ui::PopupMenu::AnimatePhase phase) {
+			) | rpl::on_next([=](Ui::PopupMenu::AnimatePhase phase) {
 				top->setForceRippled(false
 					|| phase == Ui::PopupMenu::AnimatePhase::Shown
 					|| phase == Ui::PopupMenu::AnimatePhase::StartShow);
@@ -416,7 +416,7 @@ void FillSponsored(
 					st::historyHasCustomEmojiPosition,
 					base::duplicate(i));
 				item->clicks(
-				) | rpl::start_with_next(callback, menu->lifetime());
+				) | rpl::on_next(callback, menu->lifetime());
 				menu->addAction(std::move(item));
 				if (i != details.info.back()) {
 					menu->addSeparator();
diff --git a/Telegram/SourceFiles/menu/menu_ttl.cpp b/Telegram/SourceFiles/menu/menu_ttl.cpp
index f77294a2f2..26100e5e85 100644
--- a/Telegram/SourceFiles/menu/menu_ttl.cpp
+++ b/Telegram/SourceFiles/menu/menu_ttl.cpp
@@ -103,7 +103,7 @@ TextItem::TextItem(
 		+ st.itemIconPosition.x());
 
 	sizeValue(
-	) | rpl::start_with_next([=](const QSize &s) {
+	) | rpl::on_next([=](const QSize &s) {
 		_label->moveToLeft(
 			st.itemIconPosition.x(),
 			(s.height() - _label->height()) / 2);
@@ -261,7 +261,7 @@ void SetupTTLMenu(
 	const auto state = parent->lifetime().make_state<State>();
 	std::move(
 		triggers
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (state->menu) {
 			return;
 		}
diff --git a/Telegram/SourceFiles/mtproto/connection_tcp.cpp b/Telegram/SourceFiles/mtproto/connection_tcp.cpp
index 26dff1dd97..44321c3a8c 100644
--- a/Telegram/SourceFiles/mtproto/connection_tcp.cpp
+++ b/Telegram/SourceFiles/mtproto/connection_tcp.cpp
@@ -547,27 +547,27 @@ void TcpConnection::connectToServer(
 	CONNECTION_LOG_INFO("Connecting...");
 
 	_socket->connected(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		socketConnected();
 	}, _connectedLifetime);
 
 	_socket->disconnected(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		socketDisconnected();
 	}, _lifetime);
 
 	_socket->readyRead(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		socketRead();
 	}, _lifetime);
 
 	_socket->error(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		socketError();
 	}, _lifetime);
 
 	_socket->syncTimeRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		syncTimeRequest();
 	}, _lifetime);
 
diff --git a/Telegram/SourceFiles/mtproto/dedicated_file_loader.cpp b/Telegram/SourceFiles/mtproto/dedicated_file_loader.cpp
index 72e69e48a9..057b055e94 100644
--- a/Telegram/SourceFiles/mtproto/dedicated_file_loader.cpp
+++ b/Telegram/SourceFiles/mtproto/dedicated_file_loader.cpp
@@ -97,7 +97,7 @@ WeakInstance::WeakInstance(base::weak_ptr<Main::Session> session)
 	_session->account().sessionChanges(
 	) | rpl::filter([](Main::Session *session) {
 		return !session;
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		die();
 	}, _lifetime);
 }
diff --git a/Telegram/SourceFiles/mtproto/mtp_instance.cpp b/Telegram/SourceFiles/mtproto/mtp_instance.cpp
index 1890c4485d..a7dd178b71 100644
--- a/Telegram/SourceFiles/mtproto/mtp_instance.cpp
+++ b/Telegram/SourceFiles/mtproto/mtp_instance.cpp
@@ -321,12 +321,12 @@ Instance::Private::Private(
 	_fileSessionThreads.resize(2 * std::max(idealThreadPoolSize / 2, 1));
 
 	details::unpaused(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		unpaused();
 	}, _lifetime);
 
 	_networkReachability->availableChanges(
-	) | rpl::start_with_next([=](bool available) {
+	) | rpl::on_next([=](bool available) {
 		restart();
 	}, _lifetime);
 
@@ -335,7 +335,7 @@ Instance::Private::Private(
 
 	_customDeviceModel = Core::App().settings().customDeviceModel();
 	Core::App().settings().customDeviceModelChanges(
-	) | rpl::start_with_next([=](const QString &value) {
+	) | rpl::on_next([=](const QString &value) {
 		QMutexLocker lock(&_deviceModelMutex);
 		_customDeviceModel = value;
 		lock.unlock();
@@ -365,7 +365,7 @@ Instance::Private::Private(
 	}
 
 	_proxySettings.connectionTypeChanges(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (_configLoader) {
 			_configLoader->setProxyEnabled(_proxySettings.isEnabled());
 		}
diff --git a/Telegram/SourceFiles/mtproto/session.cpp b/Telegram/SourceFiles/mtproto/session.cpp
index 842541e77b..a826f70c93 100644
--- a/Telegram/SourceFiles/mtproto/session.cpp
+++ b/Telegram/SourceFiles/mtproto/session.cpp
@@ -180,7 +180,7 @@ void Session::watchDcKeyChanges() {
 	_instance->dcTemporaryKeyChanged(
 	) | rpl::filter([=](DcId dcId) {
 		return (dcId == _shiftedDcId) || (dcId == BareDcId(_shiftedDcId));
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		DEBUG_LOG(("AuthKey Info: dcTemporaryKeyChanged in Session %1"
 			).arg(_shiftedDcId));
 		if (const auto captured = _private) {
@@ -197,7 +197,7 @@ void Session::watchDcOptionsChanges() {
 	_instance->dcOptions().changed(
 	) | rpl::filter([=](DcId dcId) {
 		return (BareDcId(_shiftedDcId) == dcId) && (_private != nullptr);
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		InvokeQueued(_private, [captured = _private] {
 			captured->dcOptionsChanged();
 		});
@@ -207,7 +207,7 @@ void Session::watchDcOptionsChanges() {
 	) | rpl::filter([=] {
 		return (_private != nullptr)
 			&& (_instance->dcOptions().dcType(_shiftedDcId) == DcType::Cdn);
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		InvokeQueued(_private, [captured = _private] {
 			captured->cdnConfigChanged();
 		});
diff --git a/Telegram/SourceFiles/passport/passport_edit_identity_box.cpp b/Telegram/SourceFiles/passport/passport_edit_identity_box.cpp
index 68285b9b75..18be2ad425 100644
--- a/Telegram/SourceFiles/passport/passport_edit_identity_box.cpp
+++ b/Telegram/SourceFiles/passport/passport_edit_identity_box.cpp
@@ -174,7 +174,7 @@ void IdentityBox::prepare() {
 		_scans.back()->setImage(scan.thumb);
 		_scans.back()->resizeToWidth(st::boxWideWidth);
 		_scans.back()->deleteClicks(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			_controller->deleteScan(_valueIndex, index - 1);
 		}, lifetime());
 	}
@@ -186,7 +186,7 @@ void IdentityBox::prepare() {
 		closeBox();
 	});
 	_controller->scanUpdated(
-	) | rpl::start_with_next([=](ScanInfo &&info) {
+	) | rpl::on_next([=](ScanInfo &&info) {
 		updateScan(std::move(info));
 	}, lifetime());
 
diff --git a/Telegram/SourceFiles/passport/passport_form_controller.cpp b/Telegram/SourceFiles/passport/passport_form_controller.cpp
index a82cecffbb..2229cbb5ed 100644
--- a/Telegram/SourceFiles/passport/passport_form_controller.cpp
+++ b/Telegram/SourceFiles/passport/passport_form_controller.cpp
@@ -1005,7 +1005,7 @@ void FormController::recoverPassword() {
 			pattern,
 			fields));
 		box->newPasswordSet(
-		) | rpl::start_with_next([=](const QByteArray &password) {
+		) | rpl::on_next([=](const QByteArray &password) {
 			if (password.isEmpty()) {
 				reloadPassword();
 			} else {
@@ -1014,7 +1014,7 @@ void FormController::recoverPassword() {
 		}, box->lifetime());
 
 		box->recoveryExpired(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			box->closeBox();
 		}, box->lifetime());
 	}).fail([=](const MTP::Error &error) {
@@ -1300,7 +1300,7 @@ void FormController::fillNativeFromFallback() {
 		scheme.additionalShown
 	) | rpl::take(
 		1
-	) | rpl::start_with_next([=](Scheme::AdditionalVisibility v) {
+	) | rpl::on_next([=](Scheme::AdditionalVisibility v) {
 		if (v != Scheme::AdditionalVisibility::OnlyIfError) {
 			return;
 		}
@@ -1558,17 +1558,17 @@ void FormController::subscribeToUploader() {
 	using namespace Storage;
 
 	session().uploader().secureReady(
-	) | rpl::start_with_next([=](const UploadSecureDone &data) {
+	) | rpl::on_next([=](const UploadSecureDone &data) {
 		scanUploadDone(data);
 	}, _uploaderSubscriptions);
 
 	session().uploader().secureProgress(
-	) | rpl::start_with_next([=](const UploadSecureProgress &data) {
+	) | rpl::on_next([=](const UploadSecureProgress &data) {
 		scanUploadProgress(data);
 	}, _uploaderSubscriptions);
 
 	session().uploader().secureFailed(
-	) | rpl::start_with_next([=](const FullMsgId &fullId) {
+	) | rpl::on_next([=](const FullMsgId &fullId) {
 		scanUploadFail(fullId);
 	}, _uploaderSubscriptions);
 }
@@ -1809,7 +1809,7 @@ void FormController::loadFile(File &file) {
 			Data::kImageCacheTag));
 	const auto loader = j->second.get();
 	loader->updates(
-	) | rpl::start_with_next_error_done([=] {
+	) | rpl::on_next_error_done([=] {
 		fileLoadProgress(key, loader->currentOffset());
 	}, [=](FileLoader::Error error) {
 		fileLoadFail(key);
diff --git a/Telegram/SourceFiles/passport/passport_panel.cpp b/Telegram/SourceFiles/passport/passport_panel.cpp
index 8db7c18f85..352a9ee031 100644
--- a/Telegram/SourceFiles/passport/passport_panel.cpp
+++ b/Telegram/SourceFiles/passport/passport_panel.cpp
@@ -29,12 +29,12 @@ Panel::Panel(not_null<PanelController*> controller)
 	_widget->setInnerSize(st::passportPanelSize);
 
 	_widget->closeRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_controller->cancelAuth();
 	}, _widget->lifetime());
 
 	_widget->closeEvents(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_controller->cancelAuthSure();
 	}, _widget->lifetime());
 }
@@ -76,7 +76,7 @@ void Panel::showCriticalError(const QString &error) {
 			st::passportErrorLabel),
 		style::margins(0, st::passportPanelSize.height() / 3, 0, 0));
 	container->widthValue(
-	) | rpl::start_with_next([label = container->entity()](int width) {
+	) | rpl::on_next([label = container->entity()](int width) {
 		label->resize(width, label->height());
 	}, container->lifetime());
 
diff --git a/Telegram/SourceFiles/passport/passport_panel_controller.cpp b/Telegram/SourceFiles/passport/passport_panel_controller.cpp
index 14b1a37336..1ae8d6ae71 100644
--- a/Telegram/SourceFiles/passport/passport_panel_controller.cpp
+++ b/Telegram/SourceFiles/passport/passport_panel_controller.cpp
@@ -575,20 +575,20 @@ PanelController::PanelController(not_null<FormController*> form)
 : _form(form)
 , _scopes(ComputeScopes(_form->form())) {
 	_form->secretReadyEvents(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		ensurePanelCreated();
 		_panel->showForm();
 	}, lifetime());
 
 	_form->verificationNeeded(
-	) | rpl::start_with_next([=](not_null<const Value*> value) {
+	) | rpl::on_next([=](not_null<const Value*> value) {
 		processVerificationNeeded(value);
 	}, lifetime());
 
 	_form->verificationUpdate(
 	) | rpl::filter([=](not_null<const Value*> field) {
 		return (field->verification.codeLength == 0);
-	}) | rpl::start_with_next([=](not_null<const Value*> field) {
+	}) | rpl::on_next([=](not_null<const Value*> field) {
 		_verificationBoxes.erase(field);
 	}, lifetime());
 }
@@ -704,7 +704,7 @@ void PanelController::setupPassword() {
 
 	auto box = show(Box<PasscodeBox>(&_form->window()->session(), fields));
 	box->newPasswordSet(
-	) | rpl::start_with_next([=](const QByteArray &password) {
+	) | rpl::on_next([=](const QByteArray &password) {
 		if (password.isEmpty()) {
 			_form->reloadPassword();
 		} else {
@@ -713,12 +713,12 @@ void PanelController::setupPassword() {
 	}, box->lifetime());
 
 	box->passwordReloadNeeded(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_form->reloadPassword();
 	}, box->lifetime());
 
 	box->clearUnconfirmedPassword(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_form->cancelPassword();
 	}, box->lifetime());
 }
@@ -741,13 +741,13 @@ void PanelController::validateRecoveryEmail() {
 
 	std::move(
 		validation.reloadRequests
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_form->reloadPassword();
 	}, validation.box->lifetime());
 
 	std::move(
 		validation.cancelRequests
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_form->cancelPassword();
 	}, validation.box->lifetime());
 
@@ -1265,12 +1265,12 @@ void PanelController::startScopeEdit(
 	_panel->setBackAllowed(true);
 
 	_panel->backRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		cancelEditScope();
 	}, content->lifetime());
 
 	_form->valueSaveFinished(
-	) | rpl::start_with_next([=](not_null<const Value*> value) {
+	) | rpl::on_next([=](not_null<const Value*> value) {
 		processValueSaveFinished(value);
 	}, content->lifetime());
 
@@ -1351,7 +1351,7 @@ void PanelController::processVerificationNeeded(
 					return field->verification.error;
 				}) | rpl::distinct_until_changed()));
 			box->boxClosing(
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				account->setHandleLoginCode(nullptr);
 			}, box->lifetime());
 			return box;
@@ -1375,7 +1375,7 @@ void PanelController::processVerificationNeeded(
 	}();
 
 	box->boxClosing(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_form->cancelValueVerification(value);
 	}, lifetime());
 
diff --git a/Telegram/SourceFiles/passport/passport_panel_edit_contact.cpp b/Telegram/SourceFiles/passport/passport_panel_edit_contact.cpp
index 9e1d108512..f79b4d8379 100644
--- a/Telegram/SourceFiles/passport/passport_panel_edit_contact.cpp
+++ b/Telegram/SourceFiles/passport/passport_panel_edit_contact.cpp
@@ -145,7 +145,7 @@ void VerifyBox::setupControls(
 				st::fragmentBoxButton),
 			small);
 		_content->widthValue(
-		) | rpl::start_with_next([=](int w) {
+		) | rpl::on_next([=](int w) {
 			button->setFullWidth(w - small.left() - small.right());
 		}, button->lifetime());
 		button->setClickedCallback([=] { ::File::OpenUrl(openUrl); });
@@ -171,14 +171,14 @@ void VerifyBox::setupControls(
 			small);
 		std::move(
 			resent
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			_content->resizeToWidth(st::boxWidth);
 		}, _content->lifetime());
 		label->overrideLinkClickHandler(resend);
 	}
 	std::move(
 		error
-	) | rpl::start_with_next([=](const QString &error) {
+	) | rpl::on_next([=](const QString &error) {
 		if (error.isEmpty()) {
 			problem->hide(anim::type::normal);
 		} else {
@@ -195,10 +195,10 @@ void VerifyBox::setupControls(
 	if (codeLength > 0) {
 		_code->setAutoSubmit(codeLength, _submit);
 	} else {
-		_code->submits() | rpl::start_with_next(_submit, _code->lifetime());
+		_code->submits() | rpl::on_next(_submit, _code->lifetime());
 	}
 	_code->changes(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		problem->hide(anim::type::normal);
 	}, _code->lifetime());
 }
@@ -215,7 +215,7 @@ void VerifyBox::prepare() {
 
 	_content->resizeToWidth(st::boxWidth);
 	_content->heightValue(
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		setDimensions(st::boxWidth, height);
 	}, _content->lifetime());
 }
@@ -246,7 +246,7 @@ void PanelEditContact::setupControls(
 		const QString &data,
 		const QString &existing) {
 	widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		_content->resizeToWidth(width);
 	}, _content->lifetime());
 
@@ -311,11 +311,11 @@ void PanelEditContact::setupControls(
 
 	_field->move(0, 0);
 	_field->heightValue(
-	) | rpl::start_with_next([=, pointer = wrap.data()](int height) {
+	) | rpl::on_next([=, pointer = wrap.data()](int height) {
 		pointer->resize(pointer->width(), height);
 	}, _field->lifetime());
 	wrap->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		_field->resize(width, _field->height());
 	}, _field->lifetime());
 
@@ -353,7 +353,7 @@ void PanelEditContact::setupControls(
 	}
 
 	_controller->saveErrors(
-	) | rpl::start_with_next([=](const ScopeError &error) {
+	) | rpl::on_next([=](const ScopeError &error) {
 		if (error.key == QString("value")) {
 			_field->showError();
 			errorWrap->entity()->setText(error.text);
diff --git a/Telegram/SourceFiles/passport/passport_panel_edit_document.cpp b/Telegram/SourceFiles/passport/passport_panel_edit_document.cpp
index 723e37f146..8f1fb3567d 100644
--- a/Telegram/SourceFiles/passport/passport_panel_edit_document.cpp
+++ b/Telegram/SourceFiles/passport/passport_panel_edit_document.cpp
@@ -312,7 +312,7 @@ not_null<Ui::RpWidget*> PanelEditDocument::setupContent(
 	const auto inner = _scroll->setOwnedWidget(
 		object_ptr<Ui::VerticalLayout>(this));
 	_scroll->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		inner->resizeToWidth(width);
 	}, inner->lifetime());
 
@@ -442,7 +442,7 @@ not_null<Ui::RpWidget*> PanelEditDocument::setupContent(
 				st::passportNativeNameHeaderPadding);
 			std::move(
 				title
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				const auto &padding = st::passportNativeNameHeaderPadding;
 				const auto available = added->width()
 					- padding.left()
@@ -483,7 +483,7 @@ not_null<Ui::RpWidget*> PanelEditDocument::setupContent(
 
 			std::move(langValue) | rpl::map(
 				shown
-			) | rpl::start_with_next([=](bool visible) {
+			) | rpl::on_next([=](bool visible) {
 				_additionalShown = visible;
 			}, lifetime());
 		}
@@ -545,7 +545,7 @@ void PanelEditDocument::createDetailsRow(
 			row.lengthLimit)));
 	const bool details = (row.valueClass != Scheme::ValueClass::Scans);
 	it->second->value(
-	) | rpl::skip(1) | rpl::start_with_next([=] {
+	) | rpl::skip(1) | rpl::on_next([=] {
 		if (details) {
 			_fieldsChanged = true;
 			updateCommonError();
diff --git a/Telegram/SourceFiles/passport/passport_panel_edit_scans.cpp b/Telegram/SourceFiles/passport/passport_panel_edit_scans.cpp
index 35d5bd8eac..1cf274d437 100644
--- a/Telegram/SourceFiles/passport/passport_panel_edit_scans.cpp
+++ b/Telegram/SourceFiles/passport/passport_panel_edit_scans.cpp
@@ -291,12 +291,12 @@ void EditScans::List::pushScan(const ScanInfo &info) {
 	const auto scan = rows.back()->entity();
 
 	scan->deleteClicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		controller->deleteScan(type, index);
 	}, scan->lifetime());
 
 	scan->restoreClicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		controller->restoreScan(type, index);
 	}, scan->lifetime());
 
@@ -713,17 +713,17 @@ void EditScans::setupSpecialScans(
 
 void EditScans::init() {
 	_controller->scanUpdated(
-	) | rpl::start_with_next([=](ScanInfo &&info) {
+	) | rpl::on_next([=](ScanInfo &&info) {
 		updateScan(std::move(info));
 	}, lifetime());
 
 	widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		_content->resizeToWidth(width);
 	}, _content->lifetime());
 
 	_content->heightValue(
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		resize(width(), height);
 	}, _content->lifetime());
 }
@@ -822,12 +822,12 @@ void EditScans::createSpecialScanRow(
 	const auto row = scan.row->entity();
 
 	row->deleteClicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_controller->deleteScan(type, std::nullopt);
 	}, row->lifetime());
 
 	row->restoreClicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_controller->restoreScan(type, std::nullopt);
 	}, row->lifetime());
 
diff --git a/Telegram/SourceFiles/passport/passport_panel_form.cpp b/Telegram/SourceFiles/passport/passport_panel_form.cpp
index 07a673cb28..bd5735e036 100644
--- a/Telegram/SourceFiles/passport/passport_panel_form.cpp
+++ b/Telegram/SourceFiles/passport/passport_panel_form.cpp
@@ -60,7 +60,7 @@ not_null<Ui::RpWidget*> PanelForm::setupContent() {
 	const auto inner = _scroll->setOwnedWidget(
 		object_ptr<Ui::VerticalLayout>(this));
 	_scroll->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		inner->resizeToWidth(width);
 	}, inner->lifetime());
 
@@ -117,7 +117,7 @@ not_null<Ui::RpWidget*> PanelForm::setupContent() {
 		++index;
 	});
 	_controller->refillRows(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto index = 0;
 		_controller->fillRows([&](
 				QString title,
diff --git a/Telegram/SourceFiles/passport/passport_panel_password.cpp b/Telegram/SourceFiles/passport/passport_panel_password.cpp
index 15163dcbde..1df93f51ec 100644
--- a/Telegram/SourceFiles/passport/passport_panel_password.cpp
+++ b/Telegram/SourceFiles/passport/passport_panel_password.cpp
@@ -62,7 +62,7 @@ PanelAskPassword::PanelAskPassword(
 			st::passportPasswordHintLabel);
 	}
 	_controller->passwordError(
-	) | rpl::start_with_next([=](const QString &error) {
+	) | rpl::on_next([=](const QString &error) {
 		showError(error);
 	}, lifetime());
 
@@ -166,7 +166,7 @@ PanelNoPassword::PanelNoPassword(
 
 void PanelNoPassword::setupContent() {
 	widthValue(
-	) | rpl::start_with_next([=](int newWidth) {
+	) | rpl::on_next([=](int newWidth) {
 		_inner->resizeToWidth(newWidth);
 	}, _inner->lifetime());
 
@@ -256,7 +256,7 @@ void PanelNoPassword::refreshBottom() {
 			_controller->validateRecoveryEmail();
 		});
 		container->widthValue(
-		) | rpl::start_with_next([=](int width) {
+		) | rpl::on_next([=](int width) {
 			const auto both = cancel->width()
 				+ validate->width()
 				+ st::boxLittleSkip;
diff --git a/Telegram/SourceFiles/passport/ui/passport_details_row.cpp b/Telegram/SourceFiles/passport/ui/passport_details_row.cpp
index 0fa946fd96..1239ea01cb 100644
--- a/Telegram/SourceFiles/passport/ui/passport_details_row.cpp
+++ b/Telegram/SourceFiles/passport/ui/passport_details_row.cpp
@@ -272,7 +272,7 @@ AbstractTextRow<Input>::AbstractTextRow(
 	_field->setMaxLength(limit);
 	if constexpr (std::is_same<Input, Ui::InputField>::value) {
 		_field->changes(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			_value = valueCurrent();
 		}, _field->lifetime());
 	} else {
@@ -332,7 +332,7 @@ CountryRow::CountryRow(
 , _link(this, CountryString(value), st::boxLinkButton)
 , _value(value) {
 	_value.changes(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		hideCountryError();
 	}, lifetime());
 
@@ -405,7 +405,7 @@ void CountryRow::chooseCountry() {
 		CountrySelectBox::Type::Countries);
 	const auto raw = box.data();
 	raw->countryChosen(
-	) | rpl::start_with_next([=](QString iso) {
+	) | rpl::on_next([=](QString iso) {
 		_value = iso;
 		_link->setText(CountryString(iso));
 		hideCountryError();
@@ -594,18 +594,18 @@ DateRow::DateRow(
 	connect(_month, &MaskedInputField::changed, changed);
 	connect(_year, &MaskedInputField::changed, changed);
 	_day->setMaxValue(31);
-	_day->putNext() | rpl::start_with_next([=](QChar ch) {
+	_day->putNext() | rpl::on_next([=](QChar ch) {
 		putNext(_month, ch);
 	}, lifetime());
 	_month->setMaxValue(12);
-	_month->putNext() | rpl::start_with_next([=](QChar ch) {
+	_month->putNext() | rpl::on_next([=](QChar ch) {
 		putNext(_year, ch);
 	}, lifetime());
-	_month->erasePrevious() | rpl::start_with_next([=] {
+	_month->erasePrevious() | rpl::on_next([=] {
 		erasePrevious(_day);
 	}, lifetime());
 	_year->setMaxValue(2999);
-	_year->erasePrevious() | rpl::start_with_next([=] {
+	_year->erasePrevious() | rpl::on_next([=] {
 		erasePrevious(_month);
 	}, lifetime());
 	_separator1->setAttribute(Qt::WA_TransparentForMouseEvents);
@@ -613,7 +613,7 @@ DateRow::DateRow(
 	setMouseTracking(true);
 
 	_value.changes(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		setErrorShown(false);
 	}, lifetime());
 }
@@ -1065,7 +1065,7 @@ void PanelDetailsRow::showError(std::optional<QString> error) {
 		_errorHideSubscription = true;
 
 		value(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			hideError();
 		}, lifetime());
 	}
@@ -1090,7 +1090,7 @@ void PanelDetailsRow::showError(std::optional<QString> error) {
 			_error->entity()->setText(*error);
 		}
 		_error->heightValue(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			resizeToWidth(width());
 		}, _error->lifetime());
 		_error->show(anim::type::normal);
diff --git a/Telegram/SourceFiles/payments/payments_checkout_process.cpp b/Telegram/SourceFiles/payments/payments_checkout_process.cpp
index d27161660e..522c86b134 100644
--- a/Telegram/SourceFiles/payments/payments_checkout_process.cpp
+++ b/Telegram/SourceFiles/payments/payments_checkout_process.cpp
@@ -53,7 +53,7 @@ base::flat_map<not_null<Main::Session*>, SessionProcesses> Processes;
 	const auto j = Processes.emplace(session).first;
 	auto &result = j->second;
 	session->account().sessionChanges(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		Processes.erase(session);
 	}, result.lifetime);
 	return result;
@@ -325,17 +325,17 @@ CheckoutProcess::CheckoutProcess(
 , _reactivate(std::move(reactivate))
 , _nonPanelPaymentFormProcess(std::move(nonPanelPaymentFormProcess)) {
 	_form->updates(
-	) | rpl::start_with_next([=](const FormUpdate &update) {
+	) | rpl::on_next([=](const FormUpdate &update) {
 		handleFormUpdate(update);
 	}, _lifetime);
 
 	_panel->savedMethodChosen(
-	) | rpl::start_with_next([=](QString id) {
+	) | rpl::on_next([=](QString id) {
 		_form->chooseSavedMethod(id);
 	}, _panel->lifetime());
 
 	_panel->backRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		panelCancelEdit();
 	}, _panel->lifetime());
 	if (!_nonPanelPaymentFormProcess) {
@@ -345,7 +345,7 @@ CheckoutProcess::CheckoutProcess(
 
 	if (mode == Mode::Payment) {
 		_session->api().cloudPassword().state(
-		) | rpl::start_with_next([=](const Core::CloudPasswordState &state) {
+		) | rpl::on_next([=](const Core::CloudPasswordState &state) {
 			_form->setHasPassword(state.hasPassword);
 		}, _lifetime);
 	}
@@ -878,12 +878,12 @@ void CheckoutProcess::panelSetPassword() {
 		rpl::merge(
 			box->newPasswordSet() | rpl::to_empty,
 			box->passwordReloadNeeded()
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			_session->api().cloudPassword().reload();
 		}, box->lifetime());
 
 		box->clearUnconfirmedPassword(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			_session->api().cloudPassword().clearUnconfirmedPassword();
 		}, box->lifetime());
 
@@ -903,7 +903,7 @@ void CheckoutProcess::getPasswordState(
 		return;
 	}
 	_session->api().cloudPassword().state(
-	) | rpl::start_with_next([=](const Core::CloudPasswordState &state) {
+	) | rpl::on_next([=](const Core::CloudPasswordState &state) {
 		_gettingPasswordState.destroy();
 		callback(state);
 	}, _gettingPasswordState);
diff --git a/Telegram/SourceFiles/payments/payments_form.cpp b/Telegram/SourceFiles/payments/payments_form.cpp
index ff005327ad..44a77a7876 100644
--- a/Telegram/SourceFiles/payments/payments_form.cpp
+++ b/Telegram/SourceFiles/payments/payments_form.cpp
@@ -296,7 +296,7 @@ void Form::loadThumbnail(not_null<PhotoData*> photo) {
 	_thumbnailLoadProcess->view = std::move(view);
 	photo->load(Data::PhotoSize::Thumbnail, thumbnailFileOrigin());
 	_session->downloaderTaskFinished(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto &view = _thumbnailLoadProcess->view;
 		if (auto good = prepareGoodThumbnail(view); !good.isNull()) {
 			_invoice.cover.thumbnail = std::move(good);
diff --git a/Telegram/SourceFiles/payments/payments_non_panel_process.cpp b/Telegram/SourceFiles/payments/payments_non_panel_process.cpp
index 09b3bc1f50..c6a4523525 100644
--- a/Telegram/SourceFiles/payments/payments_non_panel_process.cpp
+++ b/Telegram/SourceFiles/payments/payments_non_panel_process.cpp
@@ -111,7 +111,7 @@ void ProcessCreditsPayment(
 					onstack(CheckoutResult::Paid);
 				}
 			}));
-		box->boxClosing() | rpl::start_with_next([=] {
+		box->boxClosing() | rpl::on_next([=] {
 			crl::on_main([=] {
 				if (*unsuccessful) {
 					if (const auto onstack = maybeReturnToBot) {
diff --git a/Telegram/SourceFiles/payments/payments_reaction_process.cpp b/Telegram/SourceFiles/payments/payments_reaction_process.cpp
index d255033d73..c16dd290e8 100644
--- a/Telegram/SourceFiles/payments/payments_reaction_process.cpp
+++ b/Telegram/SourceFiles/payments/payments_reaction_process.cpp
@@ -298,7 +298,7 @@ void ShowPaidReactionDetails(
 
 	if (const auto strong = state->selectBox.get()) {
 		session->data().itemRemoved(
-		) | rpl::start_with_next([=](not_null<const HistoryItem*> removed) {
+		) | rpl::on_next([=](not_null<const HistoryItem*> removed) {
 			if (removed == item) {
 				strong->closeBox();
 			}
diff --git a/Telegram/SourceFiles/payments/ui/payments_edit_card.cpp b/Telegram/SourceFiles/payments/ui/payments_edit_card.cpp
index ec18ef6d27..7dbcbee985 100644
--- a/Telegram/SourceFiles/payments/ui/payments_edit_card.cpp
+++ b/Telegram/SourceFiles/payments/ui/payments_edit_card.cpp
@@ -273,7 +273,7 @@ not_null<RpWidget*> EditCard::setupContent() {
 		object_ptr<VerticalLayout>(this));
 
 	_scroll->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		inner->resizeToWidth(width);
 	}, inner->lifetime());
 
@@ -317,7 +317,7 @@ not_null<RpWidget*> EditCard::setupContent() {
 		.validator = CvcValidator([=] { return _number->value(); }),
 	});
 	container->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		const auto left = (width - st::paymentsExpireCvcSkip) / 2;
 		const auto right = width - st::paymentsExpireCvcSkip - left;
 		_expire->widget()->resizeToWidth(left);
@@ -359,7 +359,7 @@ not_null<RpWidget*> EditCard::setupContent() {
 		});
 		if (_country) {
 			_country->finished(
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				_zip->setFocus();
 			}, lifetime());
 		}
@@ -374,7 +374,7 @@ not_null<RpWidget*> EditCard::setupContent() {
 	}
 
 	last->submitted(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_delegate->panelValidateCard(collect(), _save && _save->checked());
 	}, lifetime());
 
diff --git a/Telegram/SourceFiles/payments/ui/payments_edit_information.cpp b/Telegram/SourceFiles/payments/ui/payments_edit_information.cpp
index ab96a8a9ea..7f15574587 100644
--- a/Telegram/SourceFiles/payments/ui/payments_edit_information.cpp
+++ b/Telegram/SourceFiles/payments/ui/payments_edit_information.cpp
@@ -106,7 +106,7 @@ not_null<RpWidget*> EditInformation::setupContent() {
 		object_ptr<VerticalLayout>(this));
 
 	_scroll->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		inner->resizeToWidth(width);
 	}, inner->lifetime());
 
@@ -209,7 +209,7 @@ not_null<RpWidget*> EditInformation::setupContent() {
 
 	if (last) {
 		last->submitted(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			_delegate->panelValidateInformation(collect());
 		}, lifetime());
 	}
diff --git a/Telegram/SourceFiles/payments/ui/payments_field.cpp b/Telegram/SourceFiles/payments/ui/payments_field.cpp
index e5fbcb34e6..346c6cb0ab 100644
--- a/Telegram/SourceFiles/payments/ui/payments_field.cpp
+++ b/Telegram/SourceFiles/payments/ui/payments_field.cpp
@@ -375,7 +375,7 @@ struct SimpleFieldState {
 	};
 	std::move(
 		textPossiblyChanged
-	) | rpl::start_with_next(updateRight, result->lifetime());
+	) | rpl::on_next(updateRight, result->lifetime());
 	if (state->left) {
 		state->left->raise();
 	}
@@ -478,11 +478,11 @@ void Field::setupMaskedGeometry() {
 
 	_wrap->resize(_masked->size());
 	_wrap->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		_masked->resize(width, _masked->height());
 	}, _masked->lifetime());
 	_masked->heightValue(
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		_wrap->resize(_wrap->width(), height);
 	}, _masked->lifetime());
 }
@@ -506,7 +506,7 @@ void Field::setupCountry() {
 			CountrySelectBox::Type::Countries);
 		const auto raw = box.data();
 		raw->countryChosen(
-		) | rpl::start_with_next([=](QString iso2) {
+		) | rpl::on_next([=](QString iso2) {
 			_countryIso2 = iso2;
 			_masked->setText(Countries::Instance().countryNameByISO2(iso2));
 			_masked->hideError();
@@ -519,7 +519,7 @@ void Field::setupCountry() {
 				}
 			}
 		}, _masked->lifetime());
-		raw->boxClosing() | rpl::start_with_next([=] {
+		raw->boxClosing() | rpl::on_next([=] {
 			setFocus();
 		}, _masked->lifetime());
 		_config.showBox(std::move(box));
@@ -613,7 +613,7 @@ void Field::setupValidator(Fn<ValidateResult(ValidateRequest)> validator) {
 		const auto raw = _input->rawTextEdit();
 		QObject::connect(raw, &QTextEdit::cursorPositionChanged, save);
 		_input->changes(
-		) | rpl::start_with_next(validate, _input->lifetime());
+		) | rpl::on_next(validate, _input->lifetime());
 	}
 }
 
@@ -652,21 +652,21 @@ void Field::setupSubmit() {
 		QObject::connect(_masked, &MaskedInputField::submitted, submitted);
 	} else {
 		_input->submits(
-		) | rpl::start_with_next(submitted, _input->lifetime());
+		) | rpl::on_next(submitted, _input->lifetime());
 	}
 }
 
 void Field::setNextField(not_null<Field*> field) {
 	_nextField = field;
 
-	finished() | rpl::start_with_next([=] {
+	finished() | rpl::on_next([=] {
 		field->setFocus();
 	}, _masked ? _masked->lifetime() : _input->lifetime());
 }
 
 void Field::setPreviousField(not_null<Field*> field) {
 	frontBackspace(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		field->setFocus();
 	}, _masked ? _masked->lifetime() : _input->lifetime());
 }
diff --git a/Telegram/SourceFiles/payments/ui/payments_form_summary.cpp b/Telegram/SourceFiles/payments/ui/payments_form_summary.cpp
index cd7d8a8e23..10dfbebad1 100644
--- a/Telegram/SourceFiles/payments/ui/payments_form_summary.cpp
+++ b/Telegram/SourceFiles/payments/ui/payments_form_summary.cpp
@@ -200,7 +200,7 @@ void FormSummary::setupControls() {
 	rpl::merge(
 		(_submit ? _submit->widthValue() : rpl::single(0)),
 		_cancel->widthValue()
-	) | rpl::skip(2) | rpl::start_with_next([=] {
+	) | rpl::skip(2) | rpl::on_next([=] {
 		updateControlsGeometry();
 	}, lifetime());
 }
@@ -227,7 +227,7 @@ void FormSummary::setupCover(not_null<VerticalLayout*> layout) {
 		_invoice.cover.seller,
 		st::paymentsSeller);
 	cover->paintRequest(
-	) | rpl::start_with_next([=](QRect clip) {
+	) | rpl::on_next([=](QRect clip) {
 		if (state->thumbnail.isNull()) {
 			return;
 		}
@@ -244,7 +244,7 @@ void FormSummary::setupCover(not_null<VerticalLayout*> layout) {
 	rpl::combine(
 		cover->widthValue(),
 		_thumbnails.events_starting_with_copy(_invoice.cover.thumbnail)
-	) | rpl::start_with_next([=](int width, QImage &&thumbnail) {
+	) | rpl::on_next([=](int width, QImage &&thumbnail) {
 		const auto &padding = st::paymentsCoverPadding;
 		const auto thumbnailSkip = st::paymentsThumbnailSize.width()
 			+ st::paymentsThumbnailSkip;
@@ -314,7 +314,7 @@ void FormSummary::setupPrices(not_null<VerticalLayout*> layout) {
 		rpl::combine(
 			left->topValue(),
 			layout->widthValue()
-		) | rpl::start_with_next([=](int top, int width) {
+		) | rpl::on_next([=](int top, int width) {
 			right->moveToRight(st::paymentsPricePadding.right(), top, width);
 		}, right->lifetime());
 		return right;
@@ -411,7 +411,7 @@ void FormSummary::setupSuggestedTips(not_null<VerticalLayout*> layout) {
 	outer->widthValue(
 	) | rpl::filter([=](int outerWidth) {
 		return outerWidth >= state->maxWidth;
-	}) | rpl::start_with_next([=](int outerWidth) {
+	}) | rpl::on_next([=](int outerWidth) {
 		const auto skip = st::paymentsTipSkip;
 		const auto &buttons = state->buttons;
 		auto left = outerWidth;
@@ -565,7 +565,7 @@ void FormSummary::setupSections(not_null<VerticalLayout*> layout) {
 
 void FormSummary::setupContent(not_null<VerticalLayout*> layout) {
 	_scroll->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		layout->resizeToWidth(width);
 	}, layout->lifetime());
 
diff --git a/Telegram/SourceFiles/payments/ui/payments_panel.cpp b/Telegram/SourceFiles/payments/ui/payments_panel.cpp
index 6e7f049bc1..6ca93cb3db 100644
--- a/Telegram/SourceFiles/payments/ui/payments_panel.cpp
+++ b/Telegram/SourceFiles/payments/ui/payments_panel.cpp
@@ -75,19 +75,19 @@ Panel::Panel(not_null<PanelDelegate*> delegate)
 	_widget->setInnerSize(st::paymentsPanelSize);
 
 	_widget->closeRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_delegate->panelRequestClose();
 	}, _widget->lifetime());
 
 	_widget->closeEvents(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_delegate->panelCloseSure();
 	}, _widget->lifetime());
 
 	style::PaletteChanged(
 	) | rpl::filter([=] {
 		return !_themeUpdateScheduled;
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		_themeUpdateScheduled = true;
 		crl::on_main(_widget.get(), [=] {
 			_themeUpdateScheduled = false;
@@ -115,7 +115,7 @@ void Panel::toggleProgress(bool shown) {
 			_widget.get(),
 			[=] { return progressRect(); });
 		_progress->widget.paintRequest(
-		) | rpl::start_with_next([=](QRect clip) {
+		) | rpl::on_next([=](QRect clip) {
 			auto p = QPainter(&_progress->widget);
 			p.setOpacity(
 				_progress->shownAnimation.value(_progress->shown ? 1. : 0.));
@@ -183,7 +183,7 @@ void Panel::setupProgressGeometry() {
 	_progress->geometryLifetime.destroy();
 	if (_webviewBottom) {
 		_webviewBottom->geometryValue(
-		) | rpl::start_with_next([=](QRect bottom) {
+		) | rpl::on_next([=](QRect bottom) {
 			const auto height = bottom.height();
 			const auto size = st::paymentsLoading.size;
 			const auto skip = (height - size.height()) / 2;
@@ -201,7 +201,7 @@ void Panel::setupProgressGeometry() {
 		}, _progress->geometryLifetime);
 	} else if (_weakFormSummary) {
 		_weakFormSummary->sizeValue(
-		) | rpl::start_with_next([=](QSize form) {
+		) | rpl::on_next([=](QSize form) {
 			const auto full = _widget->innerGeometry();
 			const auto size = st::defaultBoxButton.height;
 			const auto inner = _weakFormSummary->contentHeight();
@@ -218,12 +218,12 @@ void Panel::setupProgressGeometry() {
 		}, _progress->geometryLifetime);
 	} else if (_weakEditInformation) {
 		_weakEditInformation->geometryValue(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			_progress->widget.setGeometry(_widget->innerGeometry());
 		}, _progress->geometryLifetime);
 	} else if (_weakEditCard) {
 		_weakEditCard->geometryValue(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			_progress->widget.setGeometry(_widget->innerGeometry());
 		}, _progress->geometryLifetime);
 	}
@@ -349,7 +349,7 @@ void Panel::chooseShippingOption(const ShippingOptions &options) {
 			const auto area = CreateChild<AbstractButton>(layout.get());
 			area->setClickedCallback([=] { group->setValue(index); });
 			button->geometryValue(
-			) | rpl::start_with_next([=](QRect geometry) {
+			) | rpl::on_next([=](QRect geometry) {
 				label->move(
 					geometry.topLeft() + st::paymentsShippingLabelPosition);
 				price->move(
@@ -417,7 +417,7 @@ void Panel::chooseTips(const Invoice &invoice) {
 			}
 		};
 		row->submitted(
-		) | rpl::start_with_next(submit, box->lifetime());
+		) | rpl::on_next(submit, box->lifetime());
 		box->addButton(tr::lng_settings_save(), submit);
 		box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
 	}));
@@ -516,7 +516,7 @@ bool Panel::showWebview(
 		rpl::combine(
 			_webviewBottom->widthValue(),
 			label->widthValue()
-		) | rpl::start_with_next([=](int outerWidth, int width) {
+		) | rpl::on_next([=](int outerWidth, int width) {
 			label->move((outerWidth - width) / 2, padding.top());
 		}, label->lifetime());
 		label->show();
@@ -540,7 +540,7 @@ bool Panel::createWebview(const Webview::ThemeParams &params) {
 			return _widget->innerGeometry();
 		}),
 		bottom->heightValue()
-	) | rpl::start_with_next([=](QRect inner, int height) {
+	) | rpl::on_next([=](QRect inner, int height) {
 		bottom->move(inner.x(), inner.y() + inner.height() - height);
 		bottom->resizeToWidth(inner.width());
 		_footerHeight = bottom->height();
@@ -591,7 +591,7 @@ bool Panel::createWebview(const Webview::ThemeParams &params) {
 	rpl::combine(
 		container->geometryValue(),
 		_footerHeight.value()
-	) | rpl::start_with_next([=](QRect geometry, int footer) {
+	) | rpl::on_next([=](QRect geometry, int footer) {
 		if (const auto view = raw->widget()) {
 			view->setGeometry(geometry.marginsRemoved({ 0, 0, 0, footer }));
 		}
@@ -852,7 +852,7 @@ void Panel::showBox(object_ptr<BoxContent> box) {
 		if (hideNow || _webview->lastHidingBox) {
 			const auto raw = _webview->lastHidingBox = box.data();
 			box->boxClosing(
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				const auto widget = _webview
 					? _webview->window.widget()
 					: nullptr;
@@ -902,7 +902,7 @@ void Panel::showCriticalError(const TextWithEntities &text) {
 			return false;
 		});
 
-		raw->widthValue() | rpl::start_with_next([=](int width) {
+		raw->widthValue() | rpl::on_next([=](int width) {
 			error->resizeToWidth(width);
 			raw->resize(width, error->height());
 		}, raw->lifetime());
diff --git a/Telegram/SourceFiles/payments/ui/payments_reaction_box.cpp b/Telegram/SourceFiles/payments/ui/payments_reaction_box.cpp
index 1588b0095c..9e0314d218 100644
--- a/Telegram/SourceFiles/payments/ui/payments_reaction_box.cpp
+++ b/Telegram/SourceFiles/payments/ui/payments_reaction_box.cpp
@@ -89,11 +89,11 @@ void AddArrowDown(not_null<RpWidget*> widget) {
 	const auto skip = st::lineWidth * 4;
 	const auto size = icon->width() + skip * 2;
 	arrow->resize(size, size);
-	widget->widthValue() | rpl::start_with_next([=](int width) {
+	widget->widthValue() | rpl::on_next([=](int width) {
 		const auto left = (width - st::paidReactTopUserpic) / 2;
 		arrow->moveToRight(left - skip, -st::lineWidth, width);
 	}, widget->lifetime());
-	arrow->paintRequest() | rpl::start_with_next([=] {
+	arrow->paintRequest() | rpl::on_next([=] {
 		Painter p(arrow);
 		auto hq = PainterHighQualityEnabler(p);
 		p.setBrush(st::activeButtonBg);
@@ -146,10 +146,10 @@ void AddArrowDown(not_null<RpWidget*> widget) {
 		result->update();
 	});
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		state->badge = QImage();
 	}, result->lifetime());
-	result->paintRequest() | rpl::start_with_next([=] {
+	result->paintRequest() | rpl::on_next([=] {
 		auto p = Painter(result);
 		const auto left = (result->width() - st::paidReactTopUserpic) / 2;
 		p.drawImage(left, top, photo->image(st::paidReactTopUserpic));
@@ -285,7 +285,7 @@ void FillTopReactors(
 	rpl::combine(
 		std::move(chosen),
 		std::move(shownPeer)
-	) | rpl::start_with_next([=](int chosen, uint64 barePeerId) {
+	) | rpl::on_next([=](int chosen, uint64 barePeerId) {
 		if (!state->initialChosen) {
 			state->initialChosen = chosen;
 		} else if (*state->initialChosen != chosen) {
@@ -375,7 +375,7 @@ void FillTopReactors(
 	rpl::combine(
 		state->updated.events_starting_with({}),
 		wrap->widthValue()
-	) | rpl::start_with_next([=](auto, int width) {
+	) | rpl::on_next([=](auto, int width) {
 		if (!state->widgets.empty()) {
 			parent->resize(parent->width(), state->widgets.back()->height());
 		}
@@ -405,7 +405,7 @@ void FillTopReactors(
 	const auto subtextHeight = st::starSelectInfoSubtext.style.font->height;
 	const auto height = titleHeight + subtextHeight;
 
-	result->paintRequest() | rpl::start_with_next([=] {
+	result->paintRequest() | rpl::on_next([=] {
 		auto p = QPainter(result);
 		auto hq = PainterHighQualityEnabler(p);
 		p.setPen(Qt::NoPen);
@@ -441,7 +441,7 @@ void FillTopReactors(
 		result->widthValue(),
 		titleLabel->widthValue(),
 		subtextLabel->widthValue()
-	) | rpl::start_with_next([=](int width, int titlew, int subtextw) {
+	) | rpl::on_next([=](int width, int titlew, int subtextw) {
 		const auto padding = st::starSelectInfoPadding;
 		titleLabel->moveToLeft((width - titlew) / 2, padding.top(), width);
 		subtextLabel->moveToLeft(
@@ -606,10 +606,10 @@ void PaidReactionsBox(
 				tr::rich)),
 		dark ? st::darkEditStarsText : st::boostText);
 	label->setTryMakeSimilarLines(true);
-	labelWrap->widthValue() | rpl::start_with_next([=](int width) {
+	labelWrap->widthValue() | rpl::on_next([=](int width) {
 		label->resizeToWidth(width);
 	}, label->lifetime());
-	label->heightValue() | rpl::start_with_next([=](int height) {
+	label->heightValue() | rpl::on_next([=](int height) {
 		const auto min = 2 * st::normalFont->height;
 		const auto skip = std::max((min - height) / 2, 0);
 		labelWrap->resize(labelWrap->width(), 2 * skip + height);
@@ -629,7 +629,7 @@ void PaidReactionsBox(
 			st::boxRowPadding + QMargins(0, 0, 0, skip),
 			style::al_top);
 		named->checkedValue(
-		) | rpl::start_with_next([=](bool show) {
+		) | rpl::on_next([=](bool show) {
 			state->shownPeer = show ? state->savedShownPeer : 0;
 		}, named->lifetime());
 	}
@@ -659,7 +659,7 @@ void PaidReactionsBox(
 
 	box->boxClosing() | rpl::filter([=] {
 		return state->shownPeer.current() != initialShownPeer;
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		args.send(0, state->shownPeer.current());
 	}, box->lifetime());
 
@@ -846,7 +846,7 @@ void PaidReactionSlider(
 			: std::max(value, min);
 	};
 
-	std::move(current) | rpl::start_with_next([=](int value) {
+	std::move(current) | rpl::on_next([=](int value) {
 		value = std::clamp(value, 1, max);
 		if (discreter.ratioToValue(slider->value()) != value) {
 			slider->setValue(discreter.valueToRatio(value));
@@ -879,7 +879,7 @@ void PaidReactionSlider(
 	const auto stars = Ui::CreateChild<Ui::RpWidget>(slider->parentWidget());
 	stars->show();
 	stars->raise();
-	slider->geometryValue() | rpl::start_with_next([=](QRect rect) {
+	slider->geometryValue() | rpl::on_next([=](QRect rect) {
 		stars->setGeometry(rect);
 	}, stars->lifetime());
 
@@ -888,7 +888,7 @@ void PaidReactionSlider(
 
 	const auto seekSize = st::paidReactSlider.seekSize.width();
 	const auto seekRadius = seekSize / 2.;
-	stars->paintRequest() | rpl::start_with_next([=] {
+	stars->paintRequest() | rpl::on_next([=] {
 		if (!state->animation.animating()) {
 			state->animation.start();
 		}
@@ -941,7 +941,7 @@ void AddStarSelectBalance(
 	rpl::combine(
 		balance->sizeValue(),
 		box->widthValue()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		balance->moveToLeft(
 			st::creditsHistoryRightSkip * 2,
 			st::creditsHistoryRightSkip);
@@ -981,7 +981,7 @@ not_null<Premium::BubbleWidget*> AddStarSelectBubble(
 		st::boxRowPadding);
 	bubble->show();
 	if (activeFgOverride) {
-		std::move(value) | rpl::start_with_next([=](int count) {
+		std::move(value) | rpl::on_next([=](int count) {
 			bubble->setBrushOverride(activeFgOverride(count));
 		}, bubble->lifetime());
 	}
@@ -1013,7 +1013,7 @@ object_ptr<RpWidget> MakeStarSelectInfoBlocks(
 			dark));
 	}
 	raw->resize(raw->width(), state->blocks.front()->height());
-	raw->widthValue() | rpl::start_with_next([=](int width) {
+	raw->widthValue() | rpl::on_next([=](int width) {
 		const auto count = int(state->blocks.size());
 		const auto skip = (st::boxRowPadding.left() / 2);
 		const auto single = (width - skip * (count - 1)) / float64(count);
diff --git a/Telegram/SourceFiles/platform/linux/tray_linux.cpp b/Telegram/SourceFiles/platform/linux/tray_linux.cpp
index 906278f458..d38631679f 100644
--- a/Telegram/SourceFiles/platform/linux/tray_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/tray_linux.cpp
@@ -298,7 +298,7 @@ void Tray::createIcon() {
 		base::qt_signal_producer(
 			_icon.get(),
 			&QSystemTrayIcon::activated
-		) | rpl::start_with_next([=](Reason reason) {
+		) | rpl::on_next([=](Reason reason) {
 			if (reason == QSystemTrayIcon::Context) {
 				showCustom();
 			} else {
@@ -312,7 +312,7 @@ void Tray::createIcon() {
 			_eventFilter = base::make_unique_q<TrayEventFilter>(
 				QCoreApplication::instance());
 			_eventFilter->contextMenuFilters(
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				showCustom();
 			}, _lifetime);
 		}
@@ -360,7 +360,7 @@ void Tray::addAction(rpl::producer<QString> text, Fn<void()> &&callback) {
 		const auto action = _menuCustom->addAction(QString(), callback);
 		rpl::duplicate(
 			text
-		) | rpl::start_with_next([=](const QString &text) {
+		) | rpl::on_next([=](const QString &text) {
 			action->setText(text);
 		}, _actionsLifetime);
 	}
@@ -369,7 +369,7 @@ void Tray::addAction(rpl::producer<QString> text, Fn<void()> &&callback) {
 		const auto action = _menu->addAction(QString(), std::move(callback));
 		std::move(
 			text
-		) | rpl::start_with_next([=](const QString &text) {
+		) | rpl::on_next([=](const QString &text) {
 			action->setText(text);
 		}, _actionsLifetime);
 	}
diff --git a/Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm b/Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm
index 3747d9b715..621ec5d937 100644
--- a/Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm
+++ b/Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm
@@ -329,7 +329,7 @@ Manager::Private::Private(Manager *manager)
 , _delegate([[NotificationDelegate alloc] initWithManager:manager managerId:_managerId])
 , _sounds(ResolveSoundsFolder()) {
 	Core::App().settings().workModeValue(
-	) | rpl::start_with_next([=](Core::Settings::WorkMode mode) {
+	) | rpl::on_next([=](Core::Settings::WorkMode mode) {
 		// We need to update the delegate _after_ the tray icon change was done in Qt.
 		// Because Qt resets the delegate.
 		crl::on_main(this, [=] {
diff --git a/Telegram/SourceFiles/platform/mac/overlay_widget_mac.mm b/Telegram/SourceFiles/platform/mac/overlay_widget_mac.mm
index ef544803e9..84892cf879 100644
--- a/Telegram/SourceFiles/platform/mac/overlay_widget_mac.mm
+++ b/Telegram/SourceFiles/platform/mac/overlay_widget_mac.mm
@@ -182,12 +182,12 @@ object_ptr<Ui::AbstractButton> MacOverlayWidgetHelper::create(
 	rpl::merge(
 		_data->masterOpacity.changes() | rpl::to_empty,
 		_data->maximized.changes() | rpl::to_empty
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		raw->update();
 	}, raw->lifetime());
 
 	_data->clearStateRequests.events(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		raw->clearState();
 		raw->update();
 		state->over = raw->isOver();
@@ -273,7 +273,7 @@ object_ptr<Ui::AbstractButton> MacOverlayWidgetHelper::create(
 	};
 
 	raw->paintRequest(
-	) | rpl::start_with_next([=, padding = info.padding] {
+	) | rpl::on_next([=, padding = info.padding] {
 		updateOver();
 		prepareFrame();
 
diff --git a/Telegram/SourceFiles/platform/mac/touchbar/items/mac_pinned_chats_item.mm b/Telegram/SourceFiles/platform/mac/touchbar/items/mac_pinned_chats_item.mm
index ca4f88dadc..747ef0d403 100644
--- a/Telegram/SourceFiles/platform/mac/touchbar/items/mac_pinned_chats_item.mm
+++ b/Telegram/SourceFiles/platform/mac/touchbar/items/mac_pinned_chats_item.mm
@@ -428,7 +428,7 @@ NSRect PeerRectByIndex(int index) {
 	_gestures.events(
 	) | rpl::filter([=] {
 		return !(*waitForFinish);
-	}) | rpl::start_with_next([=](
+	}) | rpl::on_next([=](
 			not_null<NSPressGestureRecognizer*> gesture) {
 		const auto currentPosition = [gesture locationInView:self].x;
 
@@ -444,7 +444,7 @@ NSRect PeerRectByIndex(int index) {
 	}, _lifetime);
 
 	_session->data().pinnedDialogsOrderUpdated(
-	) | rpl::start_with_next(cancelCurrent, _lifetime);
+	) | rpl::on_next(cancelCurrent, _lifetime);
 
 	_lifetime.add([=] {
 		for (const auto &pin : _pins) {
@@ -477,7 +477,7 @@ NSRect PeerRectByIndex(int index) {
 	// manually, before it leads to crashes.
 	std::move(
 		touchBarSwitches
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_lifetime.destroy();
 	}, _lifetime);
 
@@ -503,7 +503,7 @@ NSRect PeerRectByIndex(int index) {
 			kCircleDiameter)];
 	};
 	lastDialogsCount->changes(
-	) | rpl::start_with_next(updatePanelSize, _lifetime);
+	) | rpl::on_next(updatePanelSize, _lifetime);
 	const auto singleUserpic = [=](const auto &pin) {
 		if (IsSelfPeer(pin->peer)) {
 			pin->userpic = _savedMessages;
@@ -537,7 +537,7 @@ NSRect PeerRectByIndex(int index) {
 	};
 	const auto listenToDownloaderFinished = [=] {
 		_session->downloaderTaskFinished(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			const auto all = ranges::all_of(_pins, [=](const auto &pin) {
 				return (!pin->peer->hasUserpic())
 					|| (!Ui::PeerUserpicLoading(pin->userpicView));
@@ -578,7 +578,7 @@ NSRect PeerRectByIndex(int index) {
 				pin->peer,
 				UpdateFlag::OnlineStatus) | to_peer,
 			onlineChanges->events()
-		) | rpl::start_with_next([=](PeerData *peer) {
+		) | rpl::on_next([=](PeerData *peer) {
 			const auto it = ranges::find(_pins, peer, &Pin::peer);
 			if (it == end(_pins)) {
 				return;
@@ -644,7 +644,7 @@ NSRect PeerRectByIndex(int index) {
 			_session->changes().peerUpdates(
 				peer,
 				UpdateFlag::Photo
-			) | rpl::start_with_next([=](const Data::PeerUpdate &update) {
+			) | rpl::on_next([=](const Data::PeerUpdate &update) {
 				_pins[index]->userpicView = update.peer->createUserpicView();
 				listenToDownloaderFinished();
 			}, *peerChangedLifetime);
@@ -666,7 +666,7 @@ NSRect PeerRectByIndex(int index) {
 					peer,
 					UpdateFlag::Notifications
 				) | rpl::to_empty
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				updateBadge(_pins[index]);
 			}, *peerChangedLifetime);
 		}
@@ -676,7 +676,7 @@ NSRect PeerRectByIndex(int index) {
 
 	rpl::single(rpl::empty) | rpl::then(
 		_session->data().pinnedDialogsOrderUpdated()
-	) | rpl::start_with_next(updatePinnedChats, _lifetime);
+	) | rpl::on_next(updatePinnedChats, _lifetime);
 
 	const auto ArchiveId = Data::Folder::kId;
 	rpl::single(
@@ -685,7 +685,7 @@ NSRect PeerRectByIndex(int index) {
 		_session->data().chatsListChanges()
 	) | rpl::filter([](Data::Folder *folder) {
 		return folder && (folder->id() == ArchiveId);
-	}) | rpl::start_with_next([=](Data::Folder *folder) {
+	}) | rpl::on_next([=](Data::Folder *folder) {
 		_hasArchive = !folder->chatsList()->empty();
 		if (_archive.isNull()) {
 			_archive = ArchiveUserpic(folder);
@@ -706,7 +706,7 @@ NSRect PeerRectByIndex(int index) {
 	const auto localGuard = _lifetime.make_state<base::has_weak_ptr>();
 
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		crl::on_main(&(*localGuard), [=] {
 			updateOnlineColor();
 			if (const auto f = _session->data().folderLoaded(ArchiveId)) {
diff --git a/Telegram/SourceFiles/platform/mac/touchbar/items/mac_scrubber_item.mm b/Telegram/SourceFiles/platform/mac/touchbar/items/mac_scrubber_item.mm
index 25b03e2a8c..e3967ef1f5 100644
--- a/Telegram/SourceFiles/platform/mac/touchbar/items/mac_scrubber_item.mm
+++ b/Telegram/SourceFiles/platform/mac/touchbar/items/mac_scrubber_item.mm
@@ -581,7 +581,7 @@ void AppendEmojiPacks(
 				? Data::CanSend(topic, right)
 				: Data::CanSend(peer, right));
 	}) | rpl::distinct_until_changed(
-	) | rpl::start_with_next([=](bool value) {
+	) | rpl::on_next([=](bool value) {
 		[self dismissPopover:nil];
 	}, _lifetime);
 
@@ -606,7 +606,7 @@ void AppendEmojiPacks(
 			Core::App().settings().recentEmojiUpdated(),
 			Ui::Emoji::Updated()
 		) | rpl::map_to(ScrubberItemType::Emoji)
-	) | rpl::start_with_next([=](ScrubberItemType type) {
+	) | rpl::on_next([=](ScrubberItemType type) {
 		_waitingForUpdate = type;
 	}, _lifetime);
 
@@ -628,7 +628,7 @@ void AppendEmojiPacks(
 			controller:_controller
 			items:_itemsDataSource] autorelease];
 		auto &lifetime = [item lifetime];
-		[item closeRequests] | rpl::start_with_next([=] {
+		[item closeRequests] | rpl::on_next([=] {
 			[self dismissPopover:nil];
 			[self updateStickers];
 		}, lifetime);
@@ -668,7 +668,7 @@ void AppendEmojiPacks(
 	const auto isPerformedOnMain = loadingLifetime->make_state<bool>(true);
 	const auto localGuard = loadingLifetime->make_state<base::has_weak_ptr>();
 	_session->downloaderTaskFinished(
-	) | rpl::start_with_next(crl::guard(&(*localGuard), [=] {
+	) | rpl::on_next(crl::guard(&(*localGuard), [=] {
 		if (*isPerformedOnMain) {
 			crl::on_main(&(*localGuard), [=] {
 				for (auto &sticker : _itemsDataSource->stickers) {
diff --git a/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_audio.mm b/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_audio.mm
index 32dd548b3b..b20f59919b 100644
--- a/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_audio.mm
+++ b/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_audio.mm
@@ -118,7 +118,7 @@ const auto kCurrentPositionItemIdentifier = Format(@"currentPosition");
 				: mediaPlayer->previous(kSongType); });
 		rpl::duplicate(
 			_trackState
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			const auto newValue = isNext
 				? mediaPlayer->nextAvailable(kSongType)
 				: mediaPlayer->previousAvailable(kSongType);
diff --git a/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_controls.mm b/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_controls.mm
index 3091701102..48f97145c9 100644
--- a/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_controls.mm
+++ b/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_controls.mm
@@ -76,7 +76,7 @@ inline NSString *FormatTime(TimeId time) {
 		) | rpl::map([](const auto &state) {
 			return state.length / 1000;
 		}) | rpl::distinct_until_changed()
-	) | rpl::start_with_next([=](int position, int length) {
+	) | rpl::on_next([=](int position, int length) {
 		[_text setString:[NSString stringWithFormat:@"%@ / %@",
 			FormatTime(position),
 			FormatTime(length)]];
@@ -86,7 +86,7 @@ inline NSString *FormatTime(TimeId time) {
 	}, _lifetime);
 
 	textLength->changes(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto size = [_text sizeWithAttributes:Attributes()];
 		_width = size.width + kPadding * 2;
 		_height = size.height;
@@ -182,7 +182,7 @@ NSButton *CreateTouchBarButtonWithTwoStates(
 
 	std::move(
 		stateChanged
-	) | rpl::start_with_next([=](bool isChangedToFirstState) {
+	) | rpl::on_next([=](bool isChangedToFirstState) {
 		button.image = isChangedToFirstState ? icon1 : icon2;
 	}, lifetime);
 
@@ -233,7 +233,7 @@ NSSliderTouchBarItem *CreateTouchBarSlider(
 
 	std::move(
 		stateChanged
-	) | rpl::start_with_next([=](const Media::Player::TrackState &state) {
+	) | rpl::on_next([=](const Media::Player::TrackState &state) {
 		const auto stop = Media::Player::IsStoppedOrStopping(state.state);
 		const auto duration = double(stop ? 0 : state.length);
 		auto slider = seekBar.slider;
diff --git a/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_manager.mm b/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_manager.mm
index ea273dab7f..3732eefb80 100644
--- a/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_manager.mm
+++ b/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_manager.mm
@@ -98,7 +98,7 @@ const auto kAudioItemIdentifier = @"touchbarAudio";
 		rpl::single(false) | rpl::then(Core::App().passcodeLockChanges()),
 		rpl::single(false) | rpl::then(std::move(audioPlayer)),
 		rpl::single(false) | rpl::then(std::move(voiceRecording))
-	) | rpl::start_with_next([=](
+	) | rpl::on_next([=](
 			Main::Session *session,
 			bool lock,
 			bool audio,
@@ -148,7 +148,7 @@ const auto kAudioItemIdentifier = @"touchbarAudio";
 					? Data::CanSendAnyOf(topic, rights)
 					: (peer && Data::CanSendAnyOf(peer, rights));
 			}) | rpl::distinct_until_changed()
-		) | rpl::start_with_next([=](
+		) | rpl::on_next([=](
 				Ui::MarkdownEnabledState state,
 				bool hasActiveChat) {
 			item.groupTouchBar.defaultItemIdentifiers = @[
@@ -166,7 +166,7 @@ const auto kAudioItemIdentifier = @"touchbarAudio";
 		auto *touchBar = [[[TouchBarAudioPlayer alloc] init]
 			autorelease];
 		item.groupTouchBar = touchBar;
-		[touchBar closeRequests] | rpl::start_with_next([=] {
+		[touchBar closeRequests] | rpl::on_next([=] {
 			Media::Player::instance()->stopAndClose();
 		}, [item lifetime]);
 		return [item autorelease];
diff --git a/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_media_view.mm b/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_media_view.mm
index 9d0869a07f..f0b3737f16 100644
--- a/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_media_view.mm
+++ b/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_media_view.mm
@@ -161,7 +161,7 @@ const auto kSeekItemIdentifier = @"seekBar";
 	std::move(
 		display
 	) | rpl::distinct_until_changed(
-	) | rpl::start_with_next([=](ItemType type) {
+	) | rpl::on_next([=](ItemType type) {
 		TouchBar::CustomEnterToCocoaEventLoop([=] {
 			self.defaultItemIdentifiers = items(type);
 		});
diff --git a/Telegram/SourceFiles/platform/mac/tray_mac.mm b/Telegram/SourceFiles/platform/mac/tray_mac.mm
index beefa11005..91de70b1e4 100644
--- a/Telegram/SourceFiles/platform/mac/tray_mac.mm
+++ b/Telegram/SourceFiles/platform/mac/tray_mac.mm
@@ -260,11 +260,11 @@ NativeIcon::NativeIcon()
 			| NSKeyValueObservingOptionInitial
 		context:nil];
 
-	[_delegate closes] | rpl::start_with_next([=] {
+	[_delegate closes] | rpl::on_next([=] {
 		_status.menu = nil;
 	}, _lifetime);
 
-	[_delegate appearanceChanges] | rpl::start_with_next([=] {
+	[_delegate appearanceChanges] | rpl::on_next([=] {
 		updateIcon();
 	}, _lifetime);
 
@@ -336,7 +336,7 @@ void Tray::createIcon() {
 		// On macOS we are activating the window on click
 		// instead of showing the menu, when the window is not activated.
 		_nativeIcon->clicks(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			if (IsAnyActiveForTrayMenu()) {
 				_nativeIcon->showMenu(_menu.get());
 			} else {
@@ -379,7 +379,7 @@ void Tray::addAction(rpl::producer<QString> text, Fn<void()> &&callback) {
 	const auto action = _menu->addAction(QString(), std::move(callback));
 	std::move(
 		text
-	) | rpl::start_with_next([=](const QString &text) {
+	) | rpl::on_next([=](const QString &text) {
 		action->setText(text);
 	}, _actionsLifetime);
 }
diff --git a/Telegram/SourceFiles/platform/platform_overlay_widget.cpp b/Telegram/SourceFiles/platform/platform_overlay_widget.cpp
index 3e07e8b971..03fb75e315 100644
--- a/Telegram/SourceFiles/platform/platform_overlay_widget.cpp
+++ b/Telegram/SourceFiles/platform/platform_overlay_widget.cpp
@@ -85,12 +85,12 @@ object_ptr<Ui::AbstractButton> DefaultOverlayWidgetHelper::Buttons::create(
 	rpl::merge(
 		_masterOpacity.changes() | rpl::to_empty,
 		_maximized.changes() | rpl::to_empty
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		raw->update();
 	}, raw->lifetime());
 
 	_clearStateRequests.events(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		raw->clearState();
 		raw->update();
 		state->over = raw->isOver();
@@ -152,7 +152,7 @@ object_ptr<Ui::AbstractButton> DefaultOverlayWidgetHelper::Buttons::create(
 	};
 
 	raw->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateOver();
 		prepareFrame();
 
diff --git a/Telegram/SourceFiles/platform/win/main_window_win.cpp b/Telegram/SourceFiles/platform/win/main_window_win.cpp
index 5061ef7d08..159ca539cd 100644
--- a/Telegram/SourceFiles/platform/win/main_window_win.cpp
+++ b/Telegram/SourceFiles/platform/win/main_window_win.cpp
@@ -393,7 +393,7 @@ MainWindow::MainWindow(not_null<Window::Controller*> controller)
 	using namespace rpl::mappers;
 	Core::App().appDeactivatedValue(
 	) | rpl::distinct_until_changed(
-	) | rpl::filter(_1) | rpl::start_with_next([=] {
+	) | rpl::filter(_1) | rpl::on_next([=] {
 		_lastDeactivateTime = crl::now();
 	}, lifetime());
 
@@ -402,7 +402,7 @@ MainWindow::MainWindow(not_null<Window::Controller*> controller)
 
 void MainWindow::setupPreviewPasscodeLock() {
 	Core::App().passcodeLockValue(
-	) | rpl::start_with_next([=](bool locked) {
+	) | rpl::on_next([=](bool locked) {
 		// Use iconic bitmap instead of the window content if passcoded.
 		BOOL fForceIconic = locked ? TRUE : FALSE;
 		BOOL fHasIconicBitmap = fForceIconic;
@@ -429,7 +429,7 @@ void MainWindow::setupNativeWindowFrame() {
 	rpl::combine(
 		std::move(nativeFrame),
 		Window::Theme::IsNightModeValue()
-	) | rpl::skip(1) | rpl::start_with_next([=](bool native, bool night) {
+	) | rpl::skip(1) | rpl::on_next([=](bool native, bool night) {
 		validateWindowTheme(native, night);
 	}, lifetime());
 }
diff --git a/Telegram/SourceFiles/platform/win/notifications_manager_win.cpp b/Telegram/SourceFiles/platform/win/notifications_manager_win.cpp
index 2692923efd..3efdb3bee9 100644
--- a/Telegram/SourceFiles/platform/win/notifications_manager_win.cpp
+++ b/Telegram/SourceFiles/platform/win/notifications_manager_win.cpp
@@ -475,7 +475,7 @@ private:
 Manager::Private::Private(Manager *instance)
 : _guarded(std::make_shared<Manager*>(instance)) {
 	ToastActivations(
-	) | rpl::start_with_next([=](const ToastActivation &activation) {
+	) | rpl::on_next([=](const ToastActivation &activation) {
 		handleActivation(activation);
 	}, _lifetime);
 }
diff --git a/Telegram/SourceFiles/platform/win/tray_win.cpp b/Telegram/SourceFiles/platform/win/tray_win.cpp
index bc496e8ebd..a58214f912 100644
--- a/Telegram/SourceFiles/platform/win/tray_win.cpp
+++ b/Telegram/SourceFiles/platform/win/tray_win.cpp
@@ -202,7 +202,7 @@ void Tray::createIcon() {
 			&QPlatformSystemTrayIcon::contextMenuRequested
 		) | rpl::filter([=] {
 			return _menu != nullptr;
-		}) | rpl::start_with_next([=](
+		}) | rpl::on_next([=](
 				QPoint globalNativePosition,
 				const QPlatformScreen *screen) {
 			_aboutToShowRequests.fire({});
@@ -270,7 +270,7 @@ void Tray::addAction(rpl::producer<QString> text, Fn<void()> &&callback) {
 	auto callbackLater = crl::guard(_menu.get(), [=] {
 		using namespace rpl::mappers;
 		_callbackFromTrayLifetime = _menu->shownValue(
-		) | rpl::filter(!_1) | rpl::take(1) | rpl::start_with_next([=] {
+		) | rpl::filter(!_1) | rpl::take(1) | rpl::on_next([=] {
 			callback();
 		});
 	});
@@ -278,7 +278,7 @@ void Tray::addAction(rpl::producer<QString> text, Fn<void()> &&callback) {
 	const auto action = _menu->addAction(QString(), std::move(callbackLater));
 	std::move(
 		text
-	) | rpl::start_with_next([=](const QString &text) {
+	) | rpl::on_next([=](const QString &text) {
 		action->setText(text);
 	}, _actionsLifetime);
 }
diff --git a/Telegram/SourceFiles/profile/profile_back_button.cpp b/Telegram/SourceFiles/profile/profile_back_button.cpp
index 15b2f28582..5de124d152 100644
--- a/Telegram/SourceFiles/profile/profile_back_button.cpp
+++ b/Telegram/SourceFiles/profile/profile_back_button.cpp
@@ -30,12 +30,12 @@ BackButton::BackButton(
 
 	std::move(
 		oneColumnValue
-	) | rpl::start_with_next([=](bool oneColumn) {
+	) | rpl::on_next([=](bool oneColumn) {
 		if (!oneColumn) {
 			_unreadBadgeLifetime.destroy();
 		} else if (!_unreadBadgeLifetime) {
 			_session->data().unreadBadgeChanges(
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				rtlupdate(
 					0,
 					0,
diff --git a/Telegram/SourceFiles/settings/business/settings_away_message.cpp b/Telegram/SourceFiles/settings/business/settings_away_message.cpp
index 181582fa3f..27c89ac41c 100644
--- a/Telegram/SourceFiles/settings/business/settings_away_message.cpp
+++ b/Telegram/SourceFiles/settings/business/settings_away_message.cpp
@@ -106,7 +106,7 @@ void AddAwayScheduleSelector(
 	const auto customInner = customWrap->entity();
 	customWrap->toggleOn(group->value() | rpl::map(_1 == Type::Custom));
 
-	group->changes() | rpl::start_with_next([=](Type value) {
+	group->changes() | rpl::on_next([=](Type value) {
 		auto copy = data->current();
 		copy.type = value;
 		*data = copy;
@@ -262,7 +262,7 @@ void AwayMessage::setupContent(
 	)));
 
 	_enabled = enabled->toggledValue();
-	_enabled.value() | rpl::filter(_1) | rpl::start_with_next([=] {
+	_enabled.value() | rpl::filter(_1) | rpl::on_next([=] {
 		if (!_canHave.current()) {
 			controller->showToast({
 				.text = { tr::lng_away_limit_reached(tr::now) },
diff --git a/Telegram/SourceFiles/settings/business/settings_chat_intro.cpp b/Telegram/SourceFiles/settings/business/settings_chat_intro.cpp
index 45c7107505..26e1bcdf53 100644
--- a/Telegram/SourceFiles/settings/business/settings_chat_intro.cpp
+++ b/Telegram/SourceFiles/settings/business/settings_chat_intro.cpp
@@ -231,20 +231,20 @@ rpl::producer<std::shared_ptr<StickerPlayer>> IconPlayerValue(
 	};
 	const auto state = right->lifetime().make_state<State>();
 	state->panel.someCustomChosen(
-	) | rpl::start_with_next([=](StickerPanel::CustomChosen chosen) {
+	) | rpl::on_next([=](StickerPanel::CustomChosen chosen) {
 		stickerChosen(chosen.sticker);
 	}, raw->lifetime());
 
 	std::move(
 		stickerValue
-	) | rpl::start_with_next([=](DocumentData *sticker) {
+	) | rpl::on_next([=](DocumentData *sticker) {
 		state->sticker = sticker;
 		if (sticker) {
 			right->resize(button.emojiWidth + button.added, right->height());
 			IconPlayerValue(
 				sticker,
 				[=] { right->update(); }
-			) | rpl::start_with_next([=](
+			) | rpl::on_next([=](
 					std::shared_ptr<StickerPlayer> player) {
 				state->player = std::move(player);
 				right->update();
@@ -260,14 +260,14 @@ rpl::producer<std::shared_ptr<StickerPlayer>> IconPlayerValue(
 	rpl::combine(
 		raw->sizeValue(),
 		right->widthValue()
-	) | rpl::start_with_next([=](QSize outer, int width) {
+	) | rpl::on_next([=](QSize outer, int width) {
 		right->resize(width, outer.height());
 		const auto skip = st::settingsButton.padding.right();
 		right->moveToRight(skip - button.added, 0, outer.width());
 	}, right->lifetime());
 
 	right->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(right);
 		const auto height = right->height();
 		if (state->player) {
@@ -352,13 +352,13 @@ PreviewWrap::PreviewWrap(
 	_style->apply(_theme.get());
 
 	session->data().viewRepaintRequest(
-	) | rpl::start_with_next([=](not_null<const Element*> view) {
+	) | rpl::on_next([=](not_null<const Element*> view) {
 		if (view == _view->view()) {
 			update();
 		}
 	}, lifetime());
 
-	session->downloaderTaskFinished() | rpl::start_with_next([=] {
+	session->downloaderTaskFinished() | rpl::on_next([=] {
 		update();
 	}, lifetime());
 
@@ -374,7 +374,7 @@ void PreviewWrap::prepare(rpl::producer<Data::ChatIntro> value) {
 		_history.get(),
 		_delegate.get());
 
-	std::move(value) | rpl::start_with_next([=](Data::ChatIntro intro) {
+	std::move(value) | rpl::on_next([=](Data::ChatIntro intro) {
 		_view->make(std::move(intro), true);
 		if (width() >= st::msgMinWidth) {
 			resizeTo(width());
@@ -385,7 +385,7 @@ void PreviewWrap::prepare(rpl::producer<Data::ChatIntro> value) {
 	widthValue(
 	) | rpl::filter([=](int width) {
 		return width >= st::msgMinWidth;
-	}) | rpl::start_with_next([=](int width) {
+	}) | rpl::on_next([=](int width) {
 		resizeTo(width);
 	}, lifetime());
 }
@@ -433,7 +433,7 @@ void StickerPanel::show(Descriptor &&descriptor) {
 		_panel->shownValue(
 		) | rpl::filter([=] {
 			return (_panelButton != nullptr);
-		}) | rpl::start_with_next([=](bool shown) {
+		}) | rpl::on_next([=](bool shown) {
 			if (shown) {
 				_panelButton->installEventFilter(_panel.get());
 			} else {
@@ -487,7 +487,7 @@ void StickerPanel::create(const Descriptor &descriptor) {
 	_panel->hide();
 
 	_panel->selector()->fileChosen(
-	) | rpl::start_with_next([=](ChatHelpers::FileChosen data) {
+	) | rpl::on_next([=](ChatHelpers::FileChosen data) {
 		_someCustomChosen.fire({ data.document });
 		_panel->hideAnimated();
 	}, _panel->lifetime());
@@ -585,13 +585,13 @@ void ChatIntro::setupContent(
 		}));
 	Ui::AddSkip(content);
 
-	title->changes() | rpl::start_with_next([=] {
+	title->changes() | rpl::on_next([=] {
 		change([&](Data::ChatIntro &intro) {
 			intro.title = title->getLastText();
 		});
 	}, title->lifetime());
 
-	description->changes() | rpl::start_with_next([=] {
+	description->changes() | rpl::on_next([=] {
 		change([&](Data::ChatIntro &intro) {
 			intro.description = description->getLastText();
 		});
diff --git a/Telegram/SourceFiles/settings/business/settings_chat_links.cpp b/Telegram/SourceFiles/settings/business/settings_chat_links.cpp
index 2cd44ca23e..444059ecd0 100644
--- a/Telegram/SourceFiles/settings/business/settings_chat_links.cpp
+++ b/Telegram/SourceFiles/settings/business/settings_chat_links.cpp
@@ -388,11 +388,11 @@ void EditChatLinkBox(
 	emojiPanel->hide();
 	emojiPanel->selector()->setCurrentPeer(peer);
 	emojiPanel->selector()->emojiChosen(
-	) | rpl::start_with_next([=](ChatHelpers::EmojiChosen data) {
+	) | rpl::on_next([=](ChatHelpers::EmojiChosen data) {
 		Ui::InsertEmojiAtCursor(field->textCursor(), data.emoji);
 	}, field->lifetime());
 	emojiPanel->selector()->customEmojiChosen(
-	) | rpl::start_with_next([=](ChatHelpers::FileChosen data) {
+	) | rpl::on_next([=](ChatHelpers::FileChosen data) {
 		Data::InsertCustomEmoji(field, data.document);
 	}, field->lifetime());
 
@@ -448,21 +448,21 @@ void EditChatLinkBox(
 	base::install_event_filter(emojiPanel, outer, filterCallback);
 
 	field->submits(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		title->setFocus();
 	}, field->lifetime());
 	field->cancelled(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		box->closeBox();
 	}, field->lifetime());
 
 	title->submits(
-	) | rpl::start_with_next(save, title->lifetime());
+	) | rpl::on_next(save, title->lifetime());
 
 	rpl::combine(
 		box->sizeValue(),
 		field->geometryValue()
-	) | rpl::start_with_next([=](QSize outer, QRect inner) {
+	) | rpl::on_next([=](QSize outer, QRect inner) {
 		emojiToggle->moveToLeft(
 			inner.x() + inner.width() - emojiToggle->width(),
 			inner.y() + st::settingsChatLinkEmojiTop);
@@ -485,7 +485,7 @@ void EditChatLinkBox(
 		}
 	});
 	field->changes(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		checkChangedTimer->callOnce(kChangesDebounceTimeout);
 		box->setCloseByOutsideClick(false);
 	}, field->lifetime());
@@ -525,12 +525,12 @@ LinksController::LinksController(
 : _window(window)
 , _session(&window->session()) {
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_icon = QImage();
 	}, _lifetime);
 
 	_session->api().chatLinks().updates(
-	) | rpl::start_with_next([=](const Api::ChatLinkUpdate &update) {
+	) | rpl::on_next([=](const Api::ChatLinkUpdate &update) {
 		if (!update.now) {
 			if (removeRow(update.was)) {
 				delegate()->peerListRefreshRows();
diff --git a/Telegram/SourceFiles/settings/business/settings_chatbots.cpp b/Telegram/SourceFiles/settings/business/settings_chatbots.cpp
index e033635267..76df1953bd 100644
--- a/Telegram/SourceFiles/settings/business/settings_chatbots.cpp
+++ b/Telegram/SourceFiles/settings/business/settings_chatbots.cpp
@@ -217,7 +217,7 @@ Main::Session &PreviewController::session() const {
 		state->timer.setCallback(push);
 		state->lastText = field->getLastText();
 		consumer.put_next_copy(field->getLastText());
-		field->changes() | rpl::start_with_next([=] {
+		field->changes() | rpl::on_next([=] {
 			const auto &text = field->getLastText();
 			const auto was = std::exchange(state->lastText, text);
 			if (std::abs(int(text.size()) - int(was.size())) == 1) {
@@ -330,7 +330,7 @@ Main::Session &PreviewController::session() const {
 	const auto child = inner->lifetime().make_state<Ui::RpWidget*>(nullptr);
 	std::move(state) | rpl::filter([=](BotState state) {
 		return state.state != LookupState::Loading;
-	}) | rpl::start_with_next([=](BotState state) {
+	}) | rpl::on_next([=](BotState state) {
 		raw->toggle(
 			(state.state == LookupState::Ready
 				|| state.state == LookupState::Unsupported),
@@ -365,7 +365,7 @@ Main::Session &PreviewController::session() const {
 			rpl::combine(
 				content->sizeValue(),
 				label->sizeValue()
-			) | rpl::start_with_next([=](QSize size, QSize inner) {
+			) | rpl::on_next([=](QSize size, QSize inner) {
 				label->move(
 					(size.width() - inner.width()) / 2,
 					(size.height() - inner.height()) / 2);
@@ -377,11 +377,11 @@ Main::Session &PreviewController::session() const {
 		}
 		(*child)->show();
 
-		inner->widthValue() | rpl::start_with_next([=](int width) {
+		inner->widthValue() | rpl::on_next([=](int width) {
 			(*child)->resizeToWidth(width);
 		}, (*child)->lifetime());
 
-		(*child)->heightValue() | rpl::start_with_next([=](int height) {
+		(*child)->heightValue() | rpl::on_next([=](int height) {
 			inner->resize(inner->width(), height + st::contactSkip);
 		}, inner->lifetime());
 	}, inner->lifetime());
@@ -474,7 +474,7 @@ void Chatbots::setupContent() {
 	_detailsWrap = content->add(object_ptr<Ui::VerticalLayout>(content));
 
 	refreshDetails();
-	_botValue.changes() | rpl::start_with_next([=](const BotState &value) {
+	_botValue.changes() | rpl::on_next([=](const BotState &value) {
 		_permissions = Defaults();
 		refreshDetails();
 	}, lifetime());
@@ -521,7 +521,7 @@ void Chatbots::refreshDetails() {
 
 	std::move(
 		permissions.changes
-	) | rpl::start_with_next([=](Data::ChatbotsPermissions now) {
+	) | rpl::on_next([=](Data::ChatbotsPermissions now) {
 		const auto warn = [&](tr::phrase<lngtag_bot> text) {
 			controller()->show(Ui::MakeInformBox({
 				.text = text(tr::now, lt_bot, Ui::Text::Bold(bot->name()), Ui::Text::RichLangValue),
diff --git a/Telegram/SourceFiles/settings/business/settings_greeting.cpp b/Telegram/SourceFiles/settings/business/settings_greeting.cpp
index b1f69022b0..3879126534 100644
--- a/Telegram/SourceFiles/settings/business/settings_greeting.cpp
+++ b/Telegram/SourceFiles/settings/business/settings_greeting.cpp
@@ -159,7 +159,7 @@ void Greeting::setupContent(
 	)));
 
 	_enabled = enabled->toggledValue();
-	_enabled.value() | rpl::filter(_1) | rpl::start_with_next([=] {
+	_enabled.value() | rpl::filter(_1) | rpl::on_next([=] {
 		if (!_canHave.current()) {
 			controller->showToast({
 				.text = { tr::lng_greeting_limit_reached(tr::now) },
diff --git a/Telegram/SourceFiles/settings/business/settings_location.cpp b/Telegram/SourceFiles/settings/business/settings_location.cpp
index 6b659d0441..da6b668835 100644
--- a/Telegram/SourceFiles/settings/business/settings_location.cpp
+++ b/Telegram/SourceFiles/settings/business/settings_location.cpp
@@ -137,11 +137,11 @@ void Location::setupPicker(not_null<Ui::VerticalLayout*> content) {
 		st::settingsChatbotsUsernameMargins);
 
 	_data.value(
-	) | rpl::start_with_next([=](const Data::BusinessLocation &location) {
+	) | rpl::on_next([=](const Data::BusinessLocation &location) {
 		address->setText(location.address);
 	}, address->lifetime());
 
-	address->changes() | rpl::start_with_next([=] {
+	address->changes() | rpl::on_next([=] {
 		auto copy = _data.current();
 		copy.address = address->getLastText();
 		_data = std::move(copy);
@@ -160,7 +160,7 @@ void Location::setupPicker(not_null<Ui::VerticalLayout*> content) {
 		return location.point.has_value();
 	}));
 
-	maptoggle->toggledValue() | rpl::start_with_next([=](bool toggled) {
+	maptoggle->toggledValue() | rpl::on_next([=](bool toggled) {
 		if (!toggled) {
 			auto copy = _data.current();
 			if (copy.point.has_value()) {
@@ -185,7 +185,7 @@ void Location::setupPicker(not_null<Ui::VerticalLayout*> content) {
 	map->resize(map->width(), st::locationSize.height());
 
 	_data.value(
-	) | rpl::start_with_next([=](const Data::BusinessLocation &location) {
+	) | rpl::on_next([=](const Data::BusinessLocation &location) {
 		const auto image = location.point.has_value()
 			? controller()->session().data().location(*location.point).get()
 			: nullptr;
@@ -197,7 +197,7 @@ void Location::setupPicker(not_null<Ui::VerticalLayout*> content) {
 		_map = image;
 	}, mapWrap->lifetime());
 
-	map->paintRequest() | rpl::start_with_next([=] {
+	map->paintRequest() | rpl::on_next([=] {
 		auto p = QPainter(map);
 
 		const auto left = (map->width() - st::locationSize.width()) / 2;
@@ -219,7 +219,7 @@ void Location::setupPicker(not_null<Ui::VerticalLayout*> content) {
 	}, map->lifetime());
 
 	controller()->session().downloaderTaskFinished(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		map->update();
 	}, map->lifetime());
 
@@ -227,7 +227,7 @@ void Location::setupPicker(not_null<Ui::VerticalLayout*> content) {
 		chooseOnMap();
 	});
 
-	showFinishes() | rpl::start_with_next([=] {
+	showFinishes() | rpl::on_next([=] {
 		address->setFocus();
 	}, address->lifetime());
 }
diff --git a/Telegram/SourceFiles/settings/business/settings_quick_replies.cpp b/Telegram/SourceFiles/settings/business/settings_quick_replies.cpp
index 9c4bcf11bb..7850f71998 100644
--- a/Telegram/SourceFiles/settings/business/settings_quick_replies.cpp
+++ b/Telegram/SourceFiles/settings/business/settings_quick_replies.cpp
@@ -87,7 +87,7 @@ void QuickReplies::setupContent(
 	rpl::combine(
 		_count.value(),
 		ShortcutsLimitValue(&controller->session())
-	) | rpl::start_with_next([=](int count, int limit) {
+	) | rpl::on_next([=](int count, int limit) {
 		while (addWrap->count()) {
 			delete addWrap->widgetAt(0);
 		}
@@ -130,7 +130,7 @@ void QuickReplies::setupContent(
 		object_ptr<Ui::VerticalLayout>(content));
 	rpl::single(rpl::empty) | rpl::then(
 		messages->shortcutsChanged()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto old = inner->count();
 
 		const auto &shortcuts = messages->shortcuts();
@@ -228,7 +228,7 @@ void EditShortcutNameBox(
 		}
 	};
 	field->submits(
-	) | rpl::start_with_next(callback, field->lifetime());
+	) | rpl::on_next(callback, field->lifetime());
 	box->addButton(tr::lng_settings_save(), callback);
 	box->addButton(tr::lng_cancel(), [=] {
 		box->closeBox();
diff --git a/Telegram/SourceFiles/settings/business/settings_recipients_helper.cpp b/Telegram/SourceFiles/settings/business/settings_recipients_helper.cpp
index e80a0cff27..039a35417e 100644
--- a/Telegram/SourceFiles/settings/business/settings_recipients_helper.cpp
+++ b/Telegram/SourceFiles/settings/business/settings_recipients_helper.cpp
@@ -112,7 +112,7 @@ not_null<FilterChatsPreview*> SetupBusinessChatsPreview(
 		base::flat_set<not_null<History*>>(begin(peers), end(peers))));
 
 	preview->flagRemoved(
-	) | rpl::start_with_next([=](Flag flag) {
+	) | rpl::on_next([=](Flag flag) {
 		*locked = true;
 		*data = Data::BusinessChats{
 			data->current().types & ~FlagsToTypes(flag),
@@ -122,7 +122,7 @@ not_null<FilterChatsPreview*> SetupBusinessChatsPreview(
 	}, preview->lifetime());
 
 	preview->peerRemoved(
-	) | rpl::start_with_next([=](not_null<History*> history) {
+	) | rpl::on_next([=](not_null<History*> history) {
 		auto list = data->current().list;
 		list.erase(
 			ranges::remove(list, not_null(history->peer->asUser())),
@@ -139,7 +139,7 @@ not_null<FilterChatsPreview*> SetupBusinessChatsPreview(
 	data->changes(
 	) | rpl::filter([=] {
 		return !*locked;
-	}) | rpl::start_with_next([=](const Data::BusinessChats &rules) {
+	}) | rpl::on_next([=](const Data::BusinessChats &rules) {
 		auto &&peers = rules.list | ranges::views::transform([=](
 				not_null<UserData*> user) {
 			return user->owner().history(user);
@@ -245,11 +245,11 @@ void AddBusinessRecipientsSelector(
 		rpl::variable<Data::BusinessChats>
 	>(data->current().excluded);
 	data->changes(
-	) | rpl::start_with_next([=](const Data::BusinessRecipients &value) {
+	) | rpl::on_next([=](const Data::BusinessRecipients &value) {
 		*excluded = value.excluded;
 	}, lifetime);
 	excluded->changes(
-	) | rpl::start_with_next([=](Data::BusinessChats &&value) {
+	) | rpl::on_next([=](Data::BusinessChats &&value) {
 		change([&](Data::BusinessRecipients &data) {
 			data.excluded = std::move(value);
 		});
@@ -303,11 +303,11 @@ void AddBusinessRecipientsSelector(
 		rpl::variable<Data::BusinessChats>
 	>(data->current().included);
 	data->changes(
-	) | rpl::start_with_next([=](const Data::BusinessRecipients &value) {
+	) | rpl::on_next([=](const Data::BusinessRecipients &value) {
 		*included = value.included;
 	}, lifetime);
 	included->changes(
-	) | rpl::start_with_next([=](Data::BusinessChats &&value) {
+	) | rpl::on_next([=](Data::BusinessChats &&value) {
 		change([&](Data::BusinessRecipients &data) {
 			data.included = std::move(value);
 		});
@@ -315,7 +315,7 @@ void AddBusinessRecipientsSelector(
 
 	SetupBusinessChatsPreview(includeInner, included);
 	included->value(
-	) | rpl::start_with_next([=](const Data::BusinessChats &value) {
+	) | rpl::on_next([=](const Data::BusinessChats &value) {
 		if (value.empty() && group->current() == kSelectedOnly) {
 			group->setValue(kAllExcept);
 		}
diff --git a/Telegram/SourceFiles/settings/business/settings_shortcut_messages.cpp b/Telegram/SourceFiles/settings/business/settings_shortcut_messages.cpp
index 522d26981e..bf8f4bf51c 100644
--- a/Telegram/SourceFiles/settings/business/settings_shortcut_messages.cpp
+++ b/Telegram/SourceFiles/settings/business/settings_shortcut_messages.cpp
@@ -347,7 +347,7 @@ ShortcutMessages::ShortcutMessages(
 	const auto messages = &_session->data().shortcutMessages();
 
 	messages->shortcutIdChanged(
-	) | rpl::start_with_next([=](Data::ShortcutIdChange change) {
+	) | rpl::on_next([=](Data::ShortcutIdChange change) {
 		if (change.oldId == _shortcutId.current()) {
 			if (change.newId) {
 				_shortcutId = change.newId;
@@ -357,12 +357,12 @@ ShortcutMessages::ShortcutMessages(
 		}
 	}, lifetime());
 	messages->shortcutsChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_shortcut = messages->lookupShortcut(_shortcutId.current()).name;
 	}, lifetime());
 
 	controller->chatStyle()->paletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_scroll->updateBars();
 	}, _scroll->lifetime());
 
@@ -378,22 +378,22 @@ ShortcutMessages::ShortcutMessages(
 
 	_scroll->sizeValue() | rpl::filter([](QSize size) {
 		return !size.isEmpty();
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		outerResized();
 	}, lifetime());
 
 	_scroll->scrolls(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		processScroll();
 	}, lifetime());
 
-	_shortcut.value() | rpl::start_with_next([=] {
+	_shortcut.value() | rpl::on_next([=] {
 		refreshEmptyText();
 		_inner->update();
 	}, lifetime());
 
 	_inner->editMessageRequested(
-	) | rpl::start_with_next([=](auto fullId) {
+	) | rpl::on_next([=](auto fullId) {
 		if (const auto item = _session->data().message(fullId)) {
 			const auto media = item->media();
 			if (!media || media->webpage() || media->allowsEditCaption()) {
@@ -406,7 +406,7 @@ ShortcutMessages::ShortcutMessages(
 		}
 	}, _inner->lifetime());
 
-	_inner->heightValue() | rpl::start_with_next([=](int height) {
+	_inner->heightValue() | rpl::on_next([=](int height) {
 		resize(width(), height);
 	}, lifetime());
 }
@@ -624,7 +624,7 @@ void ShortcutMessages::updateComposeControlsPosition() {
 }
 
 void ShortcutMessages::setupComposeControls() {
-	_shortcutId.value() | rpl::start_with_next([=](BusinessShortcutId id) {
+	_shortcutId.value() | rpl::on_next([=](BusinessShortcutId id) {
 		_composeControls->updateShortcutId(id);
 	}, lifetime());
 
@@ -655,28 +655,28 @@ void ShortcutMessages::setupComposeControls() {
 	});
 
 	_composeControls->cancelRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		listCancelRequest();
 	}, lifetime());
 
 	_composeControls->sendRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		send();
 	}, lifetime());
 
 	_composeControls->sendVoiceRequests(
-	) | rpl::start_with_next([=](ComposeControls::VoiceToSend &&data) {
+	) | rpl::on_next([=](ComposeControls::VoiceToSend &&data) {
 		sendVoice(std::move(data));
 	}, lifetime());
 
 	_composeControls->sendCommandRequests(
-	) | rpl::start_with_next([=](const QString &command) {
+	) | rpl::on_next([=](const QString &command) {
 		listSendBotCommand(command, FullMsgId());
 	}, lifetime());
 
 	const auto saveEditMsgRequestId = lifetime().make_state<mtpRequestId>(0);
 	_composeControls->editRequests(
-	) | rpl::start_with_next([=](auto data) {
+	) | rpl::on_next([=](auto data) {
 		if (const auto item = _session->data().message(data.fullId)) {
 			if (item->isBusinessShortcut()) {
 				const auto spoiler = data.spoilered;
@@ -688,7 +688,7 @@ void ShortcutMessages::setupComposeControls() {
 	_composeControls->attachRequests(
 	) | rpl::filter([=] {
 		return !_choosingAttach;
-	}) | rpl::start_with_next([=](std::optional<bool> overrideCompress) {
+	}) | rpl::on_next([=](std::optional<bool> overrideCompress) {
 		_choosingAttach = true;
 		base::call_delayed(st::historyAttach.ripple.hideDuration, this, [=] {
 			_choosingAttach = false;
@@ -697,23 +697,23 @@ void ShortcutMessages::setupComposeControls() {
 	}, lifetime());
 
 	_composeControls->fileChosen(
-	) | rpl::start_with_next([=](ChatHelpers::FileChosen data) {
+	) | rpl::on_next([=](ChatHelpers::FileChosen data) {
 		_controller->hideLayer(anim::type::normal);
 		sendExistingDocument(data.document, {}, std::nullopt);
 	}, lifetime());
 
 	_composeControls->photoChosen(
-	) | rpl::start_with_next([=](ChatHelpers::PhotoChosen chosen) {
+	) | rpl::on_next([=](ChatHelpers::PhotoChosen chosen) {
 		sendExistingPhoto(chosen.photo);
 	}, lifetime());
 
 	_composeControls->inlineResultChosen(
-	) | rpl::start_with_next([=](ChatHelpers::InlineChosen chosen) {
+	) | rpl::on_next([=](ChatHelpers::InlineChosen chosen) {
 		sendInlineResult(chosen.result, chosen.bot);
 	}, lifetime());
 
 	_composeControls->jumpToItemRequests(
-	) | rpl::start_with_next([=](FullReplyTo to) {
+	) | rpl::on_next([=](FullReplyTo to) {
 		if (const auto item = _session->data().message(to.messageId)) {
 			showAtPosition(item->position());
 		}
@@ -722,12 +722,12 @@ void ShortcutMessages::setupComposeControls() {
 	rpl::merge(
 		_composeControls->scrollKeyEvents(),
 		_inner->scrollKeyEvents()
-	) | rpl::start_with_next([=](not_null<QKeyEvent*> e) {
+	) | rpl::on_next([=](not_null<QKeyEvent*> e) {
 		_scroll->keyPressEvent(e);
 	}, lifetime());
 
 	_composeControls->editLastMessageRequests(
-	) | rpl::start_with_next([=](not_null<QKeyEvent*> e) {
+	) | rpl::on_next([=](not_null<QKeyEvent*> e) {
 		if (!_inner->lastMessageEditRequestNotify()) {
 			_scroll->keyPressEvent(e);
 		}
@@ -748,22 +748,22 @@ void ShortcutMessages::setupComposeControls() {
 	});
 
 	_composeControls->lockShowStarts(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_cornerButtons.updateJumpDownVisibility();
 		_cornerButtons.updateUnreadThingsVisibility();
 	}, lifetime());
 
 	_composeControls->viewportEvents(
-	) | rpl::start_with_next([=](not_null<QEvent*> e) {
+	) | rpl::on_next([=](not_null<QEvent*> e) {
 		_scroll->viewportEvent(e);
 	}, lifetime());
 
-	_controlsWrap->widthValue() | rpl::start_with_next([=](int width) {
+	_controlsWrap->widthValue() | rpl::on_next([=](int width) {
 		_composeControls->resizeToWidth(width);
 	}, _controlsWrap->lifetime());
 
 	_composeControls->height(
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		const auto wasMax = (_scroll->scrollTopMax() == _scroll->scrollTop());
 		_controlsWrap->resize(width(), height - st::boxRadius);
 		updateComposeControlsPosition();
diff --git a/Telegram/SourceFiles/settings/business/settings_working_hours.cpp b/Telegram/SourceFiles/settings/business/settings_working_hours.cpp
index 974d22cf24..03812b6fc1 100644
--- a/Telegram/SourceFiles/settings/business/settings_working_hours.cpp
+++ b/Telegram/SourceFiles/settings/business/settings_working_hours.cpp
@@ -173,7 +173,7 @@ void EditTimeBox(
 	rpl::combine(
 		content->sizeValue(),
 		minutes->value()
-	) | rpl::start_with_next([=](QSize s, Ui::VerticalDrumPicker *minutes) {
+	) | rpl::on_next([=](QSize s, Ui::VerticalDrumPicker *minutes) {
 		const auto half = (s.width() - separatorWidth) / 2;
 		hours->setGeometry(0, 0, half, s.height());
 		if (minutes) {
@@ -184,7 +184,7 @@ void EditTimeBox(
 	Ui::SendPendingMoveResizeEvents(hours);
 
 	const auto minutesStart = content->lifetime().make_state<TimeId>();
-	hours->value() | rpl::start_with_next([=](int hoursIndex) {
+	hours->value() | rpl::on_next([=](int hoursIndex) {
 		const auto start = std::max(low, (hoursIndex + (low / 3600)) * 3600);
 		const auto end = std::min(high, ((start / 3600) * 60 + 59) * 60);
 		const auto minutesCount = (end - start + 60) / 60;
@@ -213,7 +213,7 @@ void EditTimeBox(
 	}, hours->lifetime());
 
 	content->paintRequest(
-	) | rpl::start_with_next([=](const QRect &r) {
+	) | rpl::on_next([=](const QRect &r) {
 		auto p = QPainter(content);
 
 		p.fillRect(r, Qt::transparent);
@@ -353,7 +353,7 @@ void EditDayBox(
 	});
 
 	state->data.value(
-	) | rpl::start_with_next([=](const Data::WorkingIntervals &data) {
+	) | rpl::on_next([=](const Data::WorkingIntervals &data) {
 		const auto count = int(data.list.size());
 		for (auto i = 0; i != count; ++i) {
 			const auto min = (i == 0) ? 0 : (data.list[i - 1].end + 60);
@@ -524,13 +524,13 @@ void AddWeekButton(
 
 	const auto separator = Ui::CreateChild<Ui::RpWidget>(container.get());
 	separator->paintRequest(
-	) | rpl::start_with_next([=, bg = st.textBgOver] {
+	) | rpl::on_next([=, bg = st.textBgOver] {
 		auto p = QPainter(separator);
 		p.fillRect(separator->rect(), bg);
 	}, separator->lifetime());
 	const auto separatorHeight = st.height - 2 * st.toggle.border;
 	button->geometryValue(
-	) | rpl::start_with_next([=](const QRect &r) {
+	) | rpl::on_next([=](const QRect &r) {
 		const auto w = st::rightsButtonToggleWidth;
 		toggleButton->setGeometry(
 			r.x() + r.width() - w,
@@ -547,12 +547,12 @@ void AddWeekButton(
 	const auto checkWidget = Ui::CreateChild<Ui::RpWidget>(toggleButton);
 	checkWidget->resize(checkView->getSize());
 	checkWidget->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(checkWidget);
 		checkView->paint(p, 0, 0, checkWidget->width());
 	}, checkWidget->lifetime());
 	toggleButton->sizeValue(
-	) | rpl::start_with_next([=](const QSize &s) {
+	) | rpl::on_next([=](const QSize &s) {
 		checkWidget->moveToRight(
 			st.toggleSkip,
 			(s.height() - checkWidget->height()) / 2);
@@ -648,7 +648,7 @@ void WorkingHours::setupContent(
 	state->timezones.value(
 	) | rpl::filter([=](const Data::Timezones &value) {
 		return !value.list.empty();
-	}) | rpl::start_with_next([=](const Data::Timezones &value) {
+	}) | rpl::on_next([=](const Data::Timezones &value) {
 		const auto now = _hours.current().timezoneId;
 		if (!ranges::contains(value.list, now, &Data::Timezone::id)) {
 			auto copy = _hours.current();
@@ -697,7 +697,7 @@ void WorkingHours::setupContent(
 		state->timezones.value(
 		) | rpl::filter([](const Data::Timezones &value) {
 			return !value.list.empty();
-		}) | rpl::start_with_next([=](const Data::Timezones &value) {
+		}) | rpl::on_next([=](const Data::Timezones &value) {
 			if (state->timezoneEditPending) {
 				state->timezoneEditPending = false;
 				editTimezone(value.list);
diff --git a/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_common.cpp b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_common.cpp
index 87e0a2a4d0..e20cc28883 100644
--- a/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_common.cpp
+++ b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_common.cpp
@@ -66,7 +66,7 @@ BottomButton CreateBottomDisableButton(
 		std::move(sectionGeometryValue),
 		parent->geometryValue(),
 		content->geometryValue()
-	) | rpl::start_with_next([=](
+	) | rpl::on_next([=](
 			const QRect &r,
 			const QRect &parentRect,
 			const QRect &bottomRect) {
@@ -119,7 +119,7 @@ void SetupHeader(
 		content->add(std::move(icon.widget));
 		std::move(
 			showFinished
-		) | rpl::start_with_next([animate = std::move(icon.animate)] {
+		) | rpl::on_next([animate = std::move(icon.animate)] {
 			animate(anim::repeat::once);
 		}, content->lifetime());
 	}
@@ -162,7 +162,7 @@ not_null<Ui::PasswordInput*> AddPasswordField(
 		text);
 
 	container->geometryValue(
-	) | rpl::start_with_next([=](const QRect &r) {
+	) | rpl::on_next([=](const QRect &r) {
 		field->moveToLeft((r.width() - field->width()) / 2, 0);
 	}, container->lifetime());
 
@@ -191,12 +191,12 @@ not_null<Ui::LinkButton*> AddLinkButton(
 		QString());
 	std::move(
 		text
-	) | rpl::start_with_next([=](const QString &text) {
+	) | rpl::on_next([=](const QString &text) {
 		button->setText(text);
 	}, button->lifetime());
 
 	input->geometryValue(
-	) | rpl::start_with_next([=](QRect r) {
+	) | rpl::on_next([=](QRect r) {
 		button->moveToLeft(r.x(), r.y() + r.height() + st::passcodeTextLine);
 	}, button->lifetime());
 	return button;
diff --git a/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_email.cpp b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_email.cpp
index ab1a0fbf8a..8406b213df 100644
--- a/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_email.cpp
+++ b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_email.cpp
@@ -90,7 +90,7 @@ void Email::setupContent() {
 		currentStepDataEmail);
 	const auto error = AddError(content, nullptr);
 	newInput->changes(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		error->hide();
 	}, newInput->lifetime());
 	AddSkipInsteadOfField(content);
@@ -108,7 +108,7 @@ void Email::setupContent() {
 				data.hint,
 				!data.email.isEmpty(),
 				data.email)
-		) | rpl::start_with_next_error_done([=](Api::CloudPassword::SetOk d) {
+		) | rpl::on_next_error_done([=](Api::CloudPassword::SetOk d) {
 			_requestLifetime.destroy();
 
 			auto data = stepData();
@@ -189,7 +189,7 @@ void Email::setupContent() {
 	});
 
 	const auto submit = [=] { button->clicked({}, Qt::LeftButton); };
-	newInput->submits() | rpl::start_with_next(submit, newInput->lifetime());
+	newInput->submits() | rpl::on_next(submit, newInput->lifetime());
 
 	setFocusCallback([=] { newInput->setFocus(); });
 
diff --git a/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_email_confirm.cpp b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_email_confirm.cpp
index e9e5e799c1..d5628d378e 100644
--- a/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_email_confirm.cpp
+++ b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_email_confirm.cpp
@@ -124,7 +124,7 @@ void EmailConfirm::setupContent() {
 		return;
 	}
 	cloudPassword().state(
-	) | rpl::start_with_next([=](const Core::CloudPasswordState &state) {
+	) | rpl::on_next([=](const Core::CloudPasswordState &state) {
 		if (!_requestLifetime
 			&& state.unconfirmedPattern.isEmpty()
 			&& recoverEmailPattern.isEmpty()) {
@@ -161,7 +161,7 @@ void EmailConfirm::setupContent() {
 
 	const auto error = AddError(content, nullptr);
 	newInput->changes(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		error->hide();
 	}, newInput->lifetime());
 	AddSkipInsteadOfField(content);
@@ -172,11 +172,11 @@ void EmailConfirm::setupContent() {
 		st::changePhoneLabel);
 	resendInfo->hide();
 	error->geometryValue(
-	) | rpl::start_with_next([=](const QRect &r) {
+	) | rpl::on_next([=](const QRect &r) {
 		resendInfo->setGeometry(r);
 	}, resendInfo->lifetime());
 	error->shownValue(
-	) | rpl::start_with_next([=](bool shown) {
+	) | rpl::on_next([=](bool shown) {
 		if (shown) {
 			resendInfo->hide();
 		}
@@ -190,7 +190,7 @@ void EmailConfirm::setupContent() {
 			return;
 		}
 		_requestLifetime = cloudPassword().resendEmailCode(
-		) | rpl::start_with_error_done([=](const QString &type) {
+		) | rpl::on_error_done([=](const QString &type) {
 			_requestLifetime.destroy();
 
 			error->show();
@@ -213,7 +213,7 @@ void EmailConfirm::setupContent() {
 					return;
 				}
 				_requestLifetime = cloudPassword().resetPassword(
-				) | rpl::start_with_next_error_done([=](
+				) | rpl::on_next_error_done([=](
 						Api::CloudPassword::ResetRetryDate retryDate) {
 					_requestLifetime.destroy();
 					const auto left = std::max(
@@ -236,7 +236,7 @@ void EmailConfirm::setupContent() {
 						return s.pendingResetDate != 0;
 					}) | rpl::take(
 						1
-					) | rpl::start_with_next([=](const PasswordState &s) {
+					) | rpl::on_next([=](const PasswordState &s) {
 						const auto left = (s.pendingResetDate
 							- base::unixtime::now());
 						if (left > 0) {
@@ -276,7 +276,7 @@ void EmailConfirm::setupContent() {
 		} else if (!_requestLifetime && recoverEmailPattern.isEmpty()) {
 			_requestLifetime = cloudPassword().confirmEmail(
 				newText
-			) | rpl::start_with_error_done([=](const QString &type) {
+			) | rpl::on_error_done([=](const QString &type) {
 				_requestLifetime.destroy();
 
 				newInput->setFocus();
@@ -313,7 +313,7 @@ void EmailConfirm::setupContent() {
 		} else if (!_requestLifetime) {
 			_requestLifetime = cloudPassword().checkRecoveryEmailAddressCode(
 				newText
-			) | rpl::start_with_error_done([=](const QString &type) {
+			) | rpl::on_error_done([=](const QString &type) {
 				_requestLifetime.destroy();
 
 				newInput->setFocus();
@@ -353,7 +353,7 @@ void EmailConfirm::setupContent() {
 
 	const auto submit = [=] { button->clicked({}, Qt::LeftButton); };
 	newInput->setAutoSubmit(currentStepDataCodeLength, submit);
-	newInput->submits() | rpl::start_with_next(submit, newInput->lifetime());
+	newInput->submits() | rpl::on_next(submit, newInput->lifetime());
 
 	setFocusCallback([=] { newInput->setFocus(); });
 
diff --git a/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_hint.cpp b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_hint.cpp
index b505ffa084..8f57cbf632 100644
--- a/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_hint.cpp
+++ b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_hint.cpp
@@ -81,7 +81,7 @@ void Hint::setupContent() {
 		currentStepDataHint);
 	const auto error = AddError(content, nullptr);
 	newInput->changes(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		error->hide();
 	}, newInput->lifetime());
 	AddSkipInsteadOfField(content);
@@ -95,7 +95,7 @@ void Hint::setupContent() {
 				currentStepData.processRecover.checkedCode,
 				currentStepData.password,
 				hint
-			) | rpl::start_with_error_done([=](const QString &type) {
+			) | rpl::on_error_done([=](const QString &type) {
 				_requestLifetime.destroy();
 
 				error->show();
@@ -144,7 +144,7 @@ void Hint::setupContent() {
 	});
 
 	const auto submit = [=] { button->clicked({}, Qt::LeftButton); };
-	newInput->submits() | rpl::start_with_next(submit, newInput->lifetime());
+	newInput->submits() | rpl::on_next(submit, newInput->lifetime());
 
 	setFocusCallback([=] { newInput->setFocus(); });
 
diff --git a/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_input.cpp b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_input.cpp
index 2986c05c4e..b537f6f2e3 100644
--- a/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_input.cpp
+++ b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_input.cpp
@@ -90,7 +90,7 @@ Icon CreateInteractiveLottieIcon(
 	raw->lifetime().add([kept = std::move(owned)]{});
 
 	raw->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(raw);
 		const auto left = (raw->width() - width) / 2;
 		icon->paint(p, left, padding.top());
@@ -110,7 +110,7 @@ Icon CreateInteractiveLottieIcon(
 	rpl::merge(
 		content->geometryValue(),
 		input->geometryValue()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto topLeft = input->mapTo(content, input->pos());
 		button->moveToLeft(
 			input->pos().x(),
@@ -280,12 +280,12 @@ void Input::setupContent() {
 		rpl::combine(
 			error->geometryValue(),
 			newInput->geometryValue()
-		) | rpl::start_with_next([=](QRect r, QRect input) {
+		) | rpl::on_next([=](QRect r, QRect input) {
 			hintInfo->setGeometry(
 				{ input.x(), r.y(), input.width(), r.height() });
 		}, hintInfo->lifetime());
 		error->shownValue(
-		) | rpl::start_with_next([=](bool shown) {
+		) | rpl::on_next([=](bool shown) {
 			if (shown) {
 				hintInfo->hide();
 			} else {
@@ -303,7 +303,7 @@ void Input::setupContent() {
 			}
 			if (state->hasRecovery) {
 				_requestLifetime = cloudPassword().requestPasswordRecovery(
-				) | rpl::start_with_next_error([=](const QString &pattern) {
+				) | rpl::on_next_error([=](const QString &pattern) {
 					_requestLifetime.destroy();
 
 					auto data = stepData();
@@ -328,7 +328,7 @@ void Input::setupContent() {
 					}
 					close();
 					_requestLifetime = cloudPassword().resetPassword(
-					) | rpl::start_with_next_error_done([=](
+					) | rpl::on_next_error_done([=](
 							Api::CloudPassword::ResetRetryDate retryDate) {
 						_requestLifetime.destroy();
 						const auto left = std::max(
@@ -361,7 +361,7 @@ void Input::setupContent() {
 			QString(),
 			st::boxDividerLabel);
 		recover->geometryValue(
-		) | rpl::start_with_next([=](const QRect &r) {
+		) | rpl::on_next([=](const QRect &r) {
 			resetInfo->moveToLeft(r.x(), r.y() + st::passcodeTextLine);
 		}, resetInfo->lifetime());
 
@@ -381,7 +381,7 @@ void Input::setupContent() {
 				currentStepProcessRecover.checkedCode,
 				QString(),
 				QString()
-			) | rpl::start_with_error_done([=](const QString &type) {
+			) | rpl::on_error_done([=](const QString &type) {
 				_requestLifetime.destroy();
 
 				error->show();
@@ -414,7 +414,7 @@ void Input::setupContent() {
 		}
 		_requestLifetime = cloudPassword().check(
 			pass
-		) | rpl::start_with_error_done([=](const QString &type) {
+		) | rpl::on_error_done([=](const QString &type) {
 			_requestLifetime.destroy();
 
 			newInput->setFocus();
@@ -436,7 +436,7 @@ void Input::setupContent() {
 				if (state->pendingResetDate > 0) {
 					auto lifetime = rpl::lifetime();
 					lifetime = cloudPassword().cancelResetPassword(
-					) | rpl::start_with_next([] {});
+					) | rpl::on_next([] {});
 				}
 			}
 
@@ -491,7 +491,7 @@ void Input::setupContent() {
 		) | rpl::map([=] {
 			return newInput->text().isEmpty();
 		}) | rpl::distinct_until_changed(
-		) | rpl::start_with_next([=](bool empty) {
+		) | rpl::on_next([=](bool empty) {
 			const auto from = icon.icon->frameIndex();
 			const auto to = empty ? 0 : (icon.icon->framesCount() / 2 - 1);
 			icon.icon->animate(icon.update, from, to);
@@ -564,7 +564,7 @@ void Input::setupRecoverButton(
 	updateStatus();
 
 	state->status.value(
-	) | rpl::start_with_next([=](const Status &status) {
+	) | rpl::on_next([=](const Status &status) {
 		switch (status.suggest) {
 		case Status::SuggestAction::Recover: {
 			info->setText(QString());
@@ -587,7 +587,7 @@ void Input::setupRecoverButton(
 	}, container->lifetime());
 
 	cloudPassword().state(
-	) | rpl::start_with_next([=](const Core::CloudPasswordState &passState) {
+	) | rpl::on_next([=](const Core::CloudPasswordState &passState) {
 		updateStatus();
 		state->timer.cancel();
 		if (passState.pendingResetDate) {
@@ -611,7 +611,7 @@ void Input::setupRecoverButton(
 				}
 				close();
 				_requestLifetime = cloudPassword().cancelResetPassword(
-				) | rpl::start_with_error_done([=](const QString &error) {
+				) | rpl::on_error_done([=](const QString &error) {
 					_requestLifetime.destroy();
 				}, [=] {
 					_requestLifetime.destroy();
@@ -625,7 +625,7 @@ void Input::setupRecoverButton(
 			}));
 		} else if (suggest == Status::SuggestAction::Reset) {
 			_requestLifetime = cloudPassword().resetPassword(
-			) | rpl::start_with_next_error_done([=](
+			) | rpl::on_next_error_done([=](
 					Api::CloudPassword::ResetRetryDate retryDate) {
 				_requestLifetime.destroy();
 				const auto left = std::max(
@@ -648,7 +648,7 @@ void Input::setupRecoverButton(
 					return !s.hasPassword;
 				}) | rpl::take(
 					1
-				) | rpl::start_with_next([=](const PasswordState &s) {
+				) | rpl::on_next([=](const PasswordState &s) {
 					_requestLifetime.destroy();
 					controller()->show(Ui::MakeInformBox(
 						tr::lng_cloud_password_removed()));
diff --git a/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_login_email.cpp b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_login_email.cpp
index 4280998e34..e22f83cd7a 100644
--- a/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_login_email.cpp
+++ b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_login_email.cpp
@@ -68,7 +68,7 @@ void LoginEmail::setupContent() {
 		tr::lng_settings_cloud_login_email_placeholder(),
 		QString());
 	const auto error = AddError(content, nullptr);
-	newInput->changes() | rpl::start_with_next([=] {
+	newInput->changes() | rpl::on_next([=] {
 		error->hide();
 	}, newInput->lifetime());
 	newInput->setText(newEmail);
@@ -159,7 +159,7 @@ void LoginEmail::setupContent() {
 	}
 
 	const auto submit = [=] { button->clicked({}, Qt::LeftButton); };
-	newInput->submits() | rpl::start_with_next(submit, newInput->lifetime());
+	newInput->submits() | rpl::on_next(submit, newInput->lifetime());
 
 	setFocusCallback([=] { newInput->setFocus(); });
 
diff --git a/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_login_email_confirm.cpp b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_login_email_confirm.cpp
index e3213f95a7..03810ac365 100644
--- a/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_login_email_confirm.cpp
+++ b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_login_email_confirm.cpp
@@ -87,7 +87,7 @@ void LoginEmailConfirm::setupContent() {
 		return;
 	}
 	cloudPassword().state(
-	) | rpl::start_with_next([=](const Core::CloudPasswordState &state) {
+	) | rpl::on_next([=](const Core::CloudPasswordState &state) {
 		if (state.loginEmailPattern.isEmpty()) {
 			setStepData(StepData());
 			showBack();
@@ -159,7 +159,7 @@ void LoginEmailConfirm::setupContent() {
 	};
 
 	newInput->codeCollected(
-	) | rpl::start_with_next([=](const QString &code) {
+	) | rpl::on_next([=](const QString &code) {
 		_collectedCode = code;
 		error->hide();
 		submit();
diff --git a/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_manage.cpp b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_manage.cpp
index 1c6c484ef6..b0cdd7b4a1 100644
--- a/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_manage.cpp
+++ b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_manage.cpp
@@ -110,7 +110,7 @@ void Manage::setupContent() {
 		return;
 	}
 	cloudPassword().state(
-	) | rpl::start_with_next([=](const Core::CloudPasswordState &state) {
+	) | rpl::on_next([=](const Core::CloudPasswordState &state) {
 		if (!_requestLifetime && !state.hasPassword) {
 			quit();
 		}
@@ -172,12 +172,12 @@ void Manage::setupContent() {
 	rpl::combine(
 		about->geometryValue(),
 		content->widthValue()
-	) | rpl::start_with_next([=](QRect r, int w) {
+	) | rpl::on_next([=](QRect r, int w) {
 		r.setWidth(w);
 		divider->setGeometry(r);
 	}, divider->lifetime());
 	_isBottomFillerShown.value(
-	) | rpl::start_with_next([=](bool shown) {
+	) | rpl::on_next([=](bool shown) {
 		divider->skipEdge(Qt::BottomEdge, shown);
 	}, divider->lifetime());
 
@@ -197,7 +197,7 @@ base::weak_qptr<Ui::RpWidget> Manage::createPinnedToBottom(
 			QString(),
 			false,
 			QString()
-		) | rpl::start_with_error_done([=](const QString &type) {
+		) | rpl::on_error_done([=](const QString &type) {
 			AbstractStep::isPasswordInvalidError(type);
 		}, [=] {
 			setStepData(StepData());
diff --git a/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_validate_icon.cpp b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_validate_icon.cpp
index d8441c5a8f..b43c9b54ae 100644
--- a/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_validate_icon.cpp
+++ b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_validate_icon.cpp
@@ -58,7 +58,7 @@ object_ptr<Ui::RpWidget> CreateValidateGoodIcon(
 			size),
 		1,
 		true);
-	widget->paintRequest() | rpl::start_with_next([=] {
+	widget->paintRequest() | rpl::on_next([=] {
 		auto p = QPainter(widget);
 		state->emoji->paint(p, Ui::Text::CustomEmojiPaintContext{
 			.textColor = st::windowFg->c,
diff --git a/Telegram/SourceFiles/settings/settings_active_sessions.cpp b/Telegram/SourceFiles/settings/settings_active_sessions.cpp
index c358456083..9d078a21cc 100644
--- a/Telegram/SourceFiles/settings/settings_active_sessions.cpp
+++ b/Telegram/SourceFiles/settings/settings_active_sessions.cpp
@@ -145,7 +145,7 @@ void RenameBox(not_null<Ui::GenericBox*> box) {
 		Core::App().settings().setCustomDeviceModel(result);
 		Core::App().saveSettingsDelayed();
 	};
-	name->submits() | rpl::start_with_next(submit, name->lifetime());
+	name->submits() | rpl::on_next(submit, name->lifetime());
 	box->addButton(tr::lng_settings_save(), submit);
 	box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
 }
@@ -378,7 +378,7 @@ void RenameBox(not_null<Ui::GenericBox*> box) {
 	if ((state->lottie = LottieForType(type))) {
 		std::move(
 			shown
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			state->lottie->animate(
 				[=] { result->update(); },
 				0,
@@ -387,7 +387,7 @@ void RenameBox(not_null<Ui::GenericBox*> box) {
 	}
 
 	result->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(result);
 		p.drawImage(QPoint(0, 0), state->background);
 		if (state->lottie) {
@@ -714,12 +714,12 @@ void SessionsContent::setupContent() {
 
 	_inner->heightValue(
 	) | rpl::distinct_until_changed(
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		resize(width(), height);
 	}, _inner->lifetime());
 
 	_inner->showRequests(
-	) | rpl::start_with_next([=](const EntryData &data) {
+	) | rpl::on_next([=](const EntryData &data) {
 		_controller->show(Box(
 			SessionInfoBox,
 			data,
@@ -727,22 +727,22 @@ void SessionsContent::setupContent() {
 	}, lifetime());
 
 	_inner->terminateOne(
-	) | rpl::start_with_next([=](uint64 hash) {
+	) | rpl::on_next([=](uint64 hash) {
 		terminateOne(hash);
 	}, lifetime());
 
 	_inner->terminateAll(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		terminateAll();
 	}, lifetime());
 
 	_loading.changes(
-	) | rpl::start_with_next([=](bool value) {
+	) | rpl::on_next([=](bool value) {
 		_inner->setVisible(!value);
 	}, lifetime());
 
 	_authorizations->listValue(
-	) | rpl::start_with_next([=](const Api::Authorizations::List &list) {
+	) | rpl::on_next([=](const Api::Authorizations::List &list) {
 		parse(list);
 	}, lifetime());
 
@@ -900,7 +900,7 @@ void SessionsContent::Inner::setupContent() {
 	rpl::combine(
 		content->sizeValue(),
 		header->positionValue()
-	) | rpl::start_with_next([=](QSize outer, QPoint position) {
+	) | rpl::on_next([=](QSize outer, QPoint position) {
 		const auto x = st::sessionTerminateSkip
 			+ st::sessionTerminate.iconPosition.x();
 		const auto y = st::defaultSubsectionTitlePadding.top()
@@ -1169,11 +1169,11 @@ void AddSessionInfoRow(
 	const auto widget = Ui::CreateChild<Ui::RpWidget>(container.get());
 	widget->resize(icon.size());
 
-	text->topValue() | rpl::start_with_next([=](int top) {
+	text->topValue() | rpl::on_next([=](int top) {
 		widget->move(st::sessionValueIconPosition + QPoint(0, top));
 	}, widget->lifetime());
 
-	widget->paintRequest() | rpl::start_with_next([=, &icon] {
+	widget->paintRequest() | rpl::on_next([=, &icon] {
 		auto p = QPainter(widget);
 		icon.paintInCenter(p, widget->rect());
 	}, widget->lifetime());
diff --git a/Telegram/SourceFiles/settings/settings_advanced.cpp b/Telegram/SourceFiles/settings/settings_advanced.cpp
index c541f7123d..2570f9cbb8 100644
--- a/Telegram/SourceFiles/settings/settings_advanced.cpp
+++ b/Telegram/SourceFiles/settings/settings_advanced.cpp
@@ -149,7 +149,7 @@ void SetupUpdate(not_null<Ui::VerticalLayout*> container) {
 		tr::lng_update_telegram(),
 		st::settingsUpdate);
 	update->hide();
-	check->widthValue() | rpl::start_with_next([=](int width) {
+	check->widthValue() | rpl::on_next([=](int width) {
 		update->resizeToWidth(width);
 		update->moveToLeft(0, 0);
 	}, update->lifetime());
@@ -157,7 +157,7 @@ void SetupUpdate(not_null<Ui::VerticalLayout*> container) {
 	rpl::combine(
 		toggle->widthValue(),
 		label->widthValue()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		label->moveToLeft(
 			st::settingsUpdateStatePosition.x(),
 			st::settingsUpdateStatePosition.y());
@@ -192,7 +192,7 @@ void SetupUpdate(not_null<Ui::VerticalLayout*> container) {
 	toggle->toggledValue(
 	) | rpl::filter([](bool toggled) {
 		return (toggled != cAutoUpdate());
-	}) | rpl::start_with_next([=](bool toggled) {
+	}) | rpl::on_next([=](bool toggled) {
 		cSetAutoUpdate(toggled);
 
 		Local::writeSettings();
@@ -210,7 +210,7 @@ void SetupUpdate(not_null<Ui::VerticalLayout*> container) {
 		install->toggledValue(
 		) | rpl::filter([](bool toggled) {
 			return (toggled != cInstallBetaVersion());
-		}) | rpl::start_with_next([=](bool toggled) {
+		}) | rpl::on_next([=](bool toggled) {
 			cSetInstallBetaVersion(toggled);
 			Core::Launcher::Instance().writeInstallBetaVersionsSetting();
 
@@ -232,26 +232,26 @@ void SetupUpdate(not_null<Ui::VerticalLayout*> container) {
 		return check && !downloading;
 	}));
 
-	checker.checking() | rpl::start_with_next([=] {
+	checker.checking() | rpl::on_next([=] {
 		options->setAttribute(Qt::WA_TransparentForMouseEvents);
 		texts->fire(tr::lng_settings_update_checking(tr::now));
 		downloading->fire(false);
 	}, options->lifetime());
-	checker.isLatest() | rpl::start_with_next([=] {
+	checker.isLatest() | rpl::on_next([=] {
 		options->setAttribute(Qt::WA_TransparentForMouseEvents, false);
 		texts->fire(tr::lng_settings_latest_installed(tr::now));
 		downloading->fire(false);
 	}, options->lifetime());
 	checker.progress(
-	) | rpl::start_with_next([=](Core::UpdateChecker::Progress progress) {
+	) | rpl::on_next([=](Core::UpdateChecker::Progress progress) {
 		showDownloadProgress(progress.already, progress.size);
 	}, options->lifetime());
-	checker.failed() | rpl::start_with_next([=] {
+	checker.failed() | rpl::on_next([=] {
 		options->setAttribute(Qt::WA_TransparentForMouseEvents, false);
 		texts->fire(tr::lng_settings_update_fail(tr::now));
 		downloading->fire(false);
 	}, options->lifetime());
-	checker.ready() | rpl::start_with_next([=] {
+	checker.ready() | rpl::on_next([=] {
 		options->setAttribute(Qt::WA_TransparentForMouseEvents, false);
 		texts->fire(tr::lng_settings_update_ready(tr::now));
 		update->show();
@@ -301,7 +301,7 @@ void SetupSpellchecker(
 	button->toggledValue(
 	) | rpl::filter([=](bool enabled) {
 		return (enabled != settings->spellcheckerEnabled());
-	}) | rpl::start_with_next([=](bool enabled) {
+	}) | rpl::on_next([=](bool enabled) {
 		settings->setSpellcheckerEnabled(enabled);
 		Core::App().saveSettingsDelayed();
 	}, container->lifetime());
@@ -324,7 +324,7 @@ void SetupSpellchecker(
 	)->toggledValue(
 	) | rpl::filter([=](bool enabled) {
 		return (enabled != settings->autoDownloadDictionaries());
-	}) | rpl::start_with_next([=](bool enabled) {
+	}) | rpl::on_next([=](bool enabled) {
 		settings->setAutoDownloadDictionaries(enabled);
 		Core::App().saveSettingsDelayed();
 	}, sliding->entity()->lifetime());
@@ -340,7 +340,7 @@ void SetupSpellchecker(
 	});
 
 	button->toggledValue(
-	) | rpl::start_with_next([=](bool enabled) {
+	) | rpl::on_next([=](bool enabled) {
 		sliding->toggle(enabled, anim::type::normal);
 	}, container->lifetime());
 #endif // !TDESKTOP_DISABLE_SPELLCHECK
@@ -374,7 +374,7 @@ void SetupWindowTitleContent(
 		showChatName->checkedChanges(
 		) | rpl::filter([=](bool checked) {
 			return (checked == content().hideChatName);
-		}) | rpl::start_with_next([=](bool checked) {
+		}) | rpl::on_next([=](bool checked) {
 			auto updated = content();
 			updated.hideChatName = !checked;
 			settings->setWindowTitleContent(updated);
@@ -388,7 +388,7 @@ void SetupWindowTitleContent(
 			showAccountName->checkedChanges(
 			) | rpl::filter([=](bool checked) {
 				return (checked == content().hideAccountName);
-			}) | rpl::start_with_next([=](bool checked) {
+			}) | rpl::on_next([=](bool checked) {
 				auto updated = content();
 				updated.hideAccountName = !checked;
 				settings->setWindowTitleContent(updated);
@@ -402,7 +402,7 @@ void SetupWindowTitleContent(
 		showTotalUnread->checkedChanges(
 		) | rpl::filter([=](bool checked) {
 			return (checked == content().hideTotalUnread);
-		}) | rpl::start_with_next([=](bool checked) {
+		}) | rpl::on_next([=](bool checked) {
 			auto updated = content();
 			updated.hideTotalUnread = !checked;
 			settings->setWindowTitleContent(updated);
@@ -420,7 +420,7 @@ void SetupWindowTitleContent(
 		nativeFrame->checkedChanges(
 		) | rpl::filter([](bool checked) {
 			return (checked != Core::App().settings().nativeWindowFrame());
-		}) | rpl::start_with_next([=](bool checked) {
+		}) | rpl::on_next([=](bool checked) {
 			Core::App().settings().setNativeWindowFrame(checked);
 			Core::App().saveSettingsDelayed();
 		}, nativeFrame->lifetime());
@@ -477,7 +477,7 @@ void SetupSystemIntegrationContent(
 			monochrome->entity()->checkedChanges(
 			) | rpl::filter([=](bool value) {
 				return (value != settings->trayIconMonochrome());
-			}) | rpl::start_with_next([=](bool value) {
+			}) | rpl::on_next([=](bool value) {
 				settings->setTrayIconMonochrome(value);
 				Core::App().saveSettingsDelayed();
 			}, monochrome->lifetime());
@@ -512,7 +512,7 @@ void SetupSystemIntegrationContent(
 		tray->checkedChanges(
 		) | rpl::filter([=](bool checked) {
 			return (checked != trayEnabled());
-		}) | rpl::start_with_next([=](bool checked) {
+		}) | rpl::on_next([=](bool checked) {
 			if (!checked && taskbar && !taskbar->checked()) {
 				taskbar->setChecked(true);
 			} else {
@@ -527,7 +527,7 @@ void SetupSystemIntegrationContent(
 			taskbar->checkedChanges(
 			) | rpl::filter([=](bool checked) {
 				return (checked != taskbarEnabled());
-			}) | rpl::start_with_next([=](bool checked) {
+			}) | rpl::on_next([=](bool checked) {
 				if (!checked && !tray->checked()) {
 					tray->setChecked(true);
 				} else {
@@ -546,7 +546,7 @@ void SetupSystemIntegrationContent(
 	warnBeforeQuit->checkedChanges(
 	) | rpl::filter([=](bool checked) {
 		return (checked != settings->macWarnBeforeQuit());
-	}) | rpl::start_with_next([=](bool checked) {
+	}) | rpl::on_next([=](bool checked) {
 		settings->setMacWarnBeforeQuit(checked);
 		Core::App().saveSettingsDelayed();
 	}, warnBeforeQuit->lifetime());
@@ -562,7 +562,7 @@ void SetupSystemIntegrationContent(
 	roundIcon->checkedChanges(
 	) | rpl::filter([=](bool checked) {
 		return (checked != enabled());
-	}) | rpl::start_with_next([=](bool checked) {
+	}) | rpl::on_next([=](bool checked) {
 		const auto digest = checked
 			? base::Platform::SetCustomAppIcon(IconMacRound())
 			: std::optional<uint64>();
@@ -585,7 +585,7 @@ void SetupSystemIntegrationContent(
 		rpl::variable<bool>
 	>(false);
 	settings->workModeValue(
-	) | rpl::start_with_next([=](WorkMode workMode) {
+	) | rpl::on_next([=](WorkMode workMode) {
 		*closeToTaskbarShown = !Core::App().tray().has();
 	}, closeToTaskbar->lifetime());
 
@@ -595,7 +595,7 @@ void SetupSystemIntegrationContent(
 		return checked ? Behavior::CloseToTaskbar : Behavior::Quit;
 	}) | rpl::filter([=](Behavior value) {
 		return (settings->closeBehavior() != value);
-	}) | rpl::start_with_next([=](Behavior value) {
+	}) | rpl::on_next([=](Behavior value) {
 		settings->setCloseBehavior(value);
 		Local::writeSettings();
 	}, closeToTaskbar->lifetime());
@@ -617,7 +617,7 @@ void SetupSystemIntegrationContent(
 		autostart->checkedChanges(
 		) | rpl::filter([](bool checked) {
 			return (checked != cAutoStart());
-		}) | rpl::start_with_next([=](bool checked) {
+		}) | rpl::on_next([=](bool checked) {
 			const auto weak = base::make_weak(controller);
 			cSetAutoStart(checked);
 			Platform::AutostartToggle(checked, crl::guard(autostart, [=](
@@ -645,7 +645,7 @@ void SetupSystemIntegrationContent(
 		minimized->entity()->checkedChanges(
 		) | rpl::filter([=](bool checked) {
 			return (checked != minimizedToggled());
-		}) | rpl::start_with_next([=](bool checked) {
+		}) | rpl::on_next([=](bool checked) {
 			if (controller->session().domain().local().hasLocalPasscode()) {
 				minimized->entity()->setChecked(false);
 				controller->show(Ui::MakeInformBox(
@@ -657,7 +657,7 @@ void SetupSystemIntegrationContent(
 		}, minimized->lifetime());
 
 		controller->session().domain().local().localPasscodeChanged(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			minimized->entity()->setChecked(minimizedToggled());
 		}, minimized->lifetime());
 	}
@@ -670,7 +670,7 @@ void SetupSystemIntegrationContent(
 		sendto->checkedChanges(
 		) | rpl::filter([](bool checked) {
 			return (checked != cSendToMenu());
-		}) | rpl::start_with_next([](bool checked) {
+		}) | rpl::on_next([](bool checked) {
 			cSetSendToMenu(checked);
 			psSendToMenu(checked);
 			Local::writeSettings();
@@ -755,7 +755,7 @@ void ArchiveSettingsBox(
 		const auto current = privacy->unarchiveOnNewMessageCurrent();
 		state->foldersWrap->toggle(!toggled, anim::type::normal);
 		return toggled != (current == Unarchive::None);
-	}) | rpl::start_with_next([=](bool toggled) {
+	}) | rpl::on_next([=](bool toggled) {
 		privacy->updateUnarchiveOnNewMessage(toggled
 			? Unarchive::None
 			: state->folders->toggled()
@@ -786,7 +786,7 @@ void ArchiveSettingsBox(
 	) | rpl::filter([=](bool toggled) {
 		const auto current = privacy->unarchiveOnNewMessageCurrent();
 		return toggled != (current != Unarchive::AnyUnmuted);
-	}) | rpl::start_with_next([=](bool toggled) {
+	}) | rpl::on_next([=](bool toggled) {
 		const auto current = privacy->unarchiveOnNewMessageCurrent();
 		privacy->updateUnarchiveOnNewMessage(!toggled
 			? Unarchive::AnyUnmuted
@@ -820,7 +820,7 @@ void SetupHardwareAcceleration(not_null<Ui::VerticalLayout*> container) {
 	)->toggledValue(
 	) | rpl::filter([=](bool enabled) {
 		return (enabled != settings->hardwareAcceleratedVideo());
-	}) | rpl::start_with_next([=](bool enabled) {
+	}) | rpl::on_next([=](bool enabled) {
 		settings->setHardwareAcceleratedVideo(enabled);
 		Core::App().saveSettingsDelayed();
 	}, container->lifetime());
@@ -918,7 +918,7 @@ void SetupOpenGL(
 	button->toggledValue(
 	) | rpl::filter([](bool enabled) {
 		return (enabled == Core::App().settings().disableOpenGL());
-	}) | rpl::start_with_next([=](bool enabled) {
+	}) | rpl::on_next([=](bool enabled) {
 		const auto confirmed = crl::guard(button, [=] {
 			Core::App().settings().setDisableOpenGL(!enabled);
 			Local::writeSettings();
@@ -1001,7 +1001,7 @@ void SetupWindowCloseBehavior(
 
 	group->value() | rpl::filter([=](Behavior value) {
 		return (value != settings->closeBehavior());
-	}) | rpl::start_with_next([=](Behavior value) {
+	}) | rpl::on_next([=](Behavior value) {
 		settings->setCloseBehavior(value);
 		Local::writeSettings();
 	}, inner->lifetime());
diff --git a/Telegram/SourceFiles/settings/settings_blocked_peers.cpp b/Telegram/SourceFiles/settings/settings_blocked_peers.cpp
index 269bd81244..df7737dc8f 100644
--- a/Telegram/SourceFiles/settings/settings_blocked_peers.cpp
+++ b/Telegram/SourceFiles/settings/settings_blocked_peers.cpp
@@ -54,13 +54,13 @@ Blocked::Blocked(
 	}
 
 	_controller->session().api().blockedPeers().slice(
-	) | rpl::start_with_next([=](const Api::BlockedPeers::Slice &slice) {
+	) | rpl::on_next([=](const Api::BlockedPeers::Slice &slice) {
 		checkTotal(slice.total);
 	}, lifetime());
 
 	_controller->session().changes().peerUpdates(
 		Data::PeerUpdate::Flag::IsBlocked
-	) | rpl::start_with_next([=](const Data::PeerUpdate &update) {
+	) | rpl::on_next([=](const Data::PeerUpdate &update) {
 		if (update.peer->isBlocked()) {
 			checkTotal(1);
 		}
@@ -111,7 +111,7 @@ base::weak_qptr<Ui::RpWidget> Blocked::createPinnedToTop(not_null<QWidget*> pare
 		// Workaround.
 		std::move(
 			subtitleText
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			subtitle->entity()->resizeToWidth(content->width());
 		}, subtitle->lifetime());
 	}
@@ -149,7 +149,7 @@ void Blocked::setupContent() {
 		state->controller->setDelegate(state->delegate.get());
 
 		state->controller->rowsCountChanges(
-		) | rpl::start_with_next([=](int total) {
+		) | rpl::on_next([=](int total) {
 			_countBlocked = total;
 			checkTotal(total);
 		}, content->lifetime());
@@ -176,7 +176,7 @@ void Blocked::setupContent() {
 		content->add(std::move(icon.widget));
 
 		_showFinished.events(
-		) | rpl::start_with_next([animate = std::move(icon.animate)] {
+		) | rpl::on_next([animate = std::move(icon.animate)] {
 			animate(anim::repeat::once);
 		}, content->lifetime());
 
@@ -204,14 +204,14 @@ void Blocked::setupContent() {
 //	Ui::ResizeFitChild(this, _container, st::settingsBlockedHeightMin);
 
 	widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		_container->resizeToWidth(width);
 	}, _container->lifetime());
 
 	rpl::combine(
 		_container->heightValue(),
 		_emptinessChanges.events_starting_with(true)
-	) | rpl::start_with_next([=](int height, bool empty) {
+	) | rpl::on_next([=](int height, bool empty) {
 		const auto subtitled = !empty || (_countBlocked.current() > 0);
 		const auto total = st::settingsBlockedHeightMin;
 		const auto padding = st::defaultSubsectionTitlePadding
diff --git a/Telegram/SourceFiles/settings/settings_business.cpp b/Telegram/SourceFiles/settings/settings_business.cpp
index 498081852e..0abc66a754 100644
--- a/Telegram/SourceFiles/settings/settings_business.cpp
+++ b/Telegram/SourceFiles/settings/settings_business.cpp
@@ -214,12 +214,12 @@ void AddBusinessSummary(
 		dummy->setAttribute(Qt::WA_TransparentForMouseEvents);
 
 		content->sizeValue(
-		) | rpl::start_with_next([=](const QSize &s) {
+		) | rpl::on_next([=](const QSize &s) {
 			dummy->resize(s.width(), iconSize.height());
 		}, dummy->lifetime());
 
 		label->geometryValue(
-		) | rpl::start_with_next([=](const QRect &r) {
+		) | rpl::on_next([=](const QRect &r) {
 			dummy->moveToLeft(0, r.y() + (r.height() - labelAscent));
 		}, dummy->lifetime());
 
@@ -227,7 +227,7 @@ void AddBusinessSummary(
 			content->widthValue(),
 			label->heightValue(),
 			description->heightValue()
-		) | rpl::start_with_next([=,
+		) | rpl::on_next([=,
 			topPadding = titlePadding,
 			bottomPadding = descriptionPadding](
 				int width,
@@ -243,7 +243,7 @@ void AddBusinessSummary(
 					+ bottomPadding.bottom());
 		}, button->lifetime());
 		label->topValue(
-		) | rpl::start_with_next([=, padding = titlePadding.top()](int top) {
+		) | rpl::on_next([=, padding = titlePadding.top()](int top) {
 			button->moveToLeft(0, top - padding);
 		}, button->lifetime());
 		const auto arrow = Ui::CreateChild<Ui::IconButton>(
@@ -254,7 +254,7 @@ void AddBusinessSummary(
 			&st::settingsPremiumArrowOver);
 		arrow->setAttribute(Qt::WA_TransparentForMouseEvents);
 		button->sizeValue(
-		) | rpl::start_with_next([=](const QSize &s) {
+		) | rpl::on_next([=](const QSize &s) {
 			const auto &point = st::settingsPremiumArrowShift;
 			arrow->moveToRight(
 				-point.x(),
@@ -516,7 +516,7 @@ void Business::setupContent() {
 			owner->session().user(),
 			Data::PeerUpdate::Flag::FullInfo) | rpl::to_empty,
 		owner->session().api().chatLinks().loadedUpdates()
-	) | rpl::start_with_next(check, content->lifetime());
+	) | rpl::on_next(check, content->lifetime());
 
 	AddBusinessSummary(content, _controller, [=](PremiumFeature feature) {
 		if (!_controller->session().premium()) {
@@ -592,16 +592,16 @@ void Business::setupContent() {
 			session);
 
 		api->toggled(
-		) | rpl::start_with_next([=](bool enabled) {
+		) | rpl::on_next([=](bool enabled) {
 			button->toggleOn(rpl::single(enabled));
 			wrap->toggle(true, anim::type::instant);
 			loading->toggle(false, anim::type::instant);
 
 			button->toggledChanges(
-			) | rpl::start_with_next([=](bool toggled) {
+			) | rpl::on_next([=](bool toggled) {
 				api->setToggled(
 					toggled
-				) | rpl::start_with_error_done([=](const QString &error) {
+				) | rpl::on_error_done([=](const QString &error) {
 					_controller->showToast(error);
 				}, [] {
 				}, button->lifetime());
@@ -613,7 +613,7 @@ void Business::setupContent() {
 	};
 	Data::AmPremiumValue(
 		&_controller->session()
-	) | rpl::start_with_next([=](bool isPremium) {
+	) | rpl::on_next([=](bool isPremium) {
 		sponsoredWrap->toggle(isPremium, anim::type::normal);
 		if (isPremium) {
 			fillSponsoredWrap();
@@ -660,7 +660,7 @@ base::weak_qptr<Ui::RpWidget> Business::createPinnedToTop(
 	};
 
 	_wrap.value(
-	) | rpl::start_with_next([=](Info::Wrap wrap) {
+	) | rpl::on_next([=](Info::Wrap wrap) {
 		content->setRoundEdges(wrap == Info::Wrap::Layer);
 	}, content->lifetime());
 
@@ -670,7 +670,7 @@ base::weak_qptr<Ui::RpWidget> Business::createPinnedToTop(
 	content->resize(content->width(), content->maximumHeight());
 
 	_wrap.value(
-	) | rpl::start_with_next([=](Info::Wrap wrap) {
+	) | rpl::on_next([=](Info::Wrap wrap) {
 		const auto isLayer = (wrap == Info::Wrap::Layer);
 		_back = base::make_unique_q<Ui::FadeWrap<Ui::IconButton>>(
 			content,
@@ -688,7 +688,7 @@ base::weak_qptr<Ui::RpWidget> Business::createPinnedToTop(
 			_showBack.fire({});
 		});
 		_back->toggledValue(
-		) | rpl::start_with_next([=](bool toggled) {
+		) | rpl::on_next([=](bool toggled) {
 			const auto &st = isLayer ? st::infoLayerTopBar : st::infoTopBar;
 			content->setTextPosition(
 				toggled ? st.back.width : st.titlePosition.x(),
@@ -706,7 +706,7 @@ base::weak_qptr<Ui::RpWidget> Business::createPinnedToTop(
 				_controller->parentController()->hideSpecialLayer();
 			});
 			content->widthValue(
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				_close->moveToRight(0, 0);
 			}, _close->lifetime());
 		}
@@ -759,12 +759,12 @@ base::weak_qptr<Ui::RpWidget> Business::createPinnedToBottom(
 	}
 
 	_showFinished.events(
-	) | rpl::take(1) | rpl::start_with_next([=] {
+	) | rpl::take(1) | rpl::on_next([=] {
 		_subscribe->startGlareAnimation();
 	}, _subscribe->lifetime());
 
 	content->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		const auto padding = st::settingsPremiumButtonPadding;
 		_subscribe->resizeToWidth(width - padding.left() - padding.right());
 	}, _subscribe->lifetime());
@@ -773,7 +773,7 @@ base::weak_qptr<Ui::RpWidget> Business::createPinnedToBottom(
 		_subscribe->heightValue(),
 		Data::AmPremiumValue(session),
 		session->premiumPossibleValue()
-	) | rpl::start_with_next([=](
+	) | rpl::on_next([=](
 			int buttonHeight,
 			bool premium,
 			bool premiumPossible) {
diff --git a/Telegram/SourceFiles/settings/settings_calls.cpp b/Telegram/SourceFiles/settings/settings_calls.cpp
index d80f394a24..c37d3e271f 100644
--- a/Telegram/SourceFiles/settings/settings_calls.cpp
+++ b/Telegram/SourceFiles/settings/settings_calls.cpp
@@ -142,7 +142,7 @@ Webrtc::VideoTrack *Calls::AddCameraSubsection(
 	rpl::combine(
 		std::move(bubbleWidth),
 		std::move(frameSize)
-	) | rpl::start_with_next([=](int width, QSize frame) {
+	) | rpl::on_next([=](int width, QSize frame) {
 		const auto useWidth = (width - 2 * padding);
 		const auto useHeight = std::min(
 			((useWidth * frame.height()) / frame.width()),
@@ -173,7 +173,7 @@ Webrtc::VideoTrack *Calls::AddCameraSubsection(
 		Core::App().calls().currentCallValue(),
 		Core::App().calls().currentGroupCallValue(),
 		_1 || _2
-	) | rpl::start_with_next([=](bool has) {
+	) | rpl::on_next([=](bool has) {
 		if (has) {
 			track->setState(VideoState::Inactive);
 			bubbleWrap->resize(bubbleWrap->width(), 0);
@@ -240,7 +240,7 @@ void Calls::setupContent() {
 		const auto empty = settings->callPlaybackDeviceId().isEmpty()
 			&& settings->callCaptureDeviceId().isEmpty();
 		return (empty != toggled);
-	}) | rpl::start_with_next([=](bool toggled) {
+	}) | rpl::on_next([=](bool toggled) {
 		if (toggled) {
 			settings->setCallPlaybackDeviceId(QString());
 			settings->setCallCaptureDeviceId(QString());
@@ -302,7 +302,7 @@ void Calls::setupContent() {
 	)->toggledChanges(
 	) | rpl::filter([=](bool value) {
 		return (value == api->authorizations().callsDisabledHere());
-	}) | start_with_next([=](bool value) {
+	}) | on_next([=](bool value) {
 		api->authorizations().toggleCallsDisabledHere(!value);
 	}, content->lifetime());
 
@@ -386,7 +386,7 @@ void Calls::initCaptureButton(
 			level->setValue(state->animation.value(state->level));
 		}, was, state->level, kMicTestAnimationDuration);
 	});
-	_testingMicrophone.value() | rpl::start_with_next([=](bool testing) {
+	_testingMicrophone.value() | rpl::on_next([=](bool testing) {
 		if (testing) {
 			state->deviceId = std::make_unique<Webrtc::DeviceResolver>(
 				&Core::App().mediaDevices(),
@@ -511,7 +511,7 @@ void ChooseMediaDeviceBox(
 	def->clicks(
 	) | rpl::filter([=] {
 		return !group->value();
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		choose(kDefaultDeviceId);
 	}, def->lifetime());
 	const auto showUnavailable = [=](QString text) {
@@ -575,7 +575,7 @@ void ChooseMediaDeviceBox(
 
 	std::move(
 		devicesValue
-	) | rpl::start_with_next([=](std::vector<DeviceInfo> &&list) {
+	) | rpl::on_next([=](std::vector<DeviceInfo> &&list) {
 		auto count = buttons->count();
 		auto index = 1;
 		state->ids.clear();
@@ -609,7 +609,7 @@ void ChooseMediaDeviceBox(
 			button->clicks(
 			) | rpl::filter([=] {
 				return (group->current() == index);
-			}) | rpl::start_with_next([=] {
+			}) | rpl::on_next([=] {
 				choose(id);
 			}, button->lifetime());
 
@@ -630,7 +630,7 @@ void ChooseMediaDeviceBox(
 	}, box->lifetime());
 
 	state->currentId.changes(
-	) | rpl::start_with_next(selectCurrent, box->lifetime());
+	) | rpl::on_next(selectCurrent, box->lifetime());
 
 	def->finishAnimating();
 
diff --git a/Telegram/SourceFiles/settings/settings_chat.cpp b/Telegram/SourceFiles/settings/settings_chat.cpp
index aef968d51c..8fba3e707b 100644
--- a/Telegram/SourceFiles/settings/settings_chat.cpp
+++ b/Telegram/SourceFiles/settings/settings_chat.cpp
@@ -176,7 +176,7 @@ ColorsPalette::Button::Button(
 	_widget.show();
 	_widget.resize(st::settingsAccentColorSize, st::settingsAccentColorSize);
 	_widget.paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		paint();
 	}, _widget.lifetime());
 }
@@ -240,7 +240,7 @@ ColorsPalette::ColorsPalette(not_null<Ui::VerticalLayout*> container)
 
 	const auto inner = _outer->entity();
 	inner->widthValue(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateInnerGeometry();
 	}, inner->lifetime());
 }
@@ -311,7 +311,7 @@ void ColorsPalette::show(
 				clicks
 			) | rpl::map([=] {
 				return _buttons[index - 1]->color();
-			}) | rpl::start_with_next([=](QColor color) {
+			}) | rpl::on_next([=](QColor color) {
 				_selected.fire_copy(color);
 			}, inner->lifetime());
 		}
@@ -321,7 +321,7 @@ void ColorsPalette::show(
 	if (clicks) {
 		std::move(
 			clicks
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			selectCustom(scheme);
 		}, inner->lifetime());
 	}
@@ -345,7 +345,7 @@ void ColorsPalette::selectCustom(not_null<const Scheme*> scheme) {
 			box->closeBox();
 		});
 		editor->submitRequests(
-		) | rpl::start_with_next(save, editor->lifetime());
+		) | rpl::on_next(save, editor->lifetime());
 		editor->setLightnessLimits(
 			colorizer.lightnessMin,
 			colorizer.lightnessMax);
@@ -469,7 +469,7 @@ BackgroundRow::BackgroundRow(
 		return (update.type == Update::Type::New
 			|| update.type == Update::Type::Start
 			|| update.type == Update::Type::Changed);
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		updateImage();
 	}, lifetime());
 }
@@ -736,7 +736,7 @@ void SetupStickersEmoji(
 			checkbox(label, checked),
 			st::settingsCheckboxPadding
 		)->checkedChanges(
-		) | rpl::start_with_next(
+		) | rpl::on_next(
 			std::move(handle),
 			inner->lifetime());
 	};
@@ -751,7 +751,7 @@ void SetupStickersEmoji(
 				checkbox(label, checked),
 				st::settingsCheckboxPadding)
 		)->setDuration(0)->toggleOn(std::move(shown))->entity()->checkedChanges(
-		) | rpl::start_with_next(
+		) | rpl::on_next(
 			std::move(handle),
 			inner->lifetime());
 	};
@@ -932,7 +932,7 @@ void SetupMessages(
 	auto selected = rpl::duplicate(idValue);
 	std::move(
 		selected
-	) | rpl::start_with_next([=, idValue = std::move(idValue)](
+	) | rpl::on_next([=, idValue = std::move(idValue)](
 			const Data::ReactionId &id) {
 		const auto index = state->icons.flag ? 1 : 0;
 		const auto iconSize = st::settingsReactionRightIcon;
@@ -977,7 +977,7 @@ void SetupMessages(
 	}, buttonRight->lifetime());
 
 	react->geometryValue(
-	) | rpl::start_with_next([=](const QRect &r) {
+	) | rpl::on_next([=](const QRect &r) {
 		const auto rightSize = buttonRight->size();
 		buttonRight->moveToRight(
 			st::settingsButtonRightSkip,
@@ -1003,7 +1003,7 @@ void SetupMessages(
 			st::settingsCheckbox),
 		st::settingsCheckboxPadding
 	)->checkedChanges(
-	) | rpl::start_with_next([=](bool checked) {
+	) | rpl::on_next([=](bool checked) {
 		Core::App().settings().setCornerReaction(checked);
 		Core::App().saveSettingsDelayed();
 	}, inner->lifetime());
@@ -1144,7 +1144,7 @@ void SetupDataStorage(
 	ask->toggledValue(
 	) | rpl::filter([](bool checked) {
 		return (checked != Core::App().settings().askDownloadPath());
-	}) | rpl::start_with_next([=](bool checked) {
+	}) | rpl::on_next([=](bool checked) {
 		Core::App().settings().setAskDownloadPath(checked);
 		Core::App().saveSettingsDelayed();
 
@@ -1245,7 +1245,7 @@ void SetupChatBackground(
 			st::settingsSendTypePadding));
 
 	tile->entity()->checkedChanges(
-	) | rpl::start_with_next([=](bool checked) {
+	) | rpl::on_next([=](bool checked) {
 		background->setTile(checked);
 	}, tile->lifetime());
 
@@ -1260,7 +1260,7 @@ void SetupChatBackground(
 	) | rpl::filter([](const Update &update) {
 		return (update.type == Update::Type::Changed)
 			|| (update.type == Update::Type::New);
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		tile->entity()->setChecked(background->tile());
 		tile->toggle(shown(), anim::type::instant);
 	}, tile->lifetime());
@@ -1271,7 +1271,7 @@ void SetupChatBackground(
 	}));
 
 	adaptive->entity()->checkedChanges(
-	) | rpl::start_with_next([=](bool checked) {
+	) | rpl::on_next([=](bool checked) {
 		Core::App().settings().setAdaptiveForWide(checked);
 		Core::App().saveSettingsDelayed();
 	}, adaptive->lifetime());
@@ -1315,7 +1315,7 @@ void SetupChatListQuickAction(
 			std::unique_ptr<Lottie::Icon> icon;
 		};
 		const auto state = widget->lifetime().make_state<State>();
-		group->value() | rpl::start_with_next([=](Type value) {
+		group->value() | rpl::on_next([=](Type value) {
 			const auto label = actionToLabel(value);
 			state->icon = Lottie::MakeIcon({
 				.name = Dialogs::ResolveQuickDialogLottieIconName(label),
@@ -1329,7 +1329,7 @@ void SetupChatListQuickAction(
 				state->icon->framesCount() - 1);
 			widget->update();
 		}, widget->lifetime());
-		widget->paintRequest() | rpl::start_with_next([=] {
+		widget->paintRequest() | rpl::on_next([=] {
 			auto p = QPainter(widget);
 			auto hq = PainterHighQualityEnabler(p);
 
@@ -1443,14 +1443,14 @@ void SetupChatListQuickAction(
 		icon->resize(st::menuIconArchive.size());
 		icon->show();
 		button->sizeValue(
-		) | rpl::start_with_next([=, left = st.iconLeft](QSize size) {
+		) | rpl::on_next([=, left = st.iconLeft](QSize size) {
 			icon->moveToLeft(
 				left,
 				(size.height() - icon->height()) / 2,
 				size.width());
 		}, icon->lifetime());
 		icon->paintRequest(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			auto p = QPainter(icon);
 			const auto value = group->current();
 			((value == Dialogs::Ui::QuickDialogAction::Mute)
@@ -1577,7 +1577,7 @@ void SetupDefaultThemes(
 			std::move(check));
 		rpl::duplicate(
 			scheme.name
-		) | rpl::start_with_next([=](const QString &themeName) {
+		) | rpl::on_next([=](const QString &themeName) {
 			result->setText(themeName);
 		}, result->lifetime());
 		result->addClickHandler([=] {
@@ -1628,7 +1628,7 @@ void SetupDefaultThemes(
 		return (update.type == BackgroundUpdate::Type::ApplyingTheme);
 	}) | rpl::map([=] {
 		return chosen();
-	}) | rpl::start_with_next([=](Type type) {
+	}) | rpl::on_next([=](Type type) {
 		refreshColorizer(type);
 		group->setValue(type);
 	}, container->lifetime());
@@ -1639,7 +1639,7 @@ void SetupDefaultThemes(
 	}
 	block->resize(block->width(), buttons[0]->height());
 	block->widthValue(
-	) | rpl::start_with_next([buttons = std::move(buttons)](int width) {
+	) | rpl::on_next([buttons = std::move(buttons)](int width) {
 		Expects(!buttons.empty());
 
 		const auto padding = st::settingsButtonNoIcon.padding;
@@ -1668,7 +1668,7 @@ void SetupDefaultThemes(
 	}, block->lifetime());
 
 	palette->selected(
-	) | rpl::start_with_next([=](QColor color) {
+	) | rpl::on_next([=](QColor color) {
 		if (Background()->editingTheme()) {
 			// We don't remember old accent color to revert it properly
 			// in Window::Theme::Revert which is called by Editor.
@@ -1735,7 +1735,7 @@ void SetupCloudThemes(
 		title->topValue(),
 		inner->widthValue(),
 		showAll->widthValue()
-	) | rpl::start_with_next([=](int top, int outerWidth, int width) {
+	) | rpl::on_next([=](int top, int outerWidth, int width) {
 		showAll->moveToRight(
 			st::defaultSubsectionTitlePadding.left(),
 			top,
@@ -1756,7 +1756,7 @@ void SetupCloudThemes(
 			0));
 
 	list->allShown(
-	) | rpl::start_with_next([=](bool shown) {
+	) | rpl::on_next([=](bool shown) {
 		showAll->setVisible(!shown);
 	}, showAll->lifetime());
 
@@ -1984,7 +1984,7 @@ void SetupSupport(
 			st::settingsCheckbox),
 		st::settingsSendTypePadding
 	)->checkedChanges(
-	) | rpl::start_with_next([=](bool checked) {
+	) | rpl::on_next([=](bool checked) {
 		controller->session().settings().setSupportTemplatesAutocomplete(
 			checked);
 		controller->session().saveSettingsDelayed();
@@ -1998,7 +1998,7 @@ void SetupSupport(
 			st::settingsCheckbox),
 		st::settingsSendTypePadding
 	)->checkedChanges(
-	) | rpl::start_with_next([=](bool checked) {
+	) | rpl::on_next([=](bool checked) {
 		controller->session().settings().setSupportAllSilent(
 			checked);
 		controller->session().saveSettingsDelayed();
diff --git a/Telegram/SourceFiles/settings/settings_common.cpp b/Telegram/SourceFiles/settings/settings_common.cpp
index 3fc7257d83..d07de46ba1 100644
--- a/Telegram/SourceFiles/settings/settings_common.cpp
+++ b/Telegram/SourceFiles/settings/settings_common.cpp
@@ -91,14 +91,14 @@ void AddButtonIcon(
 	icon->widget.resize(icon->icon.size());
 	icon->widget.show();
 	button->sizeValue(
-	) | rpl::start_with_next([=, left = st.iconLeft](QSize size) {
+	) | rpl::on_next([=, left = st.iconLeft](QSize size) {
 		icon->widget.moveToLeft(
 			left,
 			(size.height() - icon->widget.height()) / 2,
 			size.width());
 	}, icon->widget.lifetime());
 	icon->widget.paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(&icon->widget);
 		icon->icon.paint(p, 0, 0);
 	}, icon->widget.lifetime());
@@ -145,7 +145,7 @@ void CreateRightLabel(
 			button->widthValue(),
 			std::move(buttonText),
 			v::text::take_plain(std::move(label))
-		) | rpl::start_with_next([=, &st](
+		) | rpl::on_next([=, &st](
 				int width,
 				const QString &button,
 				const QString &text) {
@@ -163,7 +163,7 @@ void CreateRightLabel(
 			button->widthValue(),
 			std::move(buttonText),
 			v::text::take_marked(std::move(label))
-		) | rpl::start_with_next([=, &st](
+		) | rpl::on_next([=, &st](
 				int width,
 				const QString &button,
 				const TextWithEntities &text) {
@@ -219,7 +219,7 @@ void AddDividerTextWithLottie(
 			anim::repeat::once);
 		std::move(
 			descriptor.showFinished
-		) | rpl::start_with_next([animate = std::move(icon.animate), repeat] {
+		) | rpl::on_next([animate = std::move(icon.animate), repeat] {
 			animate(repeat);
 		}, verticalLayout->lifetime());
 	}
@@ -237,7 +237,7 @@ void AddDividerTextWithLottie(
 	}
 
 	verticalLayout->geometryValue(
-	) | rpl::start_with_next([=](const QRect &r) {
+	) | rpl::on_next([=](const QRect &r) {
 		divider->setGeometry(r);
 	}, divider->lifetime());
 }
@@ -275,7 +275,7 @@ LottieIcon CreateLottieIcon(
 		start();
 	};
 	raw->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(raw);
 		const auto left = (raw->width() - width) / 2;
 		icon->paint(p, left, padding.top(), colorOverride
@@ -311,7 +311,7 @@ SliderWithLabel MakeSliderWithLabel(
 	rpl::combine(
 		raw->sizeValue(),
 		label->sizeValue()
-	) | rpl::start_with_next([=](QSize outer, QSize size) {
+	) | rpl::on_next([=](QSize outer, QSize size) {
 		const auto right = std::max(size.width(), minLabelWidth) + skip;
 		label->moveToRight(0, (outer.height() - size.height()) / 2);
 		const auto width = std::max(
diff --git a/Telegram/SourceFiles/settings/settings_credits.cpp b/Telegram/SourceFiles/settings/settings_credits.cpp
index 796a4694e5..7f7ed33af6 100644
--- a/Telegram/SourceFiles/settings/settings_credits.cpp
+++ b/Telegram/SourceFiles/settings/settings_credits.cpp
@@ -135,7 +135,7 @@ Credits::Credits(
 	setupSwipeBack();
 
 	_controller->session().premiumPossibleValue(
-	) | rpl::start_with_next([=](bool premiumPossible) {
+	) | rpl::on_next([=](bool premiumPossible) {
 		if (!premiumPossible) {
 			_showBack.fire({});
 		}
@@ -231,7 +231,7 @@ void Credits::setupSubscriptions(not_null<Ui::VerticalLayout*> container) {
 		const auto rebuilder = content->lifetime().make_state<RebuilderPtr>(
 			self->owner().createCreditsSubsRebuilder());
 		rebuilder->get()->events(
-		) | rpl::start_with_next([=](Data::CreditsStatusSlice slice) {
+		) | rpl::on_next([=](Data::CreditsStatusSlice slice) {
 			while (content->count()) {
 				delete content->widgetAt(0);
 			}
@@ -285,12 +285,12 @@ void Credits::setupHistory(not_null<Ui::VerticalLayout*> container) {
 		slider->toggle(!hasOneTab, anim::type::instant);
 		if (!hasOneTab) {
 			const auto shadow = Ui::CreateChild<Ui::RpWidget>(inner);
-			shadow->paintRequest() | rpl::start_with_next([=] {
+			shadow->paintRequest() | rpl::on_next([=] {
 				auto p = QPainter(shadow);
 				p.fillRect(shadow->rect(), st::shadowFg);
 			}, shadow->lifetime());
 			slider->geometryValue(
-			) | rpl::start_with_next([=](const QRect &r) {
+			) | rpl::on_next([=](const QRect &r) {
 				shadow->setGeometry(
 					inner->x(),
 					rect::bottom(slider) - st::lineWidth,
@@ -333,7 +333,7 @@ void Credits::setupHistory(not_null<Ui::VerticalLayout*> container) {
 
 		rpl::single(0) | rpl::then(
 			slider->entity()->sectionActivated()
-		) | rpl::start_with_next([=](int index) {
+		) | rpl::on_next([=](int index) {
 			if (index == 0) {
 				fullWrap->toggle(true, anim::type::instant);
 				inWrap->toggle(false, anim::type::instant);
@@ -403,7 +403,7 @@ void Credits::setupHistory(not_null<Ui::VerticalLayout*> container) {
 				apiOut->request({}, [=](Data::CreditsStatusSlice outSlice) {
 					::Api::PremiumPeerBot(
 						&_controller->session()
-					) | rpl::start_with_next([=](not_null<PeerData*> bot) {
+					) | rpl::on_next([=](not_null<PeerData*> bot) {
 						fill(bot, fullSlice, inSlice, outSlice);
 						apiLifetime->destroy();
 					}, *apiLifetime);
@@ -672,7 +672,7 @@ void Credits::setupContent() {
 			rpl::combine(
 				majorLabel->sizeValue(),
 				minorLabel->sizeValue()
-			) | rpl::start_with_next([=](
+			) | rpl::on_next([=](
 					const QSize &majorSize,
 					const QSize &minorSize) {
 				labels->resize(
@@ -715,7 +715,7 @@ void Credits::setupContent() {
 			rpl::combine(
 				button->sizeValue(),
 				label->sizeValue()
-			) | rpl::start_with_next([=](const QSize &b, const QSize &l) {
+			) | rpl::on_next([=](const QSize &b, const QSize &l) {
 				label->moveToLeft(
 					(b.width() - l.width()) / 2,
 					(b.height() - l.height()) / 2);
@@ -756,7 +756,7 @@ void Credits::setupContent() {
 		const auto apiLifetime = wrap->lifetime().make_state<rpl::lifetime>();
 		const auto api = apiLifetime->make_state<Api::EarnStatistics>(self);
 		wrap->toggle(false, anim::type::instant);
-		api->request() | rpl::start_with_error_done([] {
+		api->request() | rpl::on_error_done([] {
 		}, [=] {
 			if (!api->data().availableBalance.empty()) {
 				wrap->toggle(true, anim::type::normal);
@@ -813,7 +813,7 @@ base::weak_qptr<Ui::RpWidget> Credits::createPinnedToTop(
 	};
 
 	_wrap.value(
-	) | rpl::start_with_next([=](Info::Wrap wrap) {
+	) | rpl::on_next([=](Info::Wrap wrap) {
 		content->setRoundEdges(wrap == Info::Wrap::Layer);
 	}, content->lifetime());
 
@@ -822,7 +822,7 @@ base::weak_qptr<Ui::RpWidget> Credits::createPinnedToTop(
 
 	content->resize(content->width(), content->maximumHeight());
 	content->additionalHeight(
-	) | rpl::start_with_next([=](int additionalHeight) {
+	) | rpl::on_next([=](int additionalHeight) {
 		const auto wasMax = (content->height() == content->maximumHeight());
 		content->setMaximumHeight(st::settingsPremiumTopHeight
 			+ additionalHeight);
@@ -848,7 +848,7 @@ base::weak_qptr<Ui::RpWidget> Credits::createPinnedToTop(
 		rpl::combine(
 			balance->sizeValue(),
 			content->sizeValue()
-		) | rpl::start_with_next([=](const QSize &, const QSize &) {
+		) | rpl::on_next([=](const QSize &, const QSize &) {
 			balance->moveToRight(
 				(_close
 					? _close->width() + st::creditsHistoryRightSkip
@@ -859,7 +859,7 @@ base::weak_qptr<Ui::RpWidget> Credits::createPinnedToTop(
 	}
 
 	_wrap.value(
-	) | rpl::start_with_next([=](Info::Wrap wrap) {
+	) | rpl::on_next([=](Info::Wrap wrap) {
 		const auto isLayer = (wrap == Info::Wrap::Layer);
 		_back = base::make_unique_q<Ui::FadeWrap<Ui::IconButton>>(
 			content,
@@ -875,7 +875,7 @@ base::weak_qptr<Ui::RpWidget> Credits::createPinnedToTop(
 			_showBack.fire({});
 		});
 		_back->toggledValue(
-		) | rpl::start_with_next([=](bool toggled) {
+		) | rpl::on_next([=](bool toggled) {
 			const auto &st = isLayer ? st::infoLayerTopBar : st::infoTopBar;
 			content->setTextPosition(
 				toggled ? st.back.width : st.titlePosition.x(),
@@ -893,7 +893,7 @@ base::weak_qptr<Ui::RpWidget> Credits::createPinnedToTop(
 				_controller->parentController()->hideSpecialLayer();
 			});
 			content->widthValue(
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				_close->moveToRight(0, 0);
 			}, _close->lifetime());
 		}
@@ -999,7 +999,7 @@ Fn<void()> BuyStarsHandler::handler(
 			const auto user = show->session().user();
 			_api = std::make_unique<Api::CreditsTopupOptions>(user);
 			_api->request(
-			) | rpl::start_with_error_done([=](const QString &error) {
+			) | rpl::on_error_done([=](const QString &error) {
 				_loading = false;
 				show->showToast(error);
 			}, [=] {
diff --git a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
index 051f8f1271..5e38cf2c7e 100644
--- a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
+++ b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
@@ -355,7 +355,7 @@ void AddViewMediaHandler(
 			}
 		}
 	};
-	thumb->events() | rpl::start_with_next([=](not_null<QEvent*> e) {
+	thumb->events() | rpl::on_next([=](not_null<QEvent*> e) {
 		if (e->type() == QEvent::MouseButtonPress) {
 			const auto mouse = static_cast<QMouseEvent*>(e.get());
 			if (mouse->button() == Qt::LeftButton) {
@@ -390,7 +390,7 @@ void AddMiniStars(
 	stars->setColorOverride(Ui::Premium::CreditsIconGradientStops());
 	widget->resize(boxWidth - photoSize, photoSize * heightRatio);
 	content->sizeValue(
-	) | rpl::start_with_next([=](const QSize &size) {
+	) | rpl::on_next([=](const QSize &size) {
 		widget->moveToLeft(photoSize / 2, 0);
 		const auto starsRect = Rect(widget->size());
 		stars->setPosition(starsRect.topLeft());
@@ -398,7 +398,7 @@ void AddMiniStars(
 		widget->lower();
 	}, widget->lifetime());
 	widget->paintRequest(
-	) | rpl::start_with_next([=](const QRect &r) {
+	) | rpl::on_next([=](const QRect &r) {
 		auto p = QPainter(widget);
 		p.fillRect(r, Qt::transparent);
 		stars->paint(p);
@@ -517,7 +517,7 @@ void FillCreditOptions(
 				1,
 				rpl::single(isRtl));
 			content->widthValue(
-			) | rpl::start_with_next([=, raw = loadingLeft.get()](int w) {
+			) | rpl::on_next([=, raw = loadingLeft.get()](int w) {
 				if (w > 0) {
 					const auto availableWidth = w
 						- st.iconLeft
@@ -595,7 +595,7 @@ void FillCreditOptions(
 						buttons,
 						std::move(owned)));
 				wrap->toggle(false, anim::type::instant);
-				showMore->clicks() | rpl::start_with_next([=] {
+				showMore->clicks() | rpl::on_next([=] {
 					wrap->toggle(true, anim::type::normal);
 				}, wrap->lifetime());
 				return wrap->entity();
@@ -622,7 +622,7 @@ void FillCreditOptions(
 			const auto textLeft = diffBetweenTextAndStar
 				+ stars.width() / style::DevicePixelRatio();
 			inner->paintRequest(
-			) | rpl::start_with_next([=](const QRect &rect) {
+			) | rpl::on_next([=](const QRect &rect) {
 				auto p = QPainter(inner);
 				p.drawImage(0, 0, stars);
 				p.setPen(st.textFg);
@@ -633,7 +633,7 @@ void FillCreditOptions(
 				});
 			}, inner->lifetime());
 			button->widthValue(
-			) | rpl::start_with_next([=](int width) {
+			) | rpl::on_next([=](int width) {
 				price->moveToRight(st.padding.right(), st.padding.top());
 				inner->moveToLeft(st.iconLeft, st.padding.top());
 				inner->resize(
@@ -697,14 +697,14 @@ void FillCreditOptions(
 	if (show->session().premiumPossible()) {
 		if (preloadedTopupOptions.empty()) {
 			fillLoading();
-			std::move(showFinishes) | rpl::start_with_next([=] {
+			std::move(showFinishes) | rpl::on_next([=] {
 				apiCredits->request(
-				) | rpl::start_with_error_done([=](const QString &error) {
+				) | rpl::on_error_done([=](const QString &error) {
 					show->showToast(error);
 				}, [=] {
 					starsState->ready.value() | rpl::filter(
 						rpl::mappers::_1
-					) | rpl::start_with_next([=] {
+					) | rpl::on_next([=] {
 						fill(apiCredits->options());
 					}, content->lifetime());
 				}, content->lifetime());
@@ -715,7 +715,7 @@ void FillCreditOptions(
 	}
 
 	show->session().premiumPossibleValue(
-	) | rpl::start_with_next([=](bool premiumPossible) {
+	) | rpl::on_next([=](bool premiumPossible) {
 		if (!premiumPossible) {
 			fill({});
 		}
@@ -756,7 +756,7 @@ not_null<Ui::RpWidget*> AddBalanceWidget(
 		st::semiboldTextStyle,
 		tr::lng_contacts_loading(tr::now));
 	if (opacityValue) {
-		std::move(opacityValue) | rpl::start_with_next([=](float64 value) {
+		std::move(opacityValue) | rpl::on_next([=](float64 value) {
 			state->opacity = value;
 		}, balance->lifetime());
 	}
@@ -768,7 +768,7 @@ not_null<Ui::RpWidget*> AddBalanceWidget(
 	};
 	std::move(
 		balanceValue
-	) | rpl::start_with_next([=](CreditsAmount value) {
+	) | rpl::on_next([=](CreditsAmount value) {
 		auto text = TextWithEntities();
 		auto helper = Ui::Text::CustomEmojiHelper();
 		if (value.ton()) {
@@ -790,7 +790,7 @@ not_null<Ui::RpWidget*> AddBalanceWidget(
 		resize();
 	}, balance->lifetime());
 	balance->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(balance);
 
 		p.setOpacity(state->opacity);
@@ -828,7 +828,7 @@ void BoostCreditsBox(
 		const auto svg = std::make_shared<QSvgRenderer>(
 			Ui::Premium::ColorizedSvg(
 				Ui::Premium::CreditsIconGradientStops()));
-		widget->paintRequest() | rpl::start_with_next([=](const QRect &r) {
+		widget->paintRequest() | rpl::on_next([=](const QRect &r) {
 			auto p = QPainter(widget);
 			svg->render(
 				&p,
@@ -869,7 +869,7 @@ void BoostCreditsBox(
 				.repaint = [=] { badge->update(); },
 			});
 		badge->paintRequest(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			auto p = QPainter(badge);
 			auto hq = PainterHighQualityEnabler(p);
 			const auto radius = badge->height() / 2;
@@ -1278,7 +1278,7 @@ void GenericCreditsEntryBox(
 
 	if (auto savedId = EntryToSavedStarGiftId(session, e)) {
 		session->data().giftUpdates(
-		) | rpl::start_with_next([=](const Data::GiftUpdate &update) {
+		) | rpl::on_next([=](const Data::GiftUpdate &update) {
 			if (update.id == savedId
 				&& update.action != Data::GiftUpdate::Action::ResaleChange) {
 				box->closeBox();
@@ -1429,20 +1429,20 @@ void GenericCreditsEntryBox(
 				session->downloaderTaskFinished()
 			) | rpl::filter([=] {
 				return state->media->loaded();
-			}) | rpl::start_with_next([=] {
+			}) | rpl::on_next([=] {
 				state->lottie = ChatHelpers::LottiePlayerFromDocument(
 					state->media.get(),
 					ChatHelpers::StickerLottieSize::MessageHistory,
 					icon->size(),
 					Lottie::Quality::High);
-				state->lottie->updates() | rpl::start_with_next([=] {
+				state->lottie->updates() | rpl::on_next([=] {
 					icon->update();
 				}, icon->lifetime());
 				state->downloadLifetime.destroy();
 			}, state->downloadLifetime);
 		}
 		icon->paintRequest(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			auto p = Painter(icon);
 			const auto &lottie = state->lottie;
 			const auto factor = style::DevicePixelRatio();
@@ -1462,7 +1462,7 @@ void GenericCreditsEntryBox(
 			}
 		}, icon->lifetime());
 		content->sizeValue(
-		) | rpl::start_with_next([=](const QSize &size) {
+		) | rpl::on_next([=](const QSize &size) {
 			icon->move((size.width() - icon->width()) / 2, isStarGift
 				? st::creditsHistoryEntryStarGiftSkip
 				: st::creditsHistoryEntryGiftStickerSkip);
@@ -1477,7 +1477,7 @@ void GenericCreditsEntryBox(
 		widget->resize(Size(stUser.photoSize));
 		widget->setNaturalWidth(stUser.photoSize);
 		widget->paintRequest(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			auto p = Painter(widget);
 			(*draw)(p, 0, 0, stUser.photoSize, stUser.photoSize);
 		}, widget->lifetime());
@@ -1642,7 +1642,7 @@ void GenericCreditsEntryBox(
 			+ roundedWidth
 			+ (minorText ? minorText->maxWidth() : 0);
 		amount->paintRequest(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			auto p = Painter(amount);
 			p.setPen(e.soldOutInfo
 				? st::menuIconAttentionColor
@@ -2219,7 +2219,7 @@ void GenericCreditsEntryBox(
 			content,
 			st::boxTitleClose);
 		close->setClickedCallback([=] { box->closeBox(); });
-		content->widthValue() | rpl::start_with_next([=](int) {
+		content->widthValue() | rpl::on_next([=](int) {
 			close->moveToRight(0, 0);
 		}, content->lifetime());
 	}
@@ -2353,20 +2353,20 @@ void UniqueGiftValueBox(
 			document->session().downloaderTaskFinished()
 		) | rpl::filter([=] {
 			return state->media->loaded();
-		}) | rpl::start_with_next([=] {
+		}) | rpl::on_next([=] {
 			state->lottie = ChatHelpers::LottiePlayerFromDocument(
 				state->media.get(),
 				ChatHelpers::StickerLottieSize::MessageHistory,
 				icon->size(),
 				Lottie::Quality::High);
-			state->lottie->updates() | rpl::start_with_next([=] {
+			state->lottie->updates() | rpl::on_next([=] {
 				icon->update();
 			}, icon->lifetime());
 			state->downloadLifetime.destroy();
 		}, state->downloadLifetime);
 	}
 	icon->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = Painter(icon);
 		const auto &lottie = state->lottie;
 		const auto factor = style::DevicePixelRatio();
@@ -2386,7 +2386,7 @@ void UniqueGiftValueBox(
 		}
 	}, icon->lifetime());
 	content->sizeValue(
-	) | rpl::start_with_next([=](const QSize &size) {
+	) | rpl::on_next([=](const QSize &size) {
 		icon->move(
 			(size.width() - icon->width()) / 2,
 			st::creditsHistoryEntryStarGiftSkip);
@@ -2402,7 +2402,7 @@ void UniqueGiftValueBox(
 				Ui::FillAmountAndCurrency(value->valuePrice, value->currency)),
 			st::uniqueGiftValuePrice),
 		style::al_top);
-	bubble->paintRequest() | rpl::start_with_next([=] {
+	bubble->paintRequest() | rpl::on_next([=] {
 		auto p = QPainter(bubble);
 		auto hq = PainterHighQualityEnabler(p);
 		p.setBrush(st::windowBgActive);
@@ -2830,7 +2830,7 @@ object_ptr<Ui::RpWidget> GenericEntryPhoto(
 	const auto draw = callback(
 		crl::guard(widget, [=] { widget->update(); }));
 	widget->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = Painter(widget);
 		draw(p, 0, 0, photoSize, photoSize);
 	}, widget->lifetime());
@@ -2883,7 +2883,7 @@ object_ptr<Ui::RpWidget> SubscriptionUserpic(
 		Ui::PaintOutlinedColoredCreditsIconCallback(
 			creditsIconSize,
 			1.5);
-	widget->paintRequest() | rpl::start_with_next([=] {
+	widget->paintRequest() | rpl::on_next([=] {
 		auto p = QPainter(raw);
 		p.fillRect(Rect(Size(photoSize)), Qt::transparent);
 		auto image = userpicMedia->image(photoSize);
@@ -3035,7 +3035,7 @@ void SmallBalanceBox(
 
 	content->resize(content->width(), content->maximumHeight());
 	content->additionalHeight(
-	) | rpl::start_with_next([=](int additionalHeight) {
+	) | rpl::on_next([=](int additionalHeight) {
 		const auto wasMax = (content->height() == content->maximumHeight());
 		content->setMaximumHeight(st::creditsLowBalancePremiumCoverHeight
 			+ additionalHeight);
@@ -3057,7 +3057,7 @@ void SmallBalanceBox(
 		rpl::combine(
 			balance->sizeValue(),
 			content->sizeValue()
-		) | rpl::start_with_next([=](const QSize &, const QSize &) {
+		) | rpl::on_next([=](const QSize &, const QSize &) {
 			balance->moveToRight(
 				st::creditsHistoryRightSkip * 2,
 				st::creditsHistoryRightSkip);
@@ -3069,7 +3069,7 @@ void SmallBalanceBox(
 		needed
 	) | rpl::filter(
 		!rpl::mappers::_1
-	) | rpl::start_with_next(done, content->lifetime());
+	) | rpl::on_next(done, content->lifetime());
 }
 
 void AddWithdrawalWidget(
@@ -3100,7 +3100,7 @@ void AddWithdrawalWidget(
 		majorLabel->height());
 	majorLabel->setAttribute(Qt::WA_TransparentForMouseEvents);
 	majorLabel->sizeValue(
-	) | rpl::start_with_next([=](const QSize &majorSize) {
+	) | rpl::on_next([=](const QSize &majorSize) {
 		const auto skip = st::channelEarnBalanceMinorLabelSkip;
 		labels->resize(
 			majorSize.width() + icon->width() + skip,
@@ -3157,12 +3157,12 @@ void AddWithdrawalWidget(
 		const auto icon = Ui::CreateChild<Ui::RpWidget>(buttonCredits);
 		const auto &st = st::msgBotKbUrlIcon;
 		icon->resize(st.width(), st.height());
-		icon->paintRequest() | rpl::start_with_next([=] {
+		icon->paintRequest() | rpl::on_next([=] {
 			auto p = QPainter(icon);
 			st.paint(p, { 0, 0 }, icon->width(), stButton.textFg->c);
 		}, icon->lifetime());
 		buttonCredits->sizeValue(
-		) | rpl::start_with_next([=, padding = st::msgBotKbIconPadding] {
+		) | rpl::on_next([=, padding = st::msgBotKbIconPadding] {
 			icon->moveToRight(padding, padding);
 		}, icon->lifetime());
 		icon->setAttribute(Qt::WA_TransparentForMouseEvents);
@@ -3186,7 +3186,7 @@ void AddWithdrawalWidget(
 	rpl::combine(
 		std::move(secondButtonUrl),
 		buttonsContainer->sizeValue()
-	) | rpl::start_with_next([=](const QString &url, const QSize &size) {
+	) | rpl::on_next([=](const QString &url, const QSize &size) {
 		const auto secondVisible = !url.isEmpty();
 		urlState->url = url;
 		withdrawalWrap->toggle(
@@ -3207,7 +3207,7 @@ void AddWithdrawalWidget(
 			buttonCredits->events(
 			) | rpl::filter([](not_null<QEvent*> e) {
 				return e->type() == QEvent::ContextMenu;
-			}) | rpl::start_with_next([=](not_null<QEvent*> e) {
+			}) | rpl::on_next([=](not_null<QEvent*> e) {
 				if (urlState->url.isEmpty()) {
 					return;
 				}
@@ -3234,7 +3234,7 @@ void AddWithdrawalWidget(
 
 	rpl::duplicate(
 		lockedValue
-	) | rpl::start_with_next([=](bool v) {
+	) | rpl::on_next([=](bool v) {
 		if (withdrawalEnabled) {
 			updateButtonState(v);
 		}
@@ -3276,7 +3276,7 @@ void AddWithdrawalWidget(
 		rpl::duplicate(lockedValue),
 		button->sizeValue(),
 		label->sizeValue()
-	) | rpl::start_with_next([=](bool v, const QSize &b, const QSize &l) {
+	) | rpl::on_next([=](bool v, const QSize &b, const QSize &l) {
 		label->moveToLeft(
 			(b.width() - l.width()) / 2,
 			(v ? -10 : 1) * (b.height() - l.height()) / 2);
@@ -3295,11 +3295,11 @@ void AddWithdrawalWidget(
 	rpl::combine(
 		rpl::duplicate(lockedValue),
 		button->sizeValue()
-	) | rpl::start_with_next([=](bool locked, const QSize &s) {
+	) | rpl::on_next([=](bool locked, const QSize &s) {
 		state->locked = locked;
 		lockedLabel->resize(s);
 	}, lockedLabel->lifetime());
-	lockedLabel->paintRequest() | rpl::start_with_next([=] {
+	lockedLabel->paintRequest() | rpl::on_next([=] {
 		auto p = QPainter(lockedLabel);
 		p.setPen(state->locked ? QPen(lockedColor) : stButton.textFg->p);
 		if (state->dateIsNull && state->locked) {
@@ -3322,7 +3322,7 @@ void AddWithdrawalWidget(
 
 	std::move(
 		dateValue
-	) | rpl::start_with_next([=](const QDateTime &dt) {
+	) | rpl::on_next([=](const QDateTime &dt) {
 		state->dateUpdateLifetime.destroy();
 		state->dateIsNull = dt.isNull();
 		if (dt.isNull()) {
@@ -3340,7 +3340,7 @@ void AddWithdrawalWidget(
 			rpl::empty
 		) | rpl::then(
 			base::timer_each(kDateUpdateInterval)
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			const auto secondsDifference = std::max(
 				was - base::unixtime::now() - 1,
 				0);
@@ -3446,7 +3446,7 @@ void MaybeRequestBalanceIncrease(
 	const auto session = &show->session();
 	session->credits().load();
 	session->credits().loadedValue(
-	) | rpl::filter(rpl::mappers::_1) | rpl::start_with_next([=] {
+	) | rpl::filter(rpl::mappers::_1) | rpl::on_next([=] {
 		state->lifetime.destroy();
 
 		const auto balance = session->credits().balance();
@@ -3467,7 +3467,7 @@ void MaybeRequestBalanceIncrease(
 				credits,
 				source,
 				success));
-			box->boxClosing() | rpl::start_with_next([=] {
+			box->boxClosing() | rpl::on_next([=] {
 				crl::on_main([=] {
 					if (!state->success) {
 						if (const auto onstack = done) {
diff --git a/Telegram/SourceFiles/settings/settings_experimental.cpp b/Telegram/SourceFiles/settings/settings_experimental.cpp
index 66551f2834..856f425089 100644
--- a/Telegram/SourceFiles/settings/settings_experimental.cpp
+++ b/Telegram/SourceFiles/settings/settings_experimental.cpp
@@ -79,7 +79,7 @@ void AddOption(
 		});
 	}
 	button->toggledChanges(
-	) | rpl::start_with_next([=, &option](bool toggled) {
+	) | rpl::on_next([=, &option](bool toggled) {
 		if (!option.relevant() && toggled != option.defaultValue()) {
 			toggles->fire_copy(option.defaultValue());
 			window->showToast(
diff --git a/Telegram/SourceFiles/settings/settings_folders.cpp b/Telegram/SourceFiles/settings/settings_folders.cpp
index c8ac855a84..dd3e63611f 100644
--- a/Telegram/SourceFiles/settings/settings_folders.cpp
+++ b/Telegram/SourceFiles/settings/settings_folders.cpp
@@ -236,7 +236,7 @@ void FilterRowButton::setup(
 	updateData(filter, true);
 	setState(_state, true);
 
-	sizeValue() | rpl::start_with_next([=](QSize size) {
+	sizeValue() | rpl::on_next([=](QSize size) {
 		const auto right = st::contactsPadding.right()
 			+ st::contactsCheckPosition.x();
 		const auto width = size.width();
@@ -463,11 +463,11 @@ void FilterRowButton::paintEvent(QPaintEvent *e) {
 		const auto button = wrap->add(
 			object_ptr<FilterRowButton>(wrap, session, filter));
 		button->removeRequests(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			remove(button);
 		}, button->lifetime());
 		button->restoreRequests(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			if (showLimitReached()) {
 				return;
 			}
@@ -503,7 +503,7 @@ void FilterRowButton::paintEvent(QPaintEvent *e) {
 		const auto id = filter.id();
 		if (ranges::contains(filters->list(), id, &Data::ChatFilter::id)) {
 			filters->chatsList(id)->fullSize().changes(
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				const auto found = find(button);
 				if (found->postponedCountUpdate) {
 					return;
@@ -543,7 +543,7 @@ void FilterRowButton::paintEvent(QPaintEvent *e) {
 	}
 
 	session->data().chatsFilters().isChatlistChanged(
-	) | rpl::start_with_next([=](FilterId id) {
+	) | rpl::on_next([=](FilterId id) {
 		const auto filters = &session->data().chatsFilters();
 		const auto &list = filters->list();
 		const auto i = ranges::find(list, id, &Data::ChatFilter::id);
@@ -605,7 +605,7 @@ void FilterRowButton::paintEvent(QPaintEvent *e) {
 		}
 	};
 	tagsButtonEnabled->events() | rpl::distinct_until_changed(
-	) | rpl::start_with_next([=](bool value) {
+	) | rpl::on_next([=](bool value) {
 		state->tagsEnabledAnimation.stop();
 		state->tagsEnabledAnimation.start(
 			setTagsProgress,
@@ -623,7 +623,7 @@ void FilterRowButton::paintEvent(QPaintEvent *e) {
 		return !list.empty();
 	}) | rpl::take(
 		1
-	) | rpl::start_with_next([=](
+	) | rpl::on_next([=](
 			const std::vector<Data::SuggestedFilter> &suggestions) {
 		for (const auto &suggestion : suggestions) {
 			const auto &filter = suggestion.filter;
@@ -637,7 +637,7 @@ void FilterRowButton::paintEvent(QPaintEvent *e) {
 				filter,
 				suggestion.description));
 			button->addRequests(
-				) | rpl::start_with_next([=] {
+				) | rpl::on_next([=] {
 				if (showLimitReached()) {
 					return;
 				}
@@ -856,7 +856,7 @@ void SetupTopContent(
 		st::settingsFilterIconPadding);
 	std::move(
 		showFinished
-	) | rpl::start_with_next([animate = std::move(icon.animate)] {
+	) | rpl::on_next([animate = std::move(icon.animate)] {
 		animate(anim::repeat::once);
 	}, verticalLayout->lifetime());
 	verticalLayout->add(std::move(icon.widget));
@@ -870,7 +870,7 @@ void SetupTopContent(
 		style::al_top)->setTryMakeSimilarLines(true);
 
 	verticalLayout->geometryValue(
-	) | rpl::start_with_next([=](const QRect &r) {
+	) | rpl::on_next([=](const QRect &r) {
 		divider->setGeometry(r);
 	}, divider->lifetime());
 
@@ -904,7 +904,7 @@ void SetupTagContent(
 			rpl::duplicate(premium),
 			rpl::mappers::_1 && rpl::mappers::_2),
 		state->tagsTurnOff.events()));
-	rpl::duplicate(premium) | rpl::start_with_next([=](bool value) {
+	rpl::duplicate(premium) | rpl::on_next([=](bool value) {
 		tagsButton->setToggleLocked(!value);
 	}, tagsButton->lifetime());
 
@@ -934,7 +934,7 @@ void SetupTagContent(
 			state->requestTimer.cancel();
 		}
 		return proceed;
-	}) | rpl::start_with_next([=](bool v) {
+	}) | rpl::on_next([=](bool v) {
 		state->sendCallback = [=] { send(v); };
 		state->requestTimer.cancel();
 		state->requestTimer.setCallback([=] { send(v); });
diff --git a/Telegram/SourceFiles/settings/settings_global_ttl.cpp b/Telegram/SourceFiles/settings/settings_global_ttl.cpp
index 0e5d3387df..f51662c9cc 100644
--- a/Telegram/SourceFiles/settings/settings_global_ttl.cpp
+++ b/Telegram/SourceFiles/settings/settings_global_ttl.cpp
@@ -174,13 +174,13 @@ void SetupTopContent(
 		st::settingsFilterIconPadding);
 	std::move(
 		showFinished
-	) | rpl::start_with_next([animate = std::move(icon.animate)] {
+	) | rpl::on_next([animate = std::move(icon.animate)] {
 		animate(anim::repeat::loop);
 	}, verticalLayout->lifetime());
 	verticalLayout->add(std::move(icon.widget));
 
 	verticalLayout->geometryValue(
-	) | rpl::start_with_next([=](const QRect &r) {
+	) | rpl::on_next([=](const QRect &r) {
 		divider->setGeometry(r);
 	}, divider->lifetime());
 
@@ -313,7 +313,7 @@ void GlobalTTL::rebuildButtons(TimeId currentTTL) const {
 		radio->setAttribute(Qt::WA_TransparentForMouseEvents);
 		radio->show();
 		button->sizeValue(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			radio->moveToRight(0, radio->checkRect().top());
 		}, radio->lifetime());
 	}
@@ -341,7 +341,7 @@ void GlobalTTL::setupContent() {
 		};
 		rebuild(apiTTL.periodDefaultHistoryTTLCurrent());
 		apiTTL.periodDefaultHistoryTTL(
-		) | rpl::start_with_next(rebuild, content->lifetime());
+		) | rpl::on_next(rebuild, content->lifetime());
 	}
 
 	const auto show = _controller->uiShow();
diff --git a/Telegram/SourceFiles/settings/settings_information.cpp b/Telegram/SourceFiles/settings/settings_information.cpp
index f66c50abbc..85e39cb60f 100644
--- a/Telegram/SourceFiles/settings/settings_information.cpp
+++ b/Telegram/SourceFiles/settings/settings_information.cpp
@@ -132,7 +132,7 @@ ComposedBadge::ComposedBadge(
 	}
 
 	_badge.updated(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (const auto button = _badge.widget()) {
 			button->widthValue(
 			) | rpl::start_to_stream(_premiumWidth, button->lifetime());
@@ -151,7 +151,7 @@ ComposedBadge::ComposedBadge(
 			: 0),
 		std::move(textWidth),
 		button->sizeValue()
-	) | rpl::start_with_next([=](
+	) | rpl::on_next([=](
 			int unreadWidth,
 			int premiumWidth,
 			int textWidth,
@@ -233,7 +233,7 @@ private:
 		user->session().changes().peerFlagsValue(
 			user,
 			Data::PeerUpdate::Flag::OnlineStatus
-		) | rpl::start_with_next(push, lifetime);
+		) | rpl::on_next(push, lifetime);
 		return lifetime;
 	};
 }
@@ -255,7 +255,7 @@ void SetupPhoto(
 	const auto upload = CreateUploadSubButton(wrap, controller);
 
 	upload->chosenImages(
-	) | rpl::start_with_next([=](Ui::UserpicButton::ChosenImage &&chosen) {
+	) | rpl::on_next([=](Ui::UserpicButton::ChosenImage &&chosen) {
 		auto &image = chosen.image;
 		UpdatePhotoLocally(self, image);
 		photo->showCustom(base::duplicate(image));
@@ -282,7 +282,7 @@ void SetupPhoto(
 		photo->widthValue(),
 		Info::Profile::NameValue(self),
 		status->widthValue()
-	) | rpl::start_with_next([=](
+	) | rpl::on_next([=](
 			int max,
 			int photoWidth,
 			const QString&,
@@ -337,7 +337,7 @@ void AddRow(
 	wrap->clicks(
 	) | rpl::filter([=] {
 		return !wrap->isDisabled();
-	}) | rpl::start_with_next([=](Qt::MouseButton button) {
+	}) | rpl::on_next([=](Qt::MouseButton button) {
 		if (button == Qt::LeftButton) {
 			edit();
 		} else if (!forcopy->isEmpty()) {
@@ -354,7 +354,7 @@ void AddRow(
 		value
 	) | rpl::filter([](const TextWithEntities &text) {
 		return text.entities.isEmpty();
-	}) | rpl::start_with_next([=](const TextWithEntities &text) {
+	}) | rpl::on_next([=](const TextWithEntities &text) {
 		*forcopy = text.text;
 	}, wrap->lifetime());
 }
@@ -527,7 +527,7 @@ void SetupRows(
 			const auto box = controller->show(
 				Box(UsernamesBox, session->user()));
 			box->boxClosing(
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				session->api().usernames().requestToCache(session->user());
 			}, box->lifetime());
 		},
@@ -570,7 +570,7 @@ void SetupBio(
 	rpl::combine(
 		bio->geometryValue(),
 		countdown->widthValue()
-	) | rpl::start_with_next([=](QRect geometry, int width) {
+	) | rpl::on_next([=](QRect geometry, int width) {
 		countdown->move(
 			geometry.x() + geometry.width() - width,
 			geometry.y() + style->textMargins.top());
@@ -603,7 +603,7 @@ void SetupBio(
 
 	Info::Profile::AboutValue(
 		self
-	) | rpl::start_with_next([=](const TextWithEntities &text) {
+	) | rpl::on_next([=](const TextWithEntities &text) {
 		const auto wasChanged = (*current != bio->getLastText());
 		*current = text.text;
 		if (wasChanged) {
@@ -616,7 +616,7 @@ void SetupBio(
 
 	const auto generation = Ui::CreateChild<int>(bio);
 	changed->events(
-	) | rpl::start_with_next([=](bool changed) {
+	) | rpl::on_next([=](bool changed) {
 		if (changed) {
 			const auto saved = *generation = std::abs(*generation) + 1;
 			base::call_delayed(kSaveBioTimeout, bio, [=] {
@@ -643,8 +643,8 @@ void SetupBio(
 	auto cursor = bio->textCursor();
 	cursor.setPosition(bio->getLastText().size());
 	bio->setTextCursor(cursor);
-	bio->submits() | rpl::start_with_next([=] { save(); }, bio->lifetime());
-	bio->changes() | rpl::start_with_next(updated, bio->lifetime());
+	bio->submits() | rpl::on_next([=] { save(); }, bio->lifetime());
+	bio->changes() | rpl::on_next(updated, bio->lifetime());
 	bio->setInstantReplaces(Ui::InstantReplaces::Default());
 	bio->setInstantReplacesEnabled(
 		Core::App().settings().replaceEmojiValue());
@@ -703,7 +703,7 @@ void SetupAccountsWrap(
 			[=] { return window->isGifPausedAtLeastFor(
 				Window::GifPauseReason::Layer); });
 		composedBadge->sizeValue(
-		) | rpl::start_with_next([=](const QSize &s) {
+		) | rpl::on_next([=](const QSize &s) {
 			container->resize(s);
 		}, container->lifetime());
 	}
@@ -723,7 +723,7 @@ void SetupAccountsWrap(
 	const auto userpicSize = st::mainMenuAccountSize
 		+ userpicSkip * 2;
 	raw->heightValue(
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		const auto left = st::mainMenuAddAccountButton.iconLeft
 			+ (st::settingsIconAdd.width() - userpicSize) / 2;
 		const auto top = (height - userpicSize) / 2;
@@ -731,7 +731,7 @@ void SetupAccountsWrap(
 	}, state->userpic.lifetime());
 
 	state->userpic.paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = Painter(&state->userpic);
 		const auto size = st::mainMenuAccountSize;
 		const auto line = st::mainMenuAccountLine;
@@ -753,7 +753,7 @@ void SetupAccountsWrap(
 
 	raw->setAcceptBoth(true);
 	raw->clicks(
-	) | rpl::start_with_next([=](Qt::MouseButton which) {
+	) | rpl::on_next([=](Qt::MouseButton which) {
 		if (which == Qt::LeftButton) {
 			callback(raw->clickModifiers());
 			return;
@@ -844,7 +844,7 @@ void AccountsList::setup() {
 
 	rpl::single(rpl::empty) | rpl::then(
 		Core::App().domain().accountsChanges()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto &list = Core::App().domain().accounts();
 		const auto exists = [&](not_null<Main::Account*> account) {
 			for (const auto &[index, existing] : list) {
@@ -864,7 +864,7 @@ void AccountsList::setup() {
 		for (const auto &[index, account] : list) {
 			if (_watched.emplace(account.get()).second) {
 				account->sessionChanges(
-				) | rpl::start_with_next([=] {
+				) | rpl::on_next([=] {
 					rebuild();
 				}, _outer->lifetime());
 			}
@@ -873,7 +873,7 @@ void AccountsList::setup() {
 	}, _outer->lifetime());
 
 	Core::App().domain().maxAccountsChanges(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		// Full rebuild.
 		for (auto i = _watched.begin(); i != _watched.end(); i++) {
 			i->second = nullptr;
@@ -923,7 +923,7 @@ not_null<Ui::SlideWrap<Ui::SettingsButton>*> AccountsList::setupAdd() {
 
 	button->setAcceptBoth(true);
 	button->clicks(
-	) | rpl::start_with_next([=](Qt::MouseButton which) {
+	) | rpl::on_next([=](Qt::MouseButton which) {
 		if (which == Qt::LeftButton) {
 			const auto modifiers = button->clickModifiers();
 			const auto newWindow = (modifiers & Qt::ControlModifier);
@@ -953,7 +953,7 @@ void AccountsList::rebuild() {
 
 	_reorder = std::make_unique<Ui::VerticalLayoutReorder>(inner);
 	_reorder->updates(
-	) | rpl::start_with_next([=](Ui::VerticalLayoutReorder::Single data) {
+	) | rpl::on_next([=](Ui::VerticalLayoutReorder::Single data) {
 		using State = Ui::VerticalLayoutReorder::State;
 		if (data.state == State::Started) {
 			++_reordering;
@@ -1111,7 +1111,7 @@ not_null<Ui::RpWidget*> AddRight(
 		button->sizeValue(),
 		widget->sizeValue(),
 		widget->shownValue()
-	) | rpl::start_with_next([=](QSize outer, QSize inner, bool shown) {
+	) | rpl::on_next([=](QSize outer, QSize inner, bool shown) {
 		auto padding = button->st().padding;
 		if (shown) {
 			widget->moveToRight(
@@ -1144,7 +1144,7 @@ not_null<Ui::RpWidget*> CreateUnread(
 
 	std::move(
 		value
-	) | rpl::start_with_next([=](UnreadBadge badge) {
+	) | rpl::on_next([=](UnreadBadge badge) {
 		state->st.muted = badge.muted;
 		state->count = badge.count;
 		if (!state->count) {
@@ -1159,7 +1159,7 @@ not_null<Ui::RpWidget*> CreateUnread(
 	}, state->widget.lifetime());
 
 	state->widget.paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = Painter(&state->widget);
 		Ui::PaintUnreadBadge(
 			p,
@@ -1178,7 +1178,7 @@ void AddUnread(
 	const auto container = AddRight(button);
 	const auto badge = CreateUnread(container, std::move(value));
 	badge->sizeValue(
-	) | rpl::start_with_next([=](const QSize &s) {
+	) | rpl::on_next([=](const QSize &s) {
 		container->resize(s);
 	}, container->lifetime());
 }
diff --git a/Telegram/SourceFiles/settings/settings_intro.cpp b/Telegram/SourceFiles/settings/settings_intro.cpp
index 904d936cf7..7f93fae937 100644
--- a/Telegram/SourceFiles/settings/settings_intro.cpp
+++ b/Telegram/SourceFiles/settings/settings_intro.cpp
@@ -137,7 +137,7 @@ Ui::RpWidget *TopBar::pushButton(base::unique_qptr<Ui::RpWidget> button) {
 	auto weak = wrapped.get();
 	_buttons.push_back(std::move(wrapped));
 	weak->widthValue(
-	) | rpl::start_with_next([this] {
+	) | rpl::on_next([this] {
 		updateControlsGeometry(width());
 	}, lifetime());
 	return weak;
@@ -231,13 +231,13 @@ IntroWidget::IntroWidget(
 , _topShadow(this) {
 	_wrap->setAttribute(Qt::WA_OpaquePaintEvent);
 	_wrap->paintRequest(
-	) | rpl::start_with_next([=](QRect clip) {
+	) | rpl::on_next([=](QRect clip) {
 		auto p = QPainter(_wrap.data());
 		p.fillRect(clip, st::boxBg);
 	}, _wrap->lifetime());
 
 	_scrollTopSkip.changes(
-	) | rpl::start_with_next([this] {
+	) | rpl::on_next([this] {
 		updateControlsGeometry();
 	}, lifetime());
 
@@ -322,7 +322,7 @@ void IntroWidget::setInnerWidget(object_ptr<Ui::RpWidget> content) {
 		_scroll->scrollTopValue(),
 		_scroll->heightValue(),
 		_innerWrap->entity()->desiredHeightValue()
-	) | rpl::start_with_next([this](
+	) | rpl::on_next([this](
 			int top,
 			int height,
 			int desired) {
@@ -437,11 +437,11 @@ void LayerWidget::setupHeightConsumers() {
 	_content->scrollTillBottomChanges(
 	) | rpl::filter([this] {
 		return !_inResize;
-	}) | rpl::start_with_next([this] {
+	}) | rpl::on_next([this] {
 		resizeToWidth(width());
 	}, lifetime());
 	_content->desiredHeightValue(
-	) | rpl::start_with_next([this](int height) {
+	) | rpl::on_next([this](int height) {
 		accumulate_max(_desiredHeight, height);
 		if (_content && !_inResize) {
 			resizeToWidth(width());
diff --git a/Telegram/SourceFiles/settings/settings_local_passcode.cpp b/Telegram/SourceFiles/settings/settings_local_passcode.cpp
index 2534edfa2a..22021f53ba 100644
--- a/Telegram/SourceFiles/settings/settings_local_passcode.cpp
+++ b/Telegram/SourceFiles/settings/settings_local_passcode.cpp
@@ -101,7 +101,7 @@ void LocalPasscodeEnter::setupContent() {
 
 	base::SystemUnlockStatus(
 		true
-	) | rpl::start_with_next([=](base::SystemUnlockAvailability status) {
+	) | rpl::on_next([=](base::SystemUnlockAvailability status) {
 		_systemUnlockWithBiometric = status.available
 			&& status.withBiometrics;
 	}, lifetime());
@@ -119,7 +119,7 @@ void LocalPasscodeEnter::setupContent() {
 		st::settingLocalPasscodeIconPadding);
 	content->add(std::move(icon.widget));
 	_showFinished.events(
-	) | rpl::start_with_next([animate = std::move(icon.animate)] {
+	) | rpl::on_next([animate = std::move(icon.animate)] {
 		animate(anim::repeat::once);
 	}, content->lifetime());
 
@@ -169,7 +169,7 @@ void LocalPasscodeEnter::setupContent() {
 			std::move(text));
 
 		container->geometryValue(
-		) | rpl::start_with_next([=](const QRect &r) {
+		) | rpl::on_next([=](const QRect &r) {
 			field->moveToLeft((r.width() - field->width()) / 2, 0);
 		}, container->lifetime());
 
@@ -293,7 +293,7 @@ void LocalPasscodeEnter::setupContent() {
 	}
 
 	_setInnerFocus.events(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (newPasscode->text().isEmpty()) {
 			newPasscode->setFocus();
 		} else if (reenterPasscode && reenterPasscode->text().isEmpty()) {
@@ -510,11 +510,11 @@ void LocalPasscodeManage::setupContent() {
 				st::boxDividerLabel),
 		st::defaultBoxDividerLabelPadding));
 	about->geometryValue(
-	) | rpl::start_with_next([=](const QRect &r) {
+	) | rpl::on_next([=](const QRect &r) {
 		divider->setGeometry(r);
 	}, divider->lifetime());
 	_isBottomFillerShown.value(
-	) | rpl::start_with_next([=](bool shown) {
+	) | rpl::on_next([=](bool shown) {
 		divider->skipEdge(Qt::BottomEdge, shown);
 	}, divider->lifetime());
 
@@ -546,7 +546,7 @@ void LocalPasscodeManage::setupContent() {
 	}));
 
 	unlockType->value(
-	) | rpl::start_with_next([=](UnlockType type) {
+	) | rpl::on_next([=](UnlockType type) {
 		while (systemUnlockContent->count()) {
 			delete systemUnlockContent->widgetAt(0);
 		}
@@ -575,7 +575,7 @@ void LocalPasscodeManage::setupContent() {
 		)->toggledChanges(
 		) | rpl::filter([=](bool value) {
 			return value != Core::App().settings().systemUnlockEnabled();
-		}) | rpl::start_with_next([=](bool value) {
+		}) | rpl::on_next([=](bool value) {
 			Core::App().settings().setSystemUnlockEnabled(value);
 			Core::App().saveSettingsDelayed();
 		}, systemUnlockContent->lifetime());
diff --git a/Telegram/SourceFiles/settings/settings_main.cpp b/Telegram/SourceFiles/settings/settings_main.cpp
index cb773b0b63..18a355ac0c 100644
--- a/Telegram/SourceFiles/settings/settings_main.cpp
+++ b/Telegram/SourceFiles/settings/settings_main.cpp
@@ -193,7 +193,7 @@ Cover::Cover(
 			_badge.widget(),
 			_badge.sizeTag());
 	});
-	_badge.updated() | rpl::start_with_next([=] {
+	_badge.updated() | rpl::on_next([=] {
 		refreshNameGeometry(width());
 	}, _name->lifetime());
 }
@@ -203,7 +203,7 @@ Cover::~Cover() = default;
 void Cover::setupChildGeometry() {
 	using namespace rpl::mappers;
 	widthValue(
-	) | rpl::start_with_next([=](int newWidth) {
+	) | rpl::on_next([=](int newWidth) {
 		_userpic->moveToLeft(
 			st::settingsPhotoLeft,
 			st::settingsPhotoTop,
@@ -217,21 +217,21 @@ void Cover::setupChildGeometry() {
 void Cover::initViewers() {
 	Info::Profile::NameValue(
 		_user
-	) | rpl::start_with_next([=](const QString &name) {
+	) | rpl::on_next([=](const QString &name) {
 		_name->setText(name);
 		refreshNameGeometry(width());
 	}, lifetime());
 
 	Info::Profile::PhoneValue(
 		_user
-	) | rpl::start_with_next([=](const TextWithEntities &value) {
+	) | rpl::on_next([=](const TextWithEntities &value) {
 		_phone->setText(value.text);
 		refreshPhoneGeometry(width());
 	}, lifetime());
 
 	Info::Profile::UsernameValue(
 		_user
-	) | rpl::start_with_next([=](const TextWithEntities &value) {
+	) | rpl::on_next([=](const TextWithEntities &value) {
 		_username->setMarkedText(Ui::Text::Link(value.text.isEmpty()
 			? tr::lng_settings_username_add(tr::now)
 			: value.text));
@@ -309,12 +309,12 @@ void Cover::refreshUsernameGeometry(int newWidth) {
 
 	const auto isPausedValue
 		= button->lifetime().make_state<rpl::variable<bool>>(isPaused());
-	isPausedValue->value() | rpl::start_with_next([=](bool value) {
+	isPausedValue->value() | rpl::on_next([=](bool value) {
 		ministars->setPaused(value);
 	}, ministarsContainer->lifetime());
 
 	ministarsContainer->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		(*isPausedValue) = isPaused();
 		auto p = QPainter(ministarsContainer);
 		{
@@ -346,13 +346,13 @@ void Cover::refreshUsernameGeometry(int newWidth) {
 	}();
 	badge->resize(star.size() / style::DevicePixelRatio());
 	badge->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(badge);
 		p.drawImage(0, 0, star);
 	}, badge->lifetime());
 
 	button->sizeValue(
-	) | rpl::start_with_next([=](const QSize &s) {
+	) | rpl::on_next([=](const QSize &s) {
 		badge->moveToLeft(
 			button->st().iconLeft
 				+ (st::menuIconShop.width() - badge->width()) / 2,
@@ -512,7 +512,7 @@ void SetupValidatePhoneNumberSuggestion(
 		}));
 	});
 
-	wrap->widthValue() | rpl::start_with_next([=](int width) {
+	wrap->widthValue() | rpl::on_next([=](int width) {
 		const auto buttonWidth = (width - st::inviteLinkButtonsSkip) / 2;
 		yes->setFullWidth(buttonWidth);
 		no->setFullWidth(buttonWidth);
@@ -583,7 +583,7 @@ void SetupValidatePasswordSuggestion(
 		showOther(Settings::CloudPasswordSuggestionInputId());
 	});
 
-	wrap->widthValue() | rpl::start_with_next([=](int width) {
+	wrap->widthValue() | rpl::on_next([=](int width) {
 		const auto buttonWidth = (width - st::inviteLinkButtonsSkip) / 2;
 		yes->setFullWidth(buttonWidth);
 		no->setFullWidth(buttonWidth);
@@ -952,7 +952,7 @@ void SetupInterfaceScale(
 	button->toggledValue(
 	) | rpl::map([](bool checked) {
 		return checked ? style::kScaleAuto : cEvalScale(cConfigScale());
-	}) | rpl::start_with_next([=](int scale) {
+	}) | rpl::on_next([=](int scale) {
 		setScale(scale, setScale);
 	}, button->lifetime());
 
diff --git a/Telegram/SourceFiles/settings/settings_notifications.cpp b/Telegram/SourceFiles/settings/settings_notifications.cpp
index 5b5b6f758d..2291ed4347 100644
--- a/Telegram/SourceFiles/settings/settings_notifications.cpp
+++ b/Telegram/SourceFiles/settings/settings_notifications.cpp
@@ -218,13 +218,13 @@ void AddTypeButton(
 
 	const auto separator = Ui::CreateChild<Ui::RpWidget>(container.get());
 	separator->paintRequest(
-	) | rpl::start_with_next([=, bg = st.textBgOver] {
+	) | rpl::on_next([=, bg = st.textBgOver] {
 		auto p = QPainter(separator);
 		p.fillRect(separator->rect(), bg);
 	}, separator->lifetime());
 	const auto separatorHeight = st.height - 2 * st.toggle.border;
 	button->geometryValue(
-	) | rpl::start_with_next([=](const QRect &r) {
+	) | rpl::on_next([=](const QRect &r) {
 		const auto w = st::rightsButtonToggleWidth;
 		toggleButton->setGeometry(
 			r.x() + r.width() - w,
@@ -241,12 +241,12 @@ void AddTypeButton(
 	const auto checkWidget = Ui::CreateChild<Ui::RpWidget>(toggleButton);
 	checkWidget->resize(checkView->getSize());
 	checkWidget->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(checkWidget);
 		checkView->paint(p, 0, 0, checkWidget->width());
 	}, checkWidget->lifetime());
 	toggleButton->sizeValue(
-	) | rpl::start_with_next([=](const QSize &s) {
+	) | rpl::on_next([=](const QSize &s) {
 		checkWidget->moveToRight(
 			st.toggleSkip,
 			(s.height() - checkWidget->height()) / 2);
@@ -261,7 +261,7 @@ void AddTypeButton(
 		});
 	});
 	toggleButton->clicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto count = int(settings->exceptions(type).size());
 		if (!count) {
 			toggle();
@@ -817,7 +817,7 @@ NotifyViewCheckboxes SetupNotifyViewOptions(
 	widget->widthValue(
 	) | rpl::filter(
 		_1 >= (st::historyMinimalWidth / 2)
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		const auto margins = st::notifyPreviewMargins;
 		const auto bubblew = width - margins.left() - margins.right();
 		const auto bubbleh = view->resizeGetHeight(bubblew);
@@ -834,7 +834,7 @@ NotifyViewCheckboxes SetupNotifyViewOptions(
 	}, widget->lifetime());
 
 	widget->paintRequest(
-	) | rpl::start_with_next([=](QRect rect) {
+	) | rpl::on_next([=](QRect rect) {
 		Window::SectionWidget::PaintBackground(
 			controller,
 			controller->defaultChatTheme().get(), // #TODO themes
@@ -849,13 +849,13 @@ NotifyViewCheckboxes SetupNotifyViewOptions(
 	}, widget->lifetime());
 
 	name->checkedChanges(
-	) | rpl::start_with_next([=](bool checked) {
+	) | rpl::on_next([=](bool checked) {
 		view->setNameShown(checked);
 		widget->update();
 	}, name->lifetime());
 
 	preview->checkedChanges(
-	) | rpl::start_with_next([=](bool checked) {
+	) | rpl::on_next([=](bool checked) {
 		view->setPreviewShown(checked);
 		widget->update();
 	}, preview->lifetime());
@@ -880,7 +880,7 @@ void SetupAdvancedNotifications(
 		skipInFocus->toggledChanges(
 		) | rpl::filter([](bool checked) {
 			return (checked != Core::App().settings().skipToastsInFocus());
-		}) | rpl::start_with_next([=](bool checked) {
+		}) | rpl::on_next([=](bool checked) {
 			Core::App().settings().setSkipToastsInFocus(checked);
 			Core::App().saveSettingsDelayed();
 			if (checked && Platform::Notifications::SkipToastForCustom()) {
@@ -986,7 +986,7 @@ void SetupAdvancedNotifications(
 	}
 	count->setActiveSectionFast(CurrentCount() - 1);
 	count->sectionActivated(
-	) | rpl::start_with_next([=](int section) {
+	) | rpl::on_next([=](int section) {
 		position->setCount(section + 1);
 	}, count->lifetime());
 	Ui::AddSkip(container, st::settingsCheckboxesSkip);
@@ -1008,7 +1008,7 @@ void SetupMultiAccountNotifications(
 	fromAll->toggledChanges(
 	) | rpl::filter([](bool checked) {
 		return (checked != Core::App().settings().notifyFromAll());
-	}) | rpl::start_with_next([=](bool checked) {
+	}) | rpl::on_next([=](bool checked) {
 		Core::App().settings().setNotifyFromAll(checked);
 		Core::App().saveSettingsDelayed();
 		if (!checked) {
@@ -1159,7 +1159,7 @@ void SetupNotificationsContent(
 	) | rpl::filter([=](bool enabled) {
 		const auto silent = session->api().contactSignupSilentCurrent();
 		return (enabled == silent.value_or(false));
-	}) | rpl::start_with_next([=](bool enabled) {
+	}) | rpl::on_next([=](bool enabled) {
 		session->api().saveContactSignupSilent(!enabled);
 	}, joined->lifetime());
 
@@ -1172,7 +1172,7 @@ void SetupNotificationsContent(
 	pinned->toggledChanges(
 	) | rpl::filter([=](bool notify) {
 		return (notify != Core::App().settings().notifyAboutPinned());
-	}) | rpl::start_with_next([=](bool notify) {
+	}) | rpl::on_next([=](bool notify) {
 		Core::App().settings().setNotifyAboutPinned(notify);
 		Core::App().saveSettingsDelayed();
 	}, joined->lifetime());
@@ -1193,7 +1193,7 @@ void SetupNotificationsContent(
 	acceptCalls->toggledChanges(
 	) | rpl::filter([=](bool toggled) {
 		return (toggled == authorizations->callsDisabledHere());
-	}) | rpl::start_with_next([=](bool toggled) {
+	}) | rpl::on_next([=](bool toggled) {
 		authorizations->toggleCallsDisabledHere(!toggled);
 	}, container->lifetime());
 
@@ -1273,7 +1273,7 @@ void SetupNotificationsContent(
 	desktop->toggledChanges(
 	) | rpl::filter([](bool checked) {
 		return (checked != Core::App().settings().desktopNotify());
-	}) | rpl::start_with_next([=](bool checked) {
+	}) | rpl::on_next([=](bool checked) {
 		Core::App().settings().setDesktopNotify(checked);
 		changed(Change::DesktopEnabled);
 	}, desktop->lifetime());
@@ -1281,7 +1281,7 @@ void SetupNotificationsContent(
 	sound->toggledChanges(
 	) | rpl::filter([](bool checked) {
 		return (checked != Core::App().settings().soundNotify());
-	}) | rpl::start_with_next([=](bool checked) {
+	}) | rpl::on_next([=](bool checked) {
 		Core::App().settings().setSoundNotify(checked);
 		changed(Change::SoundEnabled);
 	}, sound->lifetime());
@@ -1297,7 +1297,7 @@ void SetupNotificationsContent(
 		return NotifyView::ShowPreview;
 	}) | rpl::filter([=](NotifyView value) {
 		return (value != Core::App().settings().notifyView());
-	}) | rpl::start_with_next([=](NotifyView value) {
+	}) | rpl::on_next([=](NotifyView value) {
 		Core::App().settings().setNotifyView(value);
 		changed(Change::ViewParams);
 	}, name->lifetime());
@@ -1313,7 +1313,7 @@ void SetupNotificationsContent(
 		return NotifyView::ShowNothing;
 	}) | rpl::filter([=](NotifyView value) {
 		return (value != Core::App().settings().notifyView());
-	}) | rpl::start_with_next([=](NotifyView value) {
+	}) | rpl::on_next([=](NotifyView value) {
 		Core::App().settings().setNotifyView(value);
 		changed(Change::ViewParams);
 	}, preview->lifetime());
@@ -1321,7 +1321,7 @@ void SetupNotificationsContent(
 	flashbounce->toggledChanges(
 	) | rpl::filter([](bool checked) {
 		return (checked != Core::App().settings().flashBounceNotify());
-	}) | rpl::start_with_next([=](bool checked) {
+	}) | rpl::on_next([=](bool checked) {
 		Core::App().settings().setFlashBounceNotify(checked);
 		changed(Change::FlashBounceEnabled);
 	}, flashbounce->lifetime());
@@ -1329,7 +1329,7 @@ void SetupNotificationsContent(
 	muted->toggledChanges(
 	) | rpl::filter([=](bool checked) {
 		return (checked != Core::App().settings().includeMutedCounter());
-	}) | rpl::start_with_next([=](bool checked) {
+	}) | rpl::on_next([=](bool checked) {
 		Core::App().settings().setIncludeMutedCounter(checked);
 		changed(Change::IncludeMuted);
 	}, muted->lifetime());
@@ -1339,7 +1339,7 @@ void SetupNotificationsContent(
 		) | rpl::filter([=](bool checked) {
 			return (checked
 				!= Core::App().settings().includeMutedCounterFolders());
-		}) | rpl::start_with_next([=](bool checked) {
+		}) | rpl::on_next([=](bool checked) {
 			Core::App().settings().setIncludeMutedCounterFolders(checked);
 			changed(Change::IncludeMuted);
 		}, mutedFolders->lifetime());
@@ -1348,13 +1348,13 @@ void SetupNotificationsContent(
 	count->toggledChanges(
 	) | rpl::filter([=](bool checked) {
 		return (checked != Core::App().settings().countUnreadMessages());
-	}) | rpl::start_with_next([=](bool checked) {
+	}) | rpl::on_next([=](bool checked) {
 		Core::App().settings().setCountUnreadMessages(checked);
 		changed(Change::CountMessages);
 	}, count->lifetime());
 
 	Core::App().notifications().settingsChanged(
-	) | rpl::start_with_next([=](Change change) {
+	) | rpl::on_next([=](Change change) {
 		if (change == Change::DesktopEnabled) {
 			desktopToggles->fire(Core::App().settings().desktopNotify());
 			previewWrap->toggle(
@@ -1377,7 +1377,7 @@ void SetupNotificationsContent(
 		native->toggledChanges(
 		) | rpl::filter([](bool checked) {
 			return (checked != Core::App().settings().nativeNotifications());
-		}) | rpl::start_with_next([=](bool checked) {
+		}) | rpl::on_next([=](bool checked) {
 			Core::App().settings().setNativeNotifications(checked);
 			Core::App().saveSettingsDelayed();
 			Core::App().notifications().createManager();
diff --git a/Telegram/SourceFiles/settings/settings_notifications_type.cpp b/Telegram/SourceFiles/settings/settings_notifications_type.cpp
index 4f3f9e9ae0..098973cbb6 100644
--- a/Telegram/SourceFiles/settings/settings_notifications_type.cpp
+++ b/Telegram/SourceFiles/settings/settings_notifications_type.cpp
@@ -148,7 +148,7 @@ void AddExceptionBoxController::prepareViewHook() {
 		Data::PeerUpdate::Flag::Notifications
 	) | rpl::filter([=](const Data::PeerUpdate &update) {
 		return update.peer == _lastClickedPeer;
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		if (const auto onstack = _done) {
 			onstack(_lastClickedPeer);
 		}
@@ -213,13 +213,13 @@ void ExceptionsController::prepare() {
 	refreshRows();
 
 	session().data().notifySettings().exceptionsUpdates(
-	) | rpl::filter(rpl::mappers::_1 == _type) | rpl::start_with_next([=] {
+	) | rpl::filter(rpl::mappers::_1 == _type) | rpl::on_next([=] {
 		refreshRows();
 	}, lifetime());
 
 	session().changes().peerUpdates(
 		Data::PeerUpdate::Flag::Notifications
-	) | rpl::start_with_next([=](const Data::PeerUpdate &update) {
+	) | rpl::on_next([=](const Data::PeerUpdate &update) {
 		const auto peer = update.peer;
 		if (const auto row = delegate()->peerListFindRow(peer->id.value)) {
 			if (peer->notify().muteUntil().has_value()) {
@@ -473,11 +473,11 @@ void SetupChecks(
 	};
 	settings->defaultUpdates(
 		Notify::User
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		toneLabel->fire(label());
 	}, toneInner->lifetime());
 	session->api().ringtones().listUpdates(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		toneLabel->fire(label());
 	}, toneInner->lifetime());
 
@@ -509,7 +509,7 @@ void SetupChecks(
 	enabled->toggledValue(
 	) | rpl::filter([=](bool value) {
 		return (value != NotificationsEnabledForType(session, type));
-	}) | rpl::start_with_next([=](bool value) {
+	}) | rpl::on_next([=](bool value) {
 		settings->defaultUpdate(type, Data::MuteValue{
 			.unmute = value,
 			.forever = !value,
@@ -520,7 +520,7 @@ void SetupChecks(
 	) | rpl::filter([=](bool enabled) {
 		const auto sound = settings->defaultSettings(type).sound();
 		return (!sound || !sound->none) != enabled;
-	}) | rpl::start_with_next([=](bool enabled) {
+	}) | rpl::on_next([=](bool enabled) {
 		const auto value = Data::NotifySound{ .none = !enabled };
 		settings->defaultUpdate(type, {}, {}, value);
 	}, sound->lifetime());
diff --git a/Telegram/SourceFiles/settings/settings_passkeys.cpp b/Telegram/SourceFiles/settings/settings_passkeys.cpp
index 99292e29b3..28293e421f 100644
--- a/Telegram/SourceFiles/settings/settings_passkeys.cpp
+++ b/Telegram/SourceFiles/settings/settings_passkeys.cpp
@@ -89,7 +89,7 @@ void PasskeysNoneBox(
 			st::settingLocalPasscodeIconPadding);
 		const auto animate = std::move(icon.animate);
 		box->addRow(std::move(icon.widget), style::al_top);
-		box->showFinishes() | rpl::take(1) | rpl::start_with_next([=] {
+		box->showFinishes() | rpl::take(1) | rpl::on_next([=] {
 			animate(anim::repeat::once);
 		}, content->lifetime());
 	}
@@ -138,13 +138,13 @@ void PasskeysNoneBox(
 			const auto left = Ui::CreateChild<Ui::RpWidget>(
 				box->verticalLayout().get());
 			left->paintRequest(
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				auto p = Painter(left);
 				icon.paint(p, 0, 0, left->width());
 			}, left->lifetime());
 			left->resize(icon.size());
 			top->geometryValue(
-			) | rpl::start_with_next([=](const QRect &g) {
+			) | rpl::on_next([=](const QRect &g) {
 				left->moveToLeft(
 					iconLeft,
 					g.top() + st::channelEarnHistoryThreeSkip);
@@ -283,7 +283,7 @@ void Passkeys::setupContent(
 					QPoint(menu->width(), menu->height()));
 				popup->popup(menuGlobal);
 			});
-			button->widthValue() | rpl::start_with_next([=](int width) {
+			button->widthValue() | rpl::on_next([=](int width) {
 				menu->moveToRight(0, (st.height - menu->height()) / 2, width);
 			}, button->lifetime());
 			const auto iconSize = st::settingsIconPasskeys.width();
@@ -376,7 +376,7 @@ void Passkeys::setupContent(
 	buttonWrap->finishAnimating();
 
 	session->passkeys().requestList(
-	) | rpl::start_with_next(rebuild, content->lifetime());
+	) | rpl::on_next(rebuild, content->lifetime());
 	rebuild();
 
 	Ui::AddSkip(content);
diff --git a/Telegram/SourceFiles/settings/settings_power_saving.cpp b/Telegram/SourceFiles/settings/settings_power_saving.cpp
index 6c4e7768da..7b29c1cfbb 100644
--- a/Telegram/SourceFiles/settings/settings_power_saving.cpp
+++ b/Telegram/SourceFiles/settings/settings_power_saving.cpp
@@ -91,7 +91,7 @@ void PowerSavingBox(not_null<Ui::GenericBox*> box) {
 				tr::lng_settings_power_turn_off(tr::now),
 				kForceDisableTooltipDuration);
 		});
-		disabler->paintRequest() | rpl::start_with_next([=](QRect clip) {
+		disabler->paintRequest() | rpl::on_next([=](QRect clip) {
 			auto color = st::boxBg->c;
 			color.setAlpha(96);
 			QPainter(disabler).fillRect(clip, color);
@@ -99,7 +99,7 @@ void PowerSavingBox(not_null<Ui::GenericBox*> box) {
 		rpl::combine(
 			subtitle->geometryValue(),
 			controlsRaw->geometryValue()
-		) | rpl::start_with_next([=](QRect subtitle, QRect controls) {
+		) | rpl::on_next([=](QRect subtitle, QRect controls) {
 			disabler->setGeometry(subtitle.united(controls));
 		}, disabler->lifetime());
 		disabler->showOn(state->forceDisabledMessage.value(
diff --git a/Telegram/SourceFiles/settings/settings_premium.cpp b/Telegram/SourceFiles/settings/settings_premium.cpp
index dd60153664..aca73cd1a9 100644
--- a/Telegram/SourceFiles/settings/settings_premium.cpp
+++ b/Telegram/SourceFiles/settings/settings_premium.cpp
@@ -535,7 +535,7 @@ EmojiStatusTopBar::EmojiStatusTopBar(
 
 	rpl::single() | rpl::then(
 		document->owner().session().downloaderTaskFinished()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (!_media->loaded()) {
 			return;
 		}
@@ -705,7 +705,7 @@ TopBarWithSticker::TopBarWithSticker(
 
 	rpl::single() | rpl::then(
 		style::PaletteChanged()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		TopBarAbstract::computeIsDark();
 		update();
 	}, lifetime());
@@ -720,7 +720,7 @@ TopBarWithSticker::TopBarWithSticker(
 		(args.aboutValue
 			? std::move(args.aboutValue)
 			: rpl::single(TextWithEntities()))
-	) | rpl::start_with_next([=](
+	) | rpl::on_next([=](
 			DocumentData *document,
 			const QString &name,
 			const TextWithEntities &about) {
@@ -743,11 +743,11 @@ TopBarWithSticker::TopBarWithSticker(
 		update();
 	}, lifetime());
 
-	_title->naturalWidthValue() | rpl::start_with_next([=] {
+	_title->naturalWidthValue() | rpl::on_next([=] {
 		_title->resizeToNaturalWidth(st::settingsPremiumUserTitle.minWidth);
 	}, _title->lifetime());
 
-	_about->naturalWidthValue() | rpl::start_with_next([=] {
+	_about->naturalWidthValue() | rpl::on_next([=] {
 		_about->resizeToNaturalWidth(st::userPremiumCover.about.minWidth);
 	}, _about->lifetime());
 
@@ -755,7 +755,7 @@ TopBarWithSticker::TopBarWithSticker(
 		_title->sizeValue(),
 		_about->sizeValue(),
 		_content->sizeValue()
-	) | rpl::start_with_next([=](
+	) | rpl::on_next([=](
 			const QSize &titleSize,
 			const QSize &aboutSize,
 			const QSize &size) {
@@ -794,7 +794,7 @@ TopBarWithSticker::TopBarWithSticker(
 			false
 		) | rpl::then(std::move(showFinished) | rpl::map_to(true)),
 		sizeValue()
-	) | rpl::start_with_next([=](bool showFinished, const QSize &size) {
+	) | rpl::on_next([=](bool showFinished, const QSize &size) {
 		_content->resize(size.width(), maximumHeight());
 		const auto skip = TopTransitionSkip();
 		_content->moveToLeft(0, size.height() - _content->height() - skip);
@@ -822,7 +822,7 @@ TopBarWithSticker::TopBarWithSticker(
 	}, lifetime());
 
 	_smallTop.widget->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		Painter p(_smallTop.widget);
 
 		p.setOpacity(_smallTop.animation.value(_smallTop.shown ? 1. : 0.));
@@ -838,7 +838,7 @@ TopBarWithSticker::TopBarWithSticker(
 	}, lifetime());
 
 	_content->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(_content);
 
 		_ministars.paint(p);
@@ -913,7 +913,7 @@ void TopBarWithSticker::updateTitle(
 			Data::StickersType::Emoji));
 
 		box->boxClosing(
-		) | rpl::start_with_next(crl::guard(this, [=] {
+		) | rpl::on_next(crl::guard(this, [=] {
 			setPaused(false);
 		}), box->lifetime());
 	});
@@ -1275,7 +1275,7 @@ base::weak_qptr<Ui::RpWidget> Premium::createPinnedToTop(
 	};
 
 	_wrap.value(
-	) | rpl::start_with_next([=](Info::Wrap wrap) {
+	) | rpl::on_next([=](Info::Wrap wrap) {
 		content->setRoundEdges(wrap == Info::Wrap::Layer);
 	}, content->lifetime());
 
@@ -1290,7 +1290,7 @@ base::weak_qptr<Ui::RpWidget> Premium::createPinnedToTop(
 
 	content->resize(content->width(), content->maximumHeight());
 	content->additionalHeight(
-	) | rpl::start_with_next([=](int additionalHeight) {
+	) | rpl::on_next([=](int additionalHeight) {
 		const auto wasMax = (content->height() == content->maximumHeight());
 		content->setMaximumHeight(calculateMaximumHeight()
 			+ additionalHeight);
@@ -1300,7 +1300,7 @@ base::weak_qptr<Ui::RpWidget> Premium::createPinnedToTop(
 	}, content->lifetime());
 
 	_wrap.value(
-	) | rpl::start_with_next([=](Info::Wrap wrap) {
+	) | rpl::on_next([=](Info::Wrap wrap) {
 		const auto isLayer = (wrap == Info::Wrap::Layer);
 		_back = base::make_unique_q<Ui::FadeWrap<Ui::IconButton>>(
 			content,
@@ -1320,7 +1320,7 @@ base::weak_qptr<Ui::RpWidget> Premium::createPinnedToTop(
 			_showBack.fire({});
 		});
 		_back->toggledValue(
-		) | rpl::start_with_next([=](bool toggled) {
+		) | rpl::on_next([=](bool toggled) {
 			const auto &st = isLayer ? st::infoLayerTopBar : st::infoTopBar;
 			content->setTextPosition(
 				toggled ? st.back.width : st.titlePosition.x(),
@@ -1340,7 +1340,7 @@ base::weak_qptr<Ui::RpWidget> Premium::createPinnedToTop(
 				_controller->parentController()->hideSpecialLayer();
 			});
 			content->widthValue(
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				_close->moveToRight(0, 0);
 			}, _close->lifetime());
 		}
@@ -1427,12 +1427,12 @@ base::weak_qptr<Ui::RpWidget> Premium::createPinnedToBottom(
 	}
 
 	_showFinished.events(
-	) | rpl::take(1) | rpl::start_with_next([=] {
+	) | rpl::take(1) | rpl::on_next([=] {
 		_subscribe->startGlareAnimation();
 	}, _subscribe->lifetime());
 
 	content->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		const auto padding = st::settingsPremiumButtonPadding;
 		_subscribe->resizeToWidth(width - padding.left() - padding.right());
 	}, _subscribe->lifetime());
@@ -1441,7 +1441,7 @@ base::weak_qptr<Ui::RpWidget> Premium::createPinnedToBottom(
 		_subscribe->heightValue(),
 		Data::AmPremiumValue(session),
 		session->premiumPossibleValue()
-	) | rpl::start_with_next([=](
+	) | rpl::on_next([=](
 			int buttonHeight,
 			bool premium,
 			bool premiumPossible) {
@@ -1637,7 +1637,7 @@ not_null<Ui::RoundButton*> CreateLockedButton(
 	const auto icon = Ui::CreateChild<Ui::RpWidget>(result);
 	icon->setAttribute(Qt::WA_TransparentForMouseEvents);
 	icon->resize(st::stickersPremiumLock.size());
-	icon->paintRequest() | rpl::start_with_next([=] {
+	icon->paintRequest() | rpl::on_next([=] {
 		auto p = QPainter(icon);
 		st::stickersPremiumLock.paint(p, 0, 0, icon->width());
 	}, icon->lifetime());
@@ -1646,7 +1646,7 @@ not_null<Ui::RoundButton*> CreateLockedButton(
 		result->widthValue(),
 		label->widthValue(),
 		std::move(locked)
-	) | rpl::start_with_next([=](int outer, int inner, bool locked) {
+	) | rpl::on_next([=](int outer, int inner, bool locked) {
 		if (locked) {
 			icon->show();
 			inner += icon->width();
@@ -1752,7 +1752,7 @@ not_null<Ui::GradientButton*> CreateSubscribeButton(
 	rpl::combine(
 		result->widthValue(),
 		label->widthValue()
-	) | rpl::start_with_next([=](int outer, int width) {
+	) | rpl::on_next([=](int outer, int width) {
 		label->moveToLeft(
 			(outer - width) / 2,
 			st::premiumPreviewBox.button.textTop,
@@ -1860,12 +1860,12 @@ void AddSummaryPremium(
 		dummy->setAttribute(Qt::WA_TransparentForMouseEvents);
 
 		content->sizeValue(
-		) | rpl::start_with_next([=](const QSize &s) {
+		) | rpl::on_next([=](const QSize &s) {
 			dummy->resize(s.width(), iconSize.height());
 		}, dummy->lifetime());
 
 		label->geometryValue(
-		) | rpl::start_with_next([=](const QRect &r) {
+		) | rpl::on_next([=](const QRect &r) {
 			dummy->moveToLeft(0, r.y() + (r.height() - labelAscent));
 		}, dummy->lifetime());
 
@@ -1873,7 +1873,7 @@ void AddSummaryPremium(
 			content->widthValue(),
 			label->heightValue(),
 			description->heightValue()
-		) | rpl::start_with_next([=,
+		) | rpl::on_next([=,
 			topPadding = titlePadding,
 			bottomPadding = descriptionPadding](
 				int width,
@@ -1889,7 +1889,7 @@ void AddSummaryPremium(
 					+ bottomPadding.bottom());
 		}, button->lifetime());
 		label->topValue(
-		) | rpl::start_with_next([=, padding = titlePadding.top()](int top) {
+		) | rpl::on_next([=, padding = titlePadding.top()](int top) {
 			button->moveToLeft(0, top - padding);
 		}, button->lifetime());
 		const auto arrow = Ui::CreateChild<Ui::IconButton>(
@@ -1900,7 +1900,7 @@ void AddSummaryPremium(
 			&st::settingsPremiumArrowOver);
 		arrow->setAttribute(Qt::WA_TransparentForMouseEvents);
 		button->sizeValue(
-		) | rpl::start_with_next([=](const QSize &s) {
+		) | rpl::on_next([=](const QSize &s) {
 			const auto &point = st::settingsPremiumArrowShift;
 			arrow->moveToRight(
 				-point.x(),
@@ -1984,12 +1984,12 @@ std::unique_ptr<Ui::RpWidget> MakeEmojiStatusPreview(
 		document,
 		[=](QRect r) { raw->update(std::move(r)); },
 		size);
-	raw->paintRequest() | rpl::start_with_next([=] {
+	raw->paintRequest() | rpl::on_next([=] {
 		auto p = QPainter(raw);
 		emoji->paint(p);
 	}, raw->lifetime());
 
-	raw->sizeValue() | rpl::start_with_next([=](QSize size) {
+	raw->sizeValue() | rpl::on_next([=](QSize size) {
 		emoji->setCenter(QPointF(size.width() / 2., size.height() / 2.));
 	}, raw->lifetime());
 
diff --git a/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp b/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp
index cf9eec1841..ca203ae862 100644
--- a/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp
+++ b/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp
@@ -111,7 +111,7 @@ void BlockPeerBoxController::prepareViewHook() {
 	delegate()->peerListSetTitle(tr::lng_blocked_list_add_title());
 	session().changes().peerUpdates(
 		Data::PeerUpdate::Flag::IsBlocked
-	) | rpl::start_with_next([=](const Data::PeerUpdate &update) {
+	) | rpl::on_next([=](const Data::PeerUpdate &update) {
 		if (auto row = delegate()->peerListFindRow(update.peer->id.value)) {
 			updateIsBlocked(row, update.peer);
 			delegate()->peerListUpdateRow(row);
@@ -350,14 +350,14 @@ void BlockedBoxController::prepare() {
 
 	session().changes().peerUpdates(
 		Data::PeerUpdate::Flag::IsBlocked
-	) | rpl::start_with_next([=](const Data::PeerUpdate &update) {
+	) | rpl::on_next([=](const Data::PeerUpdate &update) {
 		handleBlockedEvent(update.peer);
 	}, lifetime());
 
 	session().api().blockedPeers().slice(
 	) | rpl::take(
 		1
-	) | rpl::start_with_next([=](const Api::BlockedPeers::Slice &result) {
+	) | rpl::on_next([=](const Api::BlockedPeers::Slice &result) {
 		setDescriptionText(tr::lng_blocked_list_about(tr::now));
 		applySlice(result);
 		loadMoreRows();
@@ -588,7 +588,7 @@ object_ptr<Ui::RpWidget> PhoneNumberPrivacyController::setupMiddleWidget(
 		key
 	) | rpl::take(
 		1
-	) | rpl::start_with_next([=](const PrivacyRule &value) {
+	) | rpl::on_next([=](const PrivacyRule &value) {
 		group->setValue(value.option);
 	}, widget->lifetime());
 
@@ -696,7 +696,7 @@ object_ptr<Ui::RpWidget> LastSeenPrivacyController::setupBelowWidget(
 		tr::lng_edit_lastseen_hide_read_time(),
 		st::settingsButtonNoIcon
 	))->toggleOn(privacy->hideReadTime())->toggledValue(
-	) | rpl::start_with_next([=](bool value) {
+	) | rpl::on_next([=](bool value) {
 		_hideReadTime = value;
 	}, content->lifetime());
 
@@ -1037,7 +1037,7 @@ object_ptr<Ui::RpWidget> ForwardsPrivacyController::setupAboveWidget(
 	state->item = std::move(message);
 	state->tooltip = base::make_unique_q<Ui::RpWidget>(outerContainer);
 	state->tooltip->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (state->info.paint) {
 			auto p = QPainter(state->tooltip.get());
 			state->info.paint(p);
@@ -1079,7 +1079,7 @@ object_ptr<Ui::RpWidget> ForwardsPrivacyController::setupAboveWidget(
 	widget->widthValue(
 	) | rpl::filter(
 		_1 >= (st::historyMinimalWidth / 2)
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		const auto height = view->resizeGetHeight(width);
 		const auto top = view->marginTop();
 		const auto bottom = view->marginBottom();
@@ -1090,7 +1090,7 @@ object_ptr<Ui::RpWidget> ForwardsPrivacyController::setupAboveWidget(
 	rpl::combine(
 		widget->widthValue(),
 		std::move(optionValue)
-	) | rpl::start_with_next([=](int width, Option value) {
+	) | rpl::on_next([=](int width, Option value) {
 		state->info = PrepareForwardedTooltip(view, value);
 		state->tooltip->resize(state->info.geometry.size());
 		state->refreshGeometry();
@@ -1098,7 +1098,7 @@ object_ptr<Ui::RpWidget> ForwardsPrivacyController::setupAboveWidget(
 	}, state->tooltip->lifetime());
 
 	widget->paintRequest(
-	) | rpl::start_with_next([=](QRect rect) {
+	) | rpl::on_next([=](QRect rect) {
 		// #TODO themes
 		Window::SectionWidget::PaintBackground(
 			controller,
@@ -1216,7 +1216,7 @@ object_ptr<Ui::RpWidget> ProfilePhotoPrivacyController::setupMiddleWidget(
 		removeButton->entity());
 	userpic->resize(state->userpicSize);
 	userpic->paintRequest(
-	) | rpl::start_with_next([=](const QRect &r) {
+	) | rpl::on_next([=](const QRect &r) {
 		auto p = QPainter(userpic);
 		p.fillRect(r, Qt::transparent);
 		if (!state->localPhoto.isNull()) {
@@ -1226,7 +1226,7 @@ object_ptr<Ui::RpWidget> ProfilePhotoPrivacyController::setupMiddleWidget(
 		}
 	}, userpic->lifetime());
 	removeButton->entity()->heightValue(
-	) | rpl::start_with_next([=,
+	) | rpl::on_next([=,
 			left = stRemoveButton.iconLeft,
 			width = st::menuBlueIconPhotoSet.width()](int height) {
 		userpic->moveToLeft(
@@ -1240,7 +1240,7 @@ object_ptr<Ui::RpWidget> ProfilePhotoPrivacyController::setupMiddleWidget(
 
 	(
 		PrepareShortInfoFallbackUserpic(self, st::shortInfoCover).value
-	) | rpl::start_with_next([=](PeerShortInfoUserpic info) {
+	) | rpl::on_next([=](PeerShortInfoUserpic info) {
 		state->updatePhoto(base::take(info.photo), false);
 		userpic->update();
 	}, userpic->lifetime());
@@ -1360,7 +1360,7 @@ VoicesPrivacyController::VoicesPrivacyController(
 		not_null<::Main::Session*> session) {
 	Data::AmPremiumValue(
 		session
-	) | rpl::start_with_next([=](bool premium) {
+	) | rpl::on_next([=](bool premium) {
 		if (!premium) {
 			if (const auto box = view()) {
 				box->closeBox();
@@ -1692,13 +1692,13 @@ object_ptr<Ui::RpWidget> GiftsAutoSavePrivacyController::setupAboveWidget(
 	) | rpl::then(_state->disables.events() | rpl::map([=] {
 		return false;
 	})));
-	Data::AmPremiumValue(session) | rpl::start_with_next([=](bool value) {
+	Data::AmPremiumValue(session) | rpl::on_next([=](bool value) {
 		icon->setToggleLocked(!value);
 		if (!value) {
 			_state->disables.fire({});
 		}
 	}, icon->lifetime());
-	icon->toggledValue() | rpl::start_with_next([=](bool enable) {
+	icon->toggledValue() | rpl::on_next([=](bool enable) {
 		if (!enable) {
 			_state->disallowed &= ~Type::SendHide;
 		} else if (!session->premium()) {
@@ -1752,10 +1752,10 @@ object_ptr<Ui::RpWidget> GiftsAutoSavePrivacyController::setupBelowWidget(
 		) | rpl::then(_state->disables.events() | rpl::map([=] {
 			return true;
 		})));
-		rpl::duplicate(premium) | rpl::start_with_next([=](bool value) {
+		rpl::duplicate(premium) | rpl::on_next([=](bool value) {
 			button->setToggleLocked(!value);
 		}, button->lifetime());
-		button->toggledValue() | rpl::start_with_next([=](bool enable) {
+		button->toggledValue() | rpl::on_next([=](bool enable) {
 			if (enable) {
 				_state->disallowed &= ~type;
 			} else if (!session->premium()) {
diff --git a/Telegram/SourceFiles/settings/settings_privacy_security.cpp b/Telegram/SourceFiles/settings/settings_privacy_security.cpp
index 43d57dc156..0885c32c4a 100644
--- a/Telegram/SourceFiles/settings/settings_privacy_security.cpp
+++ b/Telegram/SourceFiles/settings/settings_privacy_security.cpp
@@ -107,7 +107,7 @@ void AddPremiumStar(
 	auto star = PremiumStar();
 	badge->resize(star.size() / style::DevicePixelRatio());
 	badge->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(badge);
 		p.drawImage(0, 0, star);
 	}, badge->lifetime());
@@ -115,7 +115,7 @@ void AddPremiumStar(
 	rpl::combine(
 		button->sizeValue(),
 		std::move(label)
-	) | rpl::start_with_next([=](const QSize &s, const QString &) {
+	) | rpl::on_next([=](const QSize &s, const QString &) {
 		if (s.isNull()) {
 			return;
 		}
@@ -273,7 +273,7 @@ void AddPremiumPrivacyButton(
 		state->widget.paintRequest(
 		) | rpl::filter([=]() -> bool {
 			return state->widget.x();
-		}) | rpl::start_with_next([=] {
+		}) | rpl::on_next([=] {
 			auto p = QPainter(&state->widget);
 			st::settingsPremiumLock.paint(p, 0, 0, state->widget.width());
 		}, state->widget.lifetime());
@@ -283,7 +283,7 @@ void AddPremiumPrivacyButton(
 			std::move(label),
 			PrivacyString(session, key),
 			Data::AmPremiumValue(session)
-		) | rpl::start_with_next([=, &st](
+		) | rpl::on_next([=, &st](
 				const QSize &buttonSize,
 				const QString &button,
 				const QString &text,
@@ -347,7 +347,7 @@ void AddPremiumPrivacyButton(
 			key
 		) | rpl::take(
 			1
-		) | rpl::start_with_next([=](const Privacy::Rule &value) {
+		) | rpl::on_next([=](const Privacy::Rule &value) {
 			controller->show(Box<EditPrivacyBox>(
 				controller,
 				controllerFactory(),
@@ -615,7 +615,7 @@ void SetupPasskeys(
 		if (count == 0) {
 			controller->show(Box([=](not_null<Ui::GenericBox*> box) {
 				PasskeysNoneBox(box, session);
-				box->boxClosing() | rpl::start_with_next([=] {
+				box->boxClosing() | rpl::on_next([=] {
 					if (session->passkeys().list().size()) {
 						controller->showSettings(PasskeysId());
 					}
@@ -708,7 +708,7 @@ void SetupTopPeers(
 	}))->toggledChanges(
 	) | rpl::filter([=](bool enabled) {
 		return enabled == session->topPeers().disabled();
-	}) | rpl::start_with_next([=](bool enabled) {
+	}) | rpl::on_next([=](bool enabled) {
 		session->topPeers().toggleDisabled(!enabled);
 	}, container->lifetime());
 
@@ -727,7 +727,7 @@ void SetupSelfDestruction(
 
 	std::move(
 		updateTrigger
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		session->api().selfDestruct().reload();
 	}, container->lifetime());
 	const auto label = [&] {
@@ -874,7 +874,7 @@ void SetupBlockedList(
 	});
 	std::move(
 		updateTrigger
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		session->api().blockedPeers().reload();
 	}, blockedPeers->lifetime());
 }
@@ -886,7 +886,7 @@ void SetupWebsitesList(
 		Fn<void(Type)> showOther) {
 	std::move(
 		updateTrigger
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		controller->session().api().websites().reload();
 	}, container->lifetime());
 
@@ -924,7 +924,7 @@ void SetupSessionsList(
 		Fn<void(Type)> showOther) {
 	std::move(
 		updateTrigger
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		controller->session().api().authorizations().reload();
 	}, container->lifetime());
 
@@ -970,7 +970,7 @@ void SetupGlobalTTLList(
 	});
 	std::move(
 		updateTrigger
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		session->api().selfDestruct().reload();
 	}, container->lifetime());
 }
@@ -1032,7 +1032,7 @@ void SetupSensitiveContent(
 
 	std::move(
 		updateTrigger
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		session->api().sensitiveContent().reload();
 	}, container->lifetime());
 	inner->add(object_ptr<Button>(
@@ -1045,7 +1045,7 @@ void SetupSensitiveContent(
 	))->toggledChanges(
 	) | rpl::filter([=](bool toggled) {
 		return toggled != session->api().sensitiveContent().enabledCurrent();
-	}) | rpl::start_with_next([=](bool toggled) {
+	}) | rpl::on_next([=](bool toggled) {
 		if (toggled && session->appConfig().ageVerifyNeeded()) {
 			disable->fire({});
 
@@ -1095,12 +1095,12 @@ object_ptr<Ui::BoxContent> EditCloudPasswordBox(not_null<Main::Session*> session
 	rpl::merge(
 		box->newPasswordSet() | rpl::to_empty,
 		box->passwordReloadNeeded()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		session->api().cloudPassword().reload();
 	}, box->lifetime());
 
 	box->clearUnconfirmedPassword(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		session->api().cloudPassword().clearUnconfirmedPassword();
 	}, box->lifetime());
 
@@ -1123,12 +1123,12 @@ void RemoveCloudPassword(not_null<Window::SessionController*> controller) {
 	rpl::merge(
 		box->newPasswordSet() | rpl::to_empty,
 		box->passwordReloadNeeded()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		session->api().cloudPassword().reload();
 	}, box->lifetime());
 
 	box->clearUnconfirmedPassword(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		session->api().cloudPassword().clearUnconfirmedPassword();
 	}, box->lifetime());
 
@@ -1168,7 +1168,7 @@ not_null<Ui::SettingsButton*> AddPrivacyButton(
 			key
 		) | rpl::take(
 			1
-		) | rpl::start_with_next([=](const Privacy::Rule &value) {
+		) | rpl::on_next([=](const Privacy::Rule &value) {
 			controller->show(Box<EditPrivacyBox>(
 				controller,
 				controllerFactory(),
@@ -1205,7 +1205,7 @@ void SetupArchiveAndMute(
 	)->toggledChanges(
 	) | rpl::filter([=](bool toggled) {
 		return toggled != privacy->archiveAndMuteCurrent();
-	}) | rpl::start_with_next([=](bool toggled) {
+	}) | rpl::on_next([=](bool toggled) {
 		privacy->updateArchiveAndMute(toggled);
 	}, container->lifetime());
 
diff --git a/Telegram/SourceFiles/settings/settings_scale_preview.cpp b/Telegram/SourceFiles/settings/settings_scale_preview.cpp
index d42007aae8..4492762e5d 100644
--- a/Telegram/SourceFiles/settings/settings_scale_preview.cpp
+++ b/Telegram/SourceFiles/settings/settings_scale_preview.cpp
@@ -138,7 +138,7 @@ Preview::Preview(QWidget *slider, rpl::producer<QImage> userpic)
 , _slider(slider)
 , _ratio(style::DevicePixelRatio())
 , _window(Ui::Platform::TranslucentWindowsSupported()) {
-	std::move(userpic) | rpl::start_with_next([=](QImage &&userpic) {
+	std::move(userpic) | rpl::on_next([=](QImage &&userpic) {
 		_userpicOriginal = std::move(userpic);
 		if (!_userpicImage.isNull()) {
 			_userpicImage = {};
@@ -282,13 +282,13 @@ void Preview::init() {
 	});
 
 	_widget.paintRequest(
-	) | rpl::start_with_next([=](QRect clip) {
+	) | rpl::on_next([=](QRect clip) {
 		auto p = Painter(&_widget);
 		paint(p, clip);
 	}, _widget.lifetime());
 
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_bubbleCorners = {};
 		_bubbleTail = {};
 		_bubbleShadowBottomRight = {};
diff --git a/Telegram/SourceFiles/settings/settings_shortcuts.cpp b/Telegram/SourceFiles/settings/settings_shortcuts.cpp
index d65f96b4cd..4849ec2b9f 100644
--- a/Telegram/SourceFiles/settings/settings_shortcuts.cpp
+++ b/Telegram/SourceFiles/settings/settings_shortcuts.cpp
@@ -231,7 +231,7 @@ struct Labeled {
 					button->key.value(),
 					state->recording.value(),
 					button->removed.value()
-				) | rpl::start_with_next([=](
+				) | rpl::on_next([=](
 						int width,
 						const QString &button,
 						const QKeySequence &key,
@@ -267,7 +267,7 @@ struct Labeled {
 
 				widget->setAcceptBoth(true);
 				widget->clicks(
-				) | rpl::start_with_next([=](Qt::MouseButton button) {
+				) | rpl::on_next([=](Qt::MouseButton button) {
 					if (const auto strong = *menu) {
 						strong->hideMenu();
 						return;
diff --git a/Telegram/SourceFiles/settings/settings_websites.cpp b/Telegram/SourceFiles/settings/settings_websites.cpp
index f772945de9..5fd6e078c3 100644
--- a/Telegram/SourceFiles/settings/settings_websites.cpp
+++ b/Telegram/SourceFiles/settings/settings_websites.cpp
@@ -389,12 +389,12 @@ Content::Content(
 void Content::setupContent() {
 	_inner->heightValue(
 	) | rpl::distinct_until_changed(
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		resize(width(), height);
 	}, _inner->lifetime());
 
 	_inner->showRequests(
-	) | rpl::start_with_next([=](const EntryData &data) {
+	) | rpl::on_next([=](const EntryData &data) {
 		_controller->show(Box(
 			InfoBox,
 			data,
@@ -402,22 +402,22 @@ void Content::setupContent() {
 	}, lifetime());
 
 	_inner->terminateOne(
-	) | rpl::start_with_next([=](uint64 hash) {
+	) | rpl::on_next([=](uint64 hash) {
 		terminateOne(hash);
 	}, lifetime());
 
 	_inner->terminateAll(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		terminateAll();
 	}, lifetime());
 
 	_loading.changes(
-	) | rpl::start_with_next([=](bool value) {
+	) | rpl::on_next([=](bool value) {
 		_inner->setVisible(!value);
 	}, lifetime());
 
 	_websites->listValue(
-	) | rpl::start_with_next([=](const Api::Websites::List &list) {
+	) | rpl::on_next([=](const Api::Websites::List &list) {
 		parse(list);
 	}, lifetime());
 
diff --git a/Telegram/SourceFiles/statistics/chart_widget.cpp b/Telegram/SourceFiles/statistics/chart_widget.cpp
index 7123b186cd..a043df9a98 100644
--- a/Telegram/SourceFiles/statistics/chart_widget.cpp
+++ b/Telegram/SourceFiles/statistics/chart_widget.cpp
@@ -280,7 +280,7 @@ ChartWidget::Footer::Footer(not_null<Ui::RpWidget*> parent)
 	Qt::SolidLine,
 	Qt::RoundCap) {
 	sizeValue(
-	) | rpl::take(2) | rpl::start_with_next([=](const QSize &s) {
+	) | rpl::take(2) | rpl::on_next([=](const QSize &s) {
 		const auto current = xPercentageLimits();
 		if (current.min == current.max) {
 			setXPercentageLimits({ 0., 1. });
@@ -288,7 +288,7 @@ ChartWidget::Footer::Footer(not_null<Ui::RpWidget*> parent)
 	}, lifetime());
 
 	mouseStateChanged(
-	) | rpl::start_with_next([=](const RpMouseWidget::State &state) {
+	) | rpl::on_next([=](const RpMouseWidget::State &state) {
 		if (_moveCenterAnimation.animating()) {
 			return;
 		}
@@ -839,7 +839,7 @@ ChartWidget::ChartWidget(not_null<Ui::RpWidget*> parent)
 	}
 }) {
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (_chartData) {
 			FillLineColorsByKey(_chartData);
 		}
@@ -928,7 +928,7 @@ QRect ChartWidget::chartAreaRect() const {
 
 void ChartWidget::setupChartArea() {
 	_chartArea->paintRequest(
-	) | rpl::start_with_next([=](const QRect &r) {
+	) | rpl::on_next([=](const QRect &r) {
 		auto p = QPainter(_chartArea.get());
 
 		const auto now = crl::now();
@@ -1112,7 +1112,7 @@ void ChartWidget::setupFooter() {
 	});
 
 	_animationController.addRulerRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_rulersView.add(
 			_animationController.finalHeightLimits(),
 			true);
@@ -1120,7 +1120,7 @@ void ChartWidget::setupFooter() {
 	}, _footer->lifetime());
 
 	_footer->xPercentageLimitsChange(
-	) | rpl::start_with_next([=](Limits xPercentageLimits) {
+	) | rpl::on_next([=](Limits xPercentageLimits) {
 		if (!_chartView) {
 			return;
 		}
@@ -1176,14 +1176,14 @@ void ChartWidget::setupDetails() {
 	});
 
 	_details.widget->shownValue(
-	) | rpl::start_with_next([=](bool shown) {
+	) | rpl::on_next([=](bool shown) {
 		if (shown && _details.widget->xIndex() < 0) {
 			_details.widget->hide();
 		}
 	}, _details.widget->lifetime());
 
 	_chartArea->mouseStateChanged(
-	) | rpl::start_with_next([=](const RpMouseWidget::State &state) {
+	) | rpl::on_next([=](const RpMouseWidget::State &state) {
 		if (_animationController.animating()) {
 			return;
 		}
@@ -1284,7 +1284,7 @@ void ChartWidget::processLocalZoom(int xIndex) {
 	const auto header = headerOwned->get();
 	header->show();
 	_header->geometryValue(
-	) | rpl::start_with_next([=](const QRect &g) {
+	) | rpl::on_next([=](const QRect &g) {
 		header->setGeometry(g);
 	}, header->lifetime());
 	header->setTitle(_header->title());
@@ -1303,7 +1303,7 @@ void ChartWidget::processLocalZoom(int xIndex) {
 		) | rpl::filter([](not_null<QEvent*> event) {
 			return (event->type() == QEvent::MouseMove)
 				|| (event->type() == QEvent::Leave);
-		}) | rpl::start_with_next([=](not_null<QEvent*> event) {
+		}) | rpl::on_next([=](not_null<QEvent*> event) {
 			auto pos = QPoint();
 			if (event->type() == QEvent::MouseMove) {
 				const auto e = static_cast<QMouseEvent*>(event.get());
@@ -1359,7 +1359,7 @@ void ChartWidget::processLocalZoom(int xIndex) {
 	const auto finish = [=](const Limits &zoomLimitIndices) {
 		createMouseTracking();
 		_footer->xPercentageLimitsChange(
-		) | rpl::start_with_next([=](const Limits &l) {
+		) | rpl::on_next([=](const Limits &l) {
 			const auto r = FindStackXIndicesFromRawXPercentages(
 				_chartData,
 				l,
@@ -1425,7 +1425,7 @@ void ChartWidget::setupFilterButtons() {
 	}
 
 	_filterButtons->buttonEnabledChanges(
-	) | rpl::start_with_next([=](const ChartLinesFilterWidget::Entry &e) {
+	) | rpl::on_next([=](const ChartLinesFilterWidget::Entry &e) {
 		const auto now = crl::now();
 		_linesFilterController->setEnabled(e.id, e.enabled, now);
 
@@ -1443,7 +1443,7 @@ void ChartWidget::setChartData(
 		ChartViewType type) {
 	if (width() < st::statisticsChartHeight) {
 		sizeValue(
-		) | rpl::start_with_next([=](const QSize &s) {
+		) | rpl::on_next([=](const QSize &s) {
 			if (s.width() > st::statisticsChartHeight) {
 				setChartData(chartData, type);
 				_waitingSizeLifetime.destroy();
@@ -1494,7 +1494,7 @@ void ChartWidget::setChartData(
 void ChartWidget::setTitle(rpl::producer<QString> &&title) {
 	std::move(
 		title
-	) | rpl::start_with_next([=](QString t) {
+	) | rpl::on_next([=](QString t) {
 		_header->setTitle(std::move(t));
 		_header->update();
 	}, _header->lifetime());
@@ -1507,7 +1507,7 @@ void ChartWidget::setZoomedChartData(
 	_zoomedChartWidget = base::make_unique_q<ChartWidget>(
 		dynamic_cast<Ui::RpWidget*>(parentWidget()));
 	geometryValue(
-	) | rpl::start_with_next([=](const QRect &geometry) {
+	) | rpl::on_next([=](const QRect &geometry) {
 		_zoomedChartWidget->moveToLeft(geometry.x(), geometry.y());
 	}, _zoomedChartWidget->lifetime());
 	_zoomedChartWidget->show();
@@ -1541,7 +1541,7 @@ void ChartWidget::setZoomedChartData(
 		(customHeader->height() - zoomOutButton->height()) / 2);
 	zoomOutButton->setClickedCallback([=] {
 		shownValue(
-		) | rpl::start_with_next([=](bool shown) {
+		) | rpl::on_next([=](bool shown) {
 			if (shown) {
 				_zoomedChartWidget = nullptr;
 			}
diff --git a/Telegram/SourceFiles/statistics/widgets/point_details_widget.cpp b/Telegram/SourceFiles/statistics/widgets/point_details_widget.cpp
index a6b5b7e795..b0cc6ba8ab 100644
--- a/Telegram/SourceFiles/statistics/widgets/point_details_widget.cpp
+++ b/Telegram/SourceFiles/statistics/widgets/point_details_widget.cpp
@@ -139,7 +139,7 @@ PointDetailsWidget::PointDetailsWidget(
 	if (zoomEnabled) {
 		rpl::single(rpl::empty_value()) | rpl::then(
 			style::PaletteChanged()
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			const auto w = st::statisticsDetailsArrowShift;
 			const auto stroke = style::ConvertScaleExact(
 				st::statisticsDetailsArrowStroke);
@@ -261,7 +261,7 @@ PointDetailsWidget::PointDetailsWidget(
 			+ _maxPercentageWidth;
 	}();
 	sizeValue(
-	) | rpl::start_with_next([=](const QSize &s) {
+	) | rpl::on_next([=](const QSize &s) {
 		const auto fullRect = s.isNull()
 			? Rect(Size(calculatedWidth))
 			: Rect(s);
diff --git a/Telegram/SourceFiles/storage/download_manager_mtproto.cpp b/Telegram/SourceFiles/storage/download_manager_mtproto.cpp
index b74eb77218..0c8ae83721 100644
--- a/Telegram/SourceFiles/storage/download_manager_mtproto.cpp
+++ b/Telegram/SourceFiles/storage/download_manager_mtproto.cpp
@@ -124,7 +124,7 @@ DownloadManagerMtproto::DownloadManagerMtproto(not_null<ApiWrap*> api)
 	_api->instance().restartsByTimeout(
 	) | rpl::filter([](MTP::ShiftedDcId shiftedDcId) {
 		return MTP::isDownloadDcId(shiftedDcId);
-	}) | rpl::start_with_next([=](MTP::ShiftedDcId shiftedDcId) {
+	}) | rpl::on_next([=](MTP::ShiftedDcId shiftedDcId) {
 		sessionTimedOut(
 			MTP::BareDcId(shiftedDcId),
 			MTP::GetDcIdShift(shiftedDcId));
@@ -824,7 +824,7 @@ void DownloadMtprotoTask::subscribeToNonPremiumLimit() {
 		return;
 	}
 	_owner->api().instance().nonPremiumDelayedRequests(
-	) | rpl::start_with_next([=](mtpRequestId id) {
+	) | rpl::on_next([=](mtpRequestId id) {
 		if (_sentRequests.contains(id)) {
 			if (const auto documentId = objectId()) {
 				const auto type = v::get<StorageFileLocation>(
diff --git a/Telegram/SourceFiles/storage/file_download_web.cpp b/Telegram/SourceFiles/storage/file_download_web.cpp
index ddac1f8436..a0525d5786 100644
--- a/Telegram/SourceFiles/storage/file_download_web.cpp
+++ b/Telegram/SourceFiles/storage/file_download_web.cpp
@@ -552,7 +552,7 @@ void webFileLoader::startLoading() {
 		_manager = GetManager();
 		_manager->updates(
 			this
-		) | rpl::start_with_next([=](const Update &data) {
+		) | rpl::on_next([=](const Update &data) {
 			if (const auto progress = std::get_if<Progress>(&data)) {
 				loadProgress(
 					progress->ready,
diff --git a/Telegram/SourceFiles/storage/file_upload.cpp b/Telegram/SourceFiles/storage/file_upload.cpp
index 39be04dc4e..dd97486068 100644
--- a/Telegram/SourceFiles/storage/file_upload.cpp
+++ b/Telegram/SourceFiles/storage/file_upload.cpp
@@ -157,7 +157,7 @@ Uploader::Uploader(not_null<ApiWrap*> api)
 , _stopSessionsTimer([=] { stopSessions(); }) {
 	const auto session = &_api->session();
 	photoReady(
-	) | rpl::start_with_next([=](UploadedMedia &&data) {
+	) | rpl::on_next([=](UploadedMedia &&data) {
 		if (data.edit) {
 			const auto item = session->data().message(data.fullId);
 			Api::EditMessageWithUploadedPhoto(
@@ -173,7 +173,7 @@ Uploader::Uploader(not_null<ApiWrap*> api)
 	}, _lifetime);
 
 	documentReady(
-	) | rpl::start_with_next([=](UploadedMedia &&data) {
+	) | rpl::on_next([=](UploadedMedia &&data) {
 		if (data.edit) {
 			const auto item = session->data().message(data.fullId);
 			Api::EditMessageWithUploadedDocument(
@@ -189,27 +189,27 @@ Uploader::Uploader(not_null<ApiWrap*> api)
 	}, _lifetime);
 
 	photoProgress(
-	) | rpl::start_with_next([=](const FullMsgId &fullId) {
+	) | rpl::on_next([=](const FullMsgId &fullId) {
 		processPhotoProgress(fullId);
 	}, _lifetime);
 
 	photoFailed(
-	) | rpl::start_with_next([=](const FullMsgId &fullId) {
+	) | rpl::on_next([=](const FullMsgId &fullId) {
 		processPhotoFailed(fullId);
 	}, _lifetime);
 
 	documentProgress(
-	) | rpl::start_with_next([=](const FullMsgId &fullId) {
+	) | rpl::on_next([=](const FullMsgId &fullId) {
 		processDocumentProgress(fullId);
 	}, _lifetime);
 
 	documentFailed(
-	) | rpl::start_with_next([=](const FullMsgId &fullId) {
+	) | rpl::on_next([=](const FullMsgId &fullId) {
 		processDocumentFailed(fullId);
 	}, _lifetime);
 
 	_api->instance().nonPremiumDelayedRequests(
-	) | rpl::start_with_next([=](mtpRequestId id) {
+	) | rpl::on_next([=](mtpRequestId id) {
 		const auto i = _requests.find(id);
 		if (i != end(_requests)) {
 			i->second.nonPremiumDelayed = true;
diff --git a/Telegram/SourceFiles/storage/storage_cloud_blob.cpp b/Telegram/SourceFiles/storage/storage_cloud_blob.cpp
index d3c454688b..8036cb82b4 100644
--- a/Telegram/SourceFiles/storage/storage_cloud_blob.cpp
+++ b/Telegram/SourceFiles/storage/storage_cloud_blob.cpp
@@ -131,12 +131,12 @@ void BlobLoader::setImplementation(
 		return BlobState(state);
 	});
 	_implementation->failed(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		fail();
 	}, _implementation->lifetime());
 
 	_implementation->ready(
-	) | rpl::start_with_next([=](const QString &filepath) {
+	) | rpl::on_next([=](const QString &filepath) {
 		unpack(filepath);
 	}, _implementation->lifetime());
 
diff --git a/Telegram/SourceFiles/storage/storage_user_photos.cpp b/Telegram/SourceFiles/storage/storage_user_photos.cpp
index 5ecb6bceeb..501c01fafd 100644
--- a/Telegram/SourceFiles/storage/storage_user_photos.cpp
+++ b/Telegram/SourceFiles/storage/storage_user_photos.cpp
@@ -147,7 +147,7 @@ std::map<UserId, UserPhotos::List>::iterator UserPhotos::enforceLists(
 	}
 	result = _lists.emplace(user, List {}).first;
 	result->second.sliceUpdated(
-	) | rpl::start_with_next([this, user](
+	) | rpl::on_next([this, user](
 			const SliceUpdate &update) {
 		_sliceUpdated.fire(UserPhotosSliceUpdate(
 			user,
diff --git a/Telegram/SourceFiles/storage/streamed_file_downloader.cpp b/Telegram/SourceFiles/storage/streamed_file_downloader.cpp
index 990e0fd5a4..e03d91e969 100644
--- a/Telegram/SourceFiles/storage/streamed_file_downloader.cpp
+++ b/Telegram/SourceFiles/storage/streamed_file_downloader.cpp
@@ -57,7 +57,7 @@ StreamedFileDownloader::StreamedFileDownloader(
 	_partIsSaved.resize(_partsCount, false);
 
 	_reader->partsForDownloader(
-	) | rpl::start_with_next([=](const LoadedPart &part) {
+	) | rpl::on_next([=](const LoadedPart &part) {
 		if (part.offset == LoadedPart::kFailedOffset) {
 			cancel(FailureReason::OtherFailure);
 		} else {
diff --git a/Telegram/SourceFiles/support/support_autocomplete.cpp b/Telegram/SourceFiles/support/support_autocomplete.cpp
index 8122a476a2..16af43532c 100644
--- a/Telegram/SourceFiles/support/support_autocomplete.cpp
+++ b/Telegram/SourceFiles/support/support_autocomplete.cpp
@@ -397,9 +397,9 @@ void Autocomplete::setupContent() {
 		scroll->scrollToY(0);
 	};
 
-	inner->activated() | rpl::start_with_next(submit, lifetime());
+	inner->activated() | rpl::on_next(submit, lifetime());
 	input->focusedChanges(
-	) | rpl::filter(!rpl::mappers::_1) | rpl::start_with_next([=] {
+	) | rpl::filter(!rpl::mappers::_1) | rpl::on_next([=] {
 		base::call_delayed(10, this, [=] {
 			if (!input->hasFocus()) {
 				deactivate();
@@ -407,11 +407,11 @@ void Autocomplete::setupContent() {
 		});
 	}, input->lifetime());
 	input->cancelled(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		deactivate();
 	}, input->lifetime());
-	input->changes() | rpl::start_with_next(refresh, input->lifetime());
-	input->submits() | rpl::start_with_next(submit, input->lifetime());
+	input->changes() | rpl::on_next(refresh, input->lifetime());
+	input->submits() | rpl::on_next(submit, input->lifetime());
 	input->customUpDown(true);
 
 	_activate = [=] {
@@ -430,7 +430,7 @@ void Autocomplete::setupContent() {
 	};
 
 	paintRequest(
-	) | rpl::start_with_next([=](QRect clip) {
+	) | rpl::on_next([=](QRect clip) {
 		QPainter p(this);
 		p.fillRect(
 			clip.intersected(QRect(0, st::lineWidth, width(), height())),
@@ -441,7 +441,7 @@ void Autocomplete::setupContent() {
 	}, lifetime());
 
 	sizeValue(
-	) | rpl::start_with_next([=](QSize size) {
+	) | rpl::on_next([=](QSize size) {
 		inputWrap->resizeToWidth(size.width());
 		inputWrap->moveToLeft(0, st::lineWidth, size.width());
 		scroll->setGeometry(
@@ -529,7 +529,7 @@ void ConfirmContactBox::prepare() {
 
 	const auto button = addButton(tr::lng_send_button(), [] {});
 	button->clicks(
-	) | rpl::start_with_next([=](Qt::MouseButton which) {
+	) | rpl::on_next([=](Qt::MouseButton which) {
 		_submit((which == Qt::RightButton)
 			? SkipSwitchModifiers()
 			: button->clickModifiers());
diff --git a/Telegram/SourceFiles/support/support_helper.cpp b/Telegram/SourceFiles/support/support_helper.cpp
index aec99b5df0..ac2ad81a17 100644
--- a/Telegram/SourceFiles/support/support_helper.cpp
+++ b/Telegram/SourceFiles/support/support_helper.cpp
@@ -116,9 +116,9 @@ void EditInfoBox::prepare() {
 	addButton(tr::lng_settings_save(), save);
 	addButton(tr::lng_cancel(), [=] { closeBox(); });
 
-	_field->submits() | rpl::start_with_next(save, _field->lifetime());
+	_field->submits() | rpl::on_next(save, _field->lifetime());
 	_field->cancelled(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		closeBox();
 	}, _field->lifetime());
 	Ui::Emoji::SuggestionsController::Init(
@@ -131,14 +131,14 @@ void EditInfoBox::prepare() {
 	_field->setTextCursor(cursor);
 
 	widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		_field->resizeToWidth(
 			width - st::boxPadding.left() - st::boxPadding.right());
 		_field->moveToLeft(st::boxPadding.left(), st::boxPadding.bottom());
 	}, _field->lifetime());
 
 	_field->heightValue(
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		setDimensions(
 			st::boxWideWidth,
 			st::boxPadding.bottom() + height + st::boxPadding.bottom());
@@ -327,7 +327,7 @@ void Helper::registerWindow(not_null<Window::SessionController*> controller) {
 		const auto history = key.history();
 		return TrackHistoryOccupation(history) ? history : nullptr;
 	}) | rpl::distinct_until_changed(
-	) | rpl::start_with_next([=](History *history) {
+	) | rpl::on_next([=](History *history) {
 		updateOccupiedHistory(controller, history);
 	}, controller->lifetime());
 }
diff --git a/Telegram/SourceFiles/support/support_templates.cpp b/Telegram/SourceFiles/support/support_templates.cpp
index cb1515ee30..f4687dfad8 100644
--- a/Telegram/SourceFiles/support/support_templates.cpp
+++ b/Telegram/SourceFiles/support/support_templates.cpp
@@ -450,7 +450,7 @@ struct Templates::Updates {
 Templates::Templates(not_null<Main::Session*> session) : _session(session) {
 	load();
 	Shortcuts::Requests(
-	) | rpl::start_with_next([=](not_null<Shortcuts::Request*> request) {
+	) | rpl::on_next([=](not_null<Shortcuts::Request*> request) {
 		using Command = Shortcuts::Command;
 		request->check(
 			Command::SupportReloadTemplates
@@ -463,7 +463,7 @@ Templates::Templates(not_null<Main::Session*> session) : _session(session) {
 
 void Templates::reload() {
 	_reloadToastSubscription = errors(
-	) | rpl::start_with_next([=](QStringList errors) {
+	) | rpl::on_next([=](QStringList errors) {
 		Ui::Toast::Show(errors.isEmpty()
 			? "Templates reloaded!"
 			: ("Errors:\n\n" + errors.join("\n\n")));
diff --git a/Telegram/SourceFiles/tests/test_text.cpp b/Telegram/SourceFiles/tests/test_text.cpp
index 688041cf5e..d6cfa0bab8 100644
--- a/Telegram/SourceFiles/tests/test_text.cpp
+++ b/Telegram/SourceFiles/tests/test_text.cpp
@@ -60,7 +60,7 @@ Duisauteiruredolorinreprehenderitinvoluptate.");
 	//data.append("hi\n\nguys");
 	text->setMarkedText(st::defaultTextStyle, data);
 
-	body->paintRequest() | rpl::start_with_next([=](QRect clip) {
+	body->paintRequest() | rpl::on_next([=](QRect clip) {
 		auto p = QPainter(body);
 		auto hq = PainterHighQualityEnabler(p);
 
diff --git a/Telegram/SourceFiles/tray.cpp b/Telegram/SourceFiles/tray.cpp
index 235bf0601d..521886ee7e 100644
--- a/Telegram/SourceFiles/tray.cpp
+++ b/Telegram/SourceFiles/tray.cpp
@@ -29,7 +29,7 @@ void Tray::create() {
 
 	Core::App().settings().workModeValue(
 	) | rpl::combine_previous(
-	) | rpl::start_with_next([=](WorkMode previous, WorkMode state) {
+	) | rpl::on_next([=](WorkMode previous, WorkMode state) {
 		const auto wasHasIcon = (previous != WorkMode::WindowOnly);
 		const auto nowHasIcon = (state != WorkMode::WindowOnly);
 		if (wasHasIcon != nowHasIcon) {
@@ -42,17 +42,17 @@ void Tray::create() {
 	}, _tray.lifetime());
 
 	Core::App().settings().trayIconMonochromeChanges(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateIconCounters();
 	}, _tray.lifetime());
 
 	Core::App().passcodeLockChanges(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		rebuildMenu();
 	}, _tray.lifetime());
 
 	_tray.iconClicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto skipTrayClick = (_lastTrayClickTime > 0)
 			&& (crl::now() - _lastTrayClickTime
 				< QApplication::doubleClickInterval());
diff --git a/Telegram/SourceFiles/ui/boxes/auto_delete_settings.cpp b/Telegram/SourceFiles/ui/boxes/auto_delete_settings.cpp
index 33be631695..e735f4d812 100644
--- a/Telegram/SourceFiles/ui/boxes/auto_delete_settings.cpp
+++ b/Telegram/SourceFiles/ui/boxes/auto_delete_settings.cpp
@@ -51,7 +51,7 @@ object_ptr<Ui::RpWidget> CreateSliderForTTL(
 	state->points.resize(count, 0);
 
 	raw->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		for (auto i = 0; i != count; ++i) {
 			state->points[i] = (width * i) / (count - 1);
 		}
@@ -59,7 +59,7 @@ object_ptr<Ui::RpWidget> CreateSliderForTTL(
 	}, lifetime);
 
 	raw->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(raw);
 
 		p.setFont(st->font);
@@ -80,7 +80,7 @@ object_ptr<Ui::RpWidget> CreateSliderForTTL(
 	}, lifetime);
 
 	slider->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(slider);
 		auto hq = PainterHighQualityEnabler(p);
 
@@ -171,7 +171,7 @@ object_ptr<Ui::RpWidget> CreateSliderForTTL(
 			return static_cast<QMouseEvent*>(e.get())->pos();
 		}));
 	}) | rpl::flatten_latest(
-	) | rpl::start_with_next([=](QPoint position) {
+	) | rpl::on_next([=](QPoint position) {
 		state->selected = std::clamp(
 			(position.x() + (state->points[1] / 2)) / state->points[1],
 			0,
diff --git a/Telegram/SourceFiles/ui/boxes/boost_box.cpp b/Telegram/SourceFiles/ui/boxes/boost_box.cpp
index 1084924ea5..ac17a091f8 100644
--- a/Telegram/SourceFiles/ui/boxes/boost_box.cpp
+++ b/Telegram/SourceFiles/ui/boxes/boost_box.cpp
@@ -82,7 +82,7 @@ namespace {
 		rpl::duplicate(title),
 		state->repeated->shownValue(),
 		state->repeated->widthValue()
-	) | rpl::start_with_next([=](int outer, auto&&, bool shown, int badge) {
+	) | rpl::on_next([=](int outer, auto&&, bool shown, int badge) {
 		const auto repeated = shown ? badge : 0;
 		const auto skip = st::boostTitleBadgeSkip;
 		const auto available = outer - repeated - skip;
@@ -98,7 +98,7 @@ namespace {
 	}, result->lifetime());
 
 	const auto badge = state->repeated;
-	badge->paintRequest() | rpl::start_with_next([=] {
+	badge->paintRequest() | rpl::on_next([=] {
 		auto p = QPainter(badge);
 		auto hq = PainterHighQualityEnabler(p);
 		const auto radius = std::min(badge->width(), badge->height()) / 2;
@@ -183,7 +183,7 @@ void AddFeaturesList(
 				style::al_top);
 			const auto padding = st::boxRowPadding;
 			const auto line = Ui::CreateChild<Ui::RpWidget>(container);
-			badge->geometryValue() | rpl::start_with_next([=](const QRect &r) {
+			badge->geometryValue() | rpl::on_next([=](const QRect &r) {
 				line->setGeometry(
 					padding.left(),
 					r.y(),
@@ -191,7 +191,7 @@ void AddFeaturesList(
 					r.height());
 			}, line->lifetime());
 			const auto shift = st::lineWidth * 10;
-			line->paintRequest() | rpl::start_with_next([=] {
+			line->paintRequest() | rpl::on_next([=] {
 				auto p = QPainter(line);
 				p.setPen(st::windowSubTextFg);
 				const auto y = line->height() / 2;
@@ -317,7 +317,7 @@ void StartFireworks(not_null<QWidget*> parent) {
 	const auto animation = lifetime.make_state<FireworksAnimation>([=] {
 		result->update();
 	});
-	result->paintRequest() | rpl::start_with_next([=] {
+	result->paintRequest() | rpl::on_next([=] {
 		auto p = QPainter(result);
 		if (!animation->paint(p, result->rect())) {
 			crl::on_main(result, [=] { delete result; });
@@ -438,7 +438,7 @@ void BoostBox(
 	}) | rpl::flatten_latest();
 	if (wasLifting) {
 		state->data.value(
-		) | rpl::start_with_next([=](BoostCounters counters) {
+		) | rpl::on_next([=](BoostCounters counters) {
 			if (counters.mine - wasMine >= wasLifting) {
 				box->closeBox();
 			}
@@ -614,7 +614,7 @@ object_ptr<Ui::RpWidget> MakeLinkLabel(
 	rpl::combine(
 		raw->widthValue(),
 		std::move(text)
-	) | rpl::start_with_next([=](int outer, const auto&) {
+	) | rpl::on_next([=](int outer, const auto&) {
 		const auto textWidth = state->label.textMaxWidth();
 		const auto skipLeft = st::giveawayGiftCodeLink.margin.left();
 		const auto skipRight = rawRight
@@ -632,7 +632,7 @@ object_ptr<Ui::RpWidget> MakeLinkLabel(
 		state->label.moveToLeft(x, st::giveawayGiftCodeLink.margin.top());
 	}, raw->lifetime());
 
-	raw->paintRequest() | rpl::start_with_next([=] {
+	raw->paintRequest() | rpl::on_next([=] {
 		auto p = QPainter(raw);
 		state->bg.paint(p, raw->rect());
 	}, raw->lifetime());
@@ -641,7 +641,7 @@ object_ptr<Ui::RpWidget> MakeLinkLabel(
 
 	raw->resize(raw->width(), st::giveawayGiftCodeLinkHeight);
 	if (rawRight) {
-		raw->widthValue() | rpl::start_with_next([=](int width) {
+		raw->widthValue() | rpl::on_next([=](int width) {
 			rawRight->move(width - rawRight->width(), 0);
 		}, raw->lifetime());
 	}
@@ -949,7 +949,7 @@ object_ptr<Ui::FlatLabel> MakeBoostFeaturesBadge(
 	const auto label = result.data();
 
 	label->show();
-	label->paintRequest() | rpl::start_with_next([=] {
+	label->paintRequest() | rpl::on_next([=] {
 		const auto size = label->textMaxWidth();
 		const auto rect = QRect(
 			(label->width() - size) / 2,
diff --git a/Telegram/SourceFiles/ui/boxes/calendar_box.cpp b/Telegram/SourceFiles/ui/boxes/calendar_box.cpp
index e5263b132b..568690e7a7 100644
--- a/Telegram/SourceFiles/ui/boxes/calendar_box.cpp
+++ b/Telegram/SourceFiles/ui/boxes/calendar_box.cpp
@@ -115,7 +115,7 @@ void FillMonthYearPicker(
 	state->currentMaxMonth = maxMonth;
 
 	years->value(
-	) | rpl::skip(1) | rpl::start_with_next([=](int yearIndex) {
+	) | rpl::skip(1) | rpl::on_next([=](int yearIndex) {
 		const auto year = minYear + yearIndex;
 		const auto [newMinMonth, newMaxMonth] = monthsRange(year);
 
@@ -150,14 +150,14 @@ void FillMonthYearPicker(
 	}, box->lifetime());
 
 	content->sizeValue(
-	) | rpl::start_with_next([=](QSize s) {
+	) | rpl::on_next([=](QSize s) {
 		const auto half = s.width() / 2;
 		state->months->setGeometry(0, 0, half, s.height());
 		years->setGeometry(half, 0, half, s.height());
 	}, content->lifetime());
 
 	content->paintRequest(
-	) | rpl::start_with_next([=](const QRect &r) {
+	) | rpl::on_next([=](const QRect &r) {
 		auto p = QPainter(content);
 		p.fillRect(r, Qt::transparent);
 		const auto lineRect = QRect(
@@ -594,7 +594,7 @@ CalendarBox::FloatingDate::FloatingDate(
 		HistoryServiceMsgRadius(),
 		st::roundedBg)) {
 	_context->monthValue(
-	) | rpl::start_with_next([=](QDate month) {
+	) | rpl::on_next([=](QDate month) {
 		_text = langMonthOfYearFull(month.month(), month.year());
 		const auto width = st::msgServiceFont->width(_text);
 		const auto rect = QRect(0, 0, width, st::msgServiceFont->height);
@@ -603,7 +603,7 @@ CalendarBox::FloatingDate::FloatingDate(
 	}, _widget.lifetime());
 
 	_widget.paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		paint();
 	}, _widget.lifetime());
 
@@ -648,12 +648,12 @@ CalendarBox::Inner::Inner(
 	setMouseTracking(true);
 
 	context->monthValue(
-	) | rpl::start_with_next([=](QDate month) {
+	) | rpl::on_next([=](QDate month) {
 		monthChanged(month);
 	}, lifetime());
 
 	context->selectionUpdates(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		update();
 	}, lifetime());
 }
@@ -947,12 +947,12 @@ CalendarBox::Title::Title(
 	_context->monthValue(
 	) | rpl::filter([=] {
 		return !_context->selectionMode();
-	}) | rpl::start_with_next([=](QDate date) {
+	}) | rpl::on_next([=](QDate date) {
 		setTextFromMonth(date);
 	}, lifetime());
 
 	_context->selectionUpdates(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (!_context->selectionMode()) {
 			setTextFromMonth(_context->month());
 			setAttribute(Qt::WA_TransparentForMouseEvents, false);
@@ -1060,7 +1060,7 @@ CalendarBox::CalendarBox(QWidget*, CalendarBoxArgs &&args)
 	_scroll->scrolls(
 	) | rpl::filter([=] {
 		return _watchScroll;
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		processScroll();
 	}, lifetime());
 
@@ -1070,7 +1070,7 @@ CalendarBox::CalendarBox(QWidget*, CalendarBoxArgs &&args)
 		button->events(
 		) | rpl::filter([=] {
 			return *enabled;
-		}) | rpl::start_with_next([=](not_null<QEvent*> e) {
+		}) | rpl::on_next([=](not_null<QEvent*> e) {
 			const auto type = e->type();
 			if (type == QEvent::MouseMove
 				&& !(static_cast<QMouseEvent*>(e.get())->buttons()
@@ -1093,7 +1093,7 @@ CalendarBox::CalendarBox(QWidget*, CalendarBoxArgs &&args)
 	setupJumps(_next.data(), &_nextEnabled);
 
 	_context->selectionUpdates(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (!_context->selectionMode()) {
 			_floatingDate = nullptr;
 		} else if (!_floatingDate) {
@@ -1103,7 +1103,7 @@ CalendarBox::CalendarBox(QWidget*, CalendarBoxArgs &&args)
 			rpl::combine(
 				_scroll->geometryValue(),
 				_floatingDate->widthValue()
-			) | rpl::start_with_next([=](QRect scroll, int width) {
+			) | rpl::on_next([=](QRect scroll, int width) {
 				const auto shift = _st.daysHeight
 					- _st.padding.top()
 					- st::calendarDaysFont->height;
@@ -1164,13 +1164,13 @@ void CalendarBox::prepare() {
 	_inner->setDateChosenCallback(std::move(_callback));
 
 	_context->monthValue(
-	) | rpl::start_with_next([=](QDate month) {
+	) | rpl::on_next([=](QDate month) {
 		monthChanged(month);
 	}, lifetime());
 	setExactScroll();
 
 	_context->selectionUpdates(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_selectionMode = _context->selectionMode();
 		if (_selectionChanged) {
 			const auto count = !_selectionMode
diff --git a/Telegram/SourceFiles/ui/boxes/choose_date_time.cpp b/Telegram/SourceFiles/ui/boxes/choose_date_time.cpp
index 9720351f58..c508060105 100644
--- a/Telegram/SourceFiles/ui/boxes/choose_date_time.cpp
+++ b/Telegram/SourceFiles/ui/boxes/choose_date_time.cpp
@@ -95,7 +95,7 @@ ChooseDateTimeBoxDescriptor ChooseDateTimeBox(
 	});
 
 	state->date.value(
-	) | rpl::start_with_next([=](QDate date) {
+	) | rpl::on_next([=](QDate date) {
 		state->day->setText(DayString(date));
 		state->time->setFocusFast();
 	}, state->day->lifetime());
@@ -129,7 +129,7 @@ ChooseDateTimeBoxDescriptor ChooseDateTimeBox(
 		return base::EventFilterResult::Continue;
 	});
 
-	state->at->widthValue() | rpl::start_with_next([=](int width) {
+	state->at->widthValue() | rpl::on_next([=](int width) {
 		const auto full = st::scheduleDateWidth
 			+ st::scheduleAtSkip
 			+ width
@@ -140,7 +140,7 @@ ChooseDateTimeBoxDescriptor ChooseDateTimeBox(
 	}, state->at->lifetime());
 
 	content->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		const auto paddings = width
 			- state->at->width()
 			- 2 * st::scheduleAtSkip
@@ -164,7 +164,7 @@ ChooseDateTimeBoxDescriptor ChooseDateTimeBox(
 		= content->lifetime().make_state<base::weak_qptr<CalendarBox>>();
 	const auto calendarStyle = args.style.calendarStyle;
 	state->day->focusedChanges(
-	) | rpl::start_with_next([=](bool focused) {
+	) | rpl::on_next([=](bool focused) {
 		if (*calendar || !focused) {
 			return;
 		}
@@ -181,7 +181,7 @@ ChooseDateTimeBoxDescriptor ChooseDateTimeBox(
 				.stColors = *calendarStyle,
 			}));
 		(*calendar)->boxClosing(
-		) | rpl::start_with_next(crl::guard(state->time, [=] {
+		) | rpl::on_next(crl::guard(state->time, [=] {
 			state->time->setFocusFast();
 		}), (*calendar)->lifetime());
 	}, state->day->lifetime());
@@ -210,7 +210,7 @@ ChooseDateTimeBoxDescriptor ChooseDateTimeBox(
 		}
 	};
 	state->time->submitRequests(
-	) | rpl::start_with_next(save, state->time->lifetime());
+	) | rpl::on_next(save, state->time->lifetime());
 
 	auto result = ChooseDateTimeBoxDescriptor();
 	box->setFocusCallback([=] { state->time->setFocusFast(); });
@@ -267,10 +267,10 @@ object_ptr<Ui::RpWidget> ChooseRepeatPeriod(
 	rpl::combine(
 		raw->widthValue(),
 		label->naturalWidthValue()
-	) | rpl::start_with_next([=](int outer, int natural) {
+	) | rpl::on_next([=](int outer, int natural) {
 		label->resizeToWidth(std::min(outer, natural));
 	}, raw->lifetime());
-	label->heightValue() | rpl::start_with_next([=](int height) {
+	label->heightValue() | rpl::on_next([=](int height) {
 		raw->resize(raw->width(), height);
 	}, label->lifetime());
 
@@ -287,7 +287,7 @@ object_ptr<Ui::RpWidget> ChooseRepeatPeriod(
 	rpl::combine(
 		state->value.value(),
 		state->locked.value()
-	) | rpl::start_with_next([=](TimeId value, bool locked) {
+	) | rpl::on_next([=](TimeId value, bool locked) {
 		auto result = tr::lng_schedule_repeat_label(
 			tr::now,
 			Ui::Text::WithEntities);
diff --git a/Telegram/SourceFiles/ui/boxes/choose_font_box.cpp b/Telegram/SourceFiles/ui/boxes/choose_font_box.cpp
index a891c422f1..aa75057019 100644
--- a/Telegram/SourceFiles/ui/boxes/choose_font_box.cpp
+++ b/Telegram/SourceFiles/ui/boxes/choose_font_box.cpp
@@ -179,13 +179,13 @@ Selector::Selector(
 , _rowHeight(_st.height + _st.padding.top() + _st.padding.bottom()) {
 	setMouseTracking(true);
 
-	std::move(filter) | rpl::start_with_next([=](const QString &query) {
+	std::move(filter) | rpl::on_next([=](const QString &query) {
 		applyFilter(query);
 	}, _lifetime);
 
 	std::move(
 		submits
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (_selected >= 0) {
 			choose(shownRowAt(_selected));
 		} else if (searching() && !_filtered.empty()) {
@@ -803,14 +803,14 @@ void PreviewPainter::layout() {
 	const auto state = raw->lifetime().make_state<State>();
 
 	state->bg = generatePreviewBg();
-	style::PaletteChanged() | rpl::start_with_next([=] {
+	style::PaletteChanged() | rpl::on_next([=] {
 		state->bg = generatePreviewBg();
 	}, raw->lifetime());
 
 	rpl::combine(
 		rpl::single(rpl::empty) | rpl::then(style::PaletteChanged()),
 		std::move(family)
-	) | rpl::start_with_next([=](const auto &, QString family) {
+	) | rpl::on_next([=](const auto &, QString family) {
 		state->family = family;
 		if (state->preview.isNull()) {
 			state->preview = GeneratePreview(
@@ -840,7 +840,7 @@ void PreviewPainter::layout() {
 		}
 	}, raw->lifetime());
 
-	raw->paintRequest() | rpl::start_with_next([=](QRect clip) {
+	raw->paintRequest() | rpl::on_next([=](QRect clip) {
 		QPainter(raw).drawImage(0, 0, state->preview);
 	}, raw->lifetime());
 
@@ -922,7 +922,7 @@ void ChooseFontBox(
 	rpl::combine(
 		box->heightValue(),
 		top->heightValue()
-	) | rpl::start_with_next([=](int box, int top) {
+	) | rpl::on_next([=](int box, int top) {
 		selector->setMinHeight(box - top);
 	}, selector->lifetime());
 
@@ -953,7 +953,7 @@ void ChooseFontBox(
 		});
 	};
 	state->family.value(
-	) | rpl::start_with_next(refreshButtons, box->lifetime());
+	) | rpl::on_next(refreshButtons, box->lifetime());
 
 	box->setFocusCallback([=] {
 		filter->setInnerFocus();
diff --git a/Telegram/SourceFiles/ui/boxes/choose_language_box.cpp b/Telegram/SourceFiles/ui/boxes/choose_language_box.cpp
index ef7604fcb1..40212beb13 100644
--- a/Telegram/SourceFiles/ui/boxes/choose_language_box.cpp
+++ b/Telegram/SourceFiles/ui/boxes/choose_language_box.cpp
@@ -320,7 +320,7 @@ void ChooseLanguageBox(
 			})));
 
 			button->entity()->toggledChanges(
-			) | rpl::start_with_next([=](bool value) {
+			) | rpl::on_next([=](bool value) {
 				if (toggleCheck && !toggleCheck(id)) {
 					state->toggles.fire({ .id = id, .selected = !value });
 				}
@@ -349,7 +349,7 @@ void ChooseLanguageBox(
 			tr::lng_languages_none(),
 			st::membersAbout);
 		box->verticalLayout()->geometryValue(
-		) | rpl::start_with_next([=](const QRect &geometry) {
+		) | rpl::on_next([=](const QRect &geometry) {
 			const auto shown = (geometry.height() <= 0);
 			label->setVisible(shown);
 			if (shown) {
diff --git a/Telegram/SourceFiles/ui/boxes/choose_time.cpp b/Telegram/SourceFiles/ui/boxes/choose_time.cpp
index ba2bdba9a7..251d979af6 100644
--- a/Telegram/SourceFiles/ui/boxes/choose_time.cpp
+++ b/Telegram/SourceFiles/ui/boxes/choose_time.cpp
@@ -87,29 +87,29 @@ ChooseTimeResult ChooseTimeWidget(
 	day->setPhrase(tr::lng_days);
 	day->setMaxValue(31);
 	day->setWheelStep(1);
-	day->putNext() | rpl::start_with_next([=](QChar ch) {
+	day->putNext() | rpl::on_next([=](QChar ch) {
 		putNext(hour.get(), ch);
 	}, content->lifetime());
 
 	hour->setPhrase(tr::lng_hours);
 	hour->setMaxValue(23);
 	hour->setWheelStep(1);
-	hour->putNext() | rpl::start_with_next([=](QChar ch) {
+	hour->putNext() | rpl::on_next([=](QChar ch) {
 		putNext(minute.get(), ch);
 	}, content->lifetime());
-	hour->erasePrevious() | rpl::start_with_next([=] {
+	hour->erasePrevious() | rpl::on_next([=] {
 		erasePrevious(day.get());
 	}, content->lifetime());
 
 	minute->setPhrase(tr::lng_minutes);
 	minute->setMaxValue(59);
 	minute->setWheelStep(10);
-	minute->erasePrevious() | rpl::start_with_next([=] {
+	minute->erasePrevious() | rpl::on_next([=] {
 		erasePrevious(hour.get());
 	}, content->lifetime());
 
 	content->sizeValue(
-	) | rpl::start_with_next([=](const QSize &s) {
+	) | rpl::on_next([=](const QSize &s) {
 		const auto inputWidth = s.width() / (hiddenDaysInput ? 2 : 3);
 		auto rect = QRect(
 			0,
@@ -130,7 +130,7 @@ ChooseTimeResult ChooseTimeWidget(
 		base::qt_signal_producer(day.get(), &MaskedInputField::changed),
 		base::qt_signal_producer(hour.get(), &MaskedInputField::changed),
 		base::qt_signal_producer(minute.get(), &MaskedInputField::changed)
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		state->valueInSeconds = 0
 			+ day->getLastText().toUInt() * 3600 * 24
 			+ hour->getLastText().toUInt() * 3600
diff --git a/Telegram/SourceFiles/ui/boxes/collectible_info_box.cpp b/Telegram/SourceFiles/ui/boxes/collectible_info_box.cpp
index f9c24efb5e..abc74a1ebf 100644
--- a/Telegram/SourceFiles/ui/boxes/collectible_info_box.cpp
+++ b/Telegram/SourceFiles/ui/boxes/collectible_info_box.cpp
@@ -82,7 +82,7 @@ constexpr auto kTonMultiplier = uint64(1000000000);
 	const auto nameWidth = st->style.font->width(name);
 	const auto added = size + st->padding.left() + st->padding.right();
 	const auto subscribed = std::make_shared<bool>(false);
-	raw->paintRequest() | rpl::start_with_next([=] {
+	raw->paintRequest() | rpl::on_next([=] {
 		const auto use = std::min(nameWidth + added, raw->width());
 		const auto x = (raw->width() - use) / 2;
 		if (const auto available = use - added; available > 0) {
@@ -132,7 +132,7 @@ void CollectibleInfoBox(
 		object_ptr<Ui::FixedHeightWidget>(box, st::collectibleIconDiameter),
 		st::collectibleIconPadding);
 	icon->paintRequest(
-	) | rpl::start_with_next([=](QRect clip) {
+	) | rpl::on_next([=](QRect clip) {
 		const auto size = icon->height();
 		const auto inner = QRect(
 			(icon->width() - size) / 2,
@@ -160,11 +160,11 @@ void CollectibleInfoBox(
 		},
 		QMargins());
 	box->showFinishes(
-	) | rpl::start_with_next([animate = std::move(lottie.animate)] {
+	) | rpl::on_next([animate = std::move(lottie.animate)] {
 		animate(anim::repeat::once);
 	}, box->lifetime());
 	const auto animation = lottie.widget.release();
-	icon->sizeValue() | rpl::start_with_next([=](QSize size) {
+	icon->sizeValue() | rpl::on_next([=](QSize size) {
 		const auto skip = (type == CollectibleType::Phone)
 			? style::ConvertScale(2)
 			: 0;
@@ -260,11 +260,11 @@ void CollectibleInfoBox(
 		box->closeBox();
 	});
 	box->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		close->moveToRight(0, 0);
 	}, box->lifetime());
 
-	box->widthValue() | rpl::start_with_next([=](int width) {
+	box->widthValue() | rpl::on_next([=](int width) {
 		more->setFullWidth(width
 			- st::collectibleMorePadding.left()
 			- st::collectibleMorePadding.right());
diff --git a/Telegram/SourceFiles/ui/boxes/confirm_box.cpp b/Telegram/SourceFiles/ui/boxes/confirm_box.cpp
index 6d9f25c984..6e017fe3b5 100644
--- a/Telegram/SourceFiles/ui/boxes/confirm_box.cpp
+++ b/Telegram/SourceFiles/ui/boxes/confirm_box.cpp
@@ -78,7 +78,7 @@ void ConfirmBox(not_null<Ui::GenericBox*> box, ConfirmBoxArgs &&args) {
 	}
 
 	box->events(
-	) | rpl::start_with_next([=](not_null<QEvent*> e) {
+	) | rpl::on_next([=](not_null<QEvent*> e) {
 		if ((e->type() != QEvent::KeyPress) || !confirmButton) {
 			return;
 		}
@@ -98,7 +98,7 @@ void ConfirmBox(not_null<Ui::GenericBox*> box, ConfirmBoxArgs &&args) {
 			args.cancelStyle ? *args.cancelStyle : defaultButtonStyle);
 
 		box->boxClosing(
-		) | rpl::start_with_next(crl::guard(cancelButton, [=] {
+		) | rpl::on_next(crl::guard(cancelButton, [=] {
 			cancelButton->clicked(Qt::KeyboardModifiers(), Qt::LeftButton);
 		}), *lifetime);
 	}
@@ -127,12 +127,12 @@ void IconWithTitle(
 	}
 
 	icon->heightValue(
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		line->resize(line->width(), height);
 	}, icon->lifetime());
 
 	line->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		icon->moveToLeft(0, 0);
 		const auto skip = st::defaultBoxCheckbox.textPosition.x();
 		title->resizeToWidth(width - rect::right(icon) - skip);
diff --git a/Telegram/SourceFiles/ui/boxes/confirm_phone_box.cpp b/Telegram/SourceFiles/ui/boxes/confirm_phone_box.cpp
index e69cd3e5f3..4f1407580b 100644
--- a/Telegram/SourceFiles/ui/boxes/confirm_phone_box.cpp
+++ b/Telegram/SourceFiles/ui/boxes/confirm_phone_box.cpp
@@ -74,7 +74,7 @@ void ConfirmPhoneBox::prepare() {
 			+ (_fragment ? (_fragment->height() + fragmentSkip()) : 0));
 
 	_code->submits(
-	) | rpl::start_with_next([=] { sendCode(); }, _code->lifetime());
+	) | rpl::on_next([=] { sendCode(); }, _code->lifetime());
 
 	showChildren();
 }
diff --git a/Telegram/SourceFiles/ui/boxes/country_select_box.cpp b/Telegram/SourceFiles/ui/boxes/country_select_box.cpp
index bb7cc70bf5..a7c1d81092 100644
--- a/Telegram/SourceFiles/ui/boxes/country_select_box.cpp
+++ b/Telegram/SourceFiles/ui/boxes/country_select_box.cpp
@@ -135,7 +135,7 @@ void CountrySelectBox::prepare() {
 	setDimensions(st::boxWidth, st::boxMaxListHeight);
 
 	_inner->mustScrollTo(
-	) | rpl::start_with_next([=](ScrollToRequest request) {
+	) | rpl::on_next([=](ScrollToRequest request) {
 		scrollToY(request.ymin, request.ymax);
 	}, lifetime());
 }
@@ -194,7 +194,7 @@ CountrySelectBox::Inner::Inner(
 	rpl::single(
 	) | rpl::then(
 		Countries::Instance().updated()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_mustScrollTo.fire(ScrollToRequest(0, 0));
 		_list.clear();
 		_namesList.clear();
diff --git a/Telegram/SourceFiles/ui/boxes/edit_birthday_box.cpp b/Telegram/SourceFiles/ui/boxes/edit_birthday_box.cpp
index 82b214b40b..df6ec3196d 100644
--- a/Telegram/SourceFiles/ui/boxes/edit_birthday_box.cpp
+++ b/Telegram/SourceFiles/ui/boxes/edit_birthday_box.cpp
@@ -82,7 +82,7 @@ void EditBirthdayBox(
 		content->sizeValue(),
 		state->months.value(),
 		state->days.value()
-	) | rpl::start_with_next([=](
+	) | rpl::on_next([=](
 			QSize s,
 			Ui::VerticalDrumPicker *months,
 			Ui::VerticalDrumPicker *days) {
@@ -98,7 +98,7 @@ void EditBirthdayBox(
 
 	Ui::SendPendingMoveResizeEvents(years);
 
-	years->value() | rpl::start_with_next([=](int yearsIndex) {
+	years->value() | rpl::on_next([=](int yearsIndex) {
 		const auto year = (yearsIndex == yearsCount - 1)
 			? 0
 			: minYear + yearsIndex;
@@ -134,7 +134,7 @@ void EditBirthdayBox(
 		return picker ? picker->value() : rpl::single(current.month()
 			? (current.month() - 1)
 			: (now.month() - 1));
-	}) | rpl::flatten_latest() | rpl::start_with_next([=](int monthIndex) {
+	}) | rpl::flatten_latest() | rpl::on_next([=](int monthIndex) {
 		const auto month = monthIndex + 1;
 		const auto yearsIndex = years->index();
 		const auto year = (yearsIndex == yearsCount - 1)
@@ -170,7 +170,7 @@ void EditBirthdayBox(
 	}, years->lifetime());
 
 	content->paintRequest(
-	) | rpl::start_with_next([=](const QRect &r) {
+	) | rpl::on_next([=](const QRect &r) {
 		auto p = QPainter(content);
 
 		p.fillRect(r, Qt::transparent);
diff --git a/Telegram/SourceFiles/ui/boxes/edit_factcheck_box.cpp b/Telegram/SourceFiles/ui/boxes/edit_factcheck_box.cpp
index 2c371da40d..2265e89e75 100644
--- a/Telegram/SourceFiles/ui/boxes/edit_factcheck_box.cpp
+++ b/Telegram/SourceFiles/ui/boxes/edit_factcheck_box.cpp
@@ -39,7 +39,7 @@ void EditFactcheckBox(
 	};
 	const auto state = box->lifetime().make_state<rpl::variable<State>>(
 		State::Initial);
-	field->changes() | rpl::start_with_next([=] {
+	field->changes() | rpl::on_next([=] {
 		const auto now = field->getLastText().trimmed();
 		*state = !now.isEmpty()
 			? State::Changed
@@ -48,7 +48,7 @@ void EditFactcheckBox(
 			: State::Removed;
 	}, field->lifetime());
 
-	state->value() | rpl::start_with_next([=](State state) {
+	state->value() | rpl::on_next([=](State state) {
 		box->clearButtons();
 		if (state == State::Removed) {
 			box->addButton(tr::lng_box_remove(), [=] {
diff --git a/Telegram/SourceFiles/ui/boxes/edit_invite_link.cpp b/Telegram/SourceFiles/ui/boxes/edit_invite_link.cpp
index 4b0bf0c136..d72a0511bc 100644
--- a/Telegram/SourceFiles/ui/boxes/edit_invite_link.cpp
+++ b/Telegram/SourceFiles/ui/boxes/edit_invite_link.cpp
@@ -343,7 +343,7 @@ void EditInviteLinkBox(
 					: QString::number(state->usageValue)),
 				200'000);
 			wrap->widthValue(
-			) | rpl::start_with_next([=](int width) {
+			) | rpl::on_next([=](int width) {
 				input->resize(width, input->height());
 				input->moveToLeft(0, st::boxPadding.bottom());
 			}, input->lifetime());
diff --git a/Telegram/SourceFiles/ui/boxes/edit_invite_link_session.cpp b/Telegram/SourceFiles/ui/boxes/edit_invite_link_session.cpp
index 0c08c464f9..37105b056e 100644
--- a/Telegram/SourceFiles/ui/boxes/edit_invite_link_session.cpp
+++ b/Telegram/SourceFiles/ui/boxes/edit_invite_link_session.cpp
@@ -74,7 +74,7 @@ InviteLinkSubscriptionToggle FillCreateInviteLinkSubscriptionToggle(
 		tr::lng_group_invite_subscription_ph(),
 		QString(),
 		std::pow(QString::number(maxCredits).size(), 10));
-	wrap->toggledValue() | rpl::start_with_next([=](bool shown) {
+	wrap->toggledValue() | rpl::on_next([=](bool shown) {
 		if (shown) {
 			input->setFocus();
 		}
@@ -85,7 +85,7 @@ InviteLinkSubscriptionToggle FillCreateInviteLinkSubscriptionToggle(
 	const auto priceOverlay = Ui::CreateChild<Ui::RpWidget>(inputContainer);
 	priceOverlay->setAttribute(Qt::WA_TransparentForMouseEvents);
 	inputContainer->sizeValue(
-	) | rpl::start_with_next([=](const QSize &size) {
+	) | rpl::on_next([=](const QSize &size) {
 		input->resize(
 			size.width() - rect::m::sum::h(st::boxRowPadding),
 			st.heightMin);
@@ -104,7 +104,7 @@ InviteLinkSubscriptionToggle FillCreateInviteLinkSubscriptionToggle(
 		priceOverlay->update();
 	});
 	priceOverlay->paintRequest(
-	) | rpl::start_with_next([=, right = st::boxRowPadding.right()] {
+	) | rpl::on_next([=, right = st::boxRowPadding.right()] {
 		if (state->usdRate.current() <= 0) {
 			return;
 		}
diff --git a/Telegram/SourceFiles/ui/boxes/peer_qr_box.cpp b/Telegram/SourceFiles/ui/boxes/peer_qr_box.cpp
index 3b111f31b7..6b4fcfb1a8 100644
--- a/Telegram/SourceFiles/ui/boxes/peer_qr_box.cpp
+++ b/Telegram/SourceFiles/ui/boxes/peer_qr_box.cpp
@@ -241,7 +241,7 @@ not_null<Ui::RpWidget*> PrepareQrWidget(
 		std::move(links),
 		std::move(about),
 		rpl::single(rpl::empty) | rpl::then(style::PaletteChanged())
-	) | rpl::start_with_next([=](
+	) | rpl::on_next([=](
 			int fontSize,
 			bool userpicToggled,
 			bool backgroundToggled,
@@ -320,7 +320,7 @@ not_null<Ui::RpWidget*> PrepareQrWidget(
 				- st::defaultBoxDividerLabelPadding.top());
 	}, container->lifetime());
 	result->paintRequest(
-	) | rpl::start_with_next([=](QRect clip) {
+	) | rpl::on_next([=](QRect clip) {
 		auto p = QPainter(result);
 		const auto size = (state->qrImage.size() / style::DevicePixelRatio());
 		const auto qrRect = Rect(
@@ -382,7 +382,7 @@ not_null<Ui::RpWidget*> PrepareQrWidget(
 		const auto dot = smallDots.back();
 		dot->resize(smallSize);
 		dot->setAttribute(Qt::WA_TransparentForMouseEvents);
-		dot->paintRequest() | rpl::start_with_next([=] {
+		dot->paintRequest() | rpl::on_next([=] {
 			auto p = QPainter(dot);
 			const auto fg = (slider->value() > (i / float64(count - 1)))
 				? st.activeFg
@@ -393,7 +393,7 @@ not_null<Ui::RpWidget*> PrepareQrWidget(
 	const auto bigDot = Ui::CreateChild<Ui::RpWidget>(slider->parentWidget());
 	bigDot->resize(st.seekSize);
 	bigDot->setAttribute(Qt::WA_TransparentForMouseEvents);
-	bigDot->paintRequest() | rpl::start_with_next([=] {
+	bigDot->paintRequest() | rpl::on_next([=] {
 		auto p = QPainter(bigDot);
 		auto hq = PainterHighQualityEnabler(p);
 		auto pen = st::boxBg->p;
@@ -478,14 +478,14 @@ void FillPeerQrBox(
 		: controller->session().user().get());
 	userpicMedia->subscribeToUpdates(
 		crl::guard(userpic, [=] { userpic->update(); }));
-	userpic->paintRequest() | rpl::start_with_next([=] {
+	userpic->paintRequest() | rpl::on_next([=] {
 		auto p = QPainter(userpic);
 		p.drawImage(0, 0, userpicMedia->image(userpicSize));
 	}, userpic->lifetime());
 
-	linkValue() | rpl::start_with_next([=](const QString &link) {
+	linkValue() | rpl::on_next([=](const QString &link) {
 		if (link.isEmpty()) {
-			box->showFinishes() | rpl::start_with_next([=] {
+			box->showFinishes() | rpl::on_next([=] {
 				box->closeBox();
 			}, box->lifetime());
 			box->closeBox();
@@ -601,7 +601,7 @@ void FillPeerQrBox(
 			state->chosen.value() | rpl::combine_previous(
 			) | rpl::filter([=](int i, int k) {
 				return i == counter || k == counter;
-			}) | rpl::start_with_next([=] {
+			}) | rpl::on_next([=] {
 				widget->update();
 			}, widget->lifetime());
 			widget->resize(size, size);
@@ -653,7 +653,7 @@ void FillPeerQrBox(
 				}
 				return result;
 			}();
-			widget->paintRequest() | rpl::start_with_next([=] {
+			widget->paintRequest() | rpl::on_next([=] {
 				auto p = QPainter(widget);
 				const auto rect = widget->rect() - Margins(activewidth * 2.5);
 				p.drawImage(rect.x(), rect.y(), back);
@@ -684,7 +684,7 @@ void FillPeerQrBox(
 	} else {
 		themes->refreshChatThemes();
 		themes->chatThemesUpdated(
-		) | rpl::take(1) | rpl::start_with_next([=] {
+		) | rpl::take(1) | rpl::on_next([=] {
 			fill(themes->chatThemes());
 		}, box->lifetime());
 	}
@@ -718,7 +718,7 @@ void FillPeerQrBox(
 			tr::lng_qr_box_quality3(),
 			labelSt);
 		labels->sizeValue(
-		) | rpl::start_with_next([=](const QSize &size) {
+		) | rpl::on_next([=](const QSize &size) {
 			left->moveToLeft(0, 0);
 			middle->moveToLeft((size.width() - middle->width()) / 2, 0);
 			right->moveToRight(0, 0);
@@ -752,7 +752,7 @@ void FillPeerQrBox(
 			st::settingsScale,
 			kMaxQualities);
 		slider->geometryValue(
-		) | rpl::start_with_next([=](const QRect &rect) {
+		) | rpl::on_next([=](const QRect &rect) {
 			updateGeometry(int(slider->value() * (kMaxQualities - 1)));
 		}, box->lifetime());
 
@@ -801,7 +801,7 @@ void FillPeerQrBox(
 			return kMinSize + index * kStep;
 		};
 		slider->geometryValue(
-		) | rpl::start_with_next([=](const QRect &rect) {
+		) | rpl::on_next([=](const QRect &rect) {
 			updateGeometry(fontSizeToIndex(state->fontSizeValue.current()));
 		}, box->lifetime());
 
diff --git a/Telegram/SourceFiles/ui/boxes/rate_call_box.cpp b/Telegram/SourceFiles/ui/boxes/rate_call_box.cpp
index d56889f0b8..fa41cd1e89 100644
--- a/Telegram/SourceFiles/ui/boxes/rate_call_box.cpp
+++ b/Telegram/SourceFiles/ui/boxes/rate_call_box.cpp
@@ -93,13 +93,13 @@ void RateCallBox::ratingChanged(int value) {
 
 			updateMaxHeight();
 			_comment->heightChanges(
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				commentResized();
 			}, _comment->lifetime());
 			_comment->submits(
-			) | rpl::start_with_next([=] { send(); }, _comment->lifetime());
+			) | rpl::on_next([=] { send(); }, _comment->lifetime());
 			_comment->cancelled(
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				closeBox();
 			}, _comment->lifetime());
 		}
diff --git a/Telegram/SourceFiles/ui/boxes/report_box_graphics.cpp b/Telegram/SourceFiles/ui/boxes/report_box_graphics.cpp
index 7dac7041bf..0c2111a467 100644
--- a/Telegram/SourceFiles/ui/boxes/report_box_graphics.cpp
+++ b/Telegram/SourceFiles/ui/boxes/report_box_graphics.cpp
@@ -159,7 +159,7 @@ void ReportDetailsBox(
 		const auto text = details->getLastText();
 		done(text);
 	};
-	details->submits() | rpl::start_with_next(submit, details->lifetime());
+	details->submits() | rpl::on_next(submit, details->lifetime());
 	box->addButton(tr::lng_report_button(), submit);
 	box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
 }
@@ -183,11 +183,11 @@ not_null<Ui::AbstractButton*> AddReportOptionButton(
 	label->setTextColorOverride(textFg);
 	const auto icon = Ui::CreateChild<Ui::RpWidget>(button);
 	icon->resize(st::settingsPremiumArrow.size());
-	icon->paintRequest() | rpl::start_with_next([=, w = icon->width()] {
+	icon->paintRequest() | rpl::on_next([=, w = icon->width()] {
 		auto p = Painter(icon);
 		st::settingsPremiumArrow.paint(p, 0, 0, w, textFg);
 	}, icon->lifetime());
-	button->sizeValue() | rpl::start_with_next([=](const QSize &size) {
+	button->sizeValue() | rpl::on_next([=](const QSize &size) {
 		const auto left = button->st().padding.left();
 		const auto right = button->st().padding.right();
 		icon->moveToRight(right, (size.height() - icon->height()) / 2);
diff --git a/Telegram/SourceFiles/ui/boxes/show_or_premium_box.cpp b/Telegram/SourceFiles/ui/boxes/show_or_premium_box.cpp
index 42e325ec02..3757517c4e 100644
--- a/Telegram/SourceFiles/ui/boxes/show_or_premium_box.cpp
+++ b/Telegram/SourceFiles/ui/boxes/show_or_premium_box.cpp
@@ -42,7 +42,7 @@ object_ptr<RpWidget> MakeShowOrLabel(
 	const auto raw = result.data();
 
 	raw->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(raw);
 
 		const auto full = st::showOrLineWidth;
@@ -142,7 +142,7 @@ void ShowOrPremiumBox(
 		const auto circle = Ui::CreateChild<Ui::RpWidget>(
 			iconRow->parentWidget());
 		circle->lower();
-		circle->paintRequest() | rpl::start_with_next([=] {
+		circle->paintRequest() | rpl::on_next([=] {
 			auto p = QPainter(circle);
 			auto hq = PainterHighQualityEnabler(p);
 			const auto size = st::normalBoxLottieSize;
@@ -153,7 +153,7 @@ void ShowOrPremiumBox(
 			p.drawEllipse(QRect(QPoint(left, top), size));
 		}, circle->lifetime());
 
-		iconRow->geometryValue() | rpl::start_with_next([=](const QRect &g) {
+		iconRow->geometryValue() | rpl::on_next([=](const QRect &g) {
 			circle->setGeometry(g);
 		}, circle->lifetime());
 	}
@@ -212,7 +212,7 @@ void ShowOrPremiumBox(
 	rpl::combine(
 		premium->widthValue(),
 		label->widthValue()
-	) | rpl::start_with_next([=](int outer, int width) {
+	) | rpl::on_next([=](int outer, int width) {
 		label->moveToLeft(
 			(outer - width) / 2,
 			st::premiumPreviewBox.button.textTop,
diff --git a/Telegram/SourceFiles/ui/boxes/time_picker_box.cpp b/Telegram/SourceFiles/ui/boxes/time_picker_box.cpp
index 4af7853a6f..f79a12f1fa 100644
--- a/Telegram/SourceFiles/ui/boxes/time_picker_box.cpp
+++ b/Telegram/SourceFiles/ui/boxes/time_picker_box.cpp
@@ -90,13 +90,13 @@ Fn<TimeId()> TimePickerBox(
 		startIndex);
 
 	content->sizeValue(
-	) | rpl::start_with_next([=](const QSize &s) {
+	) | rpl::on_next([=](const QSize &s) {
 		picker->resize(maxPhraseWidth, s.height());
 		picker->moveToLeft((s.width() - picker->width()) / 2, 0);
 	}, content->lifetime());
 
 	content->paintRequest(
-	) | rpl::start_with_next([=](const QRect &r) {
+	) | rpl::on_next([=](const QRect &r) {
 		auto p = QPainter(content);
 
 		p.fillRect(r, Qt::transparent);
diff --git a/Telegram/SourceFiles/ui/cached_round_corners.cpp b/Telegram/SourceFiles/ui/cached_round_corners.cpp
index 4aba838513..852ded08a0 100644
--- a/Telegram/SourceFiles/ui/cached_round_corners.cpp
+++ b/Telegram/SourceFiles/ui/cached_round_corners.cpp
@@ -100,7 +100,7 @@ void StartCachedCorners() {
 	CreatePaletteCorners();
 
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		CreatePaletteCorners();
 	}, PaletteChangedLifetime);
 }
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_bot_downloads.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_bot_downloads.cpp
index 5f6fe432c5..05b2e1d033 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_bot_downloads.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_bot_downloads.cpp
@@ -80,12 +80,12 @@ Action::Action(
 	});
 
 	paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		Painter p(this);
 		paint(p);
 	}, lifetime());
 
-	widthValue() | rpl::start_with_next([=](int width) {
+	widthValue() | rpl::on_next([=](int width) {
 		_progress.moveToLeft(
 			_st.itemPadding.left(),
 			st::ttlItemPadding.top() + _st.itemStyle.font->height,
@@ -230,7 +230,7 @@ FnMut<void(not_null<PopupMenu*>)> FillAttachBotDownloadsSubmenu(
 		const auto state = menu->lifetime().make_state<State>();
 		std::move(
 			moved
-		) | rpl::start_with_next([=](
+		) | rpl::on_next([=](
 			const std::vector<DownloadsEntry> &entries) {
 			auto found = base::flat_set<uint32>();
 			for (const auto &entry : entries | ranges::views::reverse) {
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
index 823f96dc01..b644d12a74 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
@@ -198,7 +198,7 @@ Panel::Button::Button(QWidget *parent, const style::RoundButton &st)
 , _bg(st::windowBgActive->c)
 , _roundRect(st::callRadius, st::windowBgActive) {
 	_textFull.value(
-	) | rpl::start_with_next([=](const QString &text) {
+	) | rpl::on_next([=](const QString &text) {
 		_text.setText(st::semiboldTextStyle, text);
 		update();
 	}, lifetime());
@@ -220,7 +220,7 @@ void Panel::Button::updateBg(QColor bg) {
 void Panel::Button::updateBg(not_null<const style::color*> paletteBg) {
 	updateBg((*paletteBg)->c);
 	_bgLifetime = style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateBg((*paletteBg)->c);
 	});
 }
@@ -234,7 +234,7 @@ void Panel::Button::updateFg(QColor fg) {
 void Panel::Button::updateFg(not_null<const style::color*> paletteFg) {
 	updateFg((*paletteFg)->c);
 	_fgLifetime = style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateFg((*paletteFg)->c);
 	});
 }
@@ -258,7 +258,7 @@ void Panel::Button::toggleProgress(bool shown) {
 			this,
 			[=] { return _progress->widget.rect(); });
 		_progress->widget.paintRequest(
-		) | rpl::start_with_next([=](QRect clip) {
+		) | rpl::on_next([=](QRect clip) {
 			auto p = QPainter(&_progress->widget);
 			p.setOpacity(
 				_progress->shownAnimation.value(_progress->shown ? 1. : 0.));
@@ -303,7 +303,7 @@ void Panel::Button::setupProgressGeometry() {
 	}
 	_progress->geometryLifetime.destroy();
 	sizeValue(
-	) | rpl::start_with_next([=](QSize outer) {
+	) | rpl::on_next([=](QSize outer) {
 		const auto height = outer.height();
 		const auto size = st::paymentsLoading.size;
 		const auto skip = (height - size.height()) / 2;
@@ -385,7 +385,7 @@ Panel::Panel(Args &&args)
 	const auto panel = _widget.get();
 	rpl::duplicate(
 		args.title
-	) | rpl::start_with_next([=](const QString &title) {
+	) | rpl::on_next([=](const QString &title) {
 		const auto value = tr::lng_credits_box_history_entry_miniapp(tr::now)
 			+ u": "_q
 			+ title;
@@ -396,7 +396,7 @@ Panel::Panel(Args &&args)
 	updateColorOverrides(params);
 
 	_fullscreen.value(
-	) | rpl::start_with_next([=](bool fullscreen) {
+	) | rpl::on_next([=](bool fullscreen) {
 		_widget->toggleFullScreen(fullscreen);
 		layoutButtons();
 		sendFullScreen();
@@ -405,12 +405,12 @@ Panel::Panel(Args &&args)
 	}, _widget->lifetime());
 
 	_widget->fullScreenValue(
-	) | rpl::start_with_next([=](bool fullscreen) {
+	) | rpl::on_next([=](bool fullscreen) {
 		_fullscreen = fullscreen;
 	}, _widget->lifetime());
 
 	_widget->closeRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (_closeNeedConfirmation) {
 			scheduleCloseWithConfirmation();
 		} else {
@@ -421,12 +421,12 @@ Panel::Panel(Args &&args)
 	_widget->closeEvents(
 	) | rpl::filter([=] {
 		return !_hiddenForPayment;
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		_delegate->botClose();
 	}, _widget->lifetime());
 
 	_widget->backRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		postEvent("back_button_pressed");
 	}, _widget->lifetime());
 
@@ -435,7 +435,7 @@ Panel::Panel(Args &&args)
 		_themeUpdateForced.events()
 	) | rpl::filter([=] {
 		return !_themeUpdateScheduled;
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		_themeUpdateScheduled = true;
 		crl::on_main(_widget.get(), [=] {
 			_themeUpdateScheduled = false;
@@ -470,7 +470,7 @@ void Panel::setupDownloadsProgress(
 	widget->show();
 	widget->setAttribute(Qt::WA_TransparentForMouseEvents);
 
-	button->sizeValue() | rpl::start_with_next([=](QSize size) {
+	button->sizeValue() | rpl::on_next([=](QSize size) {
 		widget->setGeometry(QRect(QPoint(), size));
 	}, widget->lifetime());
 
@@ -496,7 +496,7 @@ void Panel::setupDownloadsProgress(
 	const auto state = widget->lifetime().make_state<State>(widget);
 	std::move(
 		progress
-	) | rpl::start_with_next([=](DownloadsProgress progress) {
+	) | rpl::on_next([=](DownloadsProgress progress) {
 		const auto toggle = [&](bool shown) {
 			if (state->shown == shown) {
 				return;
@@ -530,7 +530,7 @@ void Panel::setupDownloadsProgress(
 		state->progress = progress;
 	}, widget->lifetime());
 
-	widget->paintRequest() | rpl::start_with_next([=] {
+	widget->paintRequest() | rpl::on_next([=] {
 		const auto opacity = std::clamp(
 			state->fade.value(state->shown ? 2. : 0.) - 1.,
 			0.,
@@ -579,7 +579,7 @@ void Panel::toggleProgress(bool shown) {
 			_widget.get(),
 			[=] { return progressRect(); });
 		_progress->widget.paintRequest(
-		) | rpl::start_with_next([=](QRect clip) {
+		) | rpl::on_next([=](QRect clip) {
 			auto p = QPainter(&_progress->widget);
 			p.setOpacity(
 				_progress->shownAnimation.value(_progress->shown ? 1. : 0.));
@@ -646,7 +646,7 @@ void Panel::setupProgressGeometry() {
 	_progress->geometryLifetime.destroy();
 	if (_webviewBottom) {
 		_webviewBottom->geometryValue(
-		) | rpl::start_with_next([=](QRect bottom) {
+		) | rpl::on_next([=](QRect bottom) {
 			const auto height = bottom.height();
 			const auto size = st::paymentsLoading.size;
 			const auto skip = (height - size.height()) / 2;
@@ -699,7 +699,7 @@ bool Panel::showWebview(Args &&args, const Webview::ThemeParams &params) {
 	_webview->window.navigate(url);
 	_widget->setBackAllowed(allowBack);
 
-	rpl::duplicate(args.downloadsProgress) | rpl::start_with_next([=] {
+	rpl::duplicate(args.downloadsProgress) | rpl::on_next([=] {
 		_downloadsUpdated.fire({});
 	}, lifetime());
 
@@ -806,7 +806,7 @@ void Panel::createWebviewBottom() {
 	rpl::combine(
 		_webviewBottom->widthValue(),
 		label->widthValue()
-	) | rpl::start_with_next([=](int outerWidth, int width) {
+	) | rpl::on_next([=](int outerWidth, int width) {
 		label->move((outerWidth - width) / 2, padding.top());
 	}, label->lifetime());
 	label->show();
@@ -817,7 +817,7 @@ void Panel::createWebviewBottom() {
 			return _widget->innerGeometry();
 		}),
 		bottom->heightValue()
-	) | rpl::start_with_next([=](QRect inner, int height) {
+	) | rpl::on_next([=](QRect inner, int height) {
 		bottom->move(inner.x(), inner.y() + inner.height() - height);
 		bottom->resizeToWidth(inner.width());
 		layoutButtons();
@@ -892,7 +892,7 @@ bool Panel::createWebview(const Webview::ThemeParams &params) {
 	rpl::combine(
 		container->geometryValue(),
 		_footerHeight.value()
-	) | rpl::start_with_next([=](QRect geometry, int footer) {
+	) | rpl::on_next([=](QRect geometry, int footer) {
 		if (const auto view = raw->widget()) {
 			view->setGeometry(geometry.marginsRemoved({ 0, 0, 0, footer }));
 			crl::on_main(view, [=] {
@@ -1065,7 +1065,7 @@ postEvent: function(eventType, eventData) {
 			&& !widget->isHidden()
 			&& handle
 			&& (focused == handle);
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		_webview->window.focus();
 	}, _webview->lifetime);
 
@@ -1691,7 +1691,7 @@ void Panel::processHeaderColor(const QJsonObject &args) {
 			args["color_key"].toString())) {
 		_widget->overrideTitleColor((*color)->c);
 		_headerColorLifetime = style::PaletteChanged(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			_widget->overrideTitleColor((*color)->c);
 		});
 	} else {
@@ -1734,7 +1734,7 @@ void Panel::processBackgroundColor(const QJsonObject &args) {
 			args["color_key"].toString())) {
 		overrideBodyColor((*color)->c);
 		_bodyColorLifetime = style::PaletteChanged(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			overrideBodyColor((*color)->c);
 		});
 	} else {
@@ -1760,7 +1760,7 @@ void Panel::processBottomBarColor(const QJsonObject &args) {
 		_widget->overrideBottomBarColor((*color)->c);
 		_bottomBarColor = (*color)->c;
 		_bottomBarColorLifetime = style::PaletteChanged(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			_widget->overrideBottomBarColor((*color)->c);
 			_bottomBarColor = (*color)->c;
 		});
@@ -1807,7 +1807,7 @@ void Panel::createButton(std::unique_ptr<Button> &button) {
 		_bottomButtonsBg = std::make_unique<RpWidget>(_widget.get());
 
 		const auto raw = _bottomButtonsBg.get();
-		raw->paintRequest() | rpl::start_with_next([=] {
+		raw->paintRequest() | rpl::on_next([=] {
 			auto p = QPainter(raw);
 			auto hq = PainterHighQualityEnabler(p);
 			p.setPen(Qt::NoPen);
@@ -1837,7 +1837,7 @@ void Panel::createButton(std::unique_ptr<Button> &button) {
 	rpl::combine(
 		raw->shownValue(),
 		raw->heightValue()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		layoutButtons();
 	}, raw->lifetime());
 }
@@ -1948,7 +1948,7 @@ void Panel::showBox(
 		raw->boxClosing(
 		) | rpl::filter([=] {
 			return _webview != nullptr;
-		}) | rpl::start_with_next([=] {
+		}) | rpl::on_next([=] {
 			auto &list = _webview->boxes;
 			list.erase(ranges::remove_if(list, [&](QPointer<RpWidget> b) {
 				return !b || (b == raw);
@@ -2034,7 +2034,7 @@ void Panel::showCriticalError(const TextWithEntities &text) {
 		return false;
 	});
 
-	raw->widthValue() | rpl::start_with_next([=](int width) {
+	raw->widthValue() | rpl::on_next([=](int width) {
 		error->resizeToWidth(width);
 		raw->resize(width, error->height());
 	}, raw->lifetime());
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_controls.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_controls.cpp
index 775218a873..ee3ae3c095 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_controls.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_controls.cpp
@@ -100,7 +100,7 @@ AttachControlsWidget::AttachControlsWidget(
 	}
 
 	paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(this);
 		_controls.paint(p, 0, 0);
 	}, lifetime());
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_item_single_file_preview.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_item_single_file_preview.cpp
index 1c235c96bf..0dfff6b52c 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_item_single_file_preview.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_item_single_file_preview.cpp
@@ -51,7 +51,7 @@ ItemSingleFilePreview::ItemSingleFilePreview(
 
 	rpl::single(rpl::empty) | rpl::then(
 		document->session().downloaderTaskFinished()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (_documentMedia->thumbnail()) {
 			_lifetimeDownload.destroy();
 		}
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_item_single_media_preview.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_item_single_media_preview.cpp
index 02f3c92581..431265d469 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_item_single_media_preview.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_item_single_media_preview.cpp
@@ -92,7 +92,7 @@ ItemSingleMediaPreview::ItemSingleMediaPreview(
 
 	rpl::single(rpl::empty) | rpl::then(
 		session->downloaderTaskFinished()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto computed = computeThumbInfo();
 		if (!computed.image) {
 			if (_documentMedia && !_documentMedia->owner()->hasThumbnail()) {
@@ -142,7 +142,7 @@ void ItemSingleMediaPreview::setupStreamedPreview(
 		[=] { update(); });
 	_streamed->lockPlayer();
 	_streamed->player().updates(
-	) | rpl::start_with_next_error([=](Update &&update) {
+	) | rpl::on_next_error([=](Update &&update) {
 		handleStreamingUpdate(std::move(update));
 	}, [=](Error &&error) {
 		handleStreamingError(std::move(error));
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_single_media_preview.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_single_media_preview.cpp
index 7f039e3570..800938bd9a 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_single_media_preview.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_single_media_preview.cpp
@@ -126,7 +126,7 @@ void SingleMediaPreview::prepareAnimatedPreview(
 			Lottie::ReadContent(QByteArray(), animatedPreviewPath),
 			Lottie::FrameRequest{ box });
 		_lottiePreview->updates(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			update();
 		}, lifetime());
 	} else if (!animatedPreviewPath.isEmpty()) {
diff --git a/Telegram/SourceFiles/ui/chat/chat_style.cpp b/Telegram/SourceFiles/ui/chat/chat_style.cpp
index aeffc7b3ac..44fd82a990 100644
--- a/Telegram/SourceFiles/ui/chat/chat_style.cpp
+++ b/Telegram/SourceFiles/ui/chat/chat_style.cpp
@@ -187,7 +187,7 @@ ChatStyle::ChatStyle(rpl::producer<ColorIndicesCompressed> colorIndices) {
 	if (colorIndices) {
 		_colorIndicesLifetime = std::move(
 			colorIndices
-		) | rpl::start_with_next([=](ColorIndicesCompressed &&indices) {
+		) | rpl::on_next([=](ColorIndicesCompressed &&indices) {
 			_colorIndices = std::move(indices);
 		});
 	}
@@ -614,7 +614,7 @@ void ChatStyle::applyCustomPalette(const style::palette *palette) {
 		_defaultPaletteChangeLifetime.destroy();
 	} else {
 		style::PaletteChanged(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			assignPalette(style::main_palette::get());
 		}, _defaultPaletteChangeLifetime);
 	}
diff --git a/Telegram/SourceFiles/ui/chat/choose_send_as.cpp b/Telegram/SourceFiles/ui/chat/choose_send_as.cpp
index 2da7689ca8..8b2855c664 100644
--- a/Telegram/SourceFiles/ui/chat/choose_send_as.cpp
+++ b/Telegram/SourceFiles/ui/chat/choose_send_as.cpp
@@ -111,7 +111,7 @@ ListController::ListController(
 , _selected(selected) {
 	Data::AmPremiumValue(
 		&selected->session()
-	) | rpl::skip(1) | rpl::start_with_next([=] {
+	) | rpl::skip(1) | rpl::on_next([=] {
 		const auto count = delegate()->peerListFullRowsCount();
 		for (auto i = 0; i != count; ++i) {
 			delegate()->peerListUpdateRow(
@@ -195,7 +195,7 @@ void ChooseSendAsBox(
 	controller->setStyleOverrides(&st.list, nullptr);
 
 	controller->clicked(
-	) | rpl::start_with_next([=](not_null<PeerData*> peer) {
+	) | rpl::on_next([=](not_null<PeerData*> peer) {
 		const auto weak = base::make_weak(box);
 		if (done(peer) && weak) {
 			box->closeBox();
@@ -291,7 +291,7 @@ void SetupSendAsButton(
 
 	std::move(
 		userpic
-	) | rpl::start_with_next([=](QImage &&userpic) {
+	) | rpl::on_next([=](QImage &&userpic) {
 		button->setUserpic(std::move(userpic));
 	}, button->lifetime());
 }
@@ -333,7 +333,7 @@ void SetupSendAsButton(
 
 	std::move(
 		userpic
-	) | rpl::start_with_next([=](QImage &&userpic) {
+	) | rpl::on_next([=](QImage &&userpic) {
 		button->setUserpic(std::move(userpic));
 	}, button->lifetime());
 }
diff --git a/Telegram/SourceFiles/ui/chat/choose_theme_controller.cpp b/Telegram/SourceFiles/ui/chat/choose_theme_controller.cpp
index ee929cfb2c..4d12c532fc 100644
--- a/Telegram/SourceFiles/ui/chat/choose_theme_controller.cpp
+++ b/Telegram/SourceFiles/ui/chat/choose_theme_controller.cpp
@@ -228,7 +228,7 @@ void ChooseThemeController::init(rpl::producer<QSize> outer) {
 	} else {
 		themes->refreshChatThemes();
 		themes->chatThemesUpdated(
-		) | rpl::take(1) | rpl::start_with_next([=] {
+		) | rpl::take(1) | rpl::on_next([=] {
 			fill(themes->chatThemes());
 		}, lifetime());
 	}
@@ -244,7 +244,7 @@ void ChooseThemeController::init(rpl::producer<QSize> outer) {
 		tr::lng_chat_theme_title(),
 		st::boxTitle);
 	_wrap->paintRequest(
-	) | rpl::start_with_next([=](QRect clip) {
+	) | rpl::on_next([=](QRect clip) {
 		QPainter(_wrap.get()).fillRect(clip, st::windowBg);
 	}, lifetime());
 
@@ -255,7 +255,7 @@ void ChooseThemeController::init(rpl::producer<QSize> outer) {
 	rpl::combine(
 		_wrap->widthValue(),
 		titleWrap->positionValue()
-	) | rpl::start_with_next([=](int width, QPoint position) {
+	) | rpl::on_next([=](int width, QPoint position) {
 		close->moveToRight(0, 0, width);
 	}, close->lifetime());
 
@@ -263,13 +263,13 @@ void ChooseThemeController::init(rpl::producer<QSize> outer) {
 	initList();
 
 	_inner->positionValue(
-	) | rpl::start_with_next([=](QPoint position) {
+	) | rpl::on_next([=](QPoint position) {
 		title->move(std::max(position.x(), 0), 0);
 	}, title->lifetime());
 
 	std::move(
 		outer
-	) | rpl::start_with_next([=](QSize outer) {
+	) | rpl::on_next([=](QSize outer) {
 		_wrap->resizeToWidth(outer.width());
 		_wrap->move(0, outer.height() - _wrap->height());
 		const auto line = st::lineWidth;
@@ -280,7 +280,7 @@ void ChooseThemeController::init(rpl::producer<QSize> outer) {
 		_shouldBeShown.value(),
 		_forceHidden.value(),
 		_1 && !_2
-	) | rpl::start_with_next([=](bool shown) {
+	) | rpl::on_next([=](bool shown) {
 		_wrap->setVisible(shown);
 		_topShadow->setVisible(shown);
 	}, lifetime());
@@ -308,7 +308,7 @@ void ChooseThemeController::initButtons() {
 		apply->widthValue(),
 		choose->widthValue(),
 		_chosen.value()
-	) | rpl::start_with_next([=](
+	) | rpl::on_next([=](
 			int outer,
 			int applyWidth,
 			int chooseWidth,
@@ -430,7 +430,7 @@ void ChooseThemeController::initList() {
 	_inner->setMouseTracking(true);
 
 	_inner->paintRequest(
-	) | rpl::start_with_next([=](QRect clip) {
+	) | rpl::on_next([=](QRect clip) {
 		auto p = QPainter(_inner.get());
 		for (const auto &entry : _entries) {
 			if (entry.preview.isNull() || !clip.intersects(entry.geometry)) {
@@ -457,7 +457,7 @@ void ChooseThemeController::initList() {
 		}
 	};
 	_inner->events(
-	) | rpl::start_with_next([=](not_null<QEvent*> event) {
+	) | rpl::on_next([=](not_null<QEvent*> event) {
 		const auto type = event->type();
 		if (type == QEvent::MouseMove) {
 			const auto mouse = static_cast<QMouseEvent*>(event.get());
@@ -522,7 +522,7 @@ void ChooseThemeController::initList() {
 	}, lifetime());
 
 	_content->events(
-	) | rpl::start_with_next([=](not_null<QEvent*> event) {
+	) | rpl::on_next([=](not_null<QEvent*> event) {
 		const auto type = event->type();
 		if (type == QEvent::KeyPress) {
 			const auto key = static_cast<QKeyEvent*>(event.get());
@@ -535,7 +535,7 @@ void ChooseThemeController::initList() {
 	rpl::combine(
 		_content->widthValue(),
 		_inner->widthValue()
-	) | rpl::start_with_next([=](int content, int inner) {
+	) | rpl::on_next([=](int content, int inner) {
 		if (!content || !inner) {
 			return;
 		} else if (!_entries.empty() && !_initialInnerLeftApplied) {
@@ -621,7 +621,7 @@ void ChooseThemeController::fill(
 		rpl::single(
 			rpl::empty
 		) | rpl::then(cloudThemes->myGiftThemesUpdated())
-	) | rpl::start_with_next([=](bool dark, auto) {
+	) | rpl::on_next([=](bool dark, auto) {
 		if (!cloudThemes->myGiftThemesReady()) {
 			return;
 		}
@@ -641,7 +641,7 @@ void ChooseThemeController::fill(
 		});
 		Assert(_entries.front().emoji != nullptr);
 		style::PaletteChanged(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			_entries.front().preview = GenerateEmptyPreview();
 		}, _cachingLifetime);
 
@@ -691,7 +691,7 @@ void ChooseThemeController::fill(
 				return data && (data->key() == key);
 			}) | rpl::take(
 				1
-			) | rpl::start_with_next([=](std::shared_ptr<ChatTheme> &&data) {
+			) | rpl::on_next([=](std::shared_ptr<ChatTheme> &&data) {
 				const auto key = data->key();
 				const auto i = ranges::find(_entries, key, &Entry::key);
 				if (i == end(_entries)) {
@@ -721,7 +721,7 @@ void ChooseThemeController::fill(
 						&Entry::key);
 					return (i == end(_entries))
 						|| !i->theme->background().prepared.isNull();
-				}) | rpl::take(1) | rpl::start_with_next([=] {
+				}) | rpl::take(1) | rpl::on_next([=] {
 					const auto i = ranges::find(
 						_entries,
 						key,
diff --git a/Telegram/SourceFiles/ui/chat/forward_options_box.cpp b/Telegram/SourceFiles/ui/chat/forward_options_box.cpp
index 0f3ed647d5..65f24c2946 100644
--- a/Telegram/SourceFiles/ui/chat/forward_options_box.cpp
+++ b/Telegram/SourceFiles/ui/chat/forward_options_box.cpp
@@ -46,7 +46,7 @@ void FillForwardOptions(
 		});
 	};
 	names->checkedChanges(
-	) | rpl::start_with_next([=](bool showNames) {
+	) | rpl::on_next([=](bool showNames) {
 		if (showNames && captions && !captions->checked()) {
 			captions->setChecked(true, anim::type::normal);
 		} else {
@@ -55,7 +55,7 @@ void FillForwardOptions(
 	}, lifetime);
 	if (captions) {
 		captions->checkedChanges(
-		) | rpl::start_with_next([=](bool showCaptions) {
+		) | rpl::on_next([=](bool showCaptions) {
 			if (!showCaptions && names->checked()) {
 				names->setChecked(false, anim::type::normal);
 			} else {
diff --git a/Telegram/SourceFiles/ui/chat/group_call_bar.cpp b/Telegram/SourceFiles/ui/chat/group_call_bar.cpp
index 239028b1fe..45a30b287e 100644
--- a/Telegram/SourceFiles/ui/chat/group_call_bar.cpp
+++ b/Telegram/SourceFiles/ui/chat/group_call_bar.cpp
@@ -31,7 +31,7 @@ GroupCallScheduledLeft::GroupCallScheduledLeft(TimeId date)
 , _timer([=] { update(); }) {
 	update();
 	base::unixtime::updates(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		restart();
 	}, _lifetime);
 }
@@ -120,7 +120,7 @@ GroupCallBar::GroupCallBar(
 	_shadow->hide();
 
 	_wrap.entity()->paintRequest(
-	) | rpl::start_with_next([=](QRect clip) {
+	) | rpl::on_next([=](QRect clip) {
 		QPainter(_wrap.entity()).fillRect(clip, st::historyPinnedBg);
 	}, lifetime());
 	_wrap.setAttribute(Qt::WA_OpaquePaintEvent);
@@ -131,7 +131,7 @@ GroupCallBar::GroupCallBar(
 
 	rpl::duplicate(
 		copy
-	) | rpl::start_with_next([=](GroupCallBarContent &&content) {
+	) | rpl::on_next([=](GroupCallBarContent &&content) {
 		_content = content;
 		_userpics->update(_content.users, !_wrap.isHidden());
 		_inner->update();
@@ -145,7 +145,7 @@ GroupCallBar::GroupCallBar(
 		copy
 	) | rpl::map([=](const GroupCallBarContent &content) {
 		return !content.shown;
-	}) | rpl::start_with_next_done([=](bool hidden) {
+	}) | rpl::on_next_done([=](bool hidden) {
 		_shouldBeShown = !hidden;
 		if (!_forceHidden) {
 			_wrap.toggle(_shouldBeShown, anim::type::normal);
@@ -202,7 +202,7 @@ void GroupCallBar::refreshScheduledProcess() {
 			st::groupCallTopBarOpen);
 		setupRightButton(_open.get());
 		_open->widthValue(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			refreshOpenBrush();
 		}, _open->lifetime());
 	} else {
@@ -213,7 +213,7 @@ void GroupCallBar::refreshScheduledProcess() {
 void GroupCallBar::setupInner() {
 	_inner->resize(0, st::historyReplyHeight);
 	_inner->paintRequest(
-	) | rpl::start_with_next([=](QRect rect) {
+	) | rpl::on_next([=](QRect rect) {
 		auto p = Painter(_inner);
 		paint(p);
 	}, _inner->lifetime());
@@ -237,7 +237,7 @@ void GroupCallBar::setupInner() {
 	) | rpl::to_empty | rpl::start_to_stream(_barClicks, _inner->lifetime());
 
 	_wrap.geometryValue(
-	) | rpl::start_with_next([=](QRect rect) {
+	) | rpl::on_next([=](QRect rect) {
 		updateShadowGeometry(rect);
 		updateControlsGeometry(rect);
 	}, _inner->lifetime());
@@ -248,7 +248,7 @@ void GroupCallBar::setupRightButton(not_null<RoundButton*> button) {
 	rpl::combine(
 		_inner->widthValue(),
 		button->widthValue()
-	) | rpl::start_with_next([=](int outerWidth, int buttonWidth) {
+	) | rpl::on_next([=](int outerWidth, int buttonWidth) {
 		// Skip shadow of the bar above.
 		const auto top = (st::historyReplyHeight
 			- st::lineWidth
diff --git a/Telegram/SourceFiles/ui/chat/group_call_userpics.cpp b/Telegram/SourceFiles/ui/chat/group_call_userpics.cpp
index f415151c2f..24ca261697 100644
--- a/Telegram/SourceFiles/ui/chat/group_call_userpics.cpp
+++ b/Telegram/SourceFiles/ui/chat/group_call_userpics.cpp
@@ -95,7 +95,7 @@ GroupCallUserpics::GroupCallUserpics(
 	_maxWidth = 2 * single + (limit - 1) * (single - shift);
 
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		for (auto &userpic : _list) {
 			userpic.cache = QImage();
 		}
@@ -120,7 +120,7 @@ GroupCallUserpics::GroupCallUserpics(
 	rpl::combine(
 		PowerSaving::OnValue(PowerSaving::kCalls),
 		std::move(hideBlobs)
-	) | rpl::start_with_next([=](bool disabled, bool deactivated) {
+	) | rpl::on_next([=](bool disabled, bool deactivated) {
 		const auto hide = disabled || deactivated;
 
 		if (!(hide && _speakingAnimationHideLastTime)) {
diff --git a/Telegram/SourceFiles/ui/chat/message_bar.cpp b/Telegram/SourceFiles/ui/chat/message_bar.cpp
index 7699445668..0efe8eaa97 100644
--- a/Telegram/SourceFiles/ui/chat/message_bar.cpp
+++ b/Telegram/SourceFiles/ui/chat/message_bar.cpp
@@ -56,7 +56,7 @@ MessageBar::MessageBar(
 	setup();
 
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_topBarGradient = _bottomBarGradient = QPixmap();
 	}, _widget.lifetime());
 }
@@ -72,7 +72,7 @@ void MessageBar::customEmojiRepaint() {
 void MessageBar::setup() {
 	_widget.resize(0, st::historyReplyHeight);
 	_widget.paintRequest(
-	) | rpl::start_with_next([=](QRect rect) {
+	) | rpl::on_next([=](QRect rect) {
 		auto p = Painter(&_widget);
 		p.setInactive(_customEmojiPaused());
 		_customEmojiRepaintScheduled = false;
@@ -89,7 +89,7 @@ void MessageBar::set(rpl::producer<MessageBarContent> content) {
 	_contentLifetime.destroy();
 	std::move(
 		content
-	) | rpl::start_with_next([=](MessageBarContent &&content) {
+	) | rpl::on_next([=](MessageBarContent &&content) {
 		tweenTo(std::move(content));
 	}, _contentLifetime);
 }
diff --git a/Telegram/SourceFiles/ui/chat/more_chats_bar.cpp b/Telegram/SourceFiles/ui/chat/more_chats_bar.cpp
index d78a60696f..be658165be 100644
--- a/Telegram/SourceFiles/ui/chat/more_chats_bar.cpp
+++ b/Telegram/SourceFiles/ui/chat/more_chats_bar.cpp
@@ -28,7 +28,7 @@ MoreChatsBar::MoreChatsBar(
 	_shadow->hide();
 
 	_wrap.entity()->paintRequest(
-	) | rpl::start_with_next([=](QRect clip) {
+	) | rpl::on_next([=](QRect clip) {
 		QPainter(_wrap.entity()).fillRect(clip, st::historyPinnedBg);
 	}, lifetime());
 	_wrap.setAttribute(Qt::WA_OpaquePaintEvent);
@@ -39,7 +39,7 @@ MoreChatsBar::MoreChatsBar(
 
 	rpl::duplicate(
 		copy
-	) | rpl::start_with_next([=](MoreChatsBarContent &&content) {
+	) | rpl::on_next([=](MoreChatsBarContent &&content) {
 		_content = content;
 		if (_content.count > 0) {
 			_text.setText(
@@ -64,7 +64,7 @@ MoreChatsBar::MoreChatsBar(
 		copy
 	) | rpl::map([=](const MoreChatsBarContent &content) {
 		return !content.count;
-	}) | rpl::start_with_next_done([=](bool hidden) {
+	}) | rpl::on_next_done([=](bool hidden) {
 		_shouldBeShown = !hidden;
 		if (!_forceHidden) {
 			_wrap.toggle(_shouldBeShown, anim::type::normal);
@@ -82,7 +82,7 @@ MoreChatsBar::~MoreChatsBar() = default;
 void MoreChatsBar::setupInner() {
 	_inner->resize(0, st::moreChatsBarHeight);
 	_inner->paintRequest(
-	) | rpl::start_with_next([=](QRect rect) {
+	) | rpl::on_next([=](QRect rect) {
 		auto p = Painter(_inner);
 		paint(p);
 	}, _inner->lifetime());
@@ -104,7 +104,7 @@ void MoreChatsBar::setupInner() {
 	) | rpl::to_empty | rpl::start_to_stream(_barClicks, _inner->lifetime());
 
 	_wrap.geometryValue(
-	) | rpl::start_with_next([=](QRect rect) {
+	) | rpl::on_next([=](QRect rect) {
 		updateShadowGeometry(rect);
 		updateControlsGeometry(rect);
 	}, _inner->lifetime());
diff --git a/Telegram/SourceFiles/ui/chat/pinned_bar.cpp b/Telegram/SourceFiles/ui/chat/pinned_bar.cpp
index eb2cf01d17..cbd80030a4 100644
--- a/Telegram/SourceFiles/ui/chat/pinned_bar.cpp
+++ b/Telegram/SourceFiles/ui/chat/pinned_bar.cpp
@@ -38,7 +38,7 @@ PinnedBar::PinnedBar(
 	}));
 
 	_wrap.entity()->paintRequest(
-	) | rpl::start_with_next([=](QRect clip) {
+	) | rpl::on_next([=](QRect clip) {
 		QPainter(_wrap.entity()).fillRect(clip, st::historyPinnedBg);
 	}, lifetime());
 	_wrap.setAttribute(Qt::WA_OpaquePaintEvent);
@@ -46,7 +46,7 @@ PinnedBar::PinnedBar(
 	if (customEmojiPausedChanges) {
 		std::move(
 			customEmojiPausedChanges
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			_wrap.entity()->update();
 		}, lifetime());
 	}
@@ -67,7 +67,7 @@ void PinnedBar::setContent(rpl::producer<Ui::MessageBarContent> content) {
 		copy
 	) | rpl::filter([=](const MessageBarContent &content) {
 		return !content.title.isEmpty() || !content.text.text.isEmpty();
-	}) | rpl::start_with_next([=](MessageBarContent &&content) {
+	}) | rpl::on_next([=](MessageBarContent &&content) {
 		const auto creating = !_bar;
 		if (creating) {
 			createControls();
@@ -88,7 +88,7 @@ void PinnedBar::setContent(rpl::producer<Ui::MessageBarContent> content) {
 		copy
 	) | rpl::map([=](const MessageBarContent &content) {
 		return content.title.isEmpty() || content.text.text.isEmpty();
-	}) | rpl::start_with_next_done([=](bool hidden) {
+	}) | rpl::on_next_done([=](bool hidden) {
 		_shouldBeShown = !hidden;
 		if (!_forceHidden) {
 			_wrap.toggle(_shouldBeShown, anim::type::normal);
@@ -106,7 +106,7 @@ void PinnedBar::setRightButton(object_ptr<Ui::RpWidget> button) {
 	if (auto previous = _right.button.release()) {
 		using Unique = base::unique_qptr<Ui::FadeWrapScaled<Ui::RpWidget>>;
 		_right.previousButtonLifetime = previous->shownValue(
-		) | rpl::filter(!rpl::mappers::_1) | rpl::start_with_next([=] {
+		) | rpl::filter(!rpl::mappers::_1) | rpl::on_next([=] {
 			_right.previousButtonLifetime.destroy();
 		});
 		previous->hide(anim::type::normal);
@@ -189,7 +189,7 @@ void PinnedBar::createControls() {
 		_bar->widget()->height());
 
 	_wrap.geometryValue(
-	) | rpl::start_with_next([=](QRect rect) {
+	) | rpl::on_next([=](QRect rect) {
 		updateShadowGeometry(rect);
 		updateControlsGeometry(rect);
 	}, _bar->widget()->lifetime());
@@ -199,7 +199,7 @@ void PinnedBar::createControls() {
 		1
 	) | rpl::filter([=](bool shown) {
 		return !shown && !_forceHidden;
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		_bar = nullptr;
 	}, _bar->widget()->lifetime());
 
diff --git a/Telegram/SourceFiles/ui/chat/requests_bar.cpp b/Telegram/SourceFiles/ui/chat/requests_bar.cpp
index c8841f5791..0b14c18fd5 100644
--- a/Telegram/SourceFiles/ui/chat/requests_bar.cpp
+++ b/Telegram/SourceFiles/ui/chat/requests_bar.cpp
@@ -36,7 +36,7 @@ RequestsBar::RequestsBar(
 	_shadow->hide();
 
 	_wrap.entity()->paintRequest(
-	) | rpl::start_with_next([=](QRect clip) {
+	) | rpl::on_next([=](QRect clip) {
 		QPainter(_wrap.entity()).fillRect(clip, st::historyPinnedBg);
 	}, lifetime());
 	_wrap.setAttribute(Qt::WA_OpaquePaintEvent);
@@ -47,7 +47,7 @@ RequestsBar::RequestsBar(
 
 	rpl::duplicate(
 		copy
-	) | rpl::start_with_next([=](RequestsBarContent &&content) {
+	) | rpl::on_next([=](RequestsBarContent &&content) {
 		_content = content;
 		if (_content.count > 0) {
 			if (_content.count == 1 && !_content.nameFull.isEmpty()) {
@@ -84,7 +84,7 @@ RequestsBar::RequestsBar(
 		copy
 	) | rpl::map([=](const RequestsBarContent &content) {
 		return !content.count;
-	}) | rpl::start_with_next_done([=](bool hidden) {
+	}) | rpl::on_next_done([=](bool hidden) {
 		_shouldBeShown = !hidden;
 		if (!_forceHidden) {
 			_wrap.toggle(_shouldBeShown, anim::type::normal);
@@ -95,7 +95,7 @@ RequestsBar::RequestsBar(
 	}, lifetime());
 
 	_userpics->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		_userpicsWidth = width;
 	}, lifetime());
 
@@ -107,7 +107,7 @@ RequestsBar::~RequestsBar() = default;
 void RequestsBar::setupInner() {
 	_inner->resize(0, st::historyRequestsHeight);
 	_inner->paintRequest(
-	) | rpl::start_with_next([=](QRect rect) {
+	) | rpl::on_next([=](QRect rect) {
 		auto p = Painter(_inner);
 		paint(p);
 	}, _inner->lifetime());
@@ -129,7 +129,7 @@ void RequestsBar::setupInner() {
 	) | rpl::to_empty | rpl::start_to_stream(_barClicks, _inner->lifetime());
 
 	_wrap.geometryValue(
-	) | rpl::start_with_next([=](QRect rect) {
+	) | rpl::on_next([=](QRect rect) {
 		updateShadowGeometry(rect);
 		updateControlsGeometry(rect);
 	}, _inner->lifetime());
diff --git a/Telegram/SourceFiles/ui/chat/sponsored_message_bar.cpp b/Telegram/SourceFiles/ui/chat/sponsored_message_bar.cpp
index 4cd3ca1df1..ce3f4c0213 100644
--- a/Telegram/SourceFiles/ui/chat/sponsored_message_bar.cpp
+++ b/Telegram/SourceFiles/ui/chat/sponsored_message_bar.cpp
@@ -52,14 +52,14 @@ public:
 		ColorFactory cache)
 	: Ui::RippleButton(parent, st::defaultRippleAnimation) {
 		text(
-		) | rpl::start_with_next([this](const QString &t) {
+		) | rpl::on_next([this](const QString &t) {
 			const auto height = st::stickersHeaderBadgeFont->height;
 			resize(
 				st::stickersHeaderBadgeFont->width(t) + height,
 				height);
 			update();
 		}, lifetime());
-		paintRequest() | rpl::start_with_next([this, cache, text] {
+		paintRequest() | rpl::on_next([this, cache, text] {
 			auto p = QPainter(this);
 			const auto colors = cache();
 			const auto r = rect();
@@ -102,7 +102,7 @@ public:
 	Window::ChatThemeValueFromPeer(
 		controller,
 		peer
-	) | rpl::start_with_next([=](std::shared_ptr<Ui::ChatTheme> &&theme) {
+	) | rpl::on_next([=](std::shared_ptr<Ui::ChatTheme> &&theme) {
 		state->theme = std::move(theme);
 	}, widget->lifetime());
 
@@ -163,7 +163,7 @@ void FillSponsoredMessageBar(
 		container,
 		st::defaultRippleAnimationBgOver);
 	widget->show();
-	container->sizeValue() | rpl::start_with_next([=](const QSize &s) {
+	container->sizeValue() | rpl::on_next([=](const QSize &s) {
 		widget->resize(s);
 	}, widget->lifetime());
 	widget->setAcceptBoth();
@@ -251,7 +251,7 @@ void FillSponsoredMessageBar(
 			st::dialogsCancelSearchInPeer);
 	if (rightHide) {
 		container->sizeValue(
-		) | rpl::start_with_next([=](const QSize &s) {
+		) | rpl::on_next([=](const QSize &s) {
 			rightHide->moveToRight(st::buttonRadius, st::lineWidth);
 		}, rightHide->lifetime());
 		rightHide->setClickedCallback(
@@ -378,14 +378,14 @@ void FillSponsoredMessageBar(
 				state->rightPhotoImage);
 		}
 	};
-	widget->paintRequest() | rpl::start_with_next([=] {
+	widget->paintRequest() | rpl::on_next([=] {
 		auto p = QPainter(widget);
 		draw(p);
 	}, widget->lifetime());
 	rpl::combine(
 		state->lastPaintedContentTop.value(),
 		state->lastPaintedContentLineAmount.value()
-	) | rpl::distinct_until_changed() | rpl::start_with_next([=](
+	) | rpl::distinct_until_changed() | rpl::on_next([=](
 			int lastTop,
 			int lastLines) {
 		const auto bottomPadding = st::msgReplyPadding.top();
@@ -411,7 +411,7 @@ void FillSponsoredMessageBar(
 	{
 		const auto top = Ui::CreateChild<PlainShadow>(widget);
 		const auto bottom = Ui::CreateChild<PlainShadow>(widget);
-		widget->sizeValue() | rpl::start_with_next([=] (const QSize &s) {
+		widget->sizeValue() | rpl::on_next([=] (const QSize &s) {
 			top->show();
 			top->raise();
 			top->resizeToWidth(s.width());
diff --git a/Telegram/SourceFiles/ui/controls/button_labels.cpp b/Telegram/SourceFiles/ui/controls/button_labels.cpp
index 13563d61bf..524ae5710f 100644
--- a/Telegram/SourceFiles/ui/controls/button_labels.cpp
+++ b/Telegram/SourceFiles/ui/controls/button_labels.cpp
@@ -36,7 +36,7 @@ void SetButtonTwoLabels(
 	if (textFg) {
 		buttonTitle->setTextColorOverride((*textFg)->c);
 		buttonSubtitle->setTextColorOverride((*textFg)->c);
-		style::PaletteChanged() | rpl::start_with_next([=] {
+		style::PaletteChanged() | rpl::on_next([=] {
 			buttonTitle->setTextColorOverride((*textFg)->c);
 			buttonSubtitle->setTextColorOverride((*textFg)->c);
 		}, buttonTitle->lifetime());
@@ -46,7 +46,7 @@ void SetButtonTwoLabels(
 		buttonTitle->sizeValue(),
 		buttonSubtitle->sizeValue(),
 		std::move(subtitle)
-	) | rpl::start_with_next([=](
+	) | rpl::on_next([=](
 			QSize outer,
 			QSize title,
 			QSize subtitle,
diff --git a/Telegram/SourceFiles/ui/controls/call_mute_button.cpp b/Telegram/SourceFiles/ui/controls/call_mute_button.cpp
index 34f26507a1..4f68587a23 100644
--- a/Telegram/SourceFiles/ui/controls/call_mute_button.cpp
+++ b/Telegram/SourceFiles/ui/controls/call_mute_button.cpp
@@ -229,12 +229,12 @@ AnimatedLabel::AnimatedLabel(
 , _options({ 0, 0, 0, Qt::LayoutDirectionAuto }) {
 	std::move(
 		text
-	) | rpl::start_with_next([=](const QString &value) {
+	) | rpl::on_next([=](const QString &value) {
 		setText(value);
 	}, lifetime());
 
 	paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		Painter p(this);
 		const auto progress = _animation.value(1.);
 
@@ -347,7 +347,7 @@ BlobsWidget::BlobsWidget(
 
 	std::move(
 		hideBlobs
-	) | rpl::start_with_next([=](bool hide) {
+	) | rpl::on_next([=](bool hide) {
 		if (_hideBlobs != hide) {
 			const auto now = crl::now();
 			if ((now - _blobsScaleLastTime) >= kBlobsScaleEnterDuration) {
@@ -400,13 +400,13 @@ void BlobsWidget::init(int diameter) {
 	setDiameter(diameter);
 
 	sizeValue(
-	) | rpl::start_with_next([=](QSize size) {
+	) | rpl::on_next([=](QSize size) {
 		_center = size.width() / 2;
 		computeCircleRect();
 	}, lifetime());
 
 	paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		Painter p(this);
 		PainterHighQualityEnabler hq(p);
 
@@ -490,7 +490,7 @@ void BlobsWidget::init(int diameter) {
 		return true;
 	});
 	shownValue(
-	) | rpl::start_with_next([=](bool shown) {
+	) | rpl::on_next([=](bool shown) {
 		if (shown) {
 			_animation.start();
 		} else {
@@ -592,7 +592,7 @@ void CallMuteButton::refreshLabels() {
 	rpl::combine(
 		_content->geometryValue(),
 		_label->sizeValue()
-	) | rpl::start_with_next([=](QRect my, QSize size) {
+	) | rpl::on_next([=](QRect my, QSize size) {
 		updateLabelGeometry(my, size);
 	}, _label->lifetime());
 	_label->setAttribute(Qt::WA_TransparentForMouseEvents);
@@ -601,7 +601,7 @@ void CallMuteButton::refreshLabels() {
 	rpl::combine(
 		_content->geometryValue(),
 		_sublabel->sizeValue()
-	) | rpl::start_with_next([=](QRect my, QSize size) {
+	) | rpl::on_next([=](QRect my, QSize size) {
 		updateSublabelGeometry(my, size);
 	}, _sublabel->lifetime());
 	_sublabel->setAttribute(Qt::WA_TransparentForMouseEvents);
@@ -610,7 +610,7 @@ void CallMuteButton::refreshLabels() {
 	rpl::combine(
 		_content->geometryValue(),
 		_centerLabel->sizeValue()
-	) | rpl::start_with_next([=](QRect my, QSize size) {
+	) | rpl::on_next([=](QRect my, QSize size) {
 		updateCenterLabelGeometry(my, size);
 	}, _centerLabel->lifetime());
 	_centerLabel->setAttribute(Qt::WA_TransparentForMouseEvents);
@@ -721,7 +721,7 @@ void CallMuteButton::init() {
 	_content->resize(button.width, button.height);
 
 	_content->events(
-	) | rpl::start_with_next([=](not_null<QEvent*> e) {
+	) | rpl::on_next([=](not_null<QEvent*> e) {
 		if (e->type() == QEvent::MouseMove) {
 			if (!_state.current().tooltip.isEmpty()) {
 				Ui::Tooltip::Show(1000, this);
@@ -734,7 +734,7 @@ void CallMuteButton::init() {
 	rpl::combine(
 		_radialInfo.rawShowProgress.value(),
 		anim::Disables()
-	) | rpl::start_with_next([=](float64 value, bool disabled) {
+	) | rpl::on_next([=](float64 value, bool disabled) {
 		auto &info = _radialInfo;
 		info.realShowProgress = (1. - value) / kRadialEndPartAnimation;
 
@@ -781,7 +781,7 @@ void CallMuteButton::init() {
 	_state.value(
 	) | rpl::map([](const CallMuteButtonState &state) {
 		return state.type;
-	}) | rpl::start_with_next([=](CallMuteButtonType type) {
+	}) | rpl::on_next([=](CallMuteButtonType type) {
 		const auto previous = *previousType;
 		*previousType = type;
 
@@ -839,7 +839,7 @@ void CallMuteButton::init() {
 
 	// Icon rect.
 	_content->sizeValue(
-	) | rpl::start_with_next([=](QSize size) {
+	) | rpl::on_next([=](QSize size) {
 		const auto icon = _lottieSize;
 		_muteIconRect = QRect(
 			(size.width() - icon.width()) / 2,
@@ -850,7 +850,7 @@ void CallMuteButton::init() {
 
 	// Paint.
 	_content->paintRequest(
-	) | rpl::start_with_next([=](QRect clip) {
+	) | rpl::on_next([=](QRect clip) {
 		Painter p(_content);
 
 		const auto expand = _state.current().expandType;
diff --git a/Telegram/SourceFiles/ui/controls/chat_service_checkbox.cpp b/Telegram/SourceFiles/ui/controls/chat_service_checkbox.cpp
index b8e80c5c95..5230a26f20 100644
--- a/Telegram/SourceFiles/ui/controls/chat_service_checkbox.cpp
+++ b/Telegram/SourceFiles/ui/controls/chat_service_checkbox.cpp
@@ -78,7 +78,7 @@ private:
 
 ServiceCheck::Generator::Generator() {
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		invalidate();
 	}, _lifetime);
 }
@@ -249,7 +249,7 @@ void SetupBackground(not_null<Checkbox*> checkbox, Fn<QColor()> bg) {
 		bg ? bg : [] { return st::msgServiceBg->c; }
 	) | rpl::filter([=](const QColor &color) {
 		return color.alpha() > 0;
-	}) | rpl::start_with_next([=](const QColor &color) {
+	}) | rpl::on_next([=](const QColor &color) {
 		auto p = QPainter(checkbox);
 		PainterHighQualityEnabler hq(p);
 		p.setPen(Qt::NoPen);
diff --git a/Telegram/SourceFiles/ui/controls/delete_message_context_action.cpp b/Telegram/SourceFiles/ui/controls/delete_message_context_action.cpp
index 2c4bca985a..340a7d9830 100644
--- a/Telegram/SourceFiles/ui/controls/delete_message_context_action.cpp
+++ b/Telegram/SourceFiles/ui/controls/delete_message_context_action.cpp
@@ -87,7 +87,7 @@ ActionWithTimer::ActionWithTimer(
 	setClickedCallback(std::move(callback));
 
 	paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		Painter p(this);
 		paint(p);
 	}, lifetime());
diff --git a/Telegram/SourceFiles/ui/controls/download_bar.cpp b/Telegram/SourceFiles/ui/controls/download_bar.cpp
index 3b3db11f9b..a13777b611 100644
--- a/Telegram/SourceFiles/ui/controls/download_bar.cpp
+++ b/Telegram/SourceFiles/ui/controls/download_bar.cpp
@@ -45,19 +45,19 @@ DownloadBar::DownloadBar(
 	_button.setDirectionUp(false);
 	_button.entity()->resize(0, st::downloadBarHeight);
 	_button.entity()->paintRequest(
-	) | rpl::start_with_next([=](QRect clip) {
+	) | rpl::on_next([=](QRect clip) {
 		auto p = Painter(_button.entity());
 		paint(p, clip);
 	}, lifetime());
 
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		refreshIcon();
 	}, lifetime());
 	refreshIcon();
 
 	_progress.value(
-	) | rpl::start_with_next([=](const DownloadBarProgress &progress) {
+	) | rpl::on_next([=](const DownloadBarProgress &progress) {
 		refreshInfo(progress);
 	}, lifetime());
 }
diff --git a/Telegram/SourceFiles/ui/controls/emoji_button_factory.cpp b/Telegram/SourceFiles/ui/controls/emoji_button_factory.cpp
index 6acbe084f9..7a8f59e932 100644
--- a/Telegram/SourceFiles/ui/controls/emoji_button_factory.cpp
+++ b/Telegram/SourceFiles/ui/controls/emoji_button_factory.cpp
@@ -40,7 +40,7 @@ namespace Ui {
 		const auto fadeTarget = Ui::CreateChild<Ui::RpWidget>(emojiToggle);
 		fadeTarget->resize(emojiToggle->size());
 		fadeTarget->paintRequest(
-		) | rpl::start_with_next([=](const QRect &rect) {
+		) | rpl::on_next([=](const QRect &rect) {
 			auto p = QPainter(fadeTarget);
 			if (fade->animating()) {
 				p.fillRect(fadeTarget->rect(), st::boxBg);
@@ -49,7 +49,7 @@ namespace Ui {
 		}, fadeTarget->lifetime());
 		rpl::single(false) | rpl::then(
 			field->focusedChanges()
-		) | rpl::start_with_next([=](bool shown) {
+		) | rpl::on_next([=](bool shown) {
 			crl::on_main(emojiToggle, [=] {
 				if (!emojiToggle->isVisible()) {
 					return;
@@ -99,7 +99,7 @@ namespace Ui {
 	rpl::combine(
 		box->sizeValue(),
 		field->geometryValue()
-	) | rpl::start_with_next([=](QSize outer, QRect inner) {
+	) | rpl::on_next([=](QSize outer, QRect inner) {
 		emojiToggle->moveToLeft(
 			rect::right(inner) + shift.x(),
 			inner.y() + shift.y());
diff --git a/Telegram/SourceFiles/ui/controls/feature_list.cpp b/Telegram/SourceFiles/ui/controls/feature_list.cpp
index b591609543..5ab504bab9 100644
--- a/Telegram/SourceFiles/ui/controls/feature_list.cpp
+++ b/Telegram/SourceFiles/ui/controls/feature_list.cpp
@@ -43,7 +43,7 @@ object_ptr<RpWidget> MakeFeatureListEntry(
 	title->show();
 	about->show();
 	widget->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		const auto left = st::infoStarsFeatureLabelLeft;
 		const auto available = width - left;
 		title->resizeToWidth(available);
diff --git a/Telegram/SourceFiles/ui/controls/filter_link_header.cpp b/Telegram/SourceFiles/ui/controls/filter_link_header.cpp
index e6a02ef66c..1815a9f1bb 100644
--- a/Telegram/SourceFiles/ui/controls/filter_link_header.cpp
+++ b/Telegram/SourceFiles/ui/controls/filter_link_header.cpp
@@ -146,7 +146,7 @@ private:
 	raw->hide();
 
 	style::PaletteChanged(
-	) | rpl::start_with_next(repaint, preview.lifetime);
+	) | rpl::on_next(repaint, preview.lifetime);
 
 	return preview;
 }
@@ -314,7 +314,7 @@ Widget::Widget(
 	refreshTitleText();
 	setTitlePosition(st::boxTitlePosition.x(), st::boxTitlePosition.y());
 
-	_badge.changes() | rpl::start_with_next([this] {
+	_badge.changes() | rpl::on_next([this] {
 		_preview = PreviewState();
 		update();
 	}, lifetime());
@@ -552,14 +552,14 @@ object_ptr<RoundButton> FilterLinkProcessButton(
 	};
 	const auto label = result->lifetime().make_state<Label>(result.data());
 	label->setAttribute(Qt::WA_TransparentForMouseEvents);
-	result->sizeValue() | rpl::start_with_next([=](QSize size) {
+	result->sizeValue() | rpl::on_next([=](QSize size) {
 		const auto xskip = st->style.font->spacew;
 		const auto yskip = xskip / 2;
 		label->setGeometry(QRect(QPoint(), size).marginsRemoved(
 			{ xskip, yskip, xskip, yskip }));
 	}, label->lifetime());
 	label->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = Painter(label);
 		const auto width = label->width();
 		const auto hasBadge = !label->badge.isEmpty();
@@ -605,7 +605,7 @@ object_ptr<RoundButton> FilterLinkProcessButton(
 	}, label->lifetime());
 
 	context.repaint = [=] { label->update(); };
-	std::move(data) | rpl::start_with_next([=](Data data) {
+	std::move(data) | rpl::on_next([=](Data data) {
 		label->text.setMarkedText(
 			st::filterInviteButtonStyle,
 			data.text,
diff --git a/Telegram/SourceFiles/ui/controls/invite_link_buttons.cpp b/Telegram/SourceFiles/ui/controls/invite_link_buttons.cpp
index ac13cab173..83da0bc972 100644
--- a/Telegram/SourceFiles/ui/controls/invite_link_buttons.cpp
+++ b/Telegram/SourceFiles/ui/controls/invite_link_buttons.cpp
@@ -52,7 +52,7 @@ void AddCopyShareLinkButtons(
 	share->setClickedCallback(shareLink);
 
 	wrap->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		const auto buttonWidth = (width - st::inviteLinkButtonsSkip) / 2;
 		copy->setFullWidth(buttonWidth);
 		share->setFullWidth(buttonWidth);
@@ -109,7 +109,7 @@ not_null<AbstractButton*> AddJoinedCountButton(
 	const auto state = result->lifetime().make_state<State>();
 	std::move(
 		content
-	) | rpl::start_with_next([=](JoinedCountContent &&content) {
+	) | rpl::on_next([=](JoinedCountContent &&content) {
 		state->content = std::move(content);
 		wrap->toggle(state->content.count > 0, anim::type::instant);
 		if (state->content.count <= 0) {
@@ -143,7 +143,7 @@ not_null<AbstractButton*> AddJoinedCountButton(
 	}, result->lifetime());
 
 	result->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(result);
 		if (!state->content.userpics.isNull()) {
 			p.drawImage(0, 0, state->content.userpics);
@@ -161,7 +161,7 @@ not_null<AbstractButton*> AddJoinedCountButton(
 	}, result->lifetime());
 
 	wrap->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		result->move((width - result->width()) / 2, 0);
 	}, wrap->lifetime());
 
diff --git a/Telegram/SourceFiles/ui/controls/invite_link_label.cpp b/Telegram/SourceFiles/ui/controls/invite_link_label.cpp
index 80d58be9a6..d5eabacae0 100644
--- a/Telegram/SourceFiles/ui/controls/invite_link_label.cpp
+++ b/Telegram/SourceFiles/ui/controls/invite_link_label.cpp
@@ -33,7 +33,7 @@ InviteLinkLabel::InviteLinkLabel(
 		: (IconButton*)(nullptr);
 
 	_outer->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		const auto margin = st::inviteLinkFieldMargin;
 		const auto labelWidth = width - margin.left() - margin.right();
 		label->resizeToWidth(labelWidth);
@@ -48,7 +48,7 @@ InviteLinkLabel::InviteLinkLabel(
 	}, _outer->lifetime());
 
 	_outer->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(_outer.get());
 		p.setPen(Qt::NoPen);
 		p.setBrush(st::filterInputInactiveBg);
@@ -72,7 +72,7 @@ InviteLinkLabel::InviteLinkLabel(
 					&& (static_cast<QMouseEvent*>(event.get())->button()
 						== Qt::RightButton);
 			}) | rpl::to_empty
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			if (_menu) {
 				_menu = nullptr;
 			} else if ((_menu = createMenu())) {
diff --git a/Telegram/SourceFiles/ui/controls/location_picker.cpp b/Telegram/SourceFiles/ui/controls/location_picker.cpp
index 08f13f9801..edd641bd45 100644
--- a/Telegram/SourceFiles/ui/controls/location_picker.cpp
+++ b/Telegram/SourceFiles/ui/controls/location_picker.cpp
@@ -186,10 +186,10 @@ private:
 	const auto raw = result.data();
 	raw->resize(0, skip + st::pickLocationPromoHeight);
 	const auto shadow = CreateChild<PlainShadow>(raw);
-	raw->widthValue() | rpl::start_with_next([=](int width) {
+	raw->widthValue() | rpl::on_next([=](int width) {
 		shadow->setGeometry(0, skip, width, st::lineWidth);
 	}, raw->lifetime());
-	raw->paintRequest() | rpl::start_with_next([=](QRect clip) {
+	raw->paintRequest() | rpl::on_next([=](QRect clip) {
 		auto p = QPainter(raw);
 		p.fillRect(clip, st::windowBg);
 		p.setPen(st::windowSubTextFg);
@@ -213,7 +213,7 @@ VenuesController::VenuesController(
 
 void VenuesController::prepare() {
 	_rows.value(
-	) | rpl::start_with_next([=](const std::vector<VenueData> &rows) {
+	) | rpl::on_next([=](const std::vector<VenueData> &rows) {
 		rebuild(rows);
 	}, _lifetime);
 }
@@ -447,7 +447,7 @@ void VenuesController::rowPaintIcon(
 		st->photoPosition.y(),
 		st->photoSize,
 		st->photoSize);
-	icon->paintRequest() | rpl::start_with_next([=] {
+	icon->paintRequest() | rpl::on_next([=] {
 		auto p = QPainter(icon);
 		auto hq = PainterHighQualityEnabler(p);
 		p.setPen(Qt::NoPen);
@@ -484,7 +484,7 @@ void VenuesController::rowPaintIcon(
 	rpl::combine(
 		result->widthValue(),
 		std::move(statusText)
-	) | rpl::start_with_next([=](int width, const QString &statusText) {
+	) | rpl::on_next([=](int width, const QString &statusText) {
 		const auto available = width
 			- st->namePosition.x()
 			- st->button.padding.right();
@@ -566,7 +566,7 @@ void SetupVenues(
 	const auto other = otherWrap->entity();
 	rpl::duplicate(
 		value
-	) | rpl::start_with_next([=](const PickerVenueState &state) {
+	) | rpl::on_next([=](const PickerVenueState &state) {
 		while (!other->children().isEmpty()) {
 			delete other->children()[0];
 		}
@@ -603,7 +603,7 @@ void SetupVenues(
 	delegate->setContent(content);
 	controller->setDelegate(delegate);
 
-	show->session().downloaderTaskFinished() | rpl::start_with_next([=] {
+	show->session().downloaderTaskFinished() | rpl::on_next([=] {
 		content->update();
 	}, content->lifetime());
 }
@@ -659,7 +659,7 @@ not_null<RpWidget*> SetupMapPlaceholder(
 	icon->lifetime().add([kept = std::move(ownedLottie)] {});
 
 	icon->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(icon);
 		const auto left = (icon->width() - iconSize) / 2;
 		const auto scale = icon->height() / float64(iconSize);
@@ -690,7 +690,7 @@ not_null<RpWidget*> SetupMapPlaceholder(
 	button->setTextTransform(RoundButton::TextTransform::NoTransform);
 	button->setClickedCallback(choose);
 
-	parent->sizeValue() | rpl::start_with_next([=](QSize size) {
+	parent->sizeValue() | rpl::on_next([=](QSize size) {
 		result->setGeometry(QRect(QPoint(), size));
 
 		const auto width = size.width();
@@ -759,7 +759,7 @@ LocationPicker::LocationPicker(Descriptor &&descriptor)
 , _venueRecipient(descriptor.recipient) {
 	std::move(
 		descriptor.closeRequests
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_window = nullptr;
 		delete this;
 	}, _lifetime);
@@ -801,7 +801,7 @@ void LocationPicker::setupWindow(const Descriptor &descriptor) {
 	const auto window = _window.get();
 
 	window->setWindowFlag(Qt::WindowStaysOnTopHint, false);
-	window->closeRequests() | rpl::start_with_next([=] {
+	window->closeRequests() | rpl::on_next([=] {
 		close();
 	}, _lifetime);
 
@@ -849,7 +849,7 @@ void LocationPicker::setupWindow(const Descriptor &descriptor) {
 		_body->sizeValue(),
 		_scroll->scrollTopValue(),
 		_venuesSearchShown.value()
-	) | rpl::start_with_next([=](QSize size, int scrollTop, bool search) {
+	) | rpl::on_next([=](QSize size, int scrollTop, bool search) {
 		const auto width = size.width();
 		const auto height = size.height();
 		const auto sub = std::min(
@@ -866,7 +866,7 @@ void LocationPicker::setupWindow(const Descriptor &descriptor) {
 		toppad->resize(width, sub);
 	}, _container->lifetime());
 
-	_container->paintRequest() | rpl::start_with_next([=](QRect clip) {
+	_container->paintRequest() | rpl::on_next([=](QRect clip) {
 		QPainter(_container).fillRect(clip, st::windowBg);
 	}, _container->lifetime());
 
@@ -904,7 +904,7 @@ void LocationPicker::setupWebview() {
 
 	_mapLoading = CreateChild<RpWidget>(_body.get());
 
-	_container->geometryValue() | rpl::start_with_next([=](QRect rect) {
+	_container->geometryValue() | rpl::on_next([=](QRect rect) {
 		_mapLoading->setGeometry(rect);
 	}, _mapLoading->lifetime());
 
@@ -926,7 +926,7 @@ void LocationPicker::setupWebview() {
 	});
 
 	window->events(
-	) | rpl::start_with_next([=](not_null<QEvent*> e) {
+	) | rpl::on_next([=](not_null<QEvent*> e) {
 		if (e->type() == QEvent::Close) {
 			close();
 		} else if (e->type() == QEvent::KeyPress) {
@@ -939,7 +939,7 @@ void LocationPicker::setupWebview() {
 	raw->widget()->show();
 
 	_container->sizeValue(
-	) | rpl::start_with_next([=](QSize size) {
+	) | rpl::on_next([=](QSize size) {
 		raw->widget()->setGeometry(QRect(QPoint(), size));
 	}, _container->lifetime());
 
@@ -1027,7 +1027,7 @@ void LocationPicker::setupWebview() {
 			rpl::merge(
 				Lang::Updated(),
 				style::PaletteChanged()
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				_updateStyles.call();
 			}, _webview->lifetime());
 		}
diff --git a/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp b/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp
index 9630ef7086..26743e07bf 100644
--- a/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp
+++ b/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp
@@ -1281,7 +1281,7 @@ void RoundVideoRecorder::setup() {
 	createImages();
 
 	_descriptor.container->sizeValue(
-	) | rpl::start_with_next([=](QSize outer) {
+	) | rpl::on_next([=](QSize outer) {
 		const auto side = _side + 2 * _extent;
 		raw->setGeometry(
 			style::centerrect(
@@ -1326,7 +1326,7 @@ void RoundVideoRecorder::setup() {
 		});
 	};
 
-	raw->paintRequest() | rpl::start_with_next([=] {
+	raw->paintRequest() | rpl::on_next([=] {
 		prepareFrame();
 
 		auto p = QPainter(raw);
@@ -1403,7 +1403,7 @@ void RoundVideoRecorder::setup() {
 	_skipFrames = kSkipFrames;
 	_descriptor.track->setState(Webrtc::VideoState::Active);
 
-	_descriptor.track->renderNextFrame() | rpl::start_with_next([=] {
+	_descriptor.track->renderNextFrame() | rpl::on_next([=] {
 		const auto info = _descriptor.track->frameWithInfo(true);
 		if (!info.original.isNull() && _lastAddedIndex != info.index) {
 			_lastAddedIndex = info.index;
diff --git a/Telegram/SourceFiles/ui/controls/send_button.cpp b/Telegram/SourceFiles/ui/controls/send_button.cpp
index 8c9c67bcfe..7cf772cc2d 100644
--- a/Telegram/SourceFiles/ui/controls/send_button.cpp
+++ b/Telegram/SourceFiles/ui/controls/send_button.cpp
@@ -340,7 +340,7 @@ SendStarButton::SendStarButton(
 , _counterSt(counterSt) {
 	resize(_st.width, _st.height);
 
-	std::move(state) | rpl::start_with_next([=](SendStarButtonState value) {
+	std::move(state) | rpl::on_next([=](SendStarButtonState value) {
 		setCount(value.count);
 		highlight(value.highlight);
 	}, lifetime());
diff --git a/Telegram/SourceFiles/ui/controls/silent_toggle.cpp b/Telegram/SourceFiles/ui/controls/silent_toggle.cpp
index 5fb1f4658e..ebf54debb3 100644
--- a/Telegram/SourceFiles/ui/controls/silent_toggle.cpp
+++ b/Telegram/SourceFiles/ui/controls/silent_toggle.cpp
@@ -30,7 +30,7 @@ SilentToggle::SilentToggle(QWidget *parent, not_null<ChannelData*> channel)
 	setMouseTracking(true);
 
 	clicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		setChecked(!_checked);
 		Ui::Tooltip::Show(0, this);
 		_channel->owner().notifySettings().update(_channel, {}, _checked);
diff --git a/Telegram/SourceFiles/ui/controls/stars_rating.cpp b/Telegram/SourceFiles/ui/controls/stars_rating.cpp
index cb8f449e4c..ccf37071d2 100644
--- a/Telegram/SourceFiles/ui/controls/stars_rating.cpp
+++ b/Telegram/SourceFiles/ui/controls/stars_rating.cpp
@@ -431,7 +431,7 @@ StarsRating::~StarsRating() = default;
 void StarsRating::init() {
 	_widget->setPointerCursor(true);
 
-	_widget->paintRequest() | rpl::start_with_next([=] {
+	_widget->paintRequest() | rpl::on_next([=] {
 		auto p = QPainter(_widget.get());
 		paint(p);
 	}, lifetime());
@@ -447,7 +447,7 @@ void StarsRating::init() {
 
 	_widget->resize(_widget->width(), st::level1.icon.height());
 
-	_value.value() | rpl::start_with_next([=](Counters rating) {
+	_value.value() | rpl::on_next([=](Counters rating) {
 		updateData(rating);
 	}, lifetime());
 }
diff --git a/Telegram/SourceFiles/ui/controls/subsection_tabs_slider.cpp b/Telegram/SourceFiles/ui/controls/subsection_tabs_slider.cpp
index 2c4dd29959..ed9dee884d 100644
--- a/Telegram/SourceFiles/ui/controls/subsection_tabs_slider.cpp
+++ b/Telegram/SourceFiles/ui/controls/subsection_tabs_slider.cpp
@@ -554,7 +554,7 @@ SubsectionSlider::~SubsectionSlider() = default;
 
 void SubsectionSlider::setupBar() {
 	_bar->setAttribute(Qt::WA_TransparentForMouseEvents);
-	sizeValue() | rpl::start_with_next([=](QSize size) {
+	sizeValue() | rpl::on_next([=](QSize size) {
 		const auto thickness = _barSt.stroke - (_barSt.stroke / 2);
 		_bar->setGeometry(
 			0,
@@ -562,7 +562,7 @@ void SubsectionSlider::setupBar() {
 			_vertical ? thickness : size.width(),
 			_vertical ? size.height() : thickness);
 	}, _bar->lifetime());
-	_bar->paintRequest() | rpl::start_with_next([=](QRect clip) {
+	_bar->paintRequest() | rpl::on_next([=](QRect clip) {
 		const auto start = -_barSt.stroke / 2;
 		const auto currentRange = getCurrentActiveRange();
 		const auto from = currentRange.from + _barSt.skip;
diff --git a/Telegram/SourceFiles/ui/controls/subsection_tabs_slider_reorder.cpp b/Telegram/SourceFiles/ui/controls/subsection_tabs_slider_reorder.cpp
index 46e1cbd2ec..f5f6915b36 100644
--- a/Telegram/SourceFiles/ui/controls/subsection_tabs_slider_reorder.cpp
+++ b/Telegram/SourceFiles/ui/controls/subsection_tabs_slider_reorder.cpp
@@ -58,7 +58,7 @@ void SubsectionSliderReorder::start() {
 			? _proxyButtonCallback(i)
 			: button;
 		eventsProducer->events(
-		) | rpl::start_with_next_done([=](not_null<QEvent*> e) {
+		) | rpl::on_next_done([=](not_null<QEvent*> e) {
 			switch (e->type()) {
 			case QEvent::MouseMove:
 				mouseMove(
diff --git a/Telegram/SourceFiles/ui/controls/swipe_handler.cpp b/Telegram/SourceFiles/ui/controls/swipe_handler.cpp
index bd0237c53f..ed20a8116d 100644
--- a/Telegram/SourceFiles/ui/controls/swipe_handler.cpp
+++ b/Telegram/SourceFiles/ui/controls/swipe_handler.cpp
@@ -101,14 +101,14 @@ void SetupSwipeHandler(SwipeHandlerArgs &&args) {
 	if (args.dontStart) {
 		std::move(
 			args.dontStart
-		) | rpl::start_with_next([=](bool dontStart) {
+		) | rpl::on_next([=](bool dontStart) {
 			state->dontStart = dontStart;
 		}, state->lifetime);
 	} else {
 		v::match(scroll, [](v::null_t) {
 		}, [&](const auto &scroll) {
 			scroll->touchMaybePressing(
-			) | rpl::start_with_next([=](bool maybePressing) {
+			) | rpl::on_next([=](bool maybePressing) {
 				state->dontStart = maybePressing;
 			}, state->lifetime);
 		});
@@ -176,7 +176,7 @@ void SetupSwipeHandler(SwipeHandlerArgs &&args) {
 	};
 	v::match(scroll, [](v::null_t) {
 	}, [&](const auto &scroll) {
-		scroll->scrolls() | rpl::start_with_next([=] {
+		scroll->scrolls() | rpl::on_next([=] {
 			if (state->orientation != Qt::Vertical) {
 				processEnd();
 			}
@@ -481,7 +481,7 @@ SwipeBackResult SetupSwipeBack(
 				state->back = base::make_unique_q<Ui::RpWidget>(widget);
 				const auto raw = state->back.get();
 				raw->paintRequest(
-				) | rpl::start_with_next(paintCallback(), raw->lifetime());
+				) | rpl::on_next(paintCallback(), raw->lifetime());
 				raw->setAttribute(Qt::WA_TransparentForMouseEvents);
 				raw->resize(Size(st::swipeBackSize));
 				raw->show();
diff --git a/Telegram/SourceFiles/ui/controls/tabbed_search.cpp b/Telegram/SourceFiles/ui/controls/tabbed_search.cpp
index ea9f1e70f1..55b9edd481 100644
--- a/Telegram/SourceFiles/ui/controls/tabbed_search.cpp
+++ b/Telegram/SourceFiles/ui/controls/tabbed_search.cpp
@@ -114,7 +114,7 @@ void GroupsStrip::clearChosen() {
 void GroupsStrip::init(rpl::producer<std::vector<EmojiGroup>> groups) {
 	std::move(
 		groups
-	) | rpl::start_with_next([=](std::vector<EmojiGroup> &&list) {
+	) | rpl::on_next([=](std::vector<EmojiGroup> &&list) {
 		set(std::move(list));
 	}, lifetime());
 
@@ -314,7 +314,7 @@ anim::type SearchWithGroups::animated() const {
 
 void SearchWithGroups::initField() {
 	_field->changes(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto last = FieldQuery(_field);
 		_query = last;
 		const auto empty = last.empty();
@@ -341,7 +341,7 @@ void SearchWithGroups::initField() {
 	_debouncedQuery = last;
 	_fieldEmpty = last.empty();
 	_fieldEmpty.value(
-	) | rpl::start_with_next([=](bool empty) {
+	) | rpl::on_next([=](bool empty) {
 		_cancel->toggle(!empty, animated());
 		_groups->toggle(empty, animated());
 		resizeToWidth(width());
@@ -358,12 +358,12 @@ void SearchWithGroups::initGroups() {
 	widget->widthValue(
 	) | rpl::filter([=] {
 		return (width() > 0);
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		resizeToWidth(width());
 	}, widget->lifetime());
 
 	widget->chosen(
-	) | rpl::start_with_next([=](const GroupsStrip::Chosen &chosen) {
+	) | rpl::on_next([=](const GroupsStrip::Chosen &chosen) {
 		_chosenGroup = chosen.group->iconId;
 		_query = (chosen.group->type == EmojiGroupType::Premium)
 			? std::vector{ PremiumGroupFakeEmoticon() }
@@ -374,14 +374,14 @@ void SearchWithGroups::initGroups() {
 	}, lifetime());
 
 	widget->moveRequests(
-	) | rpl::start_with_next([=](int delta) {
+	) | rpl::on_next([=](int delta) {
 		moveGroupsBy(width(), delta);
 	}, lifetime());
 
 	_chosenGroup.value(
 	) | rpl::map([=](const QString &id) {
 		return id.isEmpty();
-	}) | rpl::start_with_next([=](bool empty) {
+	}) | rpl::on_next([=](bool empty) {
 		_search->toggle(empty, animated());
 		_back->toggle(!empty, animated());
 		if (empty) {
@@ -428,7 +428,7 @@ void SearchWithGroups::scrollGroupsTo(int left) {
 }
 
 void SearchWithGroups::initEdges() {
-	paintRequest() | rpl::start_with_next([=](QRect clip) {
+	paintRequest() | rpl::on_next([=](QRect clip) {
 		QPainter(this).fillRect(clip, _st.bg);
 	}, lifetime());
 
@@ -441,12 +441,12 @@ void SearchWithGroups::initEdges() {
 			edge->move(0, 0);
 		} else {
 			widthValue(
-			) | rpl::start_with_next([=](int width) {
+			) | rpl::on_next([=](int width) {
 				edge->move(width - edge->width(), 0);
 			}, edge->lifetime());
 		}
 		edge->paintRequest(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			const auto ratio = edge->devicePixelRatioF();
 			ensureRounding(height(), ratio);
 			const auto size = _rounding.height();
@@ -461,12 +461,12 @@ void SearchWithGroups::initEdges() {
 	makeEdge(false);
 
 	_fadeOpacity.changes(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_fade->update();
 	}, _fade->lifetime());
 
 	_fade->paintRequest(
-	) | rpl::start_with_next([=](QRect clip) {
+	) | rpl::on_next([=](QRect clip) {
 		auto p = QPainter(_fade);
 		p.setOpacity(_fadeOpacity.current());
 		const auto fill = QRect(0, 0, _fadeLeftStart, _st.height);
@@ -485,7 +485,7 @@ void SearchWithGroups::initEdges() {
 	_fade->setAttribute(Qt::WA_TransparentForMouseEvents);
 
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_rounding = QImage();
 	}, lifetime());
 }
@@ -503,7 +503,7 @@ void SearchWithGroups::initButtons() {
 		scrollGroupsToStart();
 	});
 	_field->focusedChanges(
-	) | rpl::filter(rpl::mappers::_1) | rpl::start_with_next([=] {
+	) | rpl::filter(rpl::mappers::_1) | rpl::on_next([=] {
 		scrollGroupsToStart();
 	}, _field->lifetime());
 	_field->raise();
@@ -646,7 +646,7 @@ TabbedSearch::TabbedSearch(
 	_search.move(_st.searchMargin.left(), _st.searchMargin.top());
 
 	parent->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		_search.resizeToWidth(width - rect::m::sum::h(_st.searchMargin));
 	}, _search.lifetime());
 }
diff --git a/Telegram/SourceFiles/ui/controls/table_rows.cpp b/Telegram/SourceFiles/ui/controls/table_rows.cpp
index 75318df040..826e3fb195 100644
--- a/Telegram/SourceFiles/ui/controls/table_rows.cpp
+++ b/Telegram/SourceFiles/ui/controls/table_rows.cpp
@@ -122,7 +122,7 @@ object_ptr<RpWidget> MakeValueWithSmallButton(
 		raw->widthValue(),
 		button->widthValue(),
 		value->naturalWidthValue()
-	) | rpl::start_with_next([=](int width, int buttonWidth, int) {
+	) | rpl::on_next([=](int width, int buttonWidth, int) {
 		const auto buttonSkip = st::normalFont->spacew + buttonWidth;
 		value->resizeToNaturalWidth(width - buttonSkip);
 		value->moveToLeft(0, 0, width);
@@ -134,7 +134,7 @@ object_ptr<RpWidget> MakeValueWithSmallButton(
 			width);
 	}, value->lifetime());
 
-	value->heightValue() | rpl::start_with_next([=](int height) {
+	value->heightValue() | rpl::on_next([=](int height) {
 		const auto bottom = st::giveawayGiftCodePeerMargin.bottom();
 		raw->resize(raw->width(), height + bottom);
 	}, raw->lifetime());
@@ -161,7 +161,7 @@ object_ptr<RpWidget> MakePeerTableValue(
 		(button && handler) ? peer->shortName() : peer->name(),
 		table->st().defaultValue);
 
-	raw->widthValue() | rpl::start_with_next([=](int width) {
+	raw->widthValue() | rpl::on_next([=](int width) {
 		const auto position = st::giveawayGiftCodeNamePosition;
 		label->resizeToNaturalWidth(width - position.x());
 		label->moveToLeft(position.x(), position.y(), width);
@@ -169,7 +169,7 @@ object_ptr<RpWidget> MakePeerTableValue(
 		userpic->moveToLeft(0, top, width);
 	}, label->lifetime());
 
-	label->naturalWidthValue() | rpl::start_with_next([=](int width) {
+	label->naturalWidthValue() | rpl::on_next([=](int width) {
 		raw->setNaturalWidth(st::giveawayGiftCodeNamePosition.x() + width);
 	}, label->lifetime());
 	userpic->setAttribute(Qt::WA_TransparentForMouseEvents);
@@ -231,7 +231,7 @@ object_ptr<RpWidget> MakePeerWithStatusValue(
 		nullptr,
 		[=] { return show->paused(ChatHelpers::PauseReason::Layer); });
 	state->content.value(
-	) | rpl::start_with_next([=](const Badge::Content &content) {
+	) | rpl::on_next([=](const Badge::Content &content) {
 		if (const auto widget = badge->widget()) {
 			pushStatusId(widget, content.emojiStatusId);
 		}
@@ -240,7 +240,7 @@ object_ptr<RpWidget> MakePeerWithStatusValue(
 	rpl::combine(
 		raw->widthValue(),
 		rpl::single(rpl::empty) | rpl::then(badge->updated())
-	) | rpl::start_with_next([=](int width, const auto &) {
+	) | rpl::on_next([=](int width, const auto &) {
 		const auto badgeWidget = badge->widget();
 		const auto badgeSkip = badgeWidget
 			? (st::normalFont->spacew + badgeWidget->width())
@@ -269,7 +269,7 @@ object_ptr<RpWidget> MakeHiddenPeerTableValue(
 	const auto userpic = CreateChild<RpWidget>(raw);
 	const auto usize = st.photoSize;
 	userpic->resize(usize, usize);
-	userpic->paintRequest() | rpl::start_with_next([=] {
+	userpic->paintRequest() | rpl::on_next([=] {
 		auto p = QPainter(userpic);
 		EmptyUserpic::PaintHiddenAuthor(p, 0, 0, usize, usize);
 	}, userpic->lifetime());
@@ -279,7 +279,7 @@ object_ptr<RpWidget> MakeHiddenPeerTableValue(
 		tr::lng_gift_from_hidden(),
 		table->st().defaultValue);
 	raw->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		const auto position = st::giveawayGiftCodeNamePosition;
 		label->resizeToNaturalWidth(width - position.x());
 		label->moveToLeft(position.x(), position.y(), width);
@@ -337,7 +337,7 @@ void ShowTableRowTooltip(
 		tooltip->pointAt(geometry, RectPart::Top, countPosition);
 	};
 	parent->widthValue(
-	) | rpl::start_with_next(update, tooltip->lifetime());
+	) | rpl::on_next(update, tooltip->lifetime());
 
 	update();
 	tooltip->toggleAnimated(true);
@@ -345,7 +345,7 @@ void ShowTableRowTooltip(
 	data->raw = tooltip;
 	tooltip->shownValue() | rpl::filter(
 		!rpl::mappers::_1
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		crl::on_main(tooltip, [=] {
 			if (tooltip->isHidden()) {
 				if (data->raw == tooltip) {
@@ -358,7 +358,7 @@ void ShowTableRowTooltip(
 
 	base::timer_once(
 		duration
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		tooltip->toggleAnimated(false);
 	}, tooltip->lifetime());
 }
diff --git a/Telegram/SourceFiles/ui/controls/ton_common.cpp b/Telegram/SourceFiles/ui/controls/ton_common.cpp
index 4f66b4b786..3cdd28c98b 100644
--- a/Telegram/SourceFiles/ui/controls/ton_common.cpp
+++ b/Telegram/SourceFiles/ui/controls/ton_common.cpp
@@ -217,7 +217,7 @@ not_null<Ui::InputField*> CreateTonAmountInput(
 			? FormatTonAmount(amount, TonFormatFlag::Simple).full
 			: QString()));
 	const auto lastAmountValue = std::make_shared<QString>();
-	result->changes() | rpl::start_with_next([=] {
+	result->changes() | rpl::on_next([=] {
 		Ui::PostponeCall(result, [=] {
 			const auto position = result->textCursor().position();
 			const auto now = result->getLastText();
diff --git a/Telegram/SourceFiles/ui/controls/userpic_button.cpp b/Telegram/SourceFiles/ui/controls/userpic_button.cpp
index ad0402e41f..c9546ca1e0 100644
--- a/Telegram/SourceFiles/ui/controls/userpic_button.cpp
+++ b/Telegram/SourceFiles/ui/controls/userpic_button.cpp
@@ -83,7 +83,7 @@ void CameraBox(
 		return;
 	}
 	track->stateValue(
-	) | rpl::start_with_next([=](const VideoState &state) {
+	) | rpl::on_next([=](const VideoState &state) {
 		if (state == VideoState::Inactive) {
 			box->closeBox();
 		}
@@ -139,7 +139,7 @@ void SetupSubButtonBackground(
 
 	background->resize(size);
 	background->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(background);
 		auto hq = PainterHighQualityEnabler(p);
 		p.setBrush(st::boxBg);
@@ -148,7 +148,7 @@ void SetupSubButtonBackground(
 	}, background->lifetime());
 
 	upload->positionValue(
-	) | rpl::start_with_next([=](QPoint position) {
+	) | rpl::on_next([=](QPoint position) {
 		background->move(position - QPoint(border, border));
 	}, background->lifetime());
 }
@@ -231,7 +231,7 @@ void UserpicButton::prepare() {
 
 void UserpicButton::showCustomOnChosen() {
 	chosenImages(
-	) | rpl::start_with_next([=](ChosenImage &&chosen) {
+	) | rpl::on_next([=](ChosenImage &&chosen) {
 		showCustom(std::move(chosen.image));
 	}, lifetime());
 }
@@ -430,7 +430,7 @@ void UserpicButton::choosePhotoLocally() {
 					key
 				) | rpl::take(
 					1
-				) | rpl::start_with_next([=](const UserPrivacy::Rule &value) {
+				) | rpl::on_next([=](const UserPrivacy::Rule &value) {
 					using namespace Settings;
 					_window->show(Box<EditPrivacyBox>(
 						_window->sessionController(),
@@ -505,7 +505,7 @@ void UserpicButton::setupPeerViewers() {
 				user->hasPersonalPhoto());
 		}) | rpl::distinct_until_changed() | rpl::skip(
 			1
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			processNewPeerPhoto();
 			update();
 		}, _sourceLifetime);
@@ -516,7 +516,7 @@ void UserpicButton::setupPeerViewers() {
 		_peer->session().changes().peerUpdates(
 			_peer,
 			Data::PeerUpdate::Flag::Photo
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			processNewPeerPhoto();
 			update();
 		}, _sourceLifetime);
@@ -524,7 +524,7 @@ void UserpicButton::setupPeerViewers() {
 	_peer->session().downloaderTaskFinished(
 	) | rpl::filter([=] {
 		return _waiting;
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		const auto loading = _showPeerUserpic
 			? Ui::PeerUserpicLoading(_userpicView)
 			: (_nonPersonalView && !_nonPersonalView->loaded());
@@ -789,7 +789,7 @@ bool UserpicButton::createStreamingObjects(not_null<PhotoData*> photo) {
 		nullptr);
 	_streamed->lockPlayer();
 	_streamed->player().updates(
-	) | rpl::start_with_next_error([=](Update &&update) {
+	) | rpl::on_next_error([=](Update &&update) {
 		handleStreamingUpdate(std::move(update));
 	}, [=](Error &&error) {
 		handleStreamingError(std::move(error));
@@ -969,7 +969,7 @@ void UserpicButton::switchChangePhotoOverlay(
 			updateCursorInChangeOverlay(
 				mapFromGlobal(QCursor::pos()));
 			if (chosen) {
-				chosenImages() | rpl::start_with_next(chosen, lifetime());
+				chosenImages() | rpl::on_next(chosen, lifetime());
 			}
 		} else {
 			_changeOverlayShown.stop();
diff --git a/Telegram/SourceFiles/ui/controls/who_reacted_context_action.cpp b/Telegram/SourceFiles/ui/controls/who_reacted_context_action.cpp
index 3fe2363553..83f52f269f 100644
--- a/Telegram/SourceFiles/ui/controls/who_reacted_context_action.cpp
+++ b/Telegram/SourceFiles/ui/controls/who_reacted_context_action.cpp
@@ -218,7 +218,7 @@ Action::Action(
 
 	std::move(
 		content
-	) | rpl::start_with_next([=](WhoReadContent &&content) {
+	) | rpl::on_next([=](WhoReadContent &&content) {
 		checkAppeared();
 		const auto changed = (_content.participants != content.participants)
 			|| (_content.state != content.state);
@@ -240,20 +240,20 @@ Action::Action(
 	resolveMinWidth();
 
 	_userpics->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		_userpicsWidth = width;
 		refreshDimensions();
 		update();
 	}, lifetime());
 
 	paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		Painter p(this);
 		paint(p);
 	}, lifetime());
 
 	clicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (_content.participants.size() == 1) {
 			if (const auto onstack = _participantChosen) {
 				onstack(_content.participants.front());
@@ -523,7 +523,7 @@ WhenAction::WhenAction(
 
 	std::move(
 		content
-	) | rpl::start_with_next([=](WhoReadContent &&content) {
+	) | rpl::on_next([=](WhoReadContent &&content) {
 		_content = content;
 		refreshText();
 		refreshDimensions();
@@ -539,13 +539,13 @@ WhenAction::WhenAction(
 	refreshDimensions();
 
 	paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		Painter p(this);
 		paint(p);
 	}, lifetime());
 
 	clicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (_content.state == WhoReadState::MyHidden) {
 			if (const auto onstack = _showOrPremium) {
 				onstack();
@@ -739,7 +739,7 @@ WhoReactedEntryAction::WhoReactedEntryAction(
 	setData(std::move(data));
 
 	paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		paint(Painter(this));
 	}, lifetime());
 
diff --git a/Telegram/SourceFiles/ui/controls/window_outdated_bar.cpp b/Telegram/SourceFiles/ui/controls/window_outdated_bar.cpp
index 69c38d049d..eedfba46a1 100644
--- a/Telegram/SourceFiles/ui/controls/window_outdated_bar.cpp
+++ b/Telegram/SourceFiles/ui/controls/window_outdated_bar.cpp
@@ -166,7 +166,7 @@ object_ptr<RpWidget> CreateOutdatedBar(
 	const auto wrap = result.data();
 
 	wrap->entity()->hideClicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		wrap->toggle(false, anim::type::normal);
 		Closed(workingPath);
 	}, wrap->lifetime());
diff --git a/Telegram/SourceFiles/ui/countryinput.cpp b/Telegram/SourceFiles/ui/countryinput.cpp
index 45123cd255..52c1d4625c 100644
--- a/Telegram/SourceFiles/ui/countryinput.cpp
+++ b/Telegram/SourceFiles/ui/countryinput.cpp
@@ -76,7 +76,7 @@ void CountryInput::mousePressEvent(QMouseEvent *e) {
 		const auto box = base::make_weak(object.data());
 		_show->showBox(std::move(object), Ui::LayerOption::CloseOther);
 		box->entryChosen(
-		) | rpl::start_with_next([=](
+		) | rpl::on_next([=](
 				const Ui::CountrySelectBox::Entry &entry) {
 			if (box) {
 				box->closeBox();
@@ -110,7 +110,7 @@ void CountryInput::keyPressEvent(QKeyEvent* e) {
 		const auto box = base::make_weak(object.data());
 		_show->showBox(std::move(object), Ui::LayerOption::CloseOther);
 		box->entryChosen(
-		) | rpl::start_with_next([=](
+		) | rpl::on_next([=](
 			const Ui::CountrySelectBox::Entry& entry) {
 				if (box) {
 					box->closeBox();
diff --git a/Telegram/SourceFiles/ui/dynamic_thumbnails.cpp b/Telegram/SourceFiles/ui/dynamic_thumbnails.cpp
index cfeac4aefa..23a22cb316 100644
--- a/Telegram/SourceFiles/ui/dynamic_thumbnails.cpp
+++ b/Telegram/SourceFiles/ui/dynamic_thumbnails.cpp
@@ -291,7 +291,7 @@ void PeerUserpic::subscribeToUpdates(Fn<void()> callback) {
 	_peer->session().changes().peerUpdates(
 		_peer,
 		Data::PeerUpdate::Flag::Photo
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_subscribed->callback();
 		processNewPhoto();
 	}, _subscribed->photoLifetime);
@@ -309,7 +309,7 @@ void PeerUserpic::processNewPhoto() {
 	_peer->session().downloaderTaskFinished(
 	) | rpl::filter([=] {
 		return !waitingUserpicLoad();
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		_subscribed->callback();
 		_subscribed->downloadLifetime.destroy();
 	}, _subscribed->downloadLifetime);
@@ -370,7 +370,7 @@ void MediaThumbnail::subscribeToUpdates(Fn<void()> callback) {
 				return true;
 			}
 			return false;
-		}) | rpl::take(1) | rpl::start_with_next(callback);
+		}) | rpl::take(1) | rpl::on_next(callback);
 	}
 }
 
diff --git a/Telegram/SourceFiles/ui/effects/credits_graphics.cpp b/Telegram/SourceFiles/ui/effects/credits_graphics.cpp
index 95683ee064..5a323690f0 100644
--- a/Telegram/SourceFiles/ui/effects/credits_graphics.cpp
+++ b/Telegram/SourceFiles/ui/effects/credits_graphics.cpp
@@ -156,7 +156,7 @@ not_null<RpWidget*> CreateSingleStarWidget(
 	const auto image = GenerateStars(height, 1);
 	widget->resize(image.size() / style::DevicePixelRatio());
 	widget->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(widget);
 		p.drawImage(0, 0, image);
 	}, widget->lifetime());
@@ -184,7 +184,7 @@ not_null<MaskedInputField*> AddInputFieldForCredits(
 		currentValue.current().whole());
 	rpl::duplicate(
 		value
-	) | rpl::start_with_next([=](CreditsAmount v) {
+	) | rpl::on_next([=](CreditsAmount v) {
 		input->changeLimit(v.whole());
 		input->setText(QString::number(v.whole()));
 	}, input->lifetime());
@@ -192,7 +192,7 @@ not_null<MaskedInputField*> AddInputFieldForCredits(
 		inputContainer,
 		st.style.font->height);
 	inputContainer->sizeValue(
-	) | rpl::start_with_next([=](const QSize &size) {
+	) | rpl::on_next([=](const QSize &size) {
 		input->resize(
 			size.width() - rect::m::sum::h(st::boxRowPadding),
 			st.heightMin);
@@ -342,7 +342,7 @@ PaintRoundImageCallback GenerateCreditsPaintEntryCallback(
 
 	rpl::single(rpl::empty_value()) | rpl::then(
 		photo->session().downloaderTaskFinished()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		using Size = Data::PhotoSize;
 		if (const auto large = state->view->image(Size::Large)) {
 			state->imagePtr = large;
@@ -392,7 +392,7 @@ PaintRoundImageCallback GenerateCreditsPaintEntryCallback(
 
 	rpl::single(rpl::empty_value()) | rpl::then(
 		video->session().downloaderTaskFinished()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (const auto thumbnail = state->view->thumbnail()) {
 			state->imagePtr = thumbnail;
 		}
diff --git a/Telegram/SourceFiles/ui/effects/emoji_fly_animation.cpp b/Telegram/SourceFiles/ui/effects/emoji_fly_animation.cpp
index 0552994f09..e89d7863d4 100644
--- a/Telegram/SourceFiles/ui/effects/emoji_fly_animation.cpp
+++ b/Telegram/SourceFiles/ui/effects/emoji_fly_animation.cpp
@@ -45,12 +45,12 @@ EmojiFlyAnimation::EmojiFlyAnimation(
 	_flySize,
 	tag)
 , _layer(body) {
-	body->sizeValue() | rpl::start_with_next([=](QSize size) {
+	body->sizeValue() | rpl::on_next([=](QSize size) {
 		_layer.setGeometry(QRect(QPoint(), size));
 	}, _layer.lifetime());
 
 	_layer.paintRequest(
-	) | rpl::start_with_next([=](QRect clip) {
+	) | rpl::on_next([=](QRect clip) {
 		const auto target = _target.data();
 		if (!target || !target->isVisible()) {
 			return;
diff --git a/Telegram/SourceFiles/ui/effects/loading_element.cpp b/Telegram/SourceFiles/ui/effects/loading_element.cpp
index bb31210602..9d91768411 100644
--- a/Telegram/SourceFiles/ui/effects/loading_element.cpp
+++ b/Telegram/SourceFiles/ui/effects/loading_element.cpp
@@ -162,7 +162,7 @@ object_ptr<Ui::RpWidget> CreateLoadingElementWidget(
 	const auto state = widget->lifetime().make_state<State>();
 	state->rtl = std::move(rtl);
 	state->rtl.value(
-	) | rpl::start_with_next([=] { raw->update(); }, raw->lifetime());
+	) | rpl::on_next([=] { raw->update(); }, raw->lifetime());
 	raw->resize(
 		raw->width(),
 		Element(std::forward<ElementArgs>(args)...).height() * lines);
@@ -191,7 +191,7 @@ object_ptr<Ui::RpWidget> CreateLoadingElementWidget(
 	};
 
 	widget->paintRequest(
-	) | rpl::start_with_next([=](const QRect &r) {
+	) | rpl::on_next([=](const QRect &r) {
 		auto p = QPainter(raw);
 		if (state->rtl.current()) {
 			const auto r = raw->rect();
@@ -205,7 +205,7 @@ object_ptr<Ui::RpWidget> CreateLoadingElementWidget(
 	constexpr auto kTimeout = crl::time(1000);
 	constexpr auto kDuration = crl::time(1000);
 	widget->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		state->glare.width = width;
 		state->glare.validate(
 			bg,
diff --git a/Telegram/SourceFiles/ui/effects/message_sending_animation_controller.cpp b/Telegram/SourceFiles/ui/effects/message_sending_animation_controller.cpp
index 0991194f6b..07015b4540 100644
--- a/Telegram/SourceFiles/ui/effects/message_sending_animation_controller.cpp
+++ b/Telegram/SourceFiles/ui/effects/message_sending_animation_controller.cpp
@@ -109,7 +109,7 @@ Content::Content(
 	base::take(
 		_toInfo.globalEndTopLeft
 	) | rpl::distinct_until_changed(
-	) | rpl::start_with_next([=](const std::optional<QPoint> &p) {
+	) | rpl::on_next([=](const std::optional<QPoint> &p) {
 		if (p) {
 			_to = parent->mapFromGlobal(*p);
 		} else {
@@ -118,7 +118,7 @@ Content::Content(
 	}, lifetime());
 
 	_controller->session().downloaderTaskFinished(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		update();
 	}, lifetime());
 
@@ -298,7 +298,7 @@ void Content::createSurrounding() {
 	stackUnder(_surrounding.get());
 
 	_surrounding->paintRequest(
-	) | rpl::start_with_next([=, size = surroundingSize](const QRect &r) {
+	) | rpl::on_next([=, size = surroundingSize](const QRect &r) {
 		Painter p(_surrounding);
 
 		p.fillRect(r, Qt::transparent);
@@ -368,7 +368,7 @@ void Content::createBubble() {
 	_bubble.widget->stackUnder(this);
 
 	_bubble.widget->paintRequest(
-	) | rpl::start_with_next([=, raw = _bubble.widget.get()](const QRect &r) {
+	) | rpl::on_next([=, raw = _bubble.widget.get()](const QRect &r) {
 		auto p = Painter(raw);
 
 		p.fillRect(r, Qt::transparent);
@@ -427,12 +427,12 @@ MessageSendingAnimationController::MessageSendingAnimationController(
 
 void MessageSendingAnimationController::subscribeToDestructions() {
 	_controller->session().data().itemIdChanged(
-	) | rpl::start_with_next([=](Data::Session::IdChange change) {
+	) | rpl::on_next([=](Data::Session::IdChange change) {
 		_itemSendPending.remove(change.oldId);
 	}, _lifetime);
 
 	_controller->session().data().itemRemoved(
-	) | rpl::start_with_next([=](not_null<const HistoryItem*> item) {
+	) | rpl::on_next([=](not_null<const HistoryItem*> item) {
 		_itemSendPending.remove(item->id);
 		_processing.remove(item);
 	}, _lifetime);
@@ -475,7 +475,7 @@ void MessageSendingAnimationController::startAnimation(SendingInfoTo &&to) {
 		std::move(to));
 
 	content->destroyRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_processing.erase(item);
 	}, content->lifetime());
 
diff --git a/Telegram/SourceFiles/ui/effects/premium_bubble.cpp b/Telegram/SourceFiles/ui/effects/premium_bubble.cpp
index 9ab7e2b5a2..1ecfd415a1 100644
--- a/Telegram/SourceFiles/ui/effects/premium_bubble.cpp
+++ b/Telegram/SourceFiles/ui/effects/premium_bubble.cpp
@@ -332,7 +332,7 @@ BubbleWidget::BubbleWidget(
 
 	resizeTo(_bubble.width(), _bubble.height());
 	_bubble.widthChanges(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		resizeTo(_bubble.width(), _bubble.height());
 	}, lifetime());
 
@@ -342,9 +342,9 @@ BubbleWidget::BubbleWidget(
 	}
 	std::move(
 		showFinishes
-	) | rpl::take(1) | rpl::start_with_next([=] {
+	) | rpl::take(1) | rpl::on_next([=] {
 		_state.value(
-		) | rpl::start_with_next([=](BubbleRowState state) {
+		) | rpl::on_next([=](BubbleRowState state) {
 			animateTo(state);
 		}, lifetime());
 		if (instant) {
@@ -355,7 +355,7 @@ BubbleWidget::BubbleWidget(
 			_bubble.finishAnimating();
 		}
 
-		parent->widthValue() | rpl::start_with_next([=](int w) {
+		parent->widthValue() | rpl::on_next([=](int w) {
 			if (!_appearanceAnimation.animating()) {
 				const auto available = w
 					- _outerPadding.left()
@@ -384,7 +384,7 @@ void BubbleWidget::setupParticles(not_null<Ui::RpWidget*> parent) {
 
 	_particlesAnimation.init([=] { _particlesWidget->update(); });
 
-	_particlesWidget->paintRequest() | rpl::start_with_next([=] {
+	_particlesWidget->paintRequest() | rpl::on_next([=] {
 		if (!_particlesAnimation.animating()) {
 			_particlesAnimation.start();
 		}
@@ -421,7 +421,7 @@ void BubbleWidget::setupParticles(not_null<Ui::RpWidget*> parent) {
 		_particles->paint(p, _particlesWidget->rect(), crl::now());
 	}, _particlesWidget->lifetime());
 
-	geometryValue() | rpl::start_with_next([=](QRect geometry) {
+	geometryValue() | rpl::on_next([=](QRect geometry) {
 		const auto particlesSize = QSize(
 			int(geometry.width() * 1.5),
 			int(geometry.height() * 1.5));
@@ -684,7 +684,7 @@ not_null<BubbleWidget*> AddBubbleRow(
 	rpl::combine(
 		container->sizeValue(),
 		bubble->sizeValue()
-	) | rpl::start_with_next([=](const QSize &parentSize, const QSize &size) {
+	) | rpl::on_next([=](const QSize &parentSize, const QSize &size) {
 		container->resize(parentSize.width(), size.height());
 	}, bubble->lifetime());
 	bubble->show();
diff --git a/Telegram/SourceFiles/ui/effects/premium_graphics.cpp b/Telegram/SourceFiles/ui/effects/premium_graphics.cpp
index 4fc6a66455..6957e1266b 100644
--- a/Telegram/SourceFiles/ui/effects/premium_graphics.cpp
+++ b/Telegram/SourceFiles/ui/effects/premium_graphics.cpp
@@ -233,7 +233,7 @@ Line::Line(
 	const auto set = [&](
 			Ui::Text::String &label,
 			rpl::producer<QString> &text) {
-		std::move(text) | rpl::start_with_next([=, &label](QString text) {
+		std::move(text) | rpl::on_next([=, &label](QString text) {
 			label = { st::semiboldTextStyle, text };
 			_recaches.fire({});
 		}, lifetime());
@@ -243,7 +243,7 @@ Line::Line(
 	set(_rightLabel, labels.rightLabel);
 	set(_rightText, labels.rightCount);
 
-	std::move(state) | rpl::start_with_next([=](LimitRowState state) {
+	std::move(state) | rpl::on_next([=](LimitRowState state) {
 		_dynamic = state.dynamic;
 		if (width() > 0) {
 			const auto from = state.animateFromZero
@@ -263,7 +263,7 @@ Line::Line(
 		_recaches.events_starting_with({})
 	) | rpl::filter([](const QSize &size, int parentWidth, auto) {
 		return !size.isEmpty() && parentWidth;
-	}) | rpl::start_with_next([=](const QSize &size, auto, auto) {
+	}) | rpl::on_next([=](const QSize &size, auto, auto) {
 		recache(size);
 		update();
 	}, lifetime());
@@ -514,7 +514,7 @@ void AddLimitRow(
 	if (color) {
 		line->setColorOverride(color());
 
-		style::PaletteChanged() | rpl::start_with_next([=] {
+		style::PaletteChanged() | rpl::on_next([=] {
 			line->setColorOverride(color());
 		}, line->lifetime());
 	}
@@ -593,7 +593,7 @@ void AddAccountsRow(
 			anim::type::instant);
 
 		widget->paintRequest(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			Painter p(widget);
 			const auto width = widget->width();
 			const auto photoLeft = (width - (imageRadius * 2)) / 2;
@@ -630,7 +630,7 @@ void AddAccountsRow(
 	}
 
 	container->sizeValue(
-	) | rpl::start_with_next([=](const QSize &size) {
+	) | rpl::on_next([=](const QSize &size) {
 		const auto count = state->accounts.size();
 		const auto columnWidth = size.width() / count;
 		for (auto i = 0; i < count; i++) {
@@ -773,11 +773,11 @@ void ShowListBox(
 			icons->push_back(QColor());
 			const auto icon = Ui::CreateChild<Ui::RpWidget>(content.get());
 			icon->resize(outlined->size());
-			title->topValue() | rpl::start_with_next([=](int y) {
+			title->topValue() | rpl::on_next([=](int y) {
 				const auto shift = st::settingsPremiumPreviewIconPosition;
 				icon->move(QPoint(0, y) + shift);
 			}, icon->lifetime());
-			icon->paintRequest() | rpl::start_with_next([=] {
+			icon->paintRequest() | rpl::on_next([=] {
 				auto p = QPainter(icon);
 				outlined->paintInCenter(p, icon->rect(), (*icons)[index]);
 			}, icon->lifetime());
@@ -901,7 +901,7 @@ void AddGiftOptions(
 		}
 
 		row->sizeValue(
-		) | rpl::start_with_next([=, margins = stCheckbox.margin](
+		) | rpl::on_next([=, margins = stCheckbox.margin](
 				const QSize &s) {
 			const auto radioHeight = radio->height()
 				- margins.top()
@@ -916,7 +916,7 @@ void AddGiftOptions(
 			row->paintRequest(
 			) | rpl::take(
 				1
-			) | rpl::start_with_next([=]() mutable {
+			) | rpl::on_next([=]() mutable {
 				const auto from = edges->top->y();
 				const auto to = edges->bottom->y() + edges->bottom->height();
 				auto partialGradient = PartialGradient(from, to, stops);
@@ -979,7 +979,7 @@ void AddGiftOptions(
 		}();
 
 		row->paintRequest(
-		) | rpl::start_with_next([=](const QRect &r) {
+		) | rpl::on_next([=](const QRect &r) {
 			auto p = QPainter(row);
 			auto hq = PainterHighQualityEnabler(p);
 
diff --git a/Telegram/SourceFiles/ui/effects/premium_top_bar.cpp b/Telegram/SourceFiles/ui/effects/premium_top_bar.cpp
index ba06933bf6..5aa9f27afb 100644
--- a/Telegram/SourceFiles/ui/effects/premium_top_bar.cpp
+++ b/Telegram/SourceFiles/ui/effects/premium_top_bar.cpp
@@ -120,7 +120,7 @@ TopBar::TopBar(
 			: MiniStarsType::BiStars) {
 	std::move(
 		descriptor.title
-	) | rpl::start_with_next([=](QString text) {
+	) | rpl::on_next([=](QString text) {
 		_titlePath = QPainterPath();
 		_titlePath.addText(0, _titleFont->ascent, _titleFont, text);
 		update();
@@ -140,7 +140,7 @@ TopBar::TopBar(
 
 	rpl::single() | rpl::then(
 		style::PaletteChanged()
-	) | rpl::start_with_next([=, starSize = st.starSize] {
+	) | rpl::on_next([=, starSize = st.starSize] {
 		TopBarAbstract::computeIsDark();
 
 		if (_logo == u"dollar"_q) {
@@ -179,7 +179,7 @@ TopBar::TopBar(
 		const auto smallTopShadow = CreateChild<FadeShadow>(this);
 		smallTopShadow->setDuration(st::fadeWrapDuration);
 		sizeValue(
-		) | rpl::start_with_next([=](QSize size) {
+		) | rpl::on_next([=](QSize size) {
 			smallTopShadow->resizeToWidth(size.width());
 			smallTopShadow->moveToLeft(
 				0,
diff --git a/Telegram/SourceFiles/ui/effects/round_checkbox.cpp b/Telegram/SourceFiles/ui/effects/round_checkbox.cpp
index 0ce16d4dbb..ff426e0e9a 100644
--- a/Telegram/SourceFiles/ui/effects/round_checkbox.cpp
+++ b/Telegram/SourceFiles/ui/effects/round_checkbox.cpp
@@ -34,7 +34,7 @@ public:
 		Expects(parent != nullptr);
 
 		style::PaletteChanged(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			_data.clear();
 		}, _lifetime);
 	}
diff --git a/Telegram/SourceFiles/ui/effects/scroll_content_shadow.cpp b/Telegram/SourceFiles/ui/effects/scroll_content_shadow.cpp
index 392caf2602..47d3ec64da 100644
--- a/Telegram/SourceFiles/ui/effects/scroll_content_shadow.cpp
+++ b/Telegram/SourceFiles/ui/effects/scroll_content_shadow.cpp
@@ -23,7 +23,7 @@ void SetupShadowsToScrollContent(
 	const auto topShadow = Ui::CreateChild<Ui::FadeShadow>(parent.get());
 	const auto bottomShadow = Ui::CreateChild<Ui::FadeShadow>(parent.get());
 	scroll->geometryValue(
-	) | rpl::start_with_next_done([=](const QRect &geometry) {
+	) | rpl::on_next_done([=](const QRect &geometry) {
 		topShadow->resizeToWidth(geometry.width());
 		topShadow->move(
 			geometry.x(),
diff --git a/Telegram/SourceFiles/ui/effects/toggle_arrow.cpp b/Telegram/SourceFiles/ui/effects/toggle_arrow.cpp
index 1c8779a938..6e91c00d05 100644
--- a/Telegram/SourceFiles/ui/effects/toggle_arrow.cpp
+++ b/Telegram/SourceFiles/ui/effects/toggle_arrow.cpp
@@ -58,7 +58,7 @@ namespace Ui {
 
 void AddToggleUpDownArrowToMoreButton(not_null<Ui::RpWidget*> parent) {
 	const auto arrow = Ui::CreateChild<Ui::RpWidget>(parent.get());
-	arrow->paintRequest() | rpl::start_with_next([=](const QRect &r) {
+	arrow->paintRequest() | rpl::on_next([=](const QRect &r) {
 		auto p = QPainter(arrow);
 
 		const auto path = ToggleUpDownArrowPath(
diff --git a/Telegram/SourceFiles/ui/filter_icon_panel.cpp b/Telegram/SourceFiles/ui/filter_icon_panel.cpp
index de82ad7700..cccd148e38 100644
--- a/Telegram/SourceFiles/ui/filter_icon_panel.cpp
+++ b/Telegram/SourceFiles/ui/filter_icon_panel.cpp
@@ -93,7 +93,7 @@ void FilterIconPanel::setup() {
 	macWindowDeactivateEvents(
 	) | rpl::filter([=] {
 		return !isHidden();
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		hideAnimated();
 	}, lifetime());
 
@@ -116,7 +116,7 @@ void FilterIconPanel::setupInner() {
 	_inner->resize(full);
 
 	_inner->paintRequest(
-		) | rpl::start_with_next([=](QRect clip) {
+		) | rpl::on_next([=](QRect clip) {
 		auto p = Painter(_inner);
 		_innerBg.paint(p, _inner->rect());
 		p.setFont(st::emojiPanHeaderFont);
@@ -153,7 +153,7 @@ void FilterIconPanel::setupInner() {
 
 	_inner->setMouseTracking(true);
 	_inner->events(
-	) | rpl::start_with_next([=](not_null<QEvent*> e) {
+	) | rpl::on_next([=](not_null<QEvent*> e) {
 		switch (e->type()) {
 		case QEvent::Leave: setSelected(-1); break;
 		case QEvent::MouseMove:
diff --git a/Telegram/SourceFiles/ui/new_badges.cpp b/Telegram/SourceFiles/ui/new_badges.cpp
index 05321816fa..59e8697eb9 100644
--- a/Telegram/SourceFiles/ui/new_badges.cpp
+++ b/Telegram/SourceFiles/ui/new_badges.cpp
@@ -27,7 +27,7 @@ not_null<Ui::RpWidget*> CreateNewBadge(
 		st::settingsPremiumNewBadgePadding);
 	badge->show();
 	badge->setAttribute(Qt::WA_TransparentForMouseEvents);
-	badge->paintRequest() | rpl::start_with_next([=] {
+	badge->paintRequest() | rpl::on_next([=] {
 		auto p = QPainter(badge);
 		auto hq = PainterHighQualityEnabler(p);
 		p.setPen(Qt::NoPen);
@@ -42,7 +42,7 @@ void AddToRight(not_null<Ui::RpWidget*> parent) {
 	const auto badge = CreateNewBadge(parent, tr::lng_bot_side_menu_new());
 
 	parent->sizeValue(
-	) | rpl::start_with_next([=](QSize size) {
+	) | rpl::on_next([=](QSize size) {
 		badge->moveToRight(
 			st::mainMenuButton.padding.right(),
 			(size.height() - badge->height()) / 2,
@@ -58,7 +58,7 @@ void AddAfterLabel(
 		tr::lng_premium_summary_new_badge());
 
 	label->geometryValue(
-	) | rpl::start_with_next([=](QRect geometry) {
+	) | rpl::on_next([=](QRect geometry) {
 		badge->move(st::settingsPremiumNewBadgePosition
 			+ QPoint(label->x() + label->width(), label->y()));
 	}, badge->lifetime());
diff --git a/Telegram/SourceFiles/ui/peer/color_sample.cpp b/Telegram/SourceFiles/ui/peer/color_sample.cpp
index b9a5c744da..8819c2e9f2 100644
--- a/Telegram/SourceFiles/ui/peer/color_sample.cpp
+++ b/Telegram/SourceFiles/ui/peer/color_sample.cpp
@@ -39,7 +39,7 @@ ColorSample::ColorSample(
 	rpl::combine(
 		std::move(colorIndex),
 		std::move(collectible)
-	) | rpl::start_with_next([=](
+	) | rpl::on_next([=](
 			uint8 index,
 			std::shared_ptr<Ui::ColorCollectible> collectible) {
 		_index = index;
@@ -295,7 +295,7 @@ ColorSelector::ColorSelector(
 , _isProfileMode(false) {
 	std::move(
 		indices
-	) | rpl::start_with_next([=](std::vector<uint8> indices) {
+	) | rpl::on_next([=](std::vector<uint8> indices) {
 		fillFrom(std::move(indices));
 	}, lifetime());
 	setupSelectionTracking();
@@ -385,7 +385,7 @@ void ColorSelector::setupSelectionTracking() {
 	}
 	_index.value(
 	) | rpl::combine_previous(
-	) | rpl::start_with_next([=](uint8 was, uint8 now) {
+	) | rpl::on_next([=](uint8 was, uint8 now) {
 		const auto i = ranges::find(_samples, was, &ColorSample::index);
 		if (i != end(_samples)) {
 			i->get()->setSelected(false);
diff --git a/Telegram/SourceFiles/ui/peer/video_userpic_player.cpp b/Telegram/SourceFiles/ui/peer/video_userpic_player.cpp
index 2ea145bf1c..d2a5c72827 100644
--- a/Telegram/SourceFiles/ui/peer/video_userpic_player.cpp
+++ b/Telegram/SourceFiles/ui/peer/video_userpic_player.cpp
@@ -113,7 +113,7 @@ bool VideoUserpicPlayer::createStreaming(
 		nullptr);
 	_streamed->lockPlayer();
 	_streamed->player().updates(
-	) | rpl::start_with_next_error([=](Update &&update) {
+	) | rpl::on_next_error([=](Update &&update) {
 		handleUpdate(std::move(update));
 	}, [=](Error &&error) {
 		handleError(std::move(error));
diff --git a/Telegram/SourceFiles/ui/resize_area.h b/Telegram/SourceFiles/ui/resize_area.h
index 84c7dea8ba..c711477929 100644
--- a/Telegram/SourceFiles/ui/resize_area.h
+++ b/Telegram/SourceFiles/ui/resize_area.h
@@ -23,7 +23,7 @@ public:
 	template <typename Callback>
 	void addMoveLeftCallback(Callback &&callback) {
 		moveLeft(
-		) | rpl::start_with_next(
+		) | rpl::on_next(
 			std::forward<Callback>(callback),
 			lifetime());
 	}
@@ -34,7 +34,7 @@ public:
 	template <typename Callback>
 	void addMoveFinishedCallback(Callback &&callback) {
 		moveFinished(
-		) | rpl::start_with_next(
+		) | rpl::on_next(
 			std::forward<Callback>(callback),
 			lifetime());
 	}
diff --git a/Telegram/SourceFiles/ui/search_field_controller.cpp b/Telegram/SourceFiles/ui/search_field_controller.cpp
index b1d3ae5fa3..279dbb1c74 100644
--- a/Telegram/SourceFiles/ui/search_field_controller.cpp
+++ b/Telegram/SourceFiles/ui/search_field_controller.cpp
@@ -40,7 +40,7 @@ auto SearchFieldController::createRowView(
 	queryValue(
 	) | rpl::map([](const QString &value) {
 		return !value.isEmpty();
-	}) | rpl::start_with_next([cancel](bool shown) {
+	}) | rpl::on_next([cancel](bool shown) {
 		cancel->toggle(shown, anim::type::normal);
 	}, cancel->lifetime());
 	cancel->finishAnimating();
@@ -49,7 +49,7 @@ auto SearchFieldController::createRowView(
 	shadow->show();
 
 	wrap->widthValue(
-	) | rpl::start_with_next([=, &st](int newWidth) {
+	) | rpl::on_next([=, &st](int newWidth) {
 		auto availableWidth = newWidth
 			- st.fieldIconSkip
 			- st.fieldCancelSkip;
@@ -66,7 +66,7 @@ auto SearchFieldController::createRowView(
 			st::lineWidth);
 	}, wrap->lifetime());
 	wrap->paintRequest(
-	) | rpl::start_with_next([=, &st] {
+	) | rpl::on_next([=, &st] {
 		auto p = QPainter(wrap);
 		st.fieldIcon.paint(
 			p,
@@ -106,7 +106,7 @@ base::unique_qptr<Ui::InputField> SearchFieldController::createField(
 		_query.current());
 	auto field = result.get();
 	field->changes(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_query = field->getLastText();
 	}, field->lifetime());
 	_view.reset(field);
diff --git a/Telegram/SourceFiles/ui/unread_badge_paint.cpp b/Telegram/SourceFiles/ui/unread_badge_paint.cpp
index d6b150a082..34e965cc0a 100644
--- a/Telegram/SourceFiles/ui/unread_badge_paint.cpp
+++ b/Telegram/SourceFiles/ui/unread_badge_paint.cpp
@@ -43,7 +43,7 @@ public:
 
 UnreadBadgeStyleData::UnreadBadgeStyleData() {
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		for (auto &data : sizes) {
 			for (auto &left : data.left) {
 				left = QPixmap();
diff --git a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider.cpp b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider.cpp
index beafcc448c..c3390a14af 100644
--- a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider.cpp
+++ b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider.cpp
@@ -43,7 +43,7 @@ ChatsFiltersTabs::ChatsFiltersTabs(
 		_cachedBadgeHeight = one.height();
 	}
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		for (auto &[index, unread] : _unreadCounts) {
 			unread.cache = cacheUnreadCount(unread.count, unread.muted);
 		}
@@ -152,7 +152,7 @@ void ChatsFiltersTabs::setLockedFrom(int index) {
 		return;
 	}
 	_paletteLifetime = style::PaletteChanged(
-	) | rpl::start_with_next([this] {
+	) | rpl::on_next([this] {
 		_lockCache.emplace(Ui::SideBarLockIcon(_st.labelFg));
 	});
 }
diff --git a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider_reorder.cpp b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider_reorder.cpp
index 21d0e96753..891abb31dd 100644
--- a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider_reorder.cpp
+++ b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider_reorder.cpp
@@ -51,7 +51,7 @@ void ChatsFiltersTabsReorder::start() {
 		return;
 	}
 	_layout->events()
-	| rpl::start_with_next_done([this](not_null<QEvent*> e) {
+	| rpl::on_next_done([this](not_null<QEvent*> e) {
 		switch (e->type()) {
 		case QEvent::MouseMove:
 			mouseMove(static_cast<QMouseEvent*>(e.get())->globalPos());
diff --git a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp
index f863fc021c..e8080d25ef 100644
--- a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp
+++ b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp
@@ -116,7 +116,7 @@ void ShowMenu(
 				state->waitingSuggested = true;
 				filters->requestSuggested();
 				filters->suggestedUpdated(
-				) | rpl::take(1) | rpl::start_with_next([=] {
+				) | rpl::take(1) | rpl::on_next([=] {
 					controller->showSettings(Settings::Folders::Id());
 				}, parent->lifetime());
 			}
@@ -184,7 +184,7 @@ void ShowFiltersListMenu(
 		}
 		state->menu->addAction(std::move(item));
 	}
-	session->data().chatsFilters().changed() | rpl::start_with_next([=] {
+	session->data().chatsFilters().changed() | rpl::on_next([=] {
 		state->menu->hideMenu();
 	}, state->menu->lifetime());
 
@@ -235,7 +235,7 @@ not_null<Ui::RpWidget*> AddChatFiltersTabsStrip(
 			rpl::combine(
 				Data::UnreadStateValue(session, list[i].id()),
 				rpl::duplicate(includeMuted)
-			) | rpl::start_with_next([=](
+			) | rpl::on_next([=](
 					const Dialogs::UnreadState &state,
 					bool includeMuted) {
 				const auto chats = state.chats;
@@ -282,7 +282,7 @@ not_null<Ui::RpWidget*> AddChatFiltersTabsStrip(
 		};
 
 		state->reorder->updates(
-		) | rpl::start_with_next([=](const Reorder::Single &data) {
+		) | rpl::on_next([=](const Reorder::Single &data) {
 			if (data.state == Reorder::State::Started) {
 				slider->setReordering(slider->reordering() + 1);
 			} else {
@@ -373,7 +373,7 @@ not_null<Ui::RpWidget*> AddChatFiltersTabsStrip(
 			slider->setLockedFrom((premiumFrom >= list.size())
 				? 0
 				: premiumFrom);
-			slider->lockedClicked() | rpl::start_with_next([=] {
+			slider->lockedClicked() | rpl::on_next([=] {
 				controller->show(Box(FiltersLimitBox, session, std::nullopt));
 			}, state->rebuildLifetime);
 			if (state->reorder) {
@@ -416,7 +416,7 @@ not_null<Ui::RpWidget*> AddChatFiltersTabsStrip(
 		}();
 		if (trackActiveFilterAndUnreadAndReorder) {
 			controller->activeChatsFilter(
-			) | rpl::start_with_next([=](FilterId id) {
+			) | rpl::on_next([=](FilterId id) {
 				const auto &list = session->data().chatsFilters().list();
 				for (auto i = 0; i < list.size(); ++i) {
 					if (list[i].id() == id) {
@@ -431,7 +431,7 @@ not_null<Ui::RpWidget*> AddChatFiltersTabsStrip(
 		rpl::single(-1) | rpl::then(
 			slider->sectionActivated()
 		) | rpl::combine_previous(
-		) | rpl::start_with_next([=](int was, int index) {
+		) | rpl::on_next([=](int was, int index) {
 			if (slider->reordering()) {
 				return;
 			}
@@ -442,7 +442,7 @@ not_null<Ui::RpWidget*> AddChatFiltersTabsStrip(
 			}
 			applyFilter(filter);
 		}, state->rebuildLifetime);
-		slider->contextMenuRequested() | rpl::start_with_next([=](int index) {
+		slider->contextMenuRequested() | rpl::on_next([=](int index) {
 			if (trackActiveFilterAndUnreadAndReorder) {
 				ShowMenu(wrap, controller, state, index);
 			} else {
@@ -463,11 +463,11 @@ not_null<Ui::RpWidget*> AddChatFiltersTabsStrip(
 	rpl::combine(
 		session->data().chatsFilters().changed(),
 		Data::AmPremiumValue(session) | rpl::to_empty
-	) | rpl::start_with_next(rebuild, wrap->lifetime());
+	) | rpl::on_next(rebuild, wrap->lifetime());
 	rebuild();
 
 	session->data().chatsFilters().isChatlistChanged(
-	) | rpl::start_with_next([=](FilterId id) {
+	) | rpl::on_next([=](FilterId id) {
 		if (!id || !state->lastFilterId || (id != state->lastFilterId)) {
 			return;
 		}
@@ -482,7 +482,7 @@ not_null<Ui::RpWidget*> AddChatFiltersTabsStrip(
 	rpl::combine(
 		parent->widthValue() | rpl::filter(rpl::mappers::_1 > 0),
 		slider->heightValue() | rpl::filter(rpl::mappers::_1 > 0)
-	) | rpl::start_with_next([=](int w, int h) {
+	) | rpl::on_next([=](int w, int h) {
 		scroll->resize(w, h);
 		container->resize(w, h);
 		wrap->resize(w, h);
diff --git a/Telegram/SourceFiles/ui/widgets/color_editor.cpp b/Telegram/SourceFiles/ui/widgets/color_editor.cpp
index 06ca4d3389..78a0e06d4c 100644
--- a/Telegram/SourceFiles/ui/widgets/color_editor.cpp
+++ b/Telegram/SourceFiles/ui/widgets/color_editor.cpp
@@ -930,7 +930,7 @@ void ColorEditor::prepare() {
 		(_hueSlider ? _hueSlider->changed() : rpl::never<>()),
 		(_opacitySlider ? _opacitySlider->changed() : rpl::never<>()),
 		(_lightnessSlider ? _lightnessSlider->changed() : rpl::never<>())
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateFromControls();
 	}, lifetime());
 
diff --git a/Telegram/SourceFiles/ui/widgets/expandable_peer_list.cpp b/Telegram/SourceFiles/ui/widgets/expandable_peer_list.cpp
index ee3c6d33a9..0340b1fbbb 100644
--- a/Telegram/SourceFiles/ui/widgets/expandable_peer_list.cpp
+++ b/Telegram/SourceFiles/ui/widgets/expandable_peer_list.cpp
@@ -94,7 +94,7 @@ void AddExpandablePeerList(
 	const auto overlay = Ui::CreateChild<Ui::AbstractButton>(inner);
 
 	checkbox->geometryValue(
-	) | rpl::start_with_next([=](const QRect &rect) {
+	) | rpl::on_next([=](const QRect &rect) {
 		overlay->setGeometry(rect);
 		overlay->raise();
 
@@ -108,7 +108,7 @@ void AddExpandablePeerList(
 	}, overlay->lifetime());
 
 	controller->toggleRequestsFromInner.events(
-	) | rpl::start_with_next([=](bool toggled) {
+	) | rpl::on_next([=](bool toggled) {
 		checkbox->setChecked(toggled);
 	}, checkbox->lifetime());
 	if (button) {
@@ -132,7 +132,7 @@ void AddExpandablePeerList(
 		wrap->toggle(hideRightButton, anim::type::instant);
 
 		controller->toggleRequestsFromTop.events(
-		) | rpl::start_with_next([=](bool toggled) {
+		) | rpl::on_next([=](bool toggled) {
 			wrap->toggle(toggled, anim::type::normal);
 		}, wrap->lifetime());
 
@@ -178,7 +178,7 @@ void AddExpandablePeerList(
 			rpl::combine(
 				line->widthValue(),
 				checkbox->widthValue()
-			) | rpl::start_with_next([=](int width, int) {
+			) | rpl::on_next([=](int width, int) {
 				userpic->moveToLeft(
 					st::boxRowPadding.left()
 						+ checkbox->checkRect().width()
@@ -207,7 +207,7 @@ void AddExpandablePeerList(
 		}) | ranges::to_vector;
 
 		clicks->events(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			controller->toggleRequestsFromInner.fire_copy(
 				checkTopOnAllInner
 				? ranges::all_of(checkboxes, &Ui::Checkbox::checked)
@@ -215,7 +215,7 @@ void AddExpandablePeerList(
 		}, container->lifetime());
 
 		controller->checkAllRequests.events(
-		) | rpl::start_with_next([=](bool checked) {
+		) | rpl::on_next([=](bool checked) {
 			for (const auto &c : checkboxes) {
 				c->setChecked(checked);
 			}
diff --git a/Telegram/SourceFiles/ui/widgets/horizontal_fit_container.cpp b/Telegram/SourceFiles/ui/widgets/horizontal_fit_container.cpp
index a7a77c54cd..1b0ac35766 100644
--- a/Telegram/SourceFiles/ui/widgets/horizontal_fit_container.cpp
+++ b/Telegram/SourceFiles/ui/widgets/horizontal_fit_container.cpp
@@ -16,7 +16,7 @@ HorizontalFitContainer::HorizontalFitContainer(
 	int spacing)
 : RpWidget(parent)
 , _spacing(spacing) {
-	sizeValue() | rpl::start_with_next([=](QSize size) {
+	sizeValue() | rpl::on_next([=](QSize size) {
 		updateLayout(size);
 	}, lifetime());
 }
diff --git a/Telegram/SourceFiles/ui/widgets/multi_select.cpp b/Telegram/SourceFiles/ui/widgets/multi_select.cpp
index e8558190ef..33f4b8e382 100644
--- a/Telegram/SourceFiles/ui/widgets/multi_select.cpp
+++ b/Telegram/SourceFiles/ui/widgets/multi_select.cpp
@@ -659,21 +659,21 @@ MultiSelect::Inner::Inner(
 , _cancel(this, _st.fieldCancel) {
 	_field->customUpDown(true);
 	_field->focusedChanges(
-	) | rpl::filter(rpl::mappers::_1) | rpl::start_with_next([=] {
+	) | rpl::filter(rpl::mappers::_1) | rpl::on_next([=] {
 		fieldFocused();
 	}, _field->lifetime());
 	_field->changes(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		queryChanged();
 	}, _field->lifetime());
 	_field->submits(
-	) | rpl::start_with_next([=](Qt::KeyboardModifiers m) {
+	) | rpl::on_next([=](Qt::KeyboardModifiers m) {
 		if (_submittedCallback) {
 			_submittedCallback(m);
 		}
 	}, _field->lifetime());
 	_field->cancelled(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		cancelled();
 	}, _field->lifetime());
 	_cancel->setClickedCallback([=] {
diff --git a/Telegram/SourceFiles/ui/widgets/peer_bubble.cpp b/Telegram/SourceFiles/ui/widgets/peer_bubble.cpp
index 73a7b1bbb8..ce18866d54 100644
--- a/Telegram/SourceFiles/ui/widgets/peer_bubble.cpp
+++ b/Telegram/SourceFiles/ui/widgets/peer_bubble.cpp
@@ -39,7 +39,7 @@ object_ptr<Ui::RpWidget> CreatePeerBubble(
 	rpl::combine(
 		left->sizeValue(),
 		right->sizeValue()
-	) | rpl::start_with_next([=](
+	) | rpl::on_next([=](
 			const QSize &leftSize,
 			const QSize &rightSize) {
 		peerBubble->setNaturalWidth(
@@ -56,7 +56,7 @@ object_ptr<Ui::RpWidget> CreatePeerBubble(
 		}
 	}, peerBubble->lifetime());
 	peerBubble->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(peerBubble);
 		auto hq = PainterHighQualityEnabler(p);
 		p.setPen(Qt::NoPen);
diff --git a/Telegram/SourceFiles/ui/widgets/sent_code_field.cpp b/Telegram/SourceFiles/ui/widgets/sent_code_field.cpp
index f5ba4b858b..2da4b633be 100644
--- a/Telegram/SourceFiles/ui/widgets/sent_code_field.cpp
+++ b/Telegram/SourceFiles/ui/widgets/sent_code_field.cpp
@@ -19,7 +19,7 @@ SentCodeField::SentCodeField(
 	rpl::producer<QString> placeholder,
 	const QString &val)
 : Ui::InputField(parent, st, std::move(placeholder), val) {
-	changes() | rpl::start_with_next([=] { fix(); }, lifetime());
+	changes() | rpl::on_next([=] { fix(); }, lifetime());
 }
 
 void SentCodeField::setAutoSubmit(int length, Fn<void()> submitCallback) {
diff --git a/Telegram/SourceFiles/ui/widgets/vertical_drum_picker.cpp b/Telegram/SourceFiles/ui/widgets/vertical_drum_picker.cpp
index 3376b72f97..9481e97ac1 100644
--- a/Telegram/SourceFiles/ui/widgets/vertical_drum_picker.cpp
+++ b/Telegram/SourceFiles/ui/widgets/vertical_drum_picker.cpp
@@ -111,7 +111,7 @@ VerticalDrumPicker::VerticalDrumPicker(
 	Expects(_paintCallback != nullptr);
 
 	sizeValue(
-	) | rpl::start_with_next([=](const QSize &s) {
+	) | rpl::on_next([=](const QSize &s) {
 		_itemsVisible.count = std::ceil(float64(s.height()) / _itemHeight);
 		_itemsVisible.centerOffset = _itemsVisible.count / 2;
 		if ((_pendingStartIndex >= 0) && _itemsVisible.count) {
@@ -129,7 +129,7 @@ VerticalDrumPicker::VerticalDrumPicker(
 	}, lifetime());
 
 	paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(this);
 
 		const auto outerWidth = width();
@@ -151,7 +151,7 @@ VerticalDrumPicker::VerticalDrumPicker(
 	}, lifetime());
 
 	_animation.updates(
-	) | rpl::start_with_next([=](PickerAnimation::Shift shift) {
+	) | rpl::on_next([=](PickerAnimation::Shift shift) {
 		increaseShift(shift);
 	}, lifetime());
 }
diff --git a/Telegram/SourceFiles/window/main_window.cpp b/Telegram/SourceFiles/window/main_window.cpp
index 4ff5bb644a..b58ce7ea9c 100644
--- a/Telegram/SourceFiles/window/main_window.cpp
+++ b/Telegram/SourceFiles/window/main_window.cpp
@@ -370,19 +370,19 @@ MainWindow::MainWindow(not_null<Controller*> controller)
 , _outdated(Ui::CreateOutdatedBar(body(), cWorkingDir()))
 , _body(body()) {
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updatePalette();
 	}, lifetime());
 
 	Core::App().unreadBadgeChanges(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateTitle();
 		unreadCounterChangedHook();
 		Core::App().tray().updateIconCounters();
 	}, lifetime());
 
 	Core::App().settings().workModeChanges(
-	) | rpl::start_with_next([=](Core::Settings::WorkMode mode) {
+	) | rpl::on_next([=](Core::Settings::WorkMode mode) {
 		workmodeUpdated(mode);
 	}, lifetime());
 
@@ -391,27 +391,27 @@ MainWindow::MainWindow(not_null<Controller*> controller)
 	}
 
 	windowActiveValue(
-	) | rpl::skip(1) | rpl::start_with_next([=](bool active) {
+	) | rpl::skip(1) | rpl::on_next([=](bool active) {
 		InvokeQueued(this, [=] {
 			handleActiveChanged(active);
 		});
 	}, lifetime());
 
 	shownValue(
-	) | rpl::skip(1) | rpl::start_with_next([=](bool visible) {
+	) | rpl::skip(1) | rpl::on_next([=](bool visible) {
 		InvokeQueued(this, [=] {
 			handleVisibleChanged(visible);
 		});
 	}, lifetime());
 
 	body()->sizeValue(
-	) | rpl::start_with_next([=](QSize size) {
+	) | rpl::on_next([=](QSize size) {
 		updateControlsGeometry();
 	}, lifetime());
 
 	if (_outdated) {
 		_outdated->heightValue(
-		) | rpl::start_with_next([=](int height) {
+		) | rpl::on_next([=](int height) {
 			if (!height) {
 				crl::on_main(this, [=] { _outdated.destroy(); });
 			}
@@ -503,7 +503,7 @@ void MainWindow::init() {
 
 	if (Ui::Platform::NativeWindowFrameSupported()) {
 		Core::App().settings().nativeWindowFrameChanges(
-		) | rpl::start_with_next([=](bool native) {
+		) | rpl::on_next([=](bool native) {
 			refreshTitleWidget();
 			recountGeometryConstraints();
 		}, lifetime());
diff --git a/Telegram/SourceFiles/window/notifications_manager.cpp b/Telegram/SourceFiles/window/notifications_manager.cpp
index 0ac6ae4cfd..22334b173e 100644
--- a/Telegram/SourceFiles/window/notifications_manager.cpp
+++ b/Telegram/SourceFiles/window/notifications_manager.cpp
@@ -194,7 +194,7 @@ System::System()
 , _waitForAllGroupedTimer([=] { showGrouped(); })
 , _manager(std::make_unique<DummyManager>(this)) {
 	settingsChanged(
-	) | rpl::start_with_next([=](ChangeType type) {
+	) | rpl::on_next([=](ChangeType type) {
 		if (type == ChangeType::DesktopEnabled) {
 			clearAll();
 		} else if (type == ChangeType::ViewParams) {
@@ -387,7 +387,7 @@ void System::registerThread(not_null<Data::Thread*> thread) {
 	if (const auto topic = thread->asTopic()) {
 		const auto &[i, ok] = _watchedTopics.emplace(topic, rpl::lifetime());
 		if (ok) {
-			topic->destroyed() | rpl::start_with_next([=] {
+			topic->destroyed() | rpl::on_next([=] {
 				clearFromTopic(topic);
 			}, i->second);
 		}
@@ -396,7 +396,7 @@ void System::registerThread(not_null<Data::Thread*> thread) {
 			sublist,
 			rpl::lifetime());
 		if (ok) {
-			sublist->destroyed() | rpl::start_with_next([=] {
+			sublist->destroyed() | rpl::on_next([=] {
 				clearFromSublist(sublist);
 			}, i->second);
 		}
diff --git a/Telegram/SourceFiles/window/notifications_manager_default.cpp b/Telegram/SourceFiles/window/notifications_manager_default.cpp
index bd4e46042a..861cd2ac3a 100644
--- a/Telegram/SourceFiles/window/notifications_manager_default.cpp
+++ b/Telegram/SourceFiles/window/notifications_manager_default.cpp
@@ -76,7 +76,7 @@ Manager::Manager(System *system)
 : Notifications::Manager(system)
 , _inputCheckTimer([=] { checkLastInput(); }) {
 	system->settingsChanged(
-	) | rpl::start_with_next([=](ChangeType change) {
+	) | rpl::on_next([=](ChangeType change) {
 		settingsChanged(change);
 	}, _lifetime);
 }
@@ -256,14 +256,14 @@ void Manager::subscribeToSession(not_null<Main::Session*> session) {
 	if (i == _subscriptions.end()) {
 		i = _subscriptions.emplace(session).first;
 		session->account().sessionChanges(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			_subscriptions.remove(session);
 		}, i->second.lifetime);
 	} else if (i->second.subscription) {
 		return;
 	}
 	session->downloaderTaskFinished(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto found = false;
 		for (const auto &notification : _notifications) {
 			if (const auto history = notification->maybeHistory()) {
@@ -662,13 +662,13 @@ Notification::Notification(
 , _close(this, st::notifyClose)
 , _reply(this, tr::lng_notification_reply(), st::defaultBoxButton) {
 	Lang::Updated(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		refreshLang();
 	}, lifetime());
 
 	if (_topic) {
 		_topic->destroyed(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			unlinkHistory();
 		}, lifetime());
 	}
@@ -699,7 +699,7 @@ Notification::Notification(
 	prepareActionsCache();
 
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateNotifyDisplay();
 		if (!_buttonsCache.isNull()) {
 			prepareActionsCache();
@@ -1123,13 +1123,13 @@ void Notification::showReplyField() {
 	// Catch mouse press event to activate the window.
 	QCoreApplication::instance()->installEventFilter(this);
 	_replyArea->heightChanges(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		replyResized();
 	}, _replyArea->lifetime());
 	_replyArea->submits(
-	) | rpl::start_with_next([=] { sendReply(); }, _replyArea->lifetime());
+	) | rpl::on_next([=] { sendReply(); }, _replyArea->lifetime());
 	_replyArea->cancelled(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		replyCancel();
 	}, _replyArea->lifetime());
 
@@ -1262,7 +1262,7 @@ HideAllButton::HideAllButton(
 	updateGeometry(position.x(), position.y(), st::notifyWidth, st::notifyHideAllHeight);
 
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		update();
 	}, lifetime());
 
diff --git a/Telegram/SourceFiles/window/section_widget.cpp b/Telegram/SourceFiles/window/section_widget.cpp
index 36fd532c31..e5e89e64d5 100644
--- a/Telegram/SourceFiles/window/section_widget.cpp
+++ b/Telegram/SourceFiles/window/section_widget.cpp
@@ -116,7 +116,7 @@ struct ResolvedPaper {
 
 		consumer.put_next_copy(rpl::empty);
 		style::PaletteChanged(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			if (state->scheduled) {
 				return;
 			}
@@ -232,7 +232,7 @@ AbstractSectionWidget::AbstractSectionWidget(
 				theme->repaintBackgroundRequests()
 			);
 		}) | rpl::flatten_latest();
-	}) | rpl::flatten_latest() | rpl::start_with_next([=] {
+	}) | rpl::flatten_latest() | rpl::on_next([=] {
 		update();
 	}, lifetime());
 }
diff --git a/Telegram/SourceFiles/window/themes/window_theme.cpp b/Telegram/SourceFiles/window/themes/window_theme.cpp
index a6827b034f..339637506e 100644
--- a/Telegram/SourceFiles/window/themes/window_theme.cpp
+++ b/Telegram/SourceFiles/window/themes/window_theme.cpp
@@ -510,7 +510,7 @@ void ChatBackground::start() {
 	saveAdjustableColors();
 
 	_updates.events(
-	) | rpl::start_with_next([=](const BackgroundUpdate &update) {
+	) | rpl::on_next([=](const BackgroundUpdate &update) {
 		refreshThemeWatcher();
 		if (update.paletteChanged()) {
 			style::NotifyPaletteChanged();
@@ -522,7 +522,7 @@ void ChatBackground::start() {
 	Core::App().domain().activeSessionValue(
 	) | rpl::filter([=](Main::Session *session) {
 		return session != _session;
-	}) | rpl::start_with_next([=](Main::Session *session) {
+	}) | rpl::on_next([=](Main::Session *session) {
 		_session = session;
 		checkUploadWallPaper();
 	}, _lifetime);
@@ -559,7 +559,7 @@ void ChatBackground::start() {
 			: palette.windowText().color().lightness()
 				> palette.window().color().lightness();
 	}) | rpl::distinct_until_changed(
-	) | rpl::start_with_next([](bool dark) {
+	) | rpl::on_next([](bool dark) {
 		Core::App().settings().setSystemDarkMode(dark);
 	}, _lifetime);
 }
@@ -612,7 +612,7 @@ void ChatBackground::checkUploadWallPaper() {
 		return;
 	}
 	_wallPaperUploadLifetime = _session->uploader().documentReady(
-	) | rpl::start_with_next([=](const Storage::UploadedMedia &data) {
+	) | rpl::on_next([=](const Storage::UploadedMedia &data) {
 		if (data.fullId != _wallPaperUploadId) {
 			return;
 		}
@@ -1649,7 +1649,7 @@ std::unique_ptr<Ui::ChatTheme> DefaultChatThemeOn(rpl::lifetime &lifetime) {
 
 	push();
 	Background()->updates(
-	) | rpl::start_with_next([=](const BackgroundUpdate &update) {
+	) | rpl::on_next([=](const BackgroundUpdate &update) {
 		if (update.type == BackgroundUpdate::Type::New
 			|| update.type == BackgroundUpdate::Type::Changed) {
 			push();
diff --git a/Telegram/SourceFiles/window/themes/window_theme_editor.cpp b/Telegram/SourceFiles/window/themes/window_theme_editor.cpp
index deba4892ad..beb665f224 100644
--- a/Telegram/SourceFiles/window/themes/window_theme_editor.cpp
+++ b/Telegram/SourceFiles/window/themes/window_theme_editor.cpp
@@ -401,25 +401,25 @@ Editor::Inner::Inner(QWidget *parent, const QString &path)
 	resize(st::windowMinWidth, st::windowMinHeight);
 
 	_context.resized.events(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		resizeToWidth(width());
 	}, lifetime());
 
 	using Context = EditorBlock::Context;
 	_context.pending.events(
-	) | rpl::start_with_next([=](const Context::EditionData &data) {
+	) | rpl::on_next([=](const Context::EditionData &data) {
 		applyEditing(data.name, data.copyOf, data.value);
 	}, lifetime());
 
 	_context.updated.events(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (_context.name.isEmpty() && _focusCallback) {
 			_focusCallback();
 		}
 	}, lifetime());
 
 	_context.scroll.events(
-	) | rpl::start_with_next([=](const Context::ScrollData &data) {
+	) | rpl::on_next([=](const Context::ScrollData &data) {
 		if (_scrollCallback) {
 			auto top = (data.type == EditorBlock::Type::Existing
 				? _existingRows
@@ -430,7 +430,7 @@ Editor::Inner::Inner(QWidget *parent, const QString &path)
 	}, lifetime());
 
 	Background()->updates(
-	) | rpl::start_with_next([=](const BackgroundUpdate &update) {
+	) | rpl::on_next([=](const BackgroundUpdate &update) {
 		if (_applyingUpdate || !Background()->editingTheme()) {
 			return;
 		}
diff --git a/Telegram/SourceFiles/window/themes/window_theme_editor_block.cpp b/Telegram/SourceFiles/window/themes/window_theme_editor_block.cpp
index cd5b5d84e4..6991f87e53 100644
--- a/Telegram/SourceFiles/window/themes/window_theme_editor_block.cpp
+++ b/Telegram/SourceFiles/window/themes/window_theme_editor_block.cpp
@@ -178,7 +178,7 @@ EditorBlock::EditorBlock(QWidget *parent, Type type, Context *context)
 	setMouseTracking(true);
 
 	_context->updated.events(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (_mouseSelection) {
 			_lastGlobalPos = QCursor::pos();
 			updateSelected(mapFromGlobal(_lastGlobalPos));
@@ -188,7 +188,7 @@ EditorBlock::EditorBlock(QWidget *parent, Type type, Context *context)
 
 	if (_type == Type::Existing) {
 		_context->appended.events(
-		) | rpl::start_with_next([=](const Context::AppendData &added) {
+		) | rpl::on_next([=](const Context::AppendData &added) {
 			auto name = added.name;
 			auto value = added.value;
 			feed(name, value);
@@ -208,7 +208,7 @@ EditorBlock::EditorBlock(QWidget *parent, Type type, Context *context)
 		}, lifetime());
 	} else {
 		_context->changed.events(
-		) | rpl::start_with_next([=](const Context::ChangeData &data) {
+		) | rpl::on_next([=](const Context::ChangeData &data) {
 			checkCopiesChanged(0, data.names, data.value);
 		}, lifetime());
 	}
@@ -335,11 +335,11 @@ void EditorBlock::activateRow(const Row &row) {
 				saveEditing(editor->color());
 			});
 			box->boxClosing(
-			) | rpl::start_with_next(crl::guard(this, [=] {
+			) | rpl::on_next(crl::guard(this, [=] {
 				cancelEditing();
 			}), state->cancelLifetime);
 			editor->submitRequests(
-			) | rpl::start_with_next(save, editor->lifetime());
+			) | rpl::on_next(save, editor->lifetime());
 
 			box->setFocusCallback([=] {
 				editor->setInnerFocus();
diff --git a/Telegram/SourceFiles/window/themes/window_theme_editor_box.cpp b/Telegram/SourceFiles/window/themes/window_theme_editor_box.cpp
index c430b3e282..b9f5e59ed5 100644
--- a/Telegram/SourceFiles/window/themes/window_theme_editor_box.cpp
+++ b/Telegram/SourceFiles/window/themes/window_theme_editor_box.cpp
@@ -563,7 +563,7 @@ Fn<void()> SavePreparedTheme(
 		session->uploader().documentReady(
 		) | rpl::filter([=](const UploadedMedia &data) {
 			return (data.fullId == state->id) && data.info.thumb.has_value();
-		}) | rpl::start_with_next([=](const UploadedMedia &data) {
+		}) | rpl::on_next([=](const UploadedMedia &data) {
 			uploadTheme(data);
 		}, state->lifetime);
 
@@ -811,12 +811,12 @@ void SaveThemeBox(
 		cloud.slug.isEmpty() ? GenerateSlug() : cloud.slug,
 		window->account().session().createInternalLink(QString()));
 	linkWrap->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		link->resize(width, link->height());
 		link->moveToLeft(0, 0, width);
 	}, link->lifetime());
 	link->heightValue(
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		linkWrap->resize(linkWrap->width(), height);
 	}, link->lifetime());
 	link->setLinkPlaceholder(
diff --git a/Telegram/SourceFiles/window/themes/window_themes_cloud_list.cpp b/Telegram/SourceFiles/window/themes/window_themes_cloud_list.cpp
index 0971a1aef3..245c4f102c 100644
--- a/Telegram/SourceFiles/window/themes/window_themes_cloud_list.cpp
+++ b/Telegram/SourceFiles/window/themes/window_themes_cloud_list.cpp
@@ -357,12 +357,12 @@ void CloudList::setup() {
 		allShown()
 	) | rpl::map([=] {
 		return collectAll();
-	}) | rpl::start_with_next([=](std::vector<Data::CloudTheme> &&list) {
+	}) | rpl::on_next([=](std::vector<Data::CloudTheme> &&list) {
 		rebuildUsing(std::move(list));
 	}, _outer->lifetime());
 
 	_outer->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		updateGeometry();
 	}, _outer->lifetime());
 }
@@ -673,7 +673,7 @@ void CloudList::subscribeToDownloadFinished() {
 		return;
 	}
 	_window->session().downloaderTaskFinished(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto &&waiting = _elements | ranges::views::filter(&Element::waiting);
 		const auto still = ranges::count_if(waiting, [&](Element &element) {
 			if (!element.media) {
diff --git a/Telegram/SourceFiles/window/window_chat_preview.cpp b/Telegram/SourceFiles/window/window_chat_preview.cpp
index 68498ec087..c4c9ea9d2e 100644
--- a/Telegram/SourceFiles/window/window_chat_preview.cpp
+++ b/Telegram/SourceFiles/window/window_chat_preview.cpp
@@ -39,7 +39,7 @@ bool ChatPreviewManager::show(
 	cancelScheduled();
 	_topicLifetime.destroy();
 	if (const auto topic = row.key.topic()) {
-		_topicLifetime = topic->destroyed() | rpl::start_with_next([=] {
+		_topicLifetime = topic->destroyed() | rpl::on_next([=] {
 			_menu = nullptr;
 		});
 	} else if (!row.key) {
@@ -59,7 +59,7 @@ bool ChatPreviewManager::show(
 	const auto weakController = base::make_weak(_controller);
 	std::move(
 		preview.actions
-	) | rpl::start_with_next([=](HistoryView::ChatPreviewAction action) {
+	) | rpl::on_next([=](HistoryView::ChatPreviewAction action) {
 		if (const auto controller = weakController.get()) {
 			if (const auto thread = weakThread.get()) {
 				const auto itemId = action.openItemId;
@@ -109,7 +109,7 @@ bool ChatPreviewManager::schedule(
 	cancelScheduled();
 	_topicLifetime.destroy();
 	if (const auto topic = row.key.topic()) {
-		_topicLifetime = topic->destroyed() | rpl::start_with_next([=] {
+		_topicLifetime = topic->destroyed() | rpl::on_next([=] {
 			cancelScheduled();
 			_menu = nullptr;
 		});
diff --git a/Telegram/SourceFiles/window/window_chat_switch_process.cpp b/Telegram/SourceFiles/window/window_chat_switch_process.cpp
index 50ac601338..230038c6f3 100644
--- a/Telegram/SourceFiles/window/window_chat_switch_process.cpp
+++ b/Telegram/SourceFiles/window/window_chat_switch_process.cpp
@@ -297,14 +297,14 @@ void ChatSwitchProcess::setSelected(int index) {
 
 void ChatSwitchProcess::setupWidget(not_null<Ui::RpWidget*> geometry) {
 	geometry->geometryValue(
-	) | rpl::start_with_next([=](QRect value) {
+	) | rpl::on_next([=](QRect value) {
 		const auto parent = geometry->parentWidget();
 		_widget->setGeometry((parent == _widget->parentWidget())
 			? value
 			: QRect(QPoint(), value.size()));
 	}, _widget->lifetime());
 
-	_widget->events() | rpl::start_with_next([=](not_null<QEvent*> e) {
+	_widget->events() | rpl::on_next([=](not_null<QEvent*> e) {
 		if (e->type() == QEvent::MouseButtonPress) {
 			crl::on_main(_widget.get(), [=] {
 				_closeRequests.fire({});
@@ -343,7 +343,7 @@ void ChatSwitchProcess::setupContent(Data::Thread *opened) {
 			_userpics);
 		const auto raw = button.get();
 
-		raw->selectRequests() | rpl::start_with_next([=] {
+		raw->selectRequests() | rpl::on_next([=] {
 			const auto i = find(raw);
 			setSelected(int(i - begin(_entries)));
 		}, raw->lifetime());
@@ -362,7 +362,7 @@ void ChatSwitchProcess::setupContent(Data::Thread *opened) {
 		if (!destroyed) {
 			continue;
 		}
-		std::move(destroyed) | rpl::start_with_next([=] {
+		std::move(destroyed) | rpl::on_next([=] {
 			remove(thread);
 		}, raw->lifetime());
 	}
@@ -395,12 +395,12 @@ void ChatSwitchProcess::remove(not_null<Data::Thread*> thread) {
 }
 
 void ChatSwitchProcess::setupView() {
-	_widget->sizeValue() | rpl::start_with_next([=](QSize size) {
+	_widget->sizeValue() | rpl::on_next([=](QSize size) {
 		layout(size);
 	}, _view->lifetime());
 	_view->show();
 
-	_view->paintRequest() | rpl::start_with_next([=](QRect clip) {
+	_view->paintRequest() | rpl::on_next([=](QRect clip) {
 		if (_outer.isEmpty()) {
 			return;
 		}
@@ -410,7 +410,7 @@ void ChatSwitchProcess::setupView() {
 		_bg.paint(p, _outer);
 	}, _view->lifetime());
 
-	_view->events() | rpl::start_with_next([=](not_null<QEvent*> e) {
+	_view->events() | rpl::on_next([=](not_null<QEvent*> e) {
 		if (e->type() == QEvent::MouseButtonPress) {
 			e->accept();
 		}
diff --git a/Telegram/SourceFiles/window/window_connecting_widget.cpp b/Telegram/SourceFiles/window/window_connecting_widget.cpp
index ba3ee79093..1e18158aec 100644
--- a/Telegram/SourceFiles/window/window_connecting_widget.cpp
+++ b/Telegram/SourceFiles/window/window_connecting_widget.cpp
@@ -156,7 +156,7 @@ ConnectionState::Widget::ProxyIcon::ProxyIcon(QWidget *parent) : RpWidget(parent
 			st::connectingProxyOn.height()));
 
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		refreshCacheImages();
 	}, lifetime());
 
@@ -227,7 +227,7 @@ ConnectionState::ConnectionState(
 	rpl::combine(
 		std::move(shown),
 		visibility()
-	) | rpl::start_with_next([=](bool shown, float64 visible) {
+	) | rpl::on_next([=](bool shown, float64 visible) {
 		if (!shown || visible == 0.) {
 			_widget = nullptr;
 		} else if (!_widget) {
@@ -240,7 +240,7 @@ ConnectionState::ConnectionState(
 		rpl::merge(
 			rpl::single(rpl::empty),
 			checker.ready()
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			refreshState();
 		}, _lifetime);
 	}
@@ -248,7 +248,7 @@ ConnectionState::ConnectionState(
 	rpl::combine(
 		Core::App().settings().proxy().connectionTypeValue(),
 		rpl::single(QRect()) | rpl::then(_parent->paintRequest())
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		refreshState();
 	}, _lifetime);
 }
@@ -263,7 +263,7 @@ void ConnectionState::createWidget() {
 		visibility(),
 		_parent->heightValue(),
 		_bottomSkip.value()
-	) | rpl::start_with_next([=](float64 visible, int height, int skip) {
+	) | rpl::on_next([=](float64 visible, int height, int skip) {
 		_widget->moveToLeft(0, anim::interpolate(
 			height - st::connectingMargin.top(),
 			height - _widget->height() - skip,
@@ -271,7 +271,7 @@ void ConnectionState::createWidget() {
 	}, _widget->lifetime());
 
 	_widget->refreshStateRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		refreshState();
 	}, _widget->lifetime());
 }
@@ -510,7 +510,7 @@ ConnectionState::Widget::Widget(
 	});
 
 	_progress->animationStepRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_refreshStateRequests.fire({});
 	}, _progress->lifetime());
 }
diff --git a/Telegram/SourceFiles/window/window_controller.cpp b/Telegram/SourceFiles/window/window_controller.cpp
index ba982ec0df..719c1a214e 100644
--- a/Telegram/SourceFiles/window/window_controller.cpp
+++ b/Telegram/SourceFiles/window/window_controller.cpp
@@ -168,13 +168,13 @@ void Controller::showAccount(
 
 	if (!isPrimary()) {
 		_id.account->sessionChanges(
-		) | rpl::start_with_next([=](Main::Session *session) {
+		) | rpl::on_next([=](Main::Session *session) {
 			Core::App().closeWindow(this);
 		}, _accountLifetime);
 	}
 
 	_id.account->sessionValue(
-	) | rpl::start_with_next([=](Main::Session *session) {
+	) | rpl::on_next([=](Main::Session *session) {
 		const auto was = base::take(_sessionController);
 		_sessionController = session
 			? std::make_unique<SessionController>(session, this)
@@ -190,12 +190,12 @@ void Controller::showAccount(
 			session->updates().isIdleValue(
 			) | rpl::filter([=](bool idle) {
 				return !idle;
-			}) | rpl::start_with_next([=] {
+			}) | rpl::on_next([=] {
 				widget()->checkActivation();
 			}, _sessionController->lifetime());
 
 			session->termsLockValue(
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				checkLockByTerms();
 				_widget.updateGlobalMenu();
 			}, _sessionController->lifetime());
@@ -203,7 +203,7 @@ void Controller::showAccount(
 			widget()->setInnerFocus();
 
 			_sessionController->activeChatChanges(
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				_widget.updateTitle();
 			}, _sessionController->lifetime());
 			_widget.updateTitle();
@@ -231,7 +231,7 @@ void Controller::setupSideBar() {
 		return;
 	}
 	_sessionController->filtersMenuChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		sideBarChanged();
 	}, _sessionController->lifetime());
 
@@ -265,7 +265,7 @@ void Controller::checkLockByTerms() {
 
 	const auto id = data->id;
 	box->agreeClicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto mention = box ? box->lastClickedMention() : QString();
 		box->closeBox();
 		if (const auto session = account().maybeSession()) {
@@ -278,7 +278,7 @@ void Controller::checkLockByTerms() {
 	}, box->lifetime());
 
 	box->cancelClicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		showTermsDecline();
 	}, box->lifetime());
 
@@ -297,7 +297,7 @@ void Controller::showTermsDecline() {
 		true));
 
 	box->agreeClicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (box) {
 			box->closeBox();
 		}
@@ -305,7 +305,7 @@ void Controller::showTermsDecline() {
 	}, box->lifetime());
 
 	box->cancelClicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (box) {
 			box->closeBox();
 		}
diff --git a/Telegram/SourceFiles/window/window_filters_menu.cpp b/Telegram/SourceFiles/window/window_filters_menu.cpp
index b23efa32f9..22e4cc1129 100644
--- a/Telegram/SourceFiles/window/window_filters_menu.cpp
+++ b/Telegram/SourceFiles/window/window_filters_menu.cpp
@@ -70,7 +70,7 @@ void FiltersMenu::setup() {
 	_outer.setAttribute(Qt::WA_OpaquePaintEvent);
 	_outer.show();
 	_outer.paintRequest(
-	) | rpl::start_with_next([=](QRect clip) {
+	) | rpl::on_next([=](QRect clip) {
 		auto p = QPainter(&_outer);
 		p.setPen(Qt::NoPen);
 		p.setBrush(st::windowFiltersButton.textBg);
@@ -78,7 +78,7 @@ void FiltersMenu::setup() {
 	}, _outer.lifetime());
 
 	_parent->heightValue(
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		const auto width = st::windowFiltersWidth;
 		_outer.setGeometry({ 0, 0, width, height });
 		_menu.resizeToWidth(width);
@@ -95,7 +95,7 @@ void FiltersMenu::setup() {
 	rpl::combine(
 		rpl::single(rpl::empty) | rpl::then(filters->changed()),
 		std::move(premium)
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		refresh();
 	}, _outer.lifetime());
 
@@ -103,7 +103,7 @@ void FiltersMenu::setup() {
 	_session->activeChatsFilter(
 	) | rpl::filter([=](FilterId id) {
 		return (id != _activeFilterId);
-	}) | rpl::start_with_next([=](FilterId id) {
+	}) | rpl::on_next([=](FilterId id) {
 		if (!_list) {
 			_activeFilterId = id;
 			return;
@@ -129,7 +129,7 @@ void FiltersMenu::setup() {
 void FiltersMenu::setupMainMenuIcon() {
 	OtherAccountsUnreadState(
 		&_session->session().account()
-	) | rpl::start_with_next([=](const OthersUnreadState &state) {
+	) | rpl::on_next([=](const OthersUnreadState &state) {
 		const auto icon = !state.count
 			? nullptr
 			: !state.allMuted
@@ -223,7 +223,7 @@ void FiltersMenu::setupList() {
 	_reorder = std::make_unique<Ui::VerticalLayoutReorder>(_list, &_scroll);
 
 	_reorder->updates(
-	) | rpl::start_with_next([=](Ui::VerticalLayoutReorder::Single data) {
+	) | rpl::on_next([=](Ui::VerticalLayoutReorder::Single data) {
 		using State = Ui::VerticalLayoutReorder::State;
 		if (data.state == State::Started) {
 			++_reordering;
@@ -279,7 +279,7 @@ base::unique_qptr<Ui::SideBarButton> FiltersMenu::prepareButton(
 		rpl::combine(
 			Data::UnreadStateValue(&_session->session(), id),
 			Data::IncludeMutedCounterFoldersValue()
-		) | rpl::start_with_next([=](
+		) | rpl::on_next([=](
 				const Dialogs::UnreadState &state,
 				bool includeMuted) {
 			const auto chats = state.chats;
@@ -318,7 +318,7 @@ base::unique_qptr<Ui::SideBarButton> FiltersMenu::prepareButton(
 				|| e->type() == QEvent::DragEnter
 				|| e->type() == QEvent::DragMove
 				|| e->type() == QEvent::DragLeave;
-		}) | rpl::start_with_next([=](not_null<QEvent*> e) {
+		}) | rpl::on_next([=](not_null<QEvent*> e) {
 			if (raw->locked()) {
 				return;
 			}
@@ -353,7 +353,7 @@ void FiltersMenu::openFiltersSettings() {
 		_waitingSuggested = true;
 		filters->requestSuggested();
 		filters->suggestedUpdated(
-		) | rpl::take(1) | rpl::start_with_next([=] {
+		) | rpl::take(1) | rpl::on_next([=] {
 			_session->showSettings(Settings::Folders::Id());
 		}, _outer.lifetime());
 	}
diff --git a/Telegram/SourceFiles/window/window_history_hider.cpp b/Telegram/SourceFiles/window/window_history_hider.cpp
index 134bd45ee3..13972cfa5f 100644
--- a/Telegram/SourceFiles/window/window_history_hider.cpp
+++ b/Telegram/SourceFiles/window/window_history_hider.cpp
@@ -21,7 +21,7 @@ HistoryHider::HistoryHider(QWidget *parent, const QString &text)
 : RpWidget(parent)
 , _text(text) {
 	Lang::Updated(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		refreshLang();
 	}, lifetime());
 
diff --git a/Telegram/SourceFiles/window/window_lock_widgets.cpp b/Telegram/SourceFiles/window/window_lock_widgets.cpp
index 3e2f6cb0ce..13160a7763 100644
--- a/Telegram/SourceFiles/window/window_lock_widgets.cpp
+++ b/Telegram/SourceFiles/window/window_lock_widgets.cpp
@@ -150,7 +150,7 @@ void PasscodeLockWidget::setupSystemUnlockInfo() {
 		std::move(text),
 		st::passcodeSystemUnlockLater);
 	_logout->geometryValue(
-	) | rpl::start_with_next([=](QRect logout) {
+	) | rpl::on_next([=](QRect logout) {
 		info->resizeToWidth(width()
 			- st::boxRowPadding.left()
 			- st::boxRowPadding.right());
@@ -167,7 +167,7 @@ void PasscodeLockWidget::setupSystemUnlock() {
 		return active
 			&& !_systemUnlockSuggested
 			&& !_systemUnlockCooldown.isActive();
-	}) | rpl::start_with_next([=](bool) {
+	}) | rpl::on_next([=](bool) {
 		[[maybe_unused]] auto refresh = base::SystemUnlockStatus();
 		suggestSystemUnlock();
 	}, lifetime());
@@ -178,7 +178,7 @@ void PasscodeLockWidget::setupSystemUnlock() {
 	if (!Platform::IsWindows()) {
 		using namespace base;
 		_systemUnlockAllowed.value(
-		) | rpl::start_with_next([=](SystemUnlockType type) {
+		) | rpl::on_next([=](SystemUnlockType type) {
 			const auto icon = (type == SystemUnlockType::Biometrics)
 				? &st::passcodeSystemTouchID
 				: (type == SystemUnlockType::Companion)
@@ -189,7 +189,7 @@ void PasscodeLockWidget::setupSystemUnlock() {
 	}
 	button->showOn(_systemUnlockAllowed.value(
 	) | rpl::map(rpl::mappers::_1 != SystemUnlockType::None));
-	_passcode->sizeValue() | rpl::start_with_next([=](QSize size) {
+	_passcode->sizeValue() | rpl::on_next([=](QSize size) {
 		button->moveToRight(0, size.height() - button->height());
 	}, button->lifetime());
 	button->setClickedCallback([=] {
@@ -211,7 +211,7 @@ void PasscodeLockWidget::suggestSystemUnlock() {
 		_systemUnlockAllowed.value(
 		) | rpl::filter(
 			rpl::mappers::_1 != SystemUnlockType::None
-		) | rpl::take(1) | rpl::start_with_next([=] {
+		) | rpl::take(1) | rpl::on_next([=] {
 			const auto weak = base::make_weak(this);
 			const auto done = [weak](SystemUnlockResult result) {
 				crl::on_main([=] {
@@ -443,12 +443,12 @@ void TermsBox::prepare() {
 
 	if (age) {
 		age->entity()->checkedChanges(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			toggleAgeError(false);
 		}, age->lifetime());
 
 		heightValue(
-		) | rpl::start_with_next([=](int height) {
+		) | rpl::on_next([=](int height) {
 			age->moveToLeft(0, height - age->height());
 		}, age->lifetime());
 	}
@@ -460,7 +460,7 @@ void TermsBox::prepare() {
 		content->heightValue(),
 		age ? age->heightValue() : rpl::single(0),
 		_1 + _2
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		setDimensions(st::boxWideWidth, height);
 	}, content->lifetime());
 }
diff --git a/Telegram/SourceFiles/window/window_main_menu.cpp b/Telegram/SourceFiles/window/window_main_menu.cpp
index 66d6ac88bf..35bbc158bf 100644
--- a/Telegram/SourceFiles/window/window_main_menu.cpp
+++ b/Telegram/SourceFiles/window/window_main_menu.cpp
@@ -164,7 +164,7 @@ MainMenu::ToggleAccountsButton::ToggleAccountsButton(
 , _current(current) {
 	rpl::single(rpl::empty) | rpl::then(
 		Core::App().unreadBadgeChanges()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_unreadBadgeStale = true;
 		if (!_toggled) {
 			validateUnreadBadge();
@@ -180,7 +180,7 @@ MainMenu::ToggleAccountsButton::ToggleAccountsButton(
 	settings.mainMenuAccountsShownValue(
 	) | rpl::filter([=](bool value) {
 		return (_toggled != value);
-	}) | rpl::start_with_next([=](bool value) {
+	}) | rpl::on_next([=](bool value) {
 		_toggled = value;
 		_toggledAnimation.start(
 			[=] { update(); },
@@ -352,7 +352,7 @@ MainMenu::MainMenu(
 
 	const auto shadow = Ui::CreateChild<Ui::PlainShadow>(this);
 	widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		const auto line = st::lineWidth;
 		shadow->setGeometry(0, st::mainMenuCoverHeight - line, width, line);
 	}, shadow->lifetime());
@@ -368,7 +368,7 @@ MainMenu::MainMenu(
 	});
 
 	_footer->heightValue(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_telegram->moveToLeft(st::mainMenuFooterLeft, _footer->height() - st::mainMenuTelegramBottom - _telegram->height());
 		_version->moveToLeft(st::mainMenuFooterLeft, _footer->height() - st::mainMenuVersionBottom - _version->height());
 	}, _footer->lifetime());
@@ -376,7 +376,7 @@ MainMenu::MainMenu(
 	rpl::combine(
 		heightValue(),
 		_inner->heightValue()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateInnerControlsGeometry();
 	}, _inner->lifetime());
 
@@ -409,7 +409,7 @@ MainMenu::MainMenu(
 	rpl::combine(
 		_toggleAccounts->rightSkipValue(),
 		rpl::single(rpl::empty) | rpl::then(_badge->updated())
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		moveBadge();
 	}, lifetime());
 	_badge->setPremiumClickCallback([=] {
@@ -417,7 +417,7 @@ MainMenu::MainMenu(
 	});
 
 	_controller->session().downloaderTaskFinished(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		update();
 	}, lifetime());
 
@@ -431,18 +431,18 @@ MainMenu::MainMenu(
 				[=](const QRect &r) { snowRaw->update(r); });
 			snow->setBrush(QColor(230, 230, 230));
 			_showFinished.value(
-			) | rpl::start_with_next([=](bool shown) {
+			) | rpl::on_next([=](bool shown) {
 				snow->setPaused(!shown);
 			}, snowRaw->lifetime());
 			snowRaw->paintRequest(
-			) | rpl::start_with_next([=](const QRect &r) {
+			) | rpl::on_next([=](const QRect &r) {
 				auto p = Painter(snowRaw);
 				p.fillRect(r, st::mainMenuBg);
 				drawName(p);
 				snow->paint(p, snowRaw->rect());
 			}, snowRaw->lifetime());
 			widthValue(
-			) | rpl::start_with_next([=](int width) {
+			) | rpl::on_next([=](int width) {
 				snowRaw->setGeometry(0, 0, width, st::mainMenuCoverHeight);
 			}, snowRaw->lifetime());
 			snowRaw->show();
@@ -451,7 +451,7 @@ MainMenu::MainMenu(
 			snowLifetime->add([=] { base::unique_qptr{ snowRaw }; });
 		};
 		Window::Theme::IsNightModeValue(
-		) | rpl::start_with_next([=](bool isNightMode) {
+		) | rpl::on_next([=](bool isNightMode) {
 			snowLifetime->destroy();
 			if (isNightMode) {
 				rebuild();
@@ -523,7 +523,7 @@ void MainMenu::setupArchive() {
 		{ 0, st::mainMenuSkip, 0, st::mainMenuSkip });
 	button->setAcceptBoth(true);
 	button->clicks(
-	) | rpl::start_with_next([=](Qt::MouseButton which) {
+	) | rpl::on_next([=](Qt::MouseButton which) {
 		if (which == Qt::LeftButton) {
 			showArchive(button->clickModifiers());
 			return;
@@ -572,7 +572,7 @@ void MainMenu::setupArchive() {
 		controller->session().data().stories().sourcesChanged(
 			Data::StorySourcesList::Hidden
 		)
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto isArchiveVisible = checkArchive();
 		wrap->toggle(isArchiveVisible, anim::type::normal);
 		if (!isArchiveVisible) {
@@ -603,7 +603,7 @@ void MainMenu::setupAccounts() {
 
 	std::move(
 		events.closeRequests
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		closeLayer();
 	}, inner->lifetime());
 
@@ -717,7 +717,7 @@ void MainMenu::setupMenu() {
 		)->toggleOn(rpl::single(
 			_controller->session().settings().supportFixChatsOrder()
 		))->toggledChanges(
-		) | rpl::start_with_next([=](bool fix) {
+		) | rpl::on_next([=](bool fix) {
 			_controller->session().settings().setSupportFixChatsOrder(fix);
 			_controller->session().saveSettings();
 		}, _menu->lifetime());
@@ -744,7 +744,7 @@ void MainMenu::setupMenu() {
 	_nightThemeToggle->toggledChanges(
 	) | rpl::filter([=](bool night) {
 		return (night != Window::Theme::IsNightMode());
-	}) | rpl::start_with_next([=](bool night) {
+	}) | rpl::on_next([=](bool night) {
 		if (Window::Theme::Background()->editingTheme()) {
 			_nightThemeSwitches.fire(!night);
 			controller->show(Ui::MakeInformBox(
@@ -766,7 +766,7 @@ void MainMenu::setupMenu() {
 	}, _nightThemeToggle->lifetime());
 
 	Core::App().settings().systemDarkModeValue(
-	) | rpl::start_with_next([=](std::optional<bool> darkMode) {
+	) | rpl::on_next([=](std::optional<bool> darkMode) {
 		const auto darkModeEnabled
 			= Core::App().settings().systemDarkModeEnabled();
 		if (darkModeEnabled && darkMode.has_value()) {
@@ -891,7 +891,7 @@ void MainMenu::initResetScaleButton() {
 		return (available.width() >= st::windowMinWidth)
 			&& (available.height() >= st::windowMinHeight);
 	}) | rpl::distinct_until_changed(
-	) | rpl::start_with_next([=](bool good) {
+	) | rpl::on_next([=](bool good) {
 		if (good) {
 			_resetScaleButton.destroy();
 		} else {
diff --git a/Telegram/SourceFiles/window/window_main_menu_helpers.cpp b/Telegram/SourceFiles/window/window_main_menu_helpers.cpp
index 0a05a3371e..dec2126b2c 100644
--- a/Telegram/SourceFiles/window/window_main_menu_helpers.cpp
+++ b/Telegram/SourceFiles/window/window_main_menu_helpers.cpp
@@ -112,7 +112,7 @@ not_null<Ui::SettingsButton*> AddMyChannelsBox(
 	const auto addIcon = [=](not_null<Ui::GenericBox*> box) {
 		const auto widget = box->addRow(object_ptr<Ui::RpWidget>(box));
 		widget->paintRequest(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			auto p = QPainter(widget);
 			p.setFont(st::boxTextFont);
 			p.setPen(st::windowSubTextFg);
@@ -139,7 +139,7 @@ not_null<Ui::SettingsButton*> AddMyChannelsBox(
 				const auto icon = owned.get();
 				widget->lifetime().add([kept = std::move(owned)]{});
 				widget->paintRequest(
-				) | rpl::start_with_next([=] {
+				) | rpl::on_next([=] {
 					auto p = QPainter(widget);
 					icon->paint(p, (widget->width() - icon->width()) / 2, 0);
 				}, widget->lifetime());
@@ -197,7 +197,7 @@ not_null<Ui::SettingsButton*> AddMyChannelsBox(
 							lt_count,
 							count)
 					: QString());
-			row->paintRequest() | rpl::start_with_next([=] {
+			row->paintRequest() | rpl::on_next([=] {
 				auto p = QPainter(row);
 				const auto &st = st::defaultPeerListItem;
 				const auto availableWidth = row->width()
@@ -317,7 +317,7 @@ void SetupMenuBots(
 		rpl::empty
 	) | rpl::then(
 		bots->attachBotsUpdates()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto width = container->widthNoMargins();
 		wrap->clear();
 		for (const auto &bot : bots->attachBots()) {
@@ -328,7 +328,7 @@ void SetupMenuBots(
 				if (!*iconLoadLifetime) {
 					auto &session = user->session();
 					*iconLoadLifetime = session.downloaderTaskFinished(
-					) | rpl::start_with_next([=] {
+					) | rpl::on_next([=] {
 						if (media->loaded()) {
 							iconLoadLifetime->destroy();
 							bots->notifyBotIconLoaded();
@@ -348,7 +348,7 @@ void SetupMenuBots(
 				button,
 				bot.media);
 			button->heightValue(
-			) | rpl::start_with_next([=](int height) {
+			) | rpl::on_next([=](int height) {
 				icon->move(
 					st::mainMenuButton.iconLeft,
 					(height - icon->height()) / 2);
@@ -357,7 +357,7 @@ void SetupMenuBots(
 			const auto show = controller->uiShow();
 			button->setAcceptBoth(true);
 			button->clicks(
-			) | rpl::start_with_next([=](Qt::MouseButton which) {
+			) | rpl::on_next([=](Qt::MouseButton which) {
 				if (which == Qt::LeftButton) {
 					bots->open({
 						.bot = user,
diff --git a/Telegram/SourceFiles/window/window_media_preview.cpp b/Telegram/SourceFiles/window/window_media_preview.cpp
index e71e98aac1..7befad08c7 100644
--- a/Telegram/SourceFiles/window/window_media_preview.cpp
+++ b/Telegram/SourceFiles/window/window_media_preview.cpp
@@ -46,12 +46,12 @@ MediaPreviewWidget::MediaPreviewWidget(
 , _emojiSize(Ui::Emoji::GetSizeLarge() / style::DevicePixelRatio()) {
 	setAttribute(Qt::WA_TransparentForMouseEvents);
 	_controller->session().downloaderTaskFinished(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		update();
 	}, lifetime());
 
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (_document && _document->emojiUsesTextColor()) {
 			_cache = QPixmap();
 		}
@@ -428,9 +428,9 @@ void MediaPreviewWidget::setupLottie() {
 		});
 	};
 
-	_lottie->updates() | rpl::start_with_next(handler, lifetime());
+	_lottie->updates() | rpl::on_next(handler, lifetime());
 	if (_effect) {
-		_effect->updates() | rpl::start_with_next(handler, lifetime());
+		_effect->updates() | rpl::on_next(handler, lifetime());
 	}
 }
 
diff --git a/Telegram/SourceFiles/window/window_peer_menu.cpp b/Telegram/SourceFiles/window/window_peer_menu.cpp
index 8f355aa290..6aadf722b6 100644
--- a/Telegram/SourceFiles/window/window_peer_menu.cpp
+++ b/Telegram/SourceFiles/window/window_peer_menu.cpp
@@ -189,7 +189,7 @@ void SetActionText(not_null<QAction*> action, rpl::producer<QString> &&text) {
 	const auto lifetime = Ui::CreateChild<rpl::lifetime>(action.get());
 	std::move(
 		text
-	) | rpl::start_with_next([=](const QString &actionText) {
+	) | rpl::on_next([=](const QString &actionText) {
 		action->setText(actionText);
 	}, *lifetime);
 }
@@ -1016,7 +1016,7 @@ void Filler::addBotToGroup() {
 	}
 	[[maybe_unused]] const auto lifetime = Info::Profile::InviteToChatButton(
 		user
-	) | rpl::take(1) | rpl::start_with_next([=](QString label) {
+	) | rpl::take(1) | rpl::on_next([=](QString label) {
 		if (!label.isEmpty()) {
 			const auto controller = _controller;
 			_addAction(
@@ -2039,7 +2039,7 @@ void PeerMenuCreatePoll(
 		}));
 	};
 	box->submitRequests(
-	) | rpl::start_with_next(state->create, box->lifetime());
+	) | rpl::on_next(state->create, box->lifetime());
 	controller->show(std::move(box), Ui::LayerOption::CloseOther);
 }
 
@@ -2149,7 +2149,7 @@ void PeerMenuCreateTodoList(
 		}));
 	};
 	box->submitRequests(
-	) | rpl::start_with_next(state->create, box->lifetime());
+	) | rpl::on_next(state->create, box->lifetime());
 	controller->show(std::move(box), Ui::LayerOption::CloseOther);
 }
 
@@ -2167,7 +2167,7 @@ void PeerMenuEditTodoList(
 	auto box = Box<EditTodoListBox>(controller, item);
 	const auto weak = base::make_weak(box);
 	box->submitRequests(
-	) | rpl::start_with_next([=](const EditTodoListBox::Result &result) {
+	) | rpl::on_next([=](const EditTodoListBox::Result &result) {
 		const auto api = &item->history()->session().api();
 		api->todoLists().edit(
 			item,
@@ -2208,7 +2208,7 @@ void PeerMenuAddTodoListTasks(
 	auto box = Box<AddTodoListTasksBox>(controller, item);
 	const auto raw = box.data();
 	box->submitRequests(
-	) | rpl::start_with_next([=](const AddTodoListTasksBox::Result &result) {
+	) | rpl::on_next([=](const AddTodoListTasksBox::Result &result) {
 		const auto show = raw->uiShow();
 		raw->closeBox();
 		session->api().todoLists().add(
@@ -2497,7 +2497,7 @@ object_ptr<Ui::BoxContent> PrepareChooseRecipientBox(
 			state->starsToSend = perMessage;
 		};
 		raw->selectionChanges(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			box->clearButtons();
 			state->refreshStarsToSend();
 			const auto shown = raw->hasSelected();
@@ -2532,7 +2532,7 @@ object_ptr<Ui::BoxContent> PrepareChooseRecipientBox(
 					if (!waiting.empty()) {
 						session->changes().peerUpdates(
 							Data::PeerUpdate::Flag::FullInfo
-						) | rpl::start_with_next([=](const Data::PeerUpdate &update) {
+						) | rpl::on_next([=](const Data::PeerUpdate &update) {
 							if (waiting.contains(update.peer)) {
 								withPaymentApproved(alreadyApproved);
 							}
@@ -2542,7 +2542,7 @@ object_ptr<Ui::BoxContent> PrepareChooseRecipientBox(
 							session->credits().loadedValue(
 							) | rpl::filter(
 								rpl::mappers::_1
-							) | rpl::take(1) | rpl::start_with_next([=] {
+							) | rpl::take(1) | rpl::on_next([=] {
 								withPaymentApproved(alreadyApproved);
 							}, state->submitLifetime);
 						}
@@ -2816,10 +2816,10 @@ base::weak_qptr<Ui::BoxContent> ShowForwardMessagesBox(
 					});
 					return lifetime;
 				})
-			) | rpl::start_with_next([box](int h, bool hasQuery) {
+			) | rpl::on_next([box](int h, bool hasQuery) {
 				box->setAddedTopScrollSkip(hasQuery ? 0 : h);
 			}, box->lifetime());
-			box->multiSelectHeightValue() | rpl::start_with_next([=](int h) {
+			box->multiSelectHeightValue() | rpl::on_next([=](int h) {
 				chatsFilters->moveToLeft(0, h);
 			}, chatsFilters->lifetime());
 		};
@@ -2875,7 +2875,7 @@ base::weak_qptr<Ui::BoxContent> ShowForwardMessagesBox(
 			}
 		};
 		state->controller->singleChosen(
-		) | rpl::start_with_next(std::move(callback), state->box->lifetime());
+		) | rpl::on_next(std::move(callback), state->box->lifetime());
 	}
 
 	const auto comment = Ui::CreateChild<Ui::SlideWrap<Ui::InputField>>(
@@ -2930,7 +2930,7 @@ base::weak_qptr<Ui::BoxContent> ShowForwardMessagesBox(
 			if (!waiting.empty()) {
 				session->changes().peerUpdates(
 					Data::PeerUpdate::Flag::FullInfo
-				) | rpl::start_with_next([=](const Data::PeerUpdate &update) {
+				) | rpl::on_next([=](const Data::PeerUpdate &update) {
 					if (waiting.contains(update.peer)) {
 						withPaymentApproved(alreadyApproved);
 					}
@@ -2940,7 +2940,7 @@ base::weak_qptr<Ui::BoxContent> ShowForwardMessagesBox(
 					session->credits().loadedValue(
 					) | rpl::filter(
 						rpl::mappers::_1
-					) | rpl::take(1) | rpl::start_with_next([=] {
+					) | rpl::take(1) | rpl::on_next([=] {
 						withPaymentApproved(alreadyApproved);
 					}, state->submitLifetime);
 				}
@@ -3010,7 +3010,7 @@ base::weak_qptr<Ui::BoxContent> ShowForwardMessagesBox(
 					nullptr);
 				std::move(
 					text
-				) | rpl::start_with_next([action = item->action()](
+				) | rpl::on_next([action = item->action()](
 						QString text) {
 					action->setText(text);
 				}, item->lifetime());
@@ -3064,7 +3064,7 @@ base::weak_qptr<Ui::BoxContent> ShowForwardMessagesBox(
 	rpl::combine(
 		state->box->sizeValue(),
 		comment->heightValue()
-	) | rpl::start_with_next([=](const QSize &size, int commentHeight) {
+	) | rpl::on_next([=](const QSize &size, int commentHeight) {
 		comment->moveToLeft(0, size.height() - commentHeight);
 		comment->resizeToWidth(size.width());
 
@@ -3072,7 +3072,7 @@ base::weak_qptr<Ui::BoxContent> ShowForwardMessagesBox(
 	}, comment->lifetime());
 
 	field->submits(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (const auto onstack = state->submit) {
 			onstack({});
 		}
@@ -3086,21 +3086,21 @@ base::weak_qptr<Ui::BoxContent> ShowForwardMessagesBox(
 		},
 	});
 	field->setSubmitSettings(Core::App().settings().sendSubmitWay());
-	field->changes() | rpl::start_with_next([=] {
+	field->changes() | rpl::on_next([=] {
 		state->refreshStarsToSend();
 	}, field->lifetime());
 
 	Ui::SendPendingMoveResizeEvents(comment);
 
 	state->box->focusRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (!comment->isHidden()) {
 			comment->entity()->setFocusFast();
 		}
 	}, comment->lifetime());
 
 	state->controller->selectionChanges(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto shown = state->controller->hasSelected();
 
 		state->box->clearButtons();
@@ -3115,7 +3115,7 @@ base::weak_qptr<Ui::BoxContent> ShowForwardMessagesBox(
 				});
 			send->setAcceptBoth();
 			send->clicks(
-			) | rpl::start_with_next([=](Qt::MouseButton button) {
+			) | rpl::on_next([=](Qt::MouseButton button) {
 				if (button == Qt::RightButton) {
 					showMenu(send);
 				}
@@ -3236,7 +3236,7 @@ base::weak_qptr<Ui::BoxContent> ShowDropMediaBox(
 		});
 
 		forum->destroyed(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			box->closeBox();
 		}, box->lifetime());
 	};
@@ -3276,7 +3276,7 @@ base::weak_qptr<Ui::BoxContent> ShowDropMediaBox(
 		});
 
 		monoforum->destroyed(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			box->closeBox();
 		}, box->lifetime());
 	};
@@ -3883,7 +3883,7 @@ void PeerMenuConfirmToggleFee(
 			rpl::variable<int>
 		>();
 		*paid = paidAmount->value();
-		paid->value() | rpl::start_with_next([=](int already) {
+		paid->value() | rpl::on_next([=](int already) {
 			if (!already) {
 				delete base::take(*refund).get();
 			} else if (!*refund) {
diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp
index 857986c1ba..1e5f9c1346 100644
--- a/Telegram/SourceFiles/window/window_session_controller.cpp
+++ b/Telegram/SourceFiles/window/window_session_controller.cpp
@@ -869,7 +869,7 @@ void SessionNavigation::resolveBoostState(
 			.group = channel->isMegagroup(),
 		}, submit));
 		if (lifting) {
-			box->boxClosing() | rpl::start_with_next([=] {
+			box->boxClosing() | rpl::on_next([=] {
 				if (*boosted) {
 					channel->updateFullForced();
 				}
@@ -1550,14 +1550,14 @@ SessionController::SessionController(
 
 	pushDefaultChatBackground();
 	Theme::Background()->updates(
-	) | rpl::start_with_next([=](const Theme::BackgroundUpdate &update) {
+	) | rpl::on_next([=](const Theme::BackgroundUpdate &update) {
 		if (update.type == Theme::BackgroundUpdate::Type::New
 			|| update.type == Theme::BackgroundUpdate::Type::Changed) {
 			pushDefaultChatBackground();
 		}
 	}, _lifetime);
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		for (auto &[key, value] : _customChatThemes) {
 			if (!key.theme.id) {
 				value.theme.reset();
@@ -1588,7 +1588,7 @@ SessionController::SessionController(
 		}
 		return (update.flags & Data::PeerUpdate::Flag::FullInfo)
 			&& (update.peer == _showEditPeer);
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		show(Box<EditPeerInfoBox>(this, base::take(_showEditPeer)));
 	}, lifetime());
 
@@ -1598,7 +1598,7 @@ SessionController::SessionController(
 			&& (folder == _openedFolder.current())
 			&& folder->chatsList()->indexed()->empty()
 			&& !folder->storiesCount();
-	}) | rpl::start_with_next([=](Data::Folder *folder) {
+	}) | rpl::on_next([=](Data::Folder *folder) {
 		folder->updateChatListSortPosition();
 		closeFolder();
 	}, lifetime());
@@ -1619,7 +1619,7 @@ SessionController::SessionController(
 		enoughSpaceForFiltersValue() | rpl::skip(1) | rpl::to_empty,
 		Core::App().settings().chatFiltersHorizontalChanges() | rpl::to_empty,
 		session->data().chatsFilters().changed()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (!_filtersActivated) {
 			processFiltersMenu();
 		}
@@ -1628,7 +1628,7 @@ SessionController::SessionController(
 	}, lifetime());
 
 	session->data().itemIdChanged(
-	) | rpl::start_with_next([=](Data::Session::IdChange change) {
+	) | rpl::on_next([=](Data::Session::IdChange change) {
 		const auto current = _activeChatEntry.current();
 		if (const auto topic = current.key.topic()) {
 			if (topic->rootId() == change.oldId) {
@@ -1649,7 +1649,7 @@ SessionController::SessionController(
 	}, lifetime());
 
 	session->api().globalPrivacy().suggestArchiveAndMute(
-	) | rpl::take(1) | rpl::start_with_next([=] {
+	) | rpl::take(1) | rpl::on_next([=] {
 		session->api().globalPrivacy().reload(crl::guard(this, [=] {
 			if (!session->api().globalPrivacy().archiveAndMuteCurrent()) {
 				suggestArchiveAndMute();
@@ -1658,12 +1658,12 @@ SessionController::SessionController(
 	}, _lifetime);
 
 	session->downloader().nonPremiumDelays(
-	) | rpl::start_with_next([=](DocumentId id) {
+	) | rpl::on_next([=](DocumentId id) {
 		checkNonPremiumLimitToastDownload(id);
 	}, _lifetime);
 
 	session->uploader().nonPremiumDelays(
-	) | rpl::start_with_next([=](FullMsgId id) {
+	) | rpl::on_next([=](FullMsgId id) {
 		checkNonPremiumLimitToastUpload(id);
 	}, _lifetime);
 
@@ -1732,7 +1732,7 @@ void SessionController::suggestArchiveAndMute() {
 		});
 		box->setCloseByOutsideClick(false);
 		box->boxClosing(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			crl::on_main(weak, [=] {
 				auto &privacy = session().api().globalPrivacy();
 				privacy.dismissArchiveAndMuteSuggestion();
@@ -1804,7 +1804,7 @@ void SessionController::setupShortcuts() {
 			&& (_chatSwitchProcess
 				|| (request.started
 					&& (Core::App().activeWindow() == &window())));
-	}) | rpl::start_with_next([=](const ChatSwitchRequest &request) {
+	}) | rpl::on_next([=](const ChatSwitchRequest &request) {
 		if (!_chatSwitchProcess) {
 			_chatSwitchProcess = std::make_unique<ChatSwitchProcess>(
 				widget()->bodyWidget(),
@@ -1817,7 +1817,7 @@ void SessionController::setupShortcuts() {
 			};
 
 			_chatSwitchProcess->chosen(
-			) | rpl::start_with_next([=](not_null<Data::Thread*> thread) {
+			) | rpl::on_next([=](not_null<Data::Thread*> thread) {
 				close();
 
 				const auto id = SeparateId(thread);
@@ -1829,7 +1829,7 @@ void SessionController::setupShortcuts() {
 			}, _chatSwitchProcess->lifetime());
 
 			_chatSwitchProcess->closeRequests(
-			) | rpl::start_with_next(close, _chatSwitchProcess->lifetime());
+			) | rpl::on_next(close, _chatSwitchProcess->lifetime());
 		}
 		_chatSwitchProcess->process(request);
 	}, _lifetime);
@@ -1839,7 +1839,7 @@ void SessionController::setupShortcuts() {
 		return (Core::App().activeWindow() == &window())
 			&& !isLayerShown()
 			&& !window().locked();
-	}) | rpl::start_with_next([=](not_null<Request*> request) {
+	}) | rpl::on_next([=](not_null<Request*> request) {
 		using C = Command;
 
 		const auto app = &Core::App();
@@ -2040,14 +2040,14 @@ void SessionController::showForum(
 	}
 
 	forum->destroyed(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		closeAndShowHistory(false);
 	}, _shownForumLifetime);
 	if (!forced) {
 		using FlagChange = Data::Flags<ChannelDataFlags>::Change;
 		if (const auto channel = forum->channel()) {
 			channel->flagsValue(
-			) | rpl::start_with_next([=](FlagChange change) {
+			) | rpl::on_next([=](FlagChange change) {
 				if (change.diff & ChannelDataFlag::ForumTabs) {
 					if (HistoryView::SubsectionTabs::UsedFor(history)) {
 						closeAndShowHistory(true);
@@ -2090,7 +2090,7 @@ void SessionController::setupPremiumToast() {
 	) | rpl::filter([=](bool premium) {
 		session().mtp().requestConfig();
 		return premium;
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		MainWindowShow(this).showToast({
 			.text = { tr::lng_premium_success(tr::now) },
 			.adaptive = true,
@@ -2127,7 +2127,7 @@ void SessionController::setActiveChatEntry(Dialogs::RowDescriptor row) {
 				ChannelData::Flag::Forum
 			) | rpl::filter([=](bool forum) {
 				return forum && !channel->useSubsectionTabs();
-			}) | rpl::start_with_next([=] {
+			}) | rpl::on_next([=] {
 				clearSectionStack(
 					{ anim::type::normal, anim::activation::background });
 				showForum(channel->forum(),
@@ -3415,7 +3415,7 @@ void SessionController::cacheChatThemeDone(
 				const auto giftSymbol = i->second.giftSymbol.get();
 				return (!media || media->loaded(true))
 					&& (!giftSymbol || giftSymbol->ready());
-			}) | rpl::start_with_next([=] {
+			}) | rpl::on_next([=] {
 				const auto i = _customChatThemes.find(key);
 				Assert(i != end(_customChatThemes));
 				updateCustomThemeBackground(i->second);
@@ -3617,7 +3617,7 @@ void SessionController::saveSubsectionTabs(
 	_savedSubsectionTabsLifetime.destroy();
 	_savedSubsectionTabs = std::move(tabs);
 	_savedSubsectionTabs->extractToParent(widget());
-	_savedSubsectionTabs->removeRequests() | rpl::start_with_next([=] {
+	_savedSubsectionTabs->removeRequests() | rpl::on_next([=] {
 		_savedSubsectionTabs = nullptr;
 	}, _savedSubsectionTabsLifetime);
 }
diff --git a/Telegram/SourceFiles/window/window_setup_email.cpp b/Telegram/SourceFiles/window/window_setup_email.cpp
index fdbc9584c7..5307689252 100644
--- a/Telegram/SourceFiles/window/window_setup_email.cpp
+++ b/Telegram/SourceFiles/window/window_setup_email.cpp
@@ -239,12 +239,12 @@ SetupEmailLockWidget::SetupEmailLockWidget(
 
 		submit->setClickedCallback([=] { this->submit(); });
 
-		emailInput->changes() | rpl::start_with_next([=] {
+		emailInput->changes() | rpl::on_next([=] {
 			_error = QString();
 			errorLabel->hide();
 		}, emailInput->lifetime());
 
-		emailInput->submits() | rpl::start_with_next([=] {
+		emailInput->submits() | rpl::on_next([=] {
 			this->submit();
 		}, emailInput->lifetime());
 	}
@@ -330,12 +330,12 @@ void SetupEmailLockWidget::showConfirmWidget(
 	_confirmWidget->setFocus();
 
 	_confirmWidget->backRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		showEmailInput();
 	}, _confirmWidget->lifetime());
 
 	_confirmWidget->confirmations(
-	) | rpl::start_with_next([=, controller = window()] {
+	) | rpl::on_next([=, controller = window()] {
 		if (const auto session = controller->maybeSession()) {
 			session->promoSuggestions().setSetupEmailState(
 				Data::SetupEmailState::None);
@@ -511,7 +511,7 @@ SetupEmailConfirmWidget::SetupEmailConfirmWidget(
 	});
 
 	codeInput->codeCollected(
-	) | rpl::start_with_next([=](const QString &code) {
+	) | rpl::on_next([=](const QString &code) {
 		verifyCode(code);
 	}, codeInput->lifetime());
 }
diff --git a/Telegram/SourceFiles/window/window_top_bar_wrap.h b/Telegram/SourceFiles/window/window_top_bar_wrap.h
index be19dac1ce..8c4239e9cf 100644
--- a/Telegram/SourceFiles/window/window_top_bar_wrap.h
+++ b/Telegram/SourceFiles/window/window_top_bar_wrap.h
@@ -22,13 +22,13 @@ public:
 		rpl::producer<bool> oneColumnValue)
 	: Parent(parent, std::move(inner)) {
 		this->sizeValue(
-		) | rpl::start_with_next([=](const QSize &size) {
+		) | rpl::on_next([=](const QSize &size) {
 			updateShadowGeometry(size);
 		}, this->lifetime());
 
 		std::move(
 			oneColumnValue
-		) | rpl::start_with_next([=](bool oneColumn) {
+		) | rpl::on_next([=](bool oneColumn) {
 			_isOneColumn = oneColumn;
 		}, this->lifetime());
 	}
diff --git a/Telegram/lib_base b/Telegram/lib_base
index b842e6719a..444ab33475 160000
--- a/Telegram/lib_base
+++ b/Telegram/lib_base
@@ -1 +1 @@
-Subproject commit b842e6719abf6fc03f8dc4e550351467a51b75e3
+Subproject commit 444ab33475734485dcc183a5fb86875c134fac8b
diff --git a/Telegram/lib_crl b/Telegram/lib_crl
index c1d6b02736..a41edfcfa8 160000
--- a/Telegram/lib_crl
+++ b/Telegram/lib_crl
@@ -1 +1 @@
-Subproject commit c1d6b0273653095b10b4d0f4f7c30b614b690fd5
+Subproject commit a41edfcfa8c04057deb8a1a38fca145248a9421a
diff --git a/Telegram/lib_lottie b/Telegram/lib_lottie
index 4fc3ac0ea5..99d8cc4d18 160000
--- a/Telegram/lib_lottie
+++ b/Telegram/lib_lottie
@@ -1 +1 @@
-Subproject commit 4fc3ac0ea52f271cc9b108481f83d56fd76ab0ed
+Subproject commit 99d8cc4d1820960fbcdafc574f1894073b14b75a
diff --git a/Telegram/lib_rpl b/Telegram/lib_rpl
index 724b79e83c..c57cccffb0 160000
--- a/Telegram/lib_rpl
+++ b/Telegram/lib_rpl
@@ -1 +1 @@
-Subproject commit 724b79e83cb2a97968aae5ade48807e6794e2011
+Subproject commit c57cccffb01d85570decd7fccb88419c9a682e63
diff --git a/Telegram/lib_spellcheck b/Telegram/lib_spellcheck
index 62c586bbbf..476bb43025 160000
--- a/Telegram/lib_spellcheck
+++ b/Telegram/lib_spellcheck
@@ -1 +1 @@
-Subproject commit 62c586bbbf7f8a6ba87b00f7eb73d41dcf7b12c5
+Subproject commit 476bb43025449ccbd815a14895e9321695a1a177
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index fb004e6d2a..62b24d00b8 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit fb004e6d2a92212edd10f832cffeaad19efef3c4
+Subproject commit 62b24d00b8aea16974a44b439048209ee364bc1d
diff --git a/Telegram/lib_webrtc b/Telegram/lib_webrtc
index 792c7a5b48..553102f8c2 160000
--- a/Telegram/lib_webrtc
+++ b/Telegram/lib_webrtc
@@ -1 +1 @@
-Subproject commit 792c7a5b4846c489753deb5b87f67b3d11b399cf
+Subproject commit 553102f8c244609253720e7a03c2ea2d3c7fee8e
diff --git a/Telegram/lib_webview b/Telegram/lib_webview
index c998e31342..7b5855204a 160000
--- a/Telegram/lib_webview
+++ b/Telegram/lib_webview
@@ -1 +1 @@
-Subproject commit c998e31342f0a9c1dc2192dee35df7f9dff4bed4
+Subproject commit 7b5855204a90db8c0cf8c0cd9b18d6fca8171493