6 files changed, 12 insertions, 12 deletions
diff --git a/tdactor/td/actor/impl/Actor-decl.h b/tdactor/td/actor/impl/Actor-decl.h
index d2414872f..0fd1ded0b 100644
--- a/tdactor/td/actor/impl/Actor-decl.h
+++ b/tdactor/td/actor/impl/Actor-decl.h
@@ -95,7 +95,7 @@ class Actor : public ObserverBase {
   auto self_closure(SelfT *self, FuncT &&func, ArgsT &&...args);
 
   template <class LambdaT>
-  auto self_lambda(LambdaT &&lambda);
+  auto self_lambda(LambdaT &&func);
 
   // proxy to info_
   ActorId<> actor_id();
diff --git a/tdactor/td/actor/impl/Actor.h b/tdactor/td/actor/impl/Actor.h
index da23b0848..5ec72e347 100644
--- a/tdactor/td/actor/impl/Actor.h
+++ b/tdactor/td/actor/impl/Actor.h
@@ -156,8 +156,8 @@ auto Actor::self_closure(SelfT *self, FuncT &&func, ArgsT &&...args) {
 }
 
 template <class LambdaT>
-auto Actor::self_lambda(LambdaT &&lambda) {
-  return EventCreator::lambda(actor_id(), std::forward<LambdaT>(lambda));
+auto Actor::self_lambda(LambdaT &&func) {
+  return EventCreator::from_lambda(actor_id(), std::forward<LambdaT>(func));
 }
 
 inline Slice Actor::get_name() const {
diff --git a/tdactor/td/actor/impl/Event.h b/tdactor/td/actor/impl/Event.h
index f082d9d1c..ceec14f53 100644
--- a/tdactor/td/actor/impl/Event.h
+++ b/tdactor/td/actor/impl/Event.h
@@ -89,7 +89,7 @@ class LambdaEvent final : public CustomEvent {
     f_();
   }
   template <class FromLambdaT, std::enable_if_t<!std::is_same<std::decay_t<FromLambdaT>, LambdaEvent>::value, int> = 0>
-  explicit LambdaEvent(FromLambdaT &&lambda) : f_(std::forward<FromLambdaT>(lambda)) {
+  explicit LambdaEvent(FromLambdaT &&func) : f_(std::forward<FromLambdaT>(func)) {
   }
 
  private:
@@ -149,8 +149,8 @@ class Event {
   }
 
   template <class FromLambdaT>
-  static Event lambda(FromLambdaT &&lambda) {
-    return custom(new LambdaEvent<std::decay_t<FromLambdaT>>(std::forward<FromLambdaT>(lambda)));
+  static Event from_lambda(FromLambdaT &&func) {
+    return custom(new LambdaEvent<std::decay_t<FromLambdaT>>(std::forward<FromLambdaT>(func)));
   }
 
   Event() : Event(Type::NoType) {
diff --git a/tdactor/td/actor/impl/EventFull-decl.h b/tdactor/td/actor/impl/EventFull-decl.h
index 4186d071a..b47443c4d 100644
--- a/tdactor/td/actor/impl/EventFull-decl.h
+++ b/tdactor/td/actor/impl/EventFull-decl.h
@@ -65,8 +65,8 @@ class EventCreator {
   }
 
   template <class LambdaT>
-  static EventFull lambda(ActorRef actor_ref, LambdaT &&lambda) {
-    return EventFull(actor_ref, Event::lambda(std::forward<LambdaT>(lambda)));
+  static EventFull from_lambda(ActorRef actor_ref, LambdaT &&func) {
+    return EventFull(actor_ref, Event::from_lambda(std::forward<LambdaT>(func)));
   }
 
   static EventFull yield(ActorRef actor_ref) {
diff --git a/tdactor/td/actor/impl/Scheduler-decl.h b/tdactor/td/actor/impl/Scheduler-decl.h
index f8909928e..850469945 100644
--- a/tdactor/td/actor/impl/Scheduler-decl.h
+++ b/tdactor/td/actor/impl/Scheduler-decl.h
@@ -107,7 +107,7 @@ class Scheduler {
   void destroy_on_scheduler(int32 sched_id, ArgsT &...values);
 
   template <ActorSendType send_type, class EventT>
-  void send_lambda(ActorRef actor_ref, EventT &&lambda);
+  void send_lambda(ActorRef actor_ref, EventT &&func);
 
   template <ActorSendType send_type, class EventT>
   void send_closure(ActorRef actor_ref, EventT &&closure);
diff --git a/tdactor/td/actor/impl/Scheduler.h b/tdactor/td/actor/impl/Scheduler.h
index 52d85af2b..ba4e0be86 100644
--- a/tdactor/td/actor/impl/Scheduler.h
+++ b/tdactor/td/actor/impl/Scheduler.h
@@ -215,15 +215,15 @@ void Scheduler::send_impl(const ActorId<> &actor_id, const RunFuncT &run_func, c
 }
 
 template <ActorSendType send_type, class EventT>
-void Scheduler::send_lambda(ActorRef actor_ref, EventT &&lambda) {
+void Scheduler::send_lambda(ActorRef actor_ref, EventT &&func) {
   return send_impl<send_type>(
       actor_ref.get(),
       [&](ActorInfo *actor_info) {
         event_context_ptr_->link_token = actor_ref.token();
-        lambda();
+        func();
       },
       [&] {
-        auto event = Event::lambda(std::forward<EventT>(lambda));
+        auto event = Event::from_lambda(std::forward<EventT>(func));
         event.set_link_token(actor_ref.token());
         return event;
       });