From 5ad9be4c24e9d7dc5672fdc42cea896622fe5685 Mon Sep 17 00:00:00 2001
From: letheed
Date: Sun, 10 Sep 2017 15:37:49 +0200
Subject: Rename pos to position in user facing methods and variables

Rename user facing methods and variables as well as the corresponding
C++ methods according to the folloming changes:

* pos -> position
* rot -> rotation
* loc -> location

C++ variables are left as is.
---
 doc/classes/AStar.xml                    | 16 ++++++++--------
 doc/classes/Animation.xml                |  6 +++---
 doc/classes/AnimationPlayer.xml          |  6 +++---
 doc/classes/AnimationTreePlayer.xml      |  8 ++++----
 doc/classes/Array.xml                    |  6 +++---
 doc/classes/AudioServer.xml              |  4 ++--
 doc/classes/AudioStreamPlayer.xml        |  8 ++++----
 doc/classes/AudioStreamPlayer2D.xml      |  8 ++++----
 doc/classes/AudioStreamPlayer3D.xml      |  8 ++++----
 doc/classes/BitMap.xml                   |  4 ++--
 doc/classes/Camera2D.xml                 |  2 +-
 doc/classes/CanvasItem.xml               | 14 +++++++-------
 doc/classes/CollisionObject.xml          |  4 ++--
 doc/classes/Control.xml                  | 20 ++++++++++----------
 doc/classes/Curve.xml                    |  4 ++--
 doc/classes/Curve2D.xml                  | 18 +++++++++---------
 doc/classes/Curve3D.xml                  | 18 +++++++++---------
 doc/classes/File.xml                     |  6 +++---
 doc/classes/Font.xml                     |  8 ++++----
 doc/classes/Geometry.xml                 |  6 +++---
 doc/classes/GraphEdit.xml                |  4 ++--
 doc/classes/GraphNode.xml                |  4 ++--
 doc/classes/ImmediateGeometry.xml        |  2 +-
 doc/classes/Input.xml                    |  2 +-
 doc/classes/InputEventScreenTouch.xml    |  2 +-
 doc/classes/ItemList.xml                 |  6 +++---
 doc/classes/Line2D.xml                   |  8 ++++----
 doc/classes/LineEdit.xml                 |  6 +++---
 doc/classes/Node.xml                     |  2 +-
 doc/classes/Node2D.xml                   |  4 ++--
 doc/classes/Physics2DDirectBodyState.xml |  6 +++---
 doc/classes/Physics2DServer.xml          |  2 +-
 doc/classes/PhysicsDirectBodyState.xml   | 10 +++++-----
 doc/classes/PhysicsServer.xml            |  2 +-
 doc/classes/ProjectSettings.xml          |  2 +-
 doc/classes/Rect2.xml                    |  2 +-
 doc/classes/Rect3.xml                    |  2 +-
 doc/classes/RigidBody.xml                |  2 +-
 doc/classes/Spatial.xml                  |  4 ++--
 doc/classes/SpriteFrames.xml             |  2 +-
 doc/classes/StreamPeerBuffer.xml         |  4 ++--
 doc/classes/String.xml                   | 10 +++++-----
 doc/classes/Texture.xml                  |  2 +-
 doc/classes/TileMap.xml                  |  8 ++++----
 doc/classes/Transform2D.xml              |  2 +-
 doc/classes/Tree.xml                     | 16 ++++++++--------
 doc/classes/Tween.xml                    |  2 +-
 doc/classes/VideoPlayer.xml              |  2 +-
 doc/classes/Viewport.xml                 |  2 +-
 doc/classes/VisualScript.xml             |  8 ++++----
 doc/classes/XMLParser.xml                |  2 +-
 51 files changed, 153 insertions(+), 153 deletions(-)

(limited to 'doc')

diff --git a/doc/classes/AStar.xml b/doc/classes/AStar.xml
index d94b8355b..9b15afbbd 100644
--- a/doc/classes/AStar.xml
+++ b/doc/classes/AStar.xml
@@ -39,7 +39,7 @@
 			</return>
 			<argument index="0" name="id" type="int">
 			</argument>
-			<argument index="1" name="pos" type="Vector3">
+			<argument index="1" name="position" type="Vector3">
 			</argument>
 			<argument index="2" name="weight_scale" type="float" default="1.0">
 			</argument>
@@ -113,19 +113,19 @@
 		<method name="get_closest_point" qualifiers="const">
 			<return type="int">
 			</return>
-			<argument index="0" name="to_pos" type="Vector3">
+			<argument index="0" name="to_position" type="Vector3">
 			</argument>
 			<description>
-				Returns the id of the closest point to [code]to_pos[/code]. Returns -1 if there are no points in the points pool.
+				Returns the id of the closest point to [code]to_position[/code]. Returns -1 if there are no points in the points pool.
 			</description>
 		</method>
-		<method name="get_closest_pos_in_segment" qualifiers="const">
+		<method name="get_closest_position_in_segment" qualifiers="const">
 			<return type="Vector3">
 			</return>
-			<argument index="0" name="to_pos" type="Vector3">
+			<argument index="0" name="to_position" type="Vector3">
 			</argument>
 			<description>
-				Returns the closest position to [code]to_pos[/code] that resides inside a segment between two connected points.
+				Returns the closest position to [code]to_position[/code] that resides inside a segment between two connected points.
 				[codeblock]
 				var as = AStar.new()
 				
@@ -134,7 +134,7 @@
 				
 				as.connect_points(1, 2)
 				
-				var res = as.get_closest_pos_in_segment(Vector3(3,3,0)) # returns (0, 3, 0)
+				var res = as.get_closest_position_in_segment(Vector3(3,3,0)) # returns (0, 3, 0)
 				[/codeblock]
 				The result is in the segment that goes from [code]y=0[/code] to [code]y=5[/code]. It's the closest position in the segment to the given point.
 			</description>
@@ -178,7 +178,7 @@
 				Returns an array with the points that are in the path found by AStar between the given points. The array is ordered from the starting point to the ending point of the path.
 			</description>
 		</method>
-		<method name="get_point_pos" qualifiers="const">
+		<method name="get_point_position" qualifiers="const">
 			<return type="Vector3">
 			</return>
 			<argument index="0" name="id" type="int">
diff --git a/doc/classes/Animation.xml b/doc/classes/Animation.xml
index b80edb24d..6cb4fd5b1 100644
--- a/doc/classes/Animation.xml
+++ b/doc/classes/Animation.xml
@@ -17,7 +17,7 @@
 			</return>
 			<argument index="0" name="type" type="int" enum="Animation.TrackType">
 			</argument>
-			<argument index="1" name="at_pos" type="int" default="-1">
+			<argument index="1" name="at_position" type="int" default="-1">
 			</argument>
 			<description>
 				Add a track to the Animation. The track type must be specified as any of the values in the TYPE_* enumeration.
@@ -281,12 +281,12 @@
 				Remove a key by index in a given track.
 			</description>
 		</method>
-		<method name="track_remove_key_at_pos">
+		<method name="track_remove_key_at_position">
 			<return type="void">
 			</return>
 			<argument index="0" name="idx" type="int">
 			</argument>
-			<argument index="1" name="pos" type="float">
+			<argument index="1" name="position" type="float">
 			</argument>
 			<description>
 				Remove a key by position (seconds) in a given track.
diff --git a/doc/classes/AnimationPlayer.xml b/doc/classes/AnimationPlayer.xml
index 746462380..74a7f6c8a 100644
--- a/doc/classes/AnimationPlayer.xml
+++ b/doc/classes/AnimationPlayer.xml
@@ -129,7 +129,7 @@
 				Get the length (in seconds) of the currently being played animation.
 			</description>
 		</method>
-		<method name="get_current_animation_pos" qualifiers="const">
+		<method name="get_current_animation_position" qualifiers="const">
 			<return type="float">
 			</return>
 			<description>
@@ -143,7 +143,7 @@
 				Return the default blend time between animations.
 			</description>
 		</method>
-		<method name="get_pos" qualifiers="const">
+		<method name="get_position" qualifiers="const">
 			<return type="float">
 			</return>
 			<description>
@@ -245,7 +245,7 @@
 		<method name="seek">
 			<return type="void">
 			</return>
-			<argument index="0" name="pos_sec" type="float">
+			<argument index="0" name="seconds" type="float">
 			</argument>
 			<argument index="1" name="update" type="bool" default="false">
 			</argument>
diff --git a/doc/classes/AnimationTreePlayer.xml b/doc/classes/AnimationTreePlayer.xml
index e128b4d86..f088d21e4 100644
--- a/doc/classes/AnimationTreePlayer.xml
+++ b/doc/classes/AnimationTreePlayer.xml
@@ -271,7 +271,7 @@
 				Return the input source for a given node input.
 			</description>
 		</method>
-		<method name="node_get_pos" qualifiers="const">
+		<method name="node_get_position" qualifiers="const">
 			<return type="Vector2">
 			</return>
 			<argument index="0" name="id" type="String">
@@ -300,12 +300,12 @@
 				Rename a node in the graph.
 			</description>
 		</method>
-		<method name="node_set_pos">
+		<method name="node_set_position">
 			<return type="void">
 			</return>
 			<argument index="0" name="id" type="String">
 			</argument>
-			<argument index="1" name="screen_pos" type="Vector2">
+			<argument index="1" name="screen_position" type="Vector2">
 			</argument>
 			<description>
 				Sets position of a node in the graph given its name and position.
@@ -531,7 +531,7 @@
 			</return>
 			<argument index="0" name="id" type="String">
 			</argument>
-			<argument index="1" name="pos_sec" type="float">
+			<argument index="1" name="seconds" type="float">
 			</argument>
 			<description>
 				Sets time seek value of a TimeSeek node given its name and value.
diff --git a/doc/classes/Array.xml b/doc/classes/Array.xml
index 042dfb3e1..f83376414 100644
--- a/doc/classes/Array.xml
+++ b/doc/classes/Array.xml
@@ -168,7 +168,7 @@
 			</description>
 		</method>
 		<method name="insert">
-			<argument index="0" name="pos" type="int">
+			<argument index="0" name="position" type="int">
 			</argument>
 			<argument index="1" name="value" type="var">
 			</argument>
@@ -206,14 +206,14 @@
 			</description>
 		</method>
 		<method name="remove">
-			<argument index="0" name="pos" type="int">
+			<argument index="0" name="position" type="int">
 			</argument>
 			<description>
 				Remove an element from the array by index.
 			</description>
 		</method>
 		<method name="resize">
-			<argument index="0" name="pos" type="int">
+			<argument index="0" name="position" type="int">
 			</argument>
 			<description>
 				Resize the array to contain a different number of elements. If the array size is smaller, elements are cleared, if bigger, new elements are Null.
diff --git a/doc/classes/AudioServer.xml b/doc/classes/AudioServer.xml
index dc30c0c5f..768987fd0 100644
--- a/doc/classes/AudioServer.xml
+++ b/doc/classes/AudioServer.xml
@@ -14,7 +14,7 @@
 		<method name="add_bus">
 			<return type="void">
 			</return>
-			<argument index="0" name="at_pos" type="int" default="-1">
+			<argument index="0" name="at_position" type="int" default="-1">
 			</argument>
 			<description>
 			</description>
@@ -26,7 +26,7 @@
 			</argument>
 			<argument index="1" name="effect" type="AudioEffect">
 			</argument>
-			<argument index="2" name="at_pos" type="int" default="-1">
+			<argument index="2" name="at_position" type="int" default="-1">
 			</argument>
 			<description>
 			</description>
diff --git a/doc/classes/AudioStreamPlayer.xml b/doc/classes/AudioStreamPlayer.xml
index edf5dd619..2dba35bec 100644
--- a/doc/classes/AudioStreamPlayer.xml
+++ b/doc/classes/AudioStreamPlayer.xml
@@ -23,7 +23,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="get_pos">
+		<method name="get_position">
 			<return type="float">
 			</return>
 			<description>
@@ -56,16 +56,16 @@
 		<method name="play">
 			<return type="void">
 			</return>
-			<argument index="0" name="from_pos" type="float" default="0.0">
+			<argument index="0" name="from_position" type="float" default="0.0">
 			</argument>
 			<description>
-				Plays the audio from the given position 'from_pos', in seconds.
+				Plays the audio from the given position 'from_position', in seconds.
 			</description>
 		</method>
 		<method name="seek">
 			<return type="void">
 			</return>
-			<argument index="0" name="to_pos" type="float">
+			<argument index="0" name="to_position" type="float">
 			</argument>
 			<description>
 				Sets the position from which audio will be played, in seconds.
diff --git a/doc/classes/AudioStreamPlayer2D.xml b/doc/classes/AudioStreamPlayer2D.xml
index e31f2dd94..68afffdb4 100644
--- a/doc/classes/AudioStreamPlayer2D.xml
+++ b/doc/classes/AudioStreamPlayer2D.xml
@@ -36,7 +36,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="get_pos">
+		<method name="get_position">
 			<return type="float">
 			</return>
 			<description>
@@ -69,16 +69,16 @@
 		<method name="play">
 			<return type="void">
 			</return>
-			<argument index="0" name="from_pos" type="float" default="0.0">
+			<argument index="0" name="from_position" type="float" default="0.0">
 			</argument>
 			<description>
-				Plays the audio from the given position 'from_pos', in seconds.
+				Plays the audio from the given position 'from_position', in seconds.
 			</description>
 		</method>
 		<method name="seek">
 			<return type="void">
 			</return>
-			<argument index="0" name="to_pos" type="float">
+			<argument index="0" name="to_position" type="float">
 			</argument>
 			<description>
 				Sets the position from which audio will be played, in seconds.
diff --git a/doc/classes/AudioStreamPlayer3D.xml b/doc/classes/AudioStreamPlayer3D.xml
index 3aad0ea87..1577c1e4d 100644
--- a/doc/classes/AudioStreamPlayer3D.xml
+++ b/doc/classes/AudioStreamPlayer3D.xml
@@ -78,7 +78,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="get_pos">
+		<method name="get_position">
 			<return type="float">
 			</return>
 			<description>
@@ -123,16 +123,16 @@
 		<method name="play">
 			<return type="void">
 			</return>
-			<argument index="0" name="from_pos" type="float" default="0.0">
+			<argument index="0" name="from_position" type="float" default="0.0">
 			</argument>
 			<description>
-				Plays the audio from the given position 'from_pos', in seconds.
+				Plays the audio from the given position 'from_position', in seconds.
 			</description>
 		</method>
 		<method name="seek">
 			<return type="void">
 			</return>
-			<argument index="0" name="to_pos" type="float">
+			<argument index="0" name="to_position" type="float">
 			</argument>
 			<description>
 				Sets the position from which audio will be played, in seconds.
diff --git a/doc/classes/BitMap.xml b/doc/classes/BitMap.xml
index 62b1c9ff4..d872d0892 100644
--- a/doc/classes/BitMap.xml
+++ b/doc/classes/BitMap.xml
@@ -32,7 +32,7 @@
 		<method name="get_bit" qualifiers="const">
 			<return type="bool">
 			</return>
-			<argument index="0" name="pos" type="Vector2">
+			<argument index="0" name="position" type="Vector2">
 			</argument>
 			<description>
 				Returns bitmap's value at the specified position.
@@ -55,7 +55,7 @@
 		<method name="set_bit">
 			<return type="void">
 			</return>
-			<argument index="0" name="pos" type="Vector2">
+			<argument index="0" name="position" type="Vector2">
 			</argument>
 			<argument index="1" name="bit" type="bool">
 			</argument>
diff --git a/doc/classes/Camera2D.xml b/doc/classes/Camera2D.xml
index 659efa860..b6b699612 100644
--- a/doc/classes/Camera2D.xml
+++ b/doc/classes/Camera2D.xml
@@ -38,7 +38,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="get_camera_pos" qualifiers="const">
+		<method name="get_camera_position" qualifiers="const">
 			<return type="Vector2">
 			</return>
 			<description>
diff --git a/doc/classes/CanvasItem.xml b/doc/classes/CanvasItem.xml
index 26a9e1519..8fc2ff2bc 100644
--- a/doc/classes/CanvasItem.xml
+++ b/doc/classes/CanvasItem.xml
@@ -27,7 +27,7 @@
 			</return>
 			<argument index="0" name="font" type="Font">
 			</argument>
-			<argument index="1" name="pos" type="Vector2">
+			<argument index="1" name="position" type="Vector2">
 			</argument>
 			<argument index="2" name="char" type="String">
 			</argument>
@@ -42,7 +42,7 @@
 		<method name="draw_circle">
 			<return type="void">
 			</return>
-			<argument index="0" name="pos" type="Vector2">
+			<argument index="0" name="position" type="Vector2">
 			</argument>
 			<argument index="1" name="radius" type="float">
 			</argument>
@@ -170,7 +170,7 @@
 		<method name="draw_set_transform">
 			<return type="void">
 			</return>
-			<argument index="0" name="pos" type="Vector2">
+			<argument index="0" name="position" type="Vector2">
 			</argument>
 			<argument index="1" name="rot" type="float">
 			</argument>
@@ -193,7 +193,7 @@
 			</return>
 			<argument index="0" name="font" type="Font">
 			</argument>
-			<argument index="1" name="pos" type="Vector2">
+			<argument index="1" name="position" type="Vector2">
 			</argument>
 			<argument index="2" name="text" type="String">
 			</argument>
@@ -221,7 +221,7 @@
 			</return>
 			<argument index="0" name="texture" type="Texture">
 			</argument>
-			<argument index="1" name="pos" type="Vector2">
+			<argument index="1" name="position" type="Vector2">
 			</argument>
 			<argument index="2" name="modulate" type="Color" default="Color( 1, 1, 1, 1 )">
 			</argument>
@@ -367,7 +367,7 @@
 				Get this item's light mask number.
 			</description>
 		</method>
-		<method name="get_local_mouse_pos" qualifiers="const">
+		<method name="get_local_mouse_position" qualifiers="const">
 			<return type="Vector2">
 			</return>
 			<description>
@@ -476,7 +476,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="make_canvas_pos_local" qualifiers="const">
+		<method name="make_canvas_position_local" qualifiers="const">
 			<return type="Vector2">
 			</return>
 			<argument index="0" name="screen_point" type="Vector2">
diff --git a/doc/classes/CollisionObject.xml b/doc/classes/CollisionObject.xml
index 791978993..98023a589 100644
--- a/doc/classes/CollisionObject.xml
+++ b/doc/classes/CollisionObject.xml
@@ -16,7 +16,7 @@
 			</argument>
 			<argument index="1" name="event" type="InputEvent">
 			</argument>
-			<argument index="2" name="click_pos" type="Vector3">
+			<argument index="2" name="click_position" type="Vector3">
 			</argument>
 			<argument index="3" name="click_normal" type="Vector3">
 			</argument>
@@ -209,7 +209,7 @@
 			</argument>
 			<argument index="1" name="event" type="Object">
 			</argument>
-			<argument index="2" name="click_pos" type="Vector3">
+			<argument index="2" name="click_position" type="Vector3">
 			</argument>
 			<argument index="3" name="click_normal" type="Vector3">
 			</argument>
diff --git a/doc/classes/Control.xml b/doc/classes/Control.xml
index 5d77f3a45..59c3bd30c 100644
--- a/doc/classes/Control.xml
+++ b/doc/classes/Control.xml
@@ -106,7 +106,7 @@
 		<method name="can_drop_data" qualifiers="virtual">
 			<return type="bool">
 			</return>
-			<argument index="0" name="pos" type="Vector2">
+			<argument index="0" name="position" type="Vector2">
 			</argument>
 			<argument index="1" name="data" type="Variant">
 			</argument>
@@ -116,7 +116,7 @@
 		<method name="drop_data" qualifiers="virtual">
 			<return type="void">
 			</return>
-			<argument index="0" name="pos" type="Vector2">
+			<argument index="0" name="position" type="Vector2">
 			</argument>
 			<argument index="1" name="data" type="Variant">
 			</argument>
@@ -177,7 +177,7 @@
 		<method name="get_cursor_shape" qualifiers="const">
 			<return type="int" enum="Control.CursorShape">
 			</return>
-			<argument index="0" name="pos" type="Vector2" default="Vector2( 0, 0 )">
+			<argument index="0" name="position" type="Vector2" default="Vector2( 0, 0 )">
 			</argument>
 			<description>
 				Return the cursor shape at a certain position in the control.
@@ -199,7 +199,7 @@
 		<method name="get_drag_data" qualifiers="virtual">
 			<return type="Object">
 			</return>
-			<argument index="0" name="pos" type="Vector2">
+			<argument index="0" name="position" type="Vector2">
 			</argument>
 			<description>
 			</description>
@@ -390,7 +390,7 @@
 		<method name="get_tooltip" qualifiers="const">
 			<return type="String">
 			</return>
-			<argument index="0" name="atpos" type="Vector2" default="Vector2( 0, 0 )">
+			<argument index="0" name="at_position" type="Vector2" default="Vector2( 0, 0 )">
 			</argument>
 			<description>
 				Return the tooltip, which will appear when the cursor is resting over this control.
@@ -596,7 +596,7 @@
 		<method name="set_begin">
 			<return type="void">
 			</return>
-			<argument index="0" name="pos" type="Vector2">
+			<argument index="0" name="position" type="Vector2">
 			</argument>
 			<description>
 				Sets MARGIN_LEFT and MARGIN_TOP at the same time. This is a helper (see [method set_margin]).
@@ -646,7 +646,7 @@
 		<method name="set_end">
 			<return type="void">
 			</return>
-			<argument index="0" name="pos" type="Vector2">
+			<argument index="0" name="position" type="Vector2">
 			</argument>
 			<description>
 				Sets MARGIN_RIGHT and MARGIN_BOTTOM at the same time. This is a helper (see [method set_margin]).
@@ -675,7 +675,7 @@
 		<method name="set_global_position">
 			<return type="void">
 			</return>
-			<argument index="0" name="pos" type="Vector2">
+			<argument index="0" name="position" type="Vector2">
 			</argument>
 			<description>
 				Move the Control to a new position, relative to the top-left corner of the [i]window[/i] Control, and without changing current anchor mode. (see [method set_margin]).
@@ -729,7 +729,7 @@
 		<method name="set_position">
 			<return type="void">
 			</return>
-			<argument index="0" name="pos" type="Vector2">
+			<argument index="0" name="position" type="Vector2">
 			</argument>
 			<description>
 				Move the Control to a new position, relative to the top-left corner of the parent Control, changing all margins if needed and without changing current anchor mode. This is a helper (see [method set_margin]).
@@ -826,7 +826,7 @@
 		<method name="warp_mouse">
 			<return type="void">
 			</return>
-			<argument index="0" name="to_pos" type="Vector2">
+			<argument index="0" name="to_position" type="Vector2">
 			</argument>
 			<description>
 			</description>
diff --git a/doc/classes/Curve.xml b/doc/classes/Curve.xml
index d676f635c..ef43d9024 100644
--- a/doc/classes/Curve.xml
+++ b/doc/classes/Curve.xml
@@ -12,7 +12,7 @@
 		<method name="add_point">
 			<return type="int">
 			</return>
-			<argument index="0" name="pos" type="Vector2">
+			<argument index="0" name="position" type="Vector2">
 			</argument>
 			<argument index="1" name="left_tangent" type="float" default="0">
 			</argument>
@@ -77,7 +77,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="get_point_pos" qualifiers="const">
+		<method name="get_point_position" qualifiers="const">
 			<return type="Vector2">
 			</return>
 			<argument index="0" name="index" type="int">
diff --git a/doc/classes/Curve2D.xml b/doc/classes/Curve2D.xml
index ccf610182..4362887be 100644
--- a/doc/classes/Curve2D.xml
+++ b/doc/classes/Curve2D.xml
@@ -15,17 +15,17 @@
 		<method name="add_point">
 			<return type="void">
 			</return>
-			<argument index="0" name="pos" type="Vector2">
+			<argument index="0" name="position" type="Vector2">
 			</argument>
 			<argument index="1" name="in" type="Vector2" default="Vector2( 0, 0 )">
 			</argument>
 			<argument index="2" name="out" type="Vector2" default="Vector2( 0, 0 )">
 			</argument>
-			<argument index="3" name="atpos" type="int" default="-1">
+			<argument index="3" name="at_position" type="int" default="-1">
 			</argument>
 			<description>
-				Adds a point to a curve, at position "pos", with control points "in" and "out".
-				If "atpos" is given, the point is inserted before the point number "atpos", moving that point (and every point after) after the inserted point. If "atpos" is not given, or is an illegal value (atpos &lt;0 or atpos &gt;= [method get_point_count]), the point will be appended at the end of the point list.
+				Adds a point to a curve, at "position", with control points "in" and "out".
+				If "at_position" is given, the point is inserted before the point number "at_position", moving that point (and every point after) after the inserted point. If "at_position" is not given, or is an illegal value (at_position &lt;0 or at_position &gt;= [method get_point_count]), the point will be appended at the end of the point list.
 			</description>
 		</method>
 		<method name="clear_points">
@@ -80,7 +80,7 @@
 				Returns the position of the control point leading out of the vertex "idx". If the index is out of bounds, the function sends an error to the console, and returns (0, 0).
 			</description>
 		</method>
-		<method name="get_point_pos" qualifiers="const">
+		<method name="get_point_position" qualifiers="const">
 			<return type="Vector2">
 			</return>
 			<argument index="0" name="idx" type="int">
@@ -146,7 +146,7 @@
 			</return>
 			<argument index="0" name="idx" type="int">
 			</argument>
-			<argument index="1" name="pos" type="Vector2">
+			<argument index="1" name="position" type="Vector2">
 			</argument>
 			<description>
 				Sets the position of the control point leading to the vertex "idx". If the index is out of bounds, the function sends an error to the console.
@@ -157,18 +157,18 @@
 			</return>
 			<argument index="0" name="idx" type="int">
 			</argument>
-			<argument index="1" name="pos" type="Vector2">
+			<argument index="1" name="position" type="Vector2">
 			</argument>
 			<description>
 				Sets the position of the control point leading out of the vertex "idx". If the index is out of bounds, the function sends an error to the console.
 			</description>
 		</method>
-		<method name="set_point_pos">
+		<method name="set_point_position">
 			<return type="void">
 			</return>
 			<argument index="0" name="idx" type="int">
 			</argument>
-			<argument index="1" name="pos" type="Vector2">
+			<argument index="1" name="position" type="Vector2">
 			</argument>
 			<description>
 				Sets the position for the vertex "idx". If the index is out of bounds, the function sends an error to the console.
diff --git a/doc/classes/Curve3D.xml b/doc/classes/Curve3D.xml
index 8ea0e04b1..02299753c 100644
--- a/doc/classes/Curve3D.xml
+++ b/doc/classes/Curve3D.xml
@@ -15,17 +15,17 @@
 		<method name="add_point">
 			<return type="void">
 			</return>
-			<argument index="0" name="pos" type="Vector3">
+			<argument index="0" name="position" type="Vector3">
 			</argument>
 			<argument index="1" name="in" type="Vector3" default="Vector3( 0, 0, 0 )">
 			</argument>
 			<argument index="2" name="out" type="Vector3" default="Vector3( 0, 0, 0 )">
 			</argument>
-			<argument index="3" name="atpos" type="int" default="-1">
+			<argument index="3" name="at_position" type="int" default="-1">
 			</argument>
 			<description>
-				Adds a point to a curve, at position "pos", with control points "in" and "out".
-				If "atpos" is given, the point is inserted before the point number "atpos", moving that point (and every point after) after the inserted point. If "atpos" is not given, or is an illegal value (atpos &lt;0 or atpos &gt;= [method get_point_count]), the point will be appended at the end of the point list.
+				Adds a point to a curve, at "position", with control points "in" and "out".
+				If "at_position" is given, the point is inserted before the point number "at_position", moving that point (and every point after) after the inserted point. If "at_position" is not given, or is an illegal value (at_position &lt;0 or at_position &gt;= [method get_point_count]), the point will be appended at the end of the point list.
 			</description>
 		</method>
 		<method name="clear_points">
@@ -87,7 +87,7 @@
 				Returns the position of the control point leading out of the vertex "idx". If the index is out of bounds, the function sends an error to the console, and returns (0, 0, 0).
 			</description>
 		</method>
-		<method name="get_point_pos" qualifiers="const">
+		<method name="get_point_position" qualifiers="const">
 			<return type="Vector3">
 			</return>
 			<argument index="0" name="idx" type="int">
@@ -162,7 +162,7 @@
 			</return>
 			<argument index="0" name="idx" type="int">
 			</argument>
-			<argument index="1" name="pos" type="Vector3">
+			<argument index="1" name="position" type="Vector3">
 			</argument>
 			<description>
 				Sets the position of the control point leading to the vertex "idx". If the index is out of bounds, the function sends an error to the console.
@@ -173,18 +173,18 @@
 			</return>
 			<argument index="0" name="idx" type="int">
 			</argument>
-			<argument index="1" name="pos" type="Vector3">
+			<argument index="1" name="position" type="Vector3">
 			</argument>
 			<description>
 				Sets the position of the control point leading out of the vertex "idx". If the index is out of bounds, the function sends an error to the console.
 			</description>
 		</method>
-		<method name="set_point_pos">
+		<method name="set_point_position">
 			<return type="void">
 			</return>
 			<argument index="0" name="idx" type="int">
 			</argument>
-			<argument index="1" name="pos" type="Vector3">
+			<argument index="1" name="position" type="Vector3">
 			</argument>
 			<description>
 				Sets the position for the vertex "idx". If the index is out of bounds, the function sends an error to the console.
diff --git a/doc/classes/File.xml b/doc/classes/File.xml
index 4e73cd8ae..e1a024270 100644
--- a/doc/classes/File.xml
+++ b/doc/classes/File.xml
@@ -168,7 +168,7 @@
 				Get a [String] saved in Pascal format from the file.
 			</description>
 		</method>
-		<method name="get_pos" qualifiers="const">
+		<method name="get_position" qualifiers="const">
 			<return type="int">
 			</return>
 			<description>
@@ -258,7 +258,7 @@
 		<method name="seek">
 			<return type="void">
 			</return>
-			<argument index="0" name="pos" type="int">
+			<argument index="0" name="position" type="int">
 			</argument>
 			<description>
 				Change the file reading/writing cursor to the specified position (in bytes from the beginning of the file).
@@ -267,7 +267,7 @@
 		<method name="seek_end">
 			<return type="void">
 			</return>
-			<argument index="0" name="pos" type="int" default="0">
+			<argument index="0" name="position" type="int" default="0">
 			</argument>
 			<description>
 				Change the file reading/writing cursor to the specified position (in bytes from the end of the file). Note that this is an offset, so you should use negative numbers or the cursor will be at the end of the file.
diff --git a/doc/classes/Font.xml b/doc/classes/Font.xml
index 420756975..2e2124cbd 100644
--- a/doc/classes/Font.xml
+++ b/doc/classes/Font.xml
@@ -16,7 +16,7 @@
 			</return>
 			<argument index="0" name="canvas_item" type="RID">
 			</argument>
-			<argument index="1" name="pos" type="Vector2">
+			<argument index="1" name="position" type="Vector2">
 			</argument>
 			<argument index="2" name="string" type="String">
 			</argument>
@@ -25,7 +25,7 @@
 			<argument index="4" name="clip_w" type="int" default="-1">
 			</argument>
 			<description>
-				Draw "string" into a canvas item using the font at a given "pos" position, with "modulate" color, and optionally clipping the width. "pos" specifies the baseline, not the top. To draw from the top, [i]ascent[/i] must be added to the Y axis.
+				Draw "string" into a canvas item using the font at a given position, with "modulate" color, and optionally clipping the width. "position" specifies the baseline, not the top. To draw from the top, [i]ascent[/i] must be added to the Y axis.
 			</description>
 		</method>
 		<method name="draw_char" qualifiers="const">
@@ -33,7 +33,7 @@
 			</return>
 			<argument index="0" name="canvas_item" type="RID">
 			</argument>
-			<argument index="1" name="pos" type="Vector2">
+			<argument index="1" name="position" type="Vector2">
 			</argument>
 			<argument index="2" name="char" type="int">
 			</argument>
@@ -42,7 +42,7 @@
 			<argument index="4" name="modulate" type="Color" default="Color( 1, 1, 1, 1 )">
 			</argument>
 			<description>
-				Draw character "char" into a canvas item using the font at a given "pos" position, with "modulate" color, and optionally kerning if "next" is passed. clipping the width. "pos" specifies the baseline, not the top. To draw from the top, [i]ascent[/i] must be added to the Y axis. The width used by the character is returned, making this function useful for drawing strings character by character.
+				Draw character "char" into a canvas item using the font at a given position, with "modulate" color, and optionally kerning if "next" is passed. clipping the width. "position" specifies the baseline, not the top. To draw from the top, [i]ascent[/i] must be added to the Y axis. The width used by the character is returned, making this function useful for drawing strings character by character.
 			</description>
 		</method>
 		<method name="get_ascent" qualifiers="const">
diff --git a/doc/classes/Geometry.xml b/doc/classes/Geometry.xml
index 6c301cb92..49f32bc68 100644
--- a/doc/classes/Geometry.xml
+++ b/doc/classes/Geometry.xml
@@ -176,7 +176,7 @@
 			</argument>
 			<argument index="1" name="segment_to" type="Vector2">
 			</argument>
-			<argument index="2" name="circle_pos" type="Vector2">
+			<argument index="2" name="circle_position" type="Vector2">
 			</argument>
 			<argument index="3" name="circle_radius" type="float">
 			</argument>
@@ -230,9 +230,9 @@
 			</argument>
 			<argument index="1" name="to" type="Vector3">
 			</argument>
-			<argument index="2" name="spos" type="Vector3">
+			<argument index="2" name="sphere_position" type="Vector3">
 			</argument>
-			<argument index="3" name="sradius" type="float">
+			<argument index="3" name="sphere_radius" type="float">
 			</argument>
 			<description>
 			</description>
diff --git a/doc/classes/GraphEdit.xml b/doc/classes/GraphEdit.xml
index bd594033e..c9771f1ad 100644
--- a/doc/classes/GraphEdit.xml
+++ b/doc/classes/GraphEdit.xml
@@ -177,7 +177,7 @@
 			</argument>
 			<argument index="1" name="from_slot" type="int">
 			</argument>
-			<argument index="2" name="release_pos" type="Vector2">
+			<argument index="2" name="release_position" type="Vector2">
 			</argument>
 			<description>
 			</description>
@@ -230,7 +230,7 @@
 	<theme_items>
 		<theme_item name="bezier_len_neg" type="int">
 		</theme_item>
-		<theme_item name="bezier_len_pos" type="int">
+		<theme_item name="bezier_len_position" type="int">
 		</theme_item>
 		<theme_item name="bg" type="StyleBox">
 		</theme_item>
diff --git a/doc/classes/GraphNode.xml b/doc/classes/GraphNode.xml
index de1d9c119..e23039088 100644
--- a/doc/classes/GraphNode.xml
+++ b/doc/classes/GraphNode.xml
@@ -43,7 +43,7 @@
 				Return the number of enabled input slots (connections) to the GraphNode.
 			</description>
 		</method>
-		<method name="get_connection_input_pos">
+		<method name="get_connection_input_position">
 			<return type="Vector2">
 			</return>
 			<argument index="0" name="idx" type="int">
@@ -77,7 +77,7 @@
 				Return the number of enabled output slots (connections) of the GraphNode.
 			</description>
 		</method>
-		<method name="get_connection_output_pos">
+		<method name="get_connection_output_position">
 			<return type="Vector2">
 			</return>
 			<argument index="0" name="idx" type="int">
diff --git a/doc/classes/ImmediateGeometry.xml b/doc/classes/ImmediateGeometry.xml
index 7b45c0c67..b12f9c99a 100644
--- a/doc/classes/ImmediateGeometry.xml
+++ b/doc/classes/ImmediateGeometry.xml
@@ -28,7 +28,7 @@
 		<method name="add_vertex">
 			<return type="void">
 			</return>
-			<argument index="0" name="pos" type="Vector3">
+			<argument index="0" name="position" type="Vector3">
 			</argument>
 			<description>
 				Add a vertex with the currently set color/uv/etc.
diff --git a/doc/classes/Input.xml b/doc/classes/Input.xml
index f63600024..3d8b4154f 100644
--- a/doc/classes/Input.xml
+++ b/doc/classes/Input.xml
@@ -298,7 +298,7 @@
 				Stops the vibration of the joypad.
 			</description>
 		</method>
-		<method name="warp_mouse_pos">
+		<method name="warp_mouse_position">
 			<return type="void">
 			</return>
 			<argument index="0" name="to" type="Vector2">
diff --git a/doc/classes/InputEventScreenTouch.xml b/doc/classes/InputEventScreenTouch.xml
index 97c353736..48c5626f1 100644
--- a/doc/classes/InputEventScreenTouch.xml
+++ b/doc/classes/InputEventScreenTouch.xml
@@ -33,7 +33,7 @@
 		<method name="set_position">
 			<return type="void">
 			</return>
-			<argument index="0" name="pos" type="Vector2">
+			<argument index="0" name="position" type="Vector2">
 			</argument>
 			<description>
 			</description>
diff --git a/doc/classes/ItemList.xml b/doc/classes/ItemList.xml
index 3423b8fb9..a8d879888 100644
--- a/doc/classes/ItemList.xml
+++ b/doc/classes/ItemList.xml
@@ -85,10 +85,10 @@
 			<description>
 			</description>
 		</method>
-		<method name="get_item_at_pos" qualifiers="const">
+		<method name="get_item_at_position" qualifiers="const">
 			<return type="int">
 			</return>
-			<argument index="0" name="pos" type="Vector2">
+			<argument index="0" name="position" type="Vector2">
 			</argument>
 			<argument index="1" name="exact" type="bool" default="false">
 			</argument>
@@ -490,7 +490,7 @@
 		<signal name="item_rmb_selected">
 			<argument index="0" name="index" type="int">
 			</argument>
-			<argument index="1" name="atpos" type="Vector2">
+			<argument index="1" name="at_position" type="Vector2">
 			</argument>
 			<description>
 				Fired when specified list item has been selected via right mouse clicking.
diff --git a/doc/classes/Line2D.xml b/doc/classes/Line2D.xml
index 81fd25578..e6e615ccf 100644
--- a/doc/classes/Line2D.xml
+++ b/doc/classes/Line2D.xml
@@ -14,7 +14,7 @@
 		<method name="add_point">
 			<return type="void">
 			</return>
-			<argument index="0" name="pos" type="Vector2">
+			<argument index="0" name="position" type="Vector2">
 			</argument>
 			<description>
 				Add a point at the x/y position in the supplied [Vector2]
@@ -56,7 +56,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="get_point_pos" qualifiers="const">
+		<method name="get_point_position" qualifiers="const">
 			<return type="Vector2">
 			</return>
 			<argument index="0" name="i" type="int">
@@ -149,12 +149,12 @@
 			<description>
 			</description>
 		</method>
-		<method name="set_point_pos">
+		<method name="set_point_position">
 			<return type="void">
 			</return>
 			<argument index="0" name="i" type="int">
 			</argument>
-			<argument index="1" name="pos" type="Vector2">
+			<argument index="1" name="position" type="Vector2">
 			</argument>
 			<description>
 			</description>
diff --git a/doc/classes/LineEdit.xml b/doc/classes/LineEdit.xml
index 0577e1ba3..e6c26e324 100644
--- a/doc/classes/LineEdit.xml
+++ b/doc/classes/LineEdit.xml
@@ -66,7 +66,7 @@
 				Return the align mode of the [LineEdit].
 			</description>
 		</method>
-		<method name="get_cursor_pos" qualifiers="const">
+		<method name="get_cursor_position" qualifiers="const">
 			<return type="int">
 			</return>
 			<description>
@@ -169,10 +169,10 @@
 				Set text alignment of the [LineEdit].
 			</description>
 		</method>
-		<method name="set_cursor_pos">
+		<method name="set_cursor_position">
 			<return type="void">
 			</return>
-			<argument index="0" name="pos" type="int">
+			<argument index="0" name="position" type="int">
 			</argument>
 			<description>
 				Set the cursor position inside the [LineEdit], causing it to scroll if needed.
diff --git a/doc/classes/Node.xml b/doc/classes/Node.xml
index 5a99263f1..e35f64a9c 100644
--- a/doc/classes/Node.xml
+++ b/doc/classes/Node.xml
@@ -441,7 +441,7 @@
 			</return>
 			<argument index="0" name="child_node" type="Node">
 			</argument>
-			<argument index="1" name="to_pos" type="int">
+			<argument index="1" name="to_position" type="int">
 			</argument>
 			<description>
 				Move a child node to a different position (order) amongst the other children. Since calls, signals, etc are performed by tree order, changing the order of children nodes may be useful.
diff --git a/doc/classes/Node2D.xml b/doc/classes/Node2D.xml
index 2ba312b30..084bee92d 100644
--- a/doc/classes/Node2D.xml
+++ b/doc/classes/Node2D.xml
@@ -169,7 +169,7 @@
 		<method name="set_global_position">
 			<return type="void">
 			</return>
-			<argument index="0" name="pos" type="Vector2">
+			<argument index="0" name="position" type="Vector2">
 			</argument>
 			<description>
 				Set the node's global position.
@@ -214,7 +214,7 @@
 		<method name="set_position">
 			<return type="void">
 			</return>
-			<argument index="0" name="pos" type="Vector2">
+			<argument index="0" name="position" type="Vector2">
 			</argument>
 			<description>
 				Set the node's position.
diff --git a/doc/classes/Physics2DDirectBodyState.xml b/doc/classes/Physics2DDirectBodyState.xml
index 9b6fe69b4..cc68aaab1 100644
--- a/doc/classes/Physics2DDirectBodyState.xml
+++ b/doc/classes/Physics2DDirectBodyState.xml
@@ -45,7 +45,7 @@
 				Return the collider object, this depends on how it was created (will return a scene node if such was used to create it).
 			</description>
 		</method>
-		<method name="get_contact_collider_pos" qualifiers="const">
+		<method name="get_contact_collider_position" qualifiers="const">
 			<return type="Vector2">
 			</return>
 			<argument index="0" name="contact_idx" type="int">
@@ -72,7 +72,7 @@
 				Return the metadata of the collided shape. This metadata is different from [method Object.get_meta], and is set with [method Physics2DServer.shape_set_data].
 			</description>
 		</method>
-		<method name="get_contact_collider_velocity_at_pos" qualifiers="const">
+		<method name="get_contact_collider_velocity_at_position" qualifiers="const">
 			<return type="Vector2">
 			</return>
 			<argument index="0" name="contact_idx" type="int">
@@ -97,7 +97,7 @@
 				Return the local normal (of this body) of the contact point.
 			</description>
 		</method>
-		<method name="get_contact_local_pos" qualifiers="const">
+		<method name="get_contact_local_position" qualifiers="const">
 			<return type="Vector2">
 			</return>
 			<argument index="0" name="contact_idx" type="int">
diff --git a/doc/classes/Physics2DServer.xml b/doc/classes/Physics2DServer.xml
index ab6308969..fd093edc8 100644
--- a/doc/classes/Physics2DServer.xml
+++ b/doc/classes/Physics2DServer.xml
@@ -306,7 +306,7 @@
 			</return>
 			<argument index="0" name="body" type="RID">
 			</argument>
-			<argument index="1" name="pos" type="Vector2">
+			<argument index="1" name="position" type="Vector2">
 			</argument>
 			<argument index="2" name="impulse" type="Vector2">
 			</argument>
diff --git a/doc/classes/PhysicsDirectBodyState.xml b/doc/classes/PhysicsDirectBodyState.xml
index de51d0e95..349b7e7c3 100644
--- a/doc/classes/PhysicsDirectBodyState.xml
+++ b/doc/classes/PhysicsDirectBodyState.xml
@@ -14,7 +14,7 @@
 			</return>
 			<argument index="0" name="force" type="Vector3">
 			</argument>
-			<argument index="1" name="pos" type="Vector3">
+			<argument index="1" name="position" type="Vector3">
 			</argument>
 			<description>
 			</description>
@@ -22,7 +22,7 @@
 		<method name="apply_impulse">
 			<return type="void">
 			</return>
-			<argument index="0" name="pos" type="Vector3">
+			<argument index="0" name="position" type="Vector3">
 			</argument>
 			<argument index="1" name="j" type="Vector3">
 			</argument>
@@ -73,7 +73,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="get_contact_collider_pos" qualifiers="const">
+		<method name="get_contact_collider_position" qualifiers="const">
 			<return type="Vector3">
 			</return>
 			<argument index="0" name="contact_idx" type="int">
@@ -89,7 +89,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="get_contact_collider_velocity_at_pos" qualifiers="const">
+		<method name="get_contact_collider_velocity_at_position" qualifiers="const">
 			<return type="Vector3">
 			</return>
 			<argument index="0" name="contact_idx" type="int">
@@ -111,7 +111,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="get_contact_local_pos" qualifiers="const">
+		<method name="get_contact_local_position" qualifiers="const">
 			<return type="Vector3">
 			</return>
 			<argument index="0" name="contact_idx" type="int">
diff --git a/doc/classes/PhysicsServer.xml b/doc/classes/PhysicsServer.xml
index 0076625eb..145f5a016 100644
--- a/doc/classes/PhysicsServer.xml
+++ b/doc/classes/PhysicsServer.xml
@@ -268,7 +268,7 @@
 			</return>
 			<argument index="0" name="body" type="RID">
 			</argument>
-			<argument index="1" name="pos" type="Vector3">
+			<argument index="1" name="position" type="Vector3">
 			</argument>
 			<argument index="2" name="impulse" type="Vector3">
 			</argument>
diff --git a/doc/classes/ProjectSettings.xml b/doc/classes/ProjectSettings.xml
index bec9525a4..1a3ea5c5c 100644
--- a/doc/classes/ProjectSettings.xml
+++ b/doc/classes/ProjectSettings.xml
@@ -147,7 +147,7 @@
 			</return>
 			<argument index="0" name="name" type="String">
 			</argument>
-			<argument index="1" name="pos" type="int">
+			<argument index="1" name="position" type="int">
 			</argument>
 			<description>
 				Set the order of a configuration value (influences when saved to the config file).
diff --git a/doc/classes/Rect2.xml b/doc/classes/Rect2.xml
index 1a467861b..80f7830a1 100644
--- a/doc/classes/Rect2.xml
+++ b/doc/classes/Rect2.xml
@@ -14,7 +14,7 @@
 		<method name="Rect2">
 			<return type="Rect2">
 			</return>
-			<argument index="0" name="pos" type="Vector2">
+			<argument index="0" name="position" type="Vector2">
 			</argument>
 			<argument index="1" name="size" type="Vector2">
 			</argument>
diff --git a/doc/classes/Rect3.xml b/doc/classes/Rect3.xml
index 8837b8f81..f41665db3 100644
--- a/doc/classes/Rect3.xml
+++ b/doc/classes/Rect3.xml
@@ -14,7 +14,7 @@
 		<method name="Rect3">
 			<return type="Rect3">
 			</return>
-			<argument index="0" name="pos" type="Vector3">
+			<argument index="0" name="position" type="Vector3">
 			</argument>
 			<argument index="1" name="size" type="Vector3">
 			</argument>
diff --git a/doc/classes/RigidBody.xml b/doc/classes/RigidBody.xml
index 8347597da..76a93248f 100644
--- a/doc/classes/RigidBody.xml
+++ b/doc/classes/RigidBody.xml
@@ -27,7 +27,7 @@
 		<method name="apply_impulse">
 			<return type="void">
 			</return>
-			<argument index="0" name="pos" type="Vector3">
+			<argument index="0" name="position" type="Vector3">
 			</argument>
 			<argument index="1" name="impulse" type="Vector3">
 			</argument>
diff --git a/doc/classes/Spatial.xml b/doc/classes/Spatial.xml
index e43e4dcc1..54eb82fbf 100644
--- a/doc/classes/Spatial.xml
+++ b/doc/classes/Spatial.xml
@@ -145,10 +145,10 @@
 				Rotates itself to point into direction of target position. Operations take place in global space.
 			</description>
 		</method>
-		<method name="look_at_from_pos">
+		<method name="look_at_from_position">
 			<return type="void">
 			</return>
-			<argument index="0" name="pos" type="Vector3">
+			<argument index="0" name="position" type="Vector3">
 			</argument>
 			<argument index="1" name="target" type="Vector3">
 			</argument>
diff --git a/doc/classes/SpriteFrames.xml b/doc/classes/SpriteFrames.xml
index 1c5669b89..f4a8eeabe 100644
--- a/doc/classes/SpriteFrames.xml
+++ b/doc/classes/SpriteFrames.xml
@@ -26,7 +26,7 @@
 			</argument>
 			<argument index="1" name="frame" type="Texture">
 			</argument>
-			<argument index="2" name="atpos" type="int" default="-1">
+			<argument index="2" name="at_position" type="int" default="-1">
 			</argument>
 			<description>
 			</description>
diff --git a/doc/classes/StreamPeerBuffer.xml b/doc/classes/StreamPeerBuffer.xml
index 70a4c781c..141d46564 100644
--- a/doc/classes/StreamPeerBuffer.xml
+++ b/doc/classes/StreamPeerBuffer.xml
@@ -27,7 +27,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="get_pos" qualifiers="const">
+		<method name="get_position" qualifiers="const">
 			<return type="int">
 			</return>
 			<description>
@@ -50,7 +50,7 @@
 		<method name="seek">
 			<return type="void">
 			</return>
-			<argument index="0" name="pos" type="int">
+			<argument index="0" name="position" type="int">
 			</argument>
 			<description>
 			</description>
diff --git a/doc/classes/String.xml b/doc/classes/String.xml
index ce3dc1db2..c7c19997b 100644
--- a/doc/classes/String.xml
+++ b/doc/classes/String.xml
@@ -266,12 +266,12 @@
 			</description>
 		</method>
 		<method name="erase">
-			<argument index="0" name="pos" type="int">
+			<argument index="0" name="position" type="int">
 			</argument>
 			<argument index="1" name="chars" type="int">
 			</argument>
 			<description>
-				Erase [code]chars[/code] characters from the string starting from [code]pos[/code].
+				Erase [code]chars[/code] characters from the string starting from [code]position[/code].
 			</description>
 		</method>
 		<method name="find">
@@ -360,7 +360,7 @@
 		<method name="insert">
 			<return type="String">
 			</return>
-			<argument index="0" name="pos" type="int">
+			<argument index="0" name="position" type="int">
 			</argument>
 			<argument index="1" name="what" type="String">
 			</argument>
@@ -445,7 +445,7 @@
 		<method name="left">
 			<return type="String">
 			</return>
-			<argument index="0" name="pos" type="int">
+			<argument index="0" name="position" type="int">
 			</argument>
 			<description>
 				Return an amount of characters from the left of the string.
@@ -596,7 +596,7 @@
 		<method name="right">
 			<return type="String">
 			</return>
-			<argument index="0" name="pos" type="int">
+			<argument index="0" name="position" type="int">
 			</argument>
 			<description>
 				Return the right side of the string from a given position.
diff --git a/doc/classes/Texture.xml b/doc/classes/Texture.xml
index d09236bbc..cbf72eb99 100644
--- a/doc/classes/Texture.xml
+++ b/doc/classes/Texture.xml
@@ -16,7 +16,7 @@
 			</return>
 			<argument index="0" name="canvas_item" type="RID">
 			</argument>
-			<argument index="1" name="pos" type="Vector2">
+			<argument index="1" name="position" type="Vector2">
 			</argument>
 			<argument index="2" name="modulate" type="Color" default="Color( 1, 1, 1, 1 )">
 			</argument>
diff --git a/doc/classes/TileMap.xml b/doc/classes/TileMap.xml
index e1a6c0b52..c44fa500c 100644
--- a/doc/classes/TileMap.xml
+++ b/doc/classes/TileMap.xml
@@ -39,7 +39,7 @@
 		<method name="get_cellv" qualifiers="const">
 			<return type="int">
 			</return>
-			<argument index="0" name="pos" type="Vector2">
+			<argument index="0" name="position" type="Vector2">
 			</argument>
 			<description>
 				Return the tile index of the cell referenced by a Vector2.
@@ -222,7 +222,7 @@
 		<method name="map_to_world" qualifiers="const">
 			<return type="Vector2">
 			</return>
-			<argument index="0" name="mappos" type="Vector2">
+			<argument index="0" name="map_position" type="Vector2">
 			</argument>
 			<argument index="1" name="ignore_half_ofs" type="bool" default="false">
 			</argument>
@@ -264,7 +264,7 @@
 		<method name="set_cellv">
 			<return type="void">
 			</return>
-			<argument index="0" name="pos" type="Vector2">
+			<argument index="0" name="position" type="Vector2">
 			</argument>
 			<argument index="1" name="tile" type="int">
 			</argument>
@@ -442,7 +442,7 @@
 		<method name="world_to_map" qualifiers="const">
 			<return type="Vector2">
 			</return>
-			<argument index="0" name="worldpos" type="Vector2">
+			<argument index="0" name="world_position" type="Vector2">
 			</argument>
 			<description>
 				Return the tilemap (grid-based) coordinates corresponding to the absolute world position given as an argument.
diff --git a/doc/classes/Transform2D.xml b/doc/classes/Transform2D.xml
index 4cbe9123f..a90013f92 100644
--- a/doc/classes/Transform2D.xml
+++ b/doc/classes/Transform2D.xml
@@ -38,7 +38,7 @@
 			</return>
 			<argument index="0" name="rot" type="float">
 			</argument>
-			<argument index="1" name="pos" type="Vector2">
+			<argument index="1" name="position" type="Vector2">
 			</argument>
 			<description>
 				Constructs the [Transform2D] from rotation angle in radians and position [Vector2].
diff --git a/doc/classes/Tree.xml b/doc/classes/Tree.xml
index a92a51049..82e85126c 100644
--- a/doc/classes/Tree.xml
+++ b/doc/classes/Tree.xml
@@ -65,10 +65,10 @@
 				Get whether a right click can select items.
 			</description>
 		</method>
-		<method name="get_column_at_pos" qualifiers="const">
+		<method name="get_column_at_position" qualifiers="const">
 			<return type="int">
 			</return>
-			<argument index="0" name="pos" type="Vector2">
+			<argument index="0" name="position" type="Vector2">
 			</argument>
 			<description>
 				Get the column index under the given point.
@@ -113,10 +113,10 @@
 				Get the flags of the current drop mode.
 			</description>
 		</method>
-		<method name="get_drop_section_at_pos" qualifiers="const">
+		<method name="get_drop_section_at_position" qualifiers="const">
 			<return type="int">
 			</return>
-			<argument index="0" name="pos" type="Vector2">
+			<argument index="0" name="position" type="Vector2">
 			</argument>
 			<description>
 			</description>
@@ -146,10 +146,10 @@
 				Get the rectangle area of the the specified item. If column is specified, only get the position and size of that column, otherwise get the rectangle containing all columns.
 			</description>
 		</method>
-		<method name="get_item_at_pos" qualifiers="const">
+		<method name="get_item_at_position" qualifiers="const">
 			<return type="TreeItem">
 			</return>
-			<argument index="0" name="pos" type="Vector2">
+			<argument index="0" name="position" type="Vector2">
 			</argument>
 			<description>
 				Get the tree item at the specified position (relative to the tree origin position).
@@ -342,7 +342,7 @@
 			</description>
 		</signal>
 		<signal name="empty_tree_rmb_selected">
-			<argument index="0" name="pos" type="Vector2">
+			<argument index="0" name="position" type="Vector2">
 			</argument>
 			<description>
 				Emitted when the right mouse button is pressed if RMB selection is active and the tree is empty.
@@ -378,7 +378,7 @@
 			</description>
 		</signal>
 		<signal name="item_rmb_selected">
-			<argument index="0" name="pos" type="Vector2">
+			<argument index="0" name="position" type="Vector2">
 			</argument>
 			<description>
 				Emitted when an item is selected with right mouse button.
diff --git a/doc/classes/Tween.xml b/doc/classes/Tween.xml
index 790a82a60..d291f44de 100644
--- a/doc/classes/Tween.xml
+++ b/doc/classes/Tween.xml
@@ -8,7 +8,7 @@
 		Because it is easy to get it wrong, here is a quick usage example:
 		[codeblock]
 		var tween = get_node("Tween")
-		tween.interpolate_property(get_node("Node2D_to_move"), "transform/pos", Vector2(0,0), Vector2(100,100), 1, Tween.TRANS_LINEAR, Tween.EASE_IN_OUT)
+		tween.interpolate_property(get_node("Node2D_to_move"), "transform/origin", Vector2(0,0), Vector2(100,100), 1, Tween.TRANS_LINEAR, Tween.EASE_IN_OUT)
 		tween.start()
 		[/codeblock]
 		Some of the methods of this class require a property name. You can get the property name by hovering over the property in the inspector of the editor.
diff --git a/doc/classes/VideoPlayer.xml b/doc/classes/VideoPlayer.xml
index 7994c1b65..57e417974 100644
--- a/doc/classes/VideoPlayer.xml
+++ b/doc/classes/VideoPlayer.xml
@@ -39,7 +39,7 @@
 				Get the name of the video stream.
 			</description>
 		</method>
-		<method name="get_stream_pos" qualifiers="const">
+		<method name="get_stream_position" qualifiers="const">
 			<return type="float">
 			</return>
 			<description>
diff --git a/doc/classes/Viewport.xml b/doc/classes/Viewport.xml
index a5170b8d0..2cf36ba69 100644
--- a/doc/classes/Viewport.xml
+++ b/doc/classes/Viewport.xml
@@ -528,7 +528,7 @@
 		<method name="warp_mouse">
 			<return type="void">
 			</return>
-			<argument index="0" name="to_pos" type="Vector2">
+			<argument index="0" name="to_position" type="Vector2">
 			</argument>
 			<description>
 				Warp the mouse to a position, relative to the viewport.
diff --git a/doc/classes/VisualScript.xml b/doc/classes/VisualScript.xml
index 0875aafcf..6473b074d 100644
--- a/doc/classes/VisualScript.xml
+++ b/doc/classes/VisualScript.xml
@@ -34,7 +34,7 @@
 			</argument>
 			<argument index="2" name="node" type="VisualScriptNode">
 			</argument>
-			<argument index="3" name="pos" type="Vector2" default="Vector2( 0, 0 )">
+			<argument index="3" name="position" type="Vector2" default="Vector2( 0, 0 )">
 			</argument>
 			<description>
 			</description>
@@ -197,7 +197,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="get_node_pos" qualifiers="const">
+		<method name="get_node_position" qualifiers="const">
 			<return type="Vector2">
 			</return>
 			<argument index="0" name="func" type="String">
@@ -405,14 +405,14 @@
 			<description>
 			</description>
 		</method>
-		<method name="set_node_pos">
+		<method name="set_node_position">
 			<return type="void">
 			</return>
 			<argument index="0" name="func" type="String">
 			</argument>
 			<argument index="1" name="id" type="int">
 			</argument>
-			<argument index="2" name="pos" type="Vector2">
+			<argument index="2" name="position" type="Vector2">
 			</argument>
 			<description>
 			</description>
diff --git a/doc/classes/XMLParser.xml b/doc/classes/XMLParser.xml
index 6ab84ef34..bb9599e27 100644
--- a/doc/classes/XMLParser.xml
+++ b/doc/classes/XMLParser.xml
@@ -133,7 +133,7 @@
 		<method name="seek">
 			<return type="int" enum="Error">
 			</return>
-			<argument index="0" name="pos" type="int">
+			<argument index="0" name="position" type="int">
 			</argument>
 			<description>
 				Move the buffer cursor to a certain offset (since the beginning) and read the next node there. This returns an error code.
-- 
cgit v1.2.3-70-g09d2