3 files changed, 16 insertions, 16 deletions
diff --git a/scene/animation/animation_player.h b/scene/animation/animation_player.h
index 96fc70a3ad..01b709205a 100644
--- a/scene/animation/animation_player.h
+++ b/scene/animation/animation_player.h
@@ -271,7 +271,7 @@ public:
 	void set_speed_scale(float p_speed);
 	float get_speed_scale() const;
 
-	void set_autoplay(const String &pname);
+	void set_autoplay(const String &p_name);
 	String get_autoplay() const;
 
 	void set_animation_process_mode(AnimationProcessMode p_mode);
diff --git a/scene/animation/animation_tree_player.h b/scene/animation/animation_tree_player.h
index 062b4e1eeb..47f18795bd 100644
--- a/scene/animation/animation_tree_player.h
+++ b/scene/animation/animation_tree_player.h
@@ -312,7 +312,7 @@ private:
 	Map<StringName, NodeBase *> node_map;
 
 	// return time left to finish animation
-	float _process_node(const StringName &p_node, AnimationNode **r_prev_anim, float p_step, bool p_seek = false, float p_fallback_weight = 1.0, HashMap<NodePath, float> *p_weights = NULL);
+	float _process_node(const StringName &p_node, AnimationNode **r_prev_anim, float p_time, bool p_seek = false, float p_fallback_weight = 1.0, HashMap<NodePath, float> *p_weights = NULL);
 	void _process_animation(float p_delta);
 	bool reset_request;
 
@@ -367,7 +367,7 @@ public:
 	float oneshot_node_get_autorestart_delay(const StringName &p_node) const;
 	float oneshot_node_get_autorestart_random_delay(const StringName &p_node) const;
 
-	void oneshot_node_set_mix_mode(const StringName &p_node, bool p_enabled);
+	void oneshot_node_set_mix_mode(const StringName &p_node, bool p_mix);
 	bool oneshot_node_get_mix_mode(const StringName &p_node) const;
 
 	void oneshot_node_start(const StringName &p_node);
@@ -428,8 +428,8 @@ public:
 	void remove_node(const StringName &p_node);
 
 	Error connect_nodes(const StringName &p_src_node, const StringName &p_dst_node, int p_dst_input);
-	bool are_nodes_connected(const StringName &p_src_node, const StringName &p_dst_node, int p_input) const;
-	void disconnect_nodes(const StringName &p_src_node, int p_input);
+	bool are_nodes_connected(const StringName &p_src_node, const StringName &p_dst_node, int p_dst_input) const;
+	void disconnect_nodes(const StringName &p_node, int p_input);
 
 	void set_base_path(const NodePath &p_path);
 	NodePath get_base_path() const;
diff --git a/scene/animation/tween.h b/scene/animation/tween.h
index f89f3bdc44..43234fab86 100644
--- a/scene/animation/tween.h
+++ b/scene/animation/tween.h
@@ -132,7 +132,7 @@ private:
 
 	void _tween_process(float p_delta);
 	void _set_process(bool p_process, bool p_force = false);
-	void _remove(Object *p_node, String p_key, bool first_only);
+	void _remove(Object *p_object, String p_key, bool first_only);
 
 protected:
 	bool _set(const StringName &p_name, const Variant &p_value);
@@ -156,34 +156,34 @@ public:
 	float get_speed_scale() const;
 
 	bool start();
-	bool reset(Object *p_node, String p_key);
+	bool reset(Object *p_object, String p_key);
 	bool reset_all();
-	bool stop(Object *p_node, String p_key);
+	bool stop(Object *p_object, String p_key);
 	bool stop_all();
-	bool resume(Object *p_node, String p_key);
+	bool resume(Object *p_object, String p_key);
 	bool resume_all();
-	bool remove(Object *p_node, String p_key);
+	bool remove(Object *p_object, String p_key);
 	bool remove_all();
 
 	bool seek(real_t p_time);
 	real_t tell() const;
 	real_t get_runtime() const;
 
-	bool interpolate_property(Object *p_node, String p_property, Variant p_initial_val, Variant p_final_val, real_t p_duration, TransitionType p_trans_type, EaseType p_ease_type, real_t p_delay = 0);
+	bool interpolate_property(Object *p_object, String p_property, Variant p_initial_val, Variant p_final_val, real_t p_duration, TransitionType p_trans_type, EaseType p_ease_type, real_t p_delay = 0);
 
-	bool interpolate_method(Object *p_node, String p_method, Variant p_initial_val, Variant p_final_val, real_t p_duration, TransitionType p_trans_type, EaseType p_ease_type, real_t p_delay = 0);
+	bool interpolate_method(Object *p_object, String p_method, Variant p_initial_val, Variant p_final_val, real_t p_duration, TransitionType p_trans_type, EaseType p_ease_type, real_t p_delay = 0);
 
 	bool interpolate_callback(Object *p_object, real_t p_duration, String p_callback, VARIANT_ARG_DECLARE);
 
 	bool interpolate_deferred_callback(Object *p_object, real_t p_duration, String p_callback, VARIANT_ARG_DECLARE);
 
-	bool follow_property(Object *p_node, String p_property, Variant p_initial_val, Object *p_target, String p_target_property, real_t p_duration, TransitionType p_trans_type, EaseType p_ease_type, real_t p_delay = 0);
+	bool follow_property(Object *p_object, String p_property, Variant p_initial_val, Object *p_target, String p_target_property, real_t p_duration, TransitionType p_trans_type, EaseType p_ease_type, real_t p_delay = 0);
 
-	bool follow_method(Object *p_node, String p_method, Variant p_initial_val, Object *p_target, String p_target_method, real_t p_duration, TransitionType p_trans_type, EaseType p_ease_type, real_t p_delay = 0);
+	bool follow_method(Object *p_object, String p_method, Variant p_initial_val, Object *p_target, String p_target_method, real_t p_duration, TransitionType p_trans_type, EaseType p_ease_type, real_t p_delay = 0);
 
-	bool targeting_property(Object *p_node, String p_property, Object *p_initial, String p_initial_property, Variant p_final_val, real_t p_duration, TransitionType p_trans_type, EaseType p_ease_type, real_t p_delay = 0);
+	bool targeting_property(Object *p_object, String p_property, Object *p_initial, String p_initial_property, Variant p_final_val, real_t p_duration, TransitionType p_trans_type, EaseType p_ease_type, real_t p_delay = 0);
 
-	bool targeting_method(Object *p_node, String p_method, Object *p_initial, String p_initial_method, Variant p_final_val, real_t p_duration, TransitionType p_trans_type, EaseType p_ease_type, real_t p_delay = 0);
+	bool targeting_method(Object *p_object, String p_method, Object *p_initial, String p_initial_method, Variant p_final_val, real_t p_duration, TransitionType p_trans_type, EaseType p_ease_type, real_t p_delay = 0);
 
 	Tween();
 	~Tween();