diff --git a/parser/output/raylib_api.json b/parser/output/raylib_api.json
index ec8d57a8c..f90e5d9fd 100644
--- a/parser/output/raylib_api.json
+++ b/parser/output/raylib_api.json
@@ -335,6 +335,12 @@
       "type": "UNKNOWN",
       "value": "SHADER_LOC_MAP_METALNESS",
       "description": ""
+    },
+    {
+      "name": "GetMouseRay",
+      "type": "UNKNOWN",
+      "value": "GetScreenToWorldRay",
+      "description": "Compatibility hack for previous raylib versions"
     }
   ],
   "structs": [
@@ -3873,12 +3879,12 @@
     },
     {
       "name": "GetScreenToWorldRay",
-      "description": "Get a ray trace from mouse position",
+      "description": "Get a ray trace from screen position (i.e mouse)",
       "returnType": "Ray",
       "params": [
         {
           "type": "Vector2",
-          "name": "mousePosition"
+          "name": "position"
         },
         {
           "type": "Camera",
@@ -3888,12 +3894,12 @@
     },
     {
       "name": "GetScreenToWorldRayEx",
-      "description": "Get a ray trace from mouse position in a viewport",
+      "description": "Get a ray trace from screen position (i.e mouse) in a viewport",
       "returnType": "Ray",
       "params": [
         {
           "type": "Vector2",
-          "name": "mousePosition"
+          "name": "position"
         },
         {
           "type": "Camera",
@@ -5091,7 +5097,7 @@
     {
       "name": "GetTouchPointId",
       "description": "Get touch point identifier for given index",
-      "returnType": "int",
+      "returnType": "long long",
       "params": [
         {
           "type": "int",
diff --git a/parser/output/raylib_api.lua b/parser/output/raylib_api.lua
index 01c1abf30..abc65ec47 100644
--- a/parser/output/raylib_api.lua
+++ b/parser/output/raylib_api.lua
@@ -335,6 +335,12 @@ return {
       type = "UNKNOWN",
       value = "SHADER_LOC_MAP_METALNESS",
       description = ""
+    },
+    {
+      name = "GetMouseRay",
+      type = "UNKNOWN",
+      value = "GetScreenToWorldRay",
+      description = "Compatibility hack for previous raylib versions"
     }
   },
   structs = {
@@ -3636,19 +3642,19 @@ return {
     },
     {
       name = "GetScreenToWorldRay",
-      description = "Get a ray trace from mouse position",
+      description = "Get a ray trace from screen position (i.e mouse)",
       returnType = "Ray",
       params = {
-        {type = "Vector2", name = "mousePosition"},
+        {type = "Vector2", name = "position"},
         {type = "Camera", name = "camera"}
       }
     },
     {
       name = "GetScreenToWorldRayEx",
-      description = "Get a ray trace from mouse position in a viewport",
+      description = "Get a ray trace from screen position (i.e mouse) in a viewport",
       returnType = "Ray",
       params = {
-        {type = "Vector2", name = "mousePosition"},
+        {type = "Vector2", name = "position"},
         {type = "Camera", name = "camera"},
         {type = "float", name = "width"},
         {type = "float", name = "height"}
@@ -4470,7 +4476,7 @@ return {
     {
       name = "GetTouchPointId",
       description = "Get touch point identifier for given index",
-      returnType = "int",
+      returnType = "long long",
       params = {
         {type = "int", name = "index"}
       }
diff --git a/parser/output/raylib_api.txt b/parser/output/raylib_api.txt
index d49ac33e4..37be0f94e 100644
--- a/parser/output/raylib_api.txt
+++ b/parser/output/raylib_api.txt
@@ -1,5 +1,5 @@
 
-Defines found: 56
+Defines found: 57
 
 Define 001: RAYLIB_H
   Name: RAYLIB_H
@@ -281,6 +281,11 @@ Define 056: SHADER_LOC_MAP_SPECULAR
   Type: UNKNOWN
   Value: SHADER_LOC_MAP_METALNESS
   Description: 
+Define 057: GetMouseRay
+  Name: GetMouseRay
+  Type: UNKNOWN
+  Value: GetScreenToWorldRay
+  Description: Compatibility hack for previous raylib versions
 
 Structures found: 34
 
@@ -1424,14 +1429,14 @@ Function 083: UnloadShader() (1 input parameters)
 Function 084: GetScreenToWorldRay() (2 input parameters)
   Name: GetScreenToWorldRay
   Return type: Ray
-  Description: Get a ray trace from mouse position
-  Param[1]: mousePosition (type: Vector2)
+  Description: Get a ray trace from screen position (i.e mouse)
+  Param[1]: position (type: Vector2)
   Param[2]: camera (type: Camera)
 Function 085: GetScreenToWorldRayEx() (4 input parameters)
   Name: GetScreenToWorldRayEx
   Return type: Ray
-  Description: Get a ray trace from mouse position in a viewport
-  Param[1]: mousePosition (type: Vector2)
+  Description: Get a ray trace from screen position (i.e mouse) in a viewport
+  Param[1]: position (type: Vector2)
   Param[2]: camera (type: Camera)
   Param[3]: width (type: float)
   Param[4]: height (type: float)
@@ -2001,7 +2006,7 @@ Function 190: GetTouchPosition() (1 input parameters)
   Param[1]: index (type: int)
 Function 191: GetTouchPointId() (1 input parameters)
   Name: GetTouchPointId
-  Return type: int
+  Return type: long long
   Description: Get touch point identifier for given index
   Param[1]: index (type: int)
 Function 192: GetTouchPointCount() (0 input parameters)
diff --git a/parser/output/raylib_api.xml b/parser/output/raylib_api.xml
index 45697f24d..dae5ff9a6 100644
--- a/parser/output/raylib_api.xml
+++ b/parser/output/raylib_api.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="Windows-1252" ?>
 <raylibAPI>
-    <Defines count="56">
+    <Defines count="57">
         <Define name="RAYLIB_H" type="GUARD" value="" desc="" />
         <Define name="RAYLIB_VERSION_MAJOR" type="INT" value="5" desc="" />
         <Define name="RAYLIB_VERSION_MINOR" type="INT" value="1" desc="" />
@@ -57,6 +57,7 @@
         <Define name="MATERIAL_MAP_SPECULAR" type="UNKNOWN" value="MATERIAL_MAP_METALNESS" desc="" />
         <Define name="SHADER_LOC_MAP_DIFFUSE" type="UNKNOWN" value="SHADER_LOC_MAP_ALBEDO" desc="" />
         <Define name="SHADER_LOC_MAP_SPECULAR" type="UNKNOWN" value="SHADER_LOC_MAP_METALNESS" desc="" />
+        <Define name="GetMouseRay" type="UNKNOWN" value="GetScreenToWorldRay" desc="Compatibility hack for previous raylib versions" />
     </Defines>
     <Structs count="34">
         <Struct name="Vector2" fieldCount="2" desc="Vector2, 2 components">
@@ -902,12 +903,12 @@
         <Function name="UnloadShader" retType="void" paramCount="1" desc="Unload shader from GPU memory (VRAM)">
             <Param type="Shader" name="shader" desc="" />
         </Function>
-        <Function name="GetScreenToWorldRay" retType="Ray" paramCount="2" desc="Get a ray trace from mouse position">
-            <Param type="Vector2" name="mousePosition" desc="" />
+        <Function name="GetScreenToWorldRay" retType="Ray" paramCount="2" desc="Get a ray trace from screen position (i.e mouse)">
+            <Param type="Vector2" name="position" desc="" />
             <Param type="Camera" name="camera" desc="" />
         </Function>
-        <Function name="GetScreenToWorldRayEx" retType="Ray" paramCount="4" desc="Get a ray trace from mouse position in a viewport">
-            <Param type="Vector2" name="mousePosition" desc="" />
+        <Function name="GetScreenToWorldRayEx" retType="Ray" paramCount="4" desc="Get a ray trace from screen position (i.e mouse) in a viewport">
+            <Param type="Vector2" name="position" desc="" />
             <Param type="Camera" name="camera" desc="" />
             <Param type="float" name="width" desc="" />
             <Param type="float" name="height" desc="" />
@@ -1244,7 +1245,7 @@
         <Function name="GetTouchPosition" retType="Vector2" paramCount="1" desc="Get touch position XY for a touch point index (relative to screen size)">
             <Param type="int" name="index" desc="" />
         </Function>
-        <Function name="GetTouchPointId" retType="int" paramCount="1" desc="Get touch point identifier for given index">
+        <Function name="GetTouchPointId" retType="long long" paramCount="1" desc="Get touch point identifier for given index">
             <Param type="int" name="index" desc="" />
         </Function>
         <Function name="GetTouchPointCount" retType="int" paramCount="0" desc="Get number of touch points">