Rename Rect3 to AABB.

Fixes #12973.

12 files changed, 431 insertions, 430 deletions

diff --git a/modules/gdnative/gdnative/aabb.cpp b/modules/gdnative/gdnative/aabb.cpp
new file mode 100644
index 0000000000..6c89bcdceb
--- /dev/null
+++ b/modules/gdnative/gdnative/aabb.cpp
@@ -0,0 +1,217 @@
+/*************************************************************************/
+/*  aabb.cpp                                                            */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2017 Godot Engine contributors (cf. AUTHORS.md)    */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+#include "gdnative/aabb.h"
+
+#include "core/math/aabb.h"
+#include "core/variant.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void GDAPI godot_aabb_new(godot_aabb *r_dest, const godot_vector3 *p_pos, const godot_vector3 *p_size) {
+	const Vector3 *pos = (const Vector3 *)p_pos;
+	const Vector3 *size = (const Vector3 *)p_size;
+	AABB *dest = (AABB *)r_dest;
+	*dest = AABB(*pos, *size);
+}
+
+godot_vector3 GDAPI godot_aabb_get_position(const godot_aabb *p_self) {
+	godot_vector3 raw_ret;
+	const AABB *self = (const AABB *)p_self;
+	Vector3 *ret = (Vector3 *)&raw_ret;
+	*ret = self->position;
+	return raw_ret;
+}
+
+void GDAPI godot_aabb_set_position(const godot_aabb *p_self, const godot_vector3 *p_v) {
+	AABB *self = (AABB *)p_self;
+	const Vector3 *v = (const Vector3 *)p_v;
+	self->position = *v;
+}
+
+godot_vector3 GDAPI godot_aabb_get_size(const godot_aabb *p_self) {
+	godot_vector3 raw_ret;
+	const AABB *self = (const AABB *)p_self;
+	Vector3 *ret = (Vector3 *)&raw_ret;
+	*ret = self->size;
+	return raw_ret;
+}
+
+void GDAPI godot_aabb_set_size(const godot_aabb *p_self, const godot_vector3 *p_v) {
+	AABB *self = (AABB *)p_self;
+	const Vector3 *v = (const Vector3 *)p_v;
+	self->size = *v;
+}
+
+godot_string GDAPI godot_aabb_as_string(const godot_aabb *p_self) {
+	godot_string ret;
+	const AABB *self = (const AABB *)p_self;
+	memnew_placement(&ret, String(*self));
+	return ret;
+}
+
+godot_real GDAPI godot_aabb_get_area(const godot_aabb *p_self) {
+	const AABB *self = (const AABB *)p_self;
+	return self->get_area();
+}
+
+godot_bool GDAPI godot_aabb_has_no_area(const godot_aabb *p_self) {
+	const AABB *self = (const AABB *)p_self;
+	return self->has_no_area();
+}
+
+godot_bool GDAPI godot_aabb_has_no_surface(const godot_aabb *p_self) {
+	const AABB *self = (const AABB *)p_self;
+	return self->has_no_surface();
+}
+
+godot_bool GDAPI godot_aabb_intersects(const godot_aabb *p_self, const godot_aabb *p_with) {
+	const AABB *self = (const AABB *)p_self;
+	const AABB *with = (const AABB *)p_with;
+	return self->intersects(*with);
+}
+
+godot_bool GDAPI godot_aabb_encloses(const godot_aabb *p_self, const godot_aabb *p_with) {
+	const AABB *self = (const AABB *)p_self;
+	const AABB *with = (const AABB *)p_with;
+	return self->encloses(*with);
+}
+
+godot_aabb GDAPI godot_aabb_merge(const godot_aabb *p_self, const godot_aabb *p_with) {
+	godot_aabb dest;
+	const AABB *self = (const AABB *)p_self;
+	const AABB *with = (const AABB *)p_with;
+	*((AABB *)&dest) = self->merge(*with);
+	return dest;
+}
+
+godot_aabb GDAPI godot_aabb_intersection(const godot_aabb *p_self, const godot_aabb *p_with) {
+	godot_aabb dest;
+	const AABB *self = (const AABB *)p_self;
+	const AABB *with = (const AABB *)p_with;
+	*((AABB *)&dest) = self->intersection(*with);
+	return dest;
+}
+
+godot_bool GDAPI godot_aabb_intersects_plane(const godot_aabb *p_self, const godot_plane *p_plane) {
+	const AABB *self = (const AABB *)p_self;
+	const Plane *plane = (const Plane *)p_plane;
+	return self->intersects_plane(*plane);
+}
+
+godot_bool GDAPI godot_aabb_intersects_segment(const godot_aabb *p_self, const godot_vector3 *p_from, const godot_vector3 *p_to) {
+	const AABB *self = (const AABB *)p_self;
+	const Vector3 *from = (const Vector3 *)p_from;
+	const Vector3 *to = (const Vector3 *)p_to;
+	return self->intersects_segment(*from, *to);
+}
+
+godot_bool GDAPI godot_aabb_has_point(const godot_aabb *p_self, const godot_vector3 *p_point) {
+	const AABB *self = (const AABB *)p_self;
+	const Vector3 *point = (const Vector3 *)p_point;
+	return self->has_point(*point);
+}
+
+godot_vector3 GDAPI godot_aabb_get_support(const godot_aabb *p_self, const godot_vector3 *p_dir) {
+	godot_vector3 dest;
+	const AABB *self = (const AABB *)p_self;
+	const Vector3 *dir = (const Vector3 *)p_dir;
+	*((Vector3 *)&dest) = self->get_support(*dir);
+	return dest;
+}
+
+godot_vector3 GDAPI godot_aabb_get_longest_axis(const godot_aabb *p_self) {
+	godot_vector3 dest;
+	const AABB *self = (const AABB *)p_self;
+	*((Vector3 *)&dest) = self->get_longest_axis();
+	return dest;
+}
+
+godot_int GDAPI godot_aabb_get_longest_axis_index(const godot_aabb *p_self) {
+	const AABB *self = (const AABB *)p_self;
+	return self->get_longest_axis_index();
+}
+
+godot_real GDAPI godot_aabb_get_longest_axis_size(const godot_aabb *p_self) {
+	const AABB *self = (const AABB *)p_self;
+	return self->get_longest_axis_size();
+}
+
+godot_vector3 GDAPI godot_aabb_get_shortest_axis(const godot_aabb *p_self) {
+	godot_vector3 dest;
+	const AABB *self = (const AABB *)p_self;
+	*((Vector3 *)&dest) = self->get_shortest_axis();
+	return dest;
+}
+
+godot_int GDAPI godot_aabb_get_shortest_axis_index(const godot_aabb *p_self) {
+	const AABB *self = (const AABB *)p_self;
+	return self->get_shortest_axis_index();
+}
+
+godot_real GDAPI godot_aabb_get_shortest_axis_size(const godot_aabb *p_self) {
+	const AABB *self = (const AABB *)p_self;
+	return self->get_shortest_axis_size();
+}
+
+godot_aabb GDAPI godot_aabb_expand(const godot_aabb *p_self, const godot_vector3 *p_to_point) {
+	godot_aabb dest;
+	const AABB *self = (const AABB *)p_self;
+	const Vector3 *to_point = (const Vector3 *)p_to_point;
+	*((AABB *)&dest) = self->expand(*to_point);
+	return dest;
+}
+
+godot_aabb GDAPI godot_aabb_grow(const godot_aabb *p_self, const godot_real p_by) {
+	godot_aabb dest;
+	const AABB *self = (const AABB *)p_self;
+
+	*((AABB *)&dest) = self->grow(p_by);
+	return dest;
+}
+
+godot_vector3 GDAPI godot_aabb_get_endpoint(const godot_aabb *p_self, const godot_int p_idx) {
+	godot_vector3 dest;
+	const AABB *self = (const AABB *)p_self;
+
+	*((Vector3 *)&dest) = self->get_endpoint(p_idx);
+	return dest;
+}
+
+godot_bool GDAPI godot_aabb_operator_equal(const godot_aabb *p_self, const godot_aabb *p_b) {
+	const AABB *self = (const AABB *)p_self;
+	const AABB *b = (const AABB *)p_b;
+	return *self == *b;
+}
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/modules/gdnative/gdnative/rect3.cpp b/modules/gdnative/gdnative/rect3.cpp
deleted file mode 100644
index 8e088743b4..0000000000
--- a/modules/gdnative/gdnative/rect3.cpp
+++ /dev/null
@@ -1,217 +0,0 @@
-/*************************************************************************/
-/*  rect3.cpp                                                            */
-/*************************************************************************/
-/*                       This file is part of:                           */
-/*                           GODOT ENGINE                                */
-/*                      https://godotengine.org                          */
-/*************************************************************************/
-/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2017 Godot Engine contributors (cf. AUTHORS.md)    */
-/*                                                                       */
-/* Permission is hereby granted, free of charge, to any person obtaining */
-/* a copy of this software and associated documentation files (the       */
-/* "Software"), to deal in the Software without restriction, including   */
-/* without limitation the rights to use, copy, modify, merge, publish,   */
-/* distribute, sublicense, and/or sell copies of the Software, and to    */
-/* permit persons to whom the Software is furnished to do so, subject to */
-/* the following conditions:                                             */
-/*                                                                       */
-/* The above copyright notice and this permission notice shall be        */
-/* included in all copies or substantial portions of the Software.       */
-/*                                                                       */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
-/*************************************************************************/
-#include "gdnative/rect3.h"
-
-#include "core/math/rect3.h"
-#include "core/variant.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void GDAPI godot_rect3_new(godot_rect3 *r_dest, const godot_vector3 *p_pos, const godot_vector3 *p_size) {
-	const Vector3 *pos = (const Vector3 *)p_pos;
-	const Vector3 *size = (const Vector3 *)p_size;
-	Rect3 *dest = (Rect3 *)r_dest;
-	*dest = Rect3(*pos, *size);
-}
-
-godot_vector3 GDAPI godot_rect3_get_position(const godot_rect3 *p_self) {
-	godot_vector3 raw_ret;
-	const Rect3 *self = (const Rect3 *)p_self;
-	Vector3 *ret = (Vector3 *)&raw_ret;
-	*ret = self->position;
-	return raw_ret;
-}
-
-void GDAPI godot_rect3_set_position(const godot_rect3 *p_self, const godot_vector3 *p_v) {
-	Rect3 *self = (Rect3 *)p_self;
-	const Vector3 *v = (const Vector3 *)p_v;
-	self->position = *v;
-}
-
-godot_vector3 GDAPI godot_rect3_get_size(const godot_rect3 *p_self) {
-	godot_vector3 raw_ret;
-	const Rect3 *self = (const Rect3 *)p_self;
-	Vector3 *ret = (Vector3 *)&raw_ret;
-	*ret = self->size;
-	return raw_ret;
-}
-
-void GDAPI godot_rect3_set_size(const godot_rect3 *p_self, const godot_vector3 *p_v) {
-	Rect3 *self = (Rect3 *)p_self;
-	const Vector3 *v = (const Vector3 *)p_v;
-	self->size = *v;
-}
-
-godot_string GDAPI godot_rect3_as_string(const godot_rect3 *p_self) {
-	godot_string ret;
-	const Rect3 *self = (const Rect3 *)p_self;
-	memnew_placement(&ret, String(*self));
-	return ret;
-}
-
-godot_real GDAPI godot_rect3_get_area(const godot_rect3 *p_self) {
-	const Rect3 *self = (const Rect3 *)p_self;
-	return self->get_area();
-}
-
-godot_bool GDAPI godot_rect3_has_no_area(const godot_rect3 *p_self) {
-	const Rect3 *self = (const Rect3 *)p_self;
-	return self->has_no_area();
-}
-
-godot_bool GDAPI godot_rect3_has_no_surface(const godot_rect3 *p_self) {
-	const Rect3 *self = (const Rect3 *)p_self;
-	return self->has_no_surface();
-}
-
-godot_bool GDAPI godot_rect3_intersects(const godot_rect3 *p_self, const godot_rect3 *p_with) {
-	const Rect3 *self = (const Rect3 *)p_self;
-	const Rect3 *with = (const Rect3 *)p_with;
-	return self->intersects(*with);
-}
-
-godot_bool GDAPI godot_rect3_encloses(const godot_rect3 *p_self, const godot_rect3 *p_with) {
-	const Rect3 *self = (const Rect3 *)p_self;
-	const Rect3 *with = (const Rect3 *)p_with;
-	return self->encloses(*with);
-}
-
-godot_rect3 GDAPI godot_rect3_merge(const godot_rect3 *p_self, const godot_rect3 *p_with) {
-	godot_rect3 dest;
-	const Rect3 *self = (const Rect3 *)p_self;
-	const Rect3 *with = (const Rect3 *)p_with;
-	*((Rect3 *)&dest) = self->merge(*with);
-	return dest;
-}
-
-godot_rect3 GDAPI godot_rect3_intersection(const godot_rect3 *p_self, const godot_rect3 *p_with) {
-	godot_rect3 dest;
-	const Rect3 *self = (const Rect3 *)p_self;
-	const Rect3 *with = (const Rect3 *)p_with;
-	*((Rect3 *)&dest) = self->intersection(*with);
-	return dest;
-}
-
-godot_bool GDAPI godot_rect3_intersects_plane(const godot_rect3 *p_self, const godot_plane *p_plane) {
-	const Rect3 *self = (const Rect3 *)p_self;
-	const Plane *plane = (const Plane *)p_plane;
-	return self->intersects_plane(*plane);
-}
-
-godot_bool GDAPI godot_rect3_intersects_segment(const godot_rect3 *p_self, const godot_vector3 *p_from, const godot_vector3 *p_to) {
-	const Rect3 *self = (const Rect3 *)p_self;
-	const Vector3 *from = (const Vector3 *)p_from;
-	const Vector3 *to = (const Vector3 *)p_to;
-	return self->intersects_segment(*from, *to);
-}
-
-godot_bool GDAPI godot_rect3_has_point(const godot_rect3 *p_self, const godot_vector3 *p_point) {
-	const Rect3 *self = (const Rect3 *)p_self;
-	const Vector3 *point = (const Vector3 *)p_point;
-	return self->has_point(*point);
-}
-
-godot_vector3 GDAPI godot_rect3_get_support(const godot_rect3 *p_self, const godot_vector3 *p_dir) {
-	godot_vector3 dest;
-	const Rect3 *self = (const Rect3 *)p_self;
-	const Vector3 *dir = (const Vector3 *)p_dir;
-	*((Vector3 *)&dest) = self->get_support(*dir);
-	return dest;
-}
-
-godot_vector3 GDAPI godot_rect3_get_longest_axis(const godot_rect3 *p_self) {
-	godot_vector3 dest;
-	const Rect3 *self = (const Rect3 *)p_self;
-	*((Vector3 *)&dest) = self->get_longest_axis();
-	return dest;
-}
-
-godot_int GDAPI godot_rect3_get_longest_axis_index(const godot_rect3 *p_self) {
-	const Rect3 *self = (const Rect3 *)p_self;
-	return self->get_longest_axis_index();
-}
-
-godot_real GDAPI godot_rect3_get_longest_axis_size(const godot_rect3 *p_self) {
-	const Rect3 *self = (const Rect3 *)p_self;
-	return self->get_longest_axis_size();
-}
-
-godot_vector3 GDAPI godot_rect3_get_shortest_axis(const godot_rect3 *p_self) {
-	godot_vector3 dest;
-	const Rect3 *self = (const Rect3 *)p_self;
-	*((Vector3 *)&dest) = self->get_shortest_axis();
-	return dest;
-}
-
-godot_int GDAPI godot_rect3_get_shortest_axis_index(const godot_rect3 *p_self) {
-	const Rect3 *self = (const Rect3 *)p_self;
-	return self->get_shortest_axis_index();
-}
-
-godot_real GDAPI godot_rect3_get_shortest_axis_size(const godot_rect3 *p_self) {
-	const Rect3 *self = (const Rect3 *)p_self;
-	return self->get_shortest_axis_size();
-}
-
-godot_rect3 GDAPI godot_rect3_expand(const godot_rect3 *p_self, const godot_vector3 *p_to_point) {
-	godot_rect3 dest;
-	const Rect3 *self = (const Rect3 *)p_self;
-	const Vector3 *to_point = (const Vector3 *)p_to_point;
-	*((Rect3 *)&dest) = self->expand(*to_point);
-	return dest;
-}
-
-godot_rect3 GDAPI godot_rect3_grow(const godot_rect3 *p_self, const godot_real p_by) {
-	godot_rect3 dest;
-	const Rect3 *self = (const Rect3 *)p_self;
-
-	*((Rect3 *)&dest) = self->grow(p_by);
-	return dest;
-}
-
-godot_vector3 GDAPI godot_rect3_get_endpoint(const godot_rect3 *p_self, const godot_int p_idx) {
-	godot_vector3 dest;
-	const Rect3 *self = (const Rect3 *)p_self;
-
-	*((Vector3 *)&dest) = self->get_endpoint(p_idx);
-	return dest;
-}
-
-godot_bool GDAPI godot_rect3_operator_equal(const godot_rect3 *p_self, const godot_rect3 *p_b) {
-	const Rect3 *self = (const Rect3 *)p_self;
-	const Rect3 *b = (const Rect3 *)p_b;
-	return *self == *b;
-}
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/modules/gdnative/gdnative/transform.cpp b/modules/gdnative/gdnative/transform.cpp
index 96b2ec8a7a..b07fcffcb6 100644
--- a/modules/gdnative/gdnative/transform.cpp
+++ b/modules/gdnative/gdnative/transform.cpp
@@ -198,20 +198,20 @@ godot_vector3 GDAPI godot_transform_xform_inv_vector3(const godot_transform *p_s
 	return raw_dest;
 }
 
-godot_rect3 GDAPI godot_transform_xform_rect3(const godot_transform *p_self, const godot_rect3 *p_v) {
-	godot_rect3 raw_dest;
-	Rect3 *dest = (Rect3 *)&raw_dest;
+godot_aabb GDAPI godot_transform_xform_aabb(const godot_transform *p_self, const godot_aabb *p_v) {
+	godot_aabb raw_dest;
+	AABB *dest = (AABB *)&raw_dest;
 	const Transform *self = (const Transform *)p_self;
-	const Rect3 *v = (const Rect3 *)p_v;
+	const AABB *v = (const AABB *)p_v;
 	*dest = self->xform(*v);
 	return raw_dest;
 }
 
-godot_rect3 GDAPI godot_transform_xform_inv_rect3(const godot_transform *p_self, const godot_rect3 *p_v) {
-	godot_rect3 raw_dest;
-	Rect3 *dest = (Rect3 *)&raw_dest;
+godot_aabb GDAPI godot_transform_xform_inv_aabb(const godot_transform *p_self, const godot_aabb *p_v) {
+	godot_aabb raw_dest;
+	AABB *dest = (AABB *)&raw_dest;
 	const Transform *self = (const Transform *)p_self;
-	const Rect3 *v = (const Rect3 *)p_v;
+	const AABB *v = (const AABB *)p_v;
 	*dest = self->xform_inv(*v);
 	return raw_dest;
 }
diff --git a/modules/gdnative/gdnative/variant.cpp b/modules/gdnative/gdnative/variant.cpp
index 0c31bc643c..6483d19d74 100644
--- a/modules/gdnative/gdnative/variant.cpp
+++ b/modules/gdnative/gdnative/variant.cpp
@@ -118,10 +118,10 @@ void GDAPI godot_variant_new_quat(godot_variant *r_dest, const godot_quat *p_qua
 	memnew_placement_custom(dest, Variant, Variant(*quat));
 }
 
-void GDAPI godot_variant_new_rect3(godot_variant *r_dest, const godot_rect3 *p_rect3) {
+void GDAPI godot_variant_new_aabb(godot_variant *r_dest, const godot_aabb *p_aabb) {
 	Variant *dest = (Variant *)r_dest;
-	Rect3 *rect3 = (Rect3 *)p_rect3;
-	memnew_placement_custom(dest, Variant, Variant(*rect3));
+	AABB *aabb = (AABB *)p_aabb;
+	memnew_placement_custom(dest, Variant, Variant(*aabb));
 }
 
 void GDAPI godot_variant_new_basis(godot_variant *r_dest, const godot_basis *p_basis) {
@@ -304,10 +304,10 @@ godot_quat GDAPI godot_variant_as_quat(const godot_variant *p_self) {
 	return raw_dest;
 }
 
-godot_rect3 GDAPI godot_variant_as_rect3(const godot_variant *p_self) {
-	godot_rect3 raw_dest;
+godot_aabb GDAPI godot_variant_as_aabb(const godot_variant *p_self) {
+	godot_aabb raw_dest;
 	const Variant *self = (const Variant *)p_self;
-	Rect3 *dest = (Rect3 *)&raw_dest;
+	AABB *dest = (AABB *)&raw_dest;
 	*dest = *self;
 	return raw_dest;
 }
diff --git a/modules/gdnative/gdnative_api.json b/modules/gdnative/gdnative_api.json
index 770fb429c7..877c65dfb9 100644
--- a/modules/gdnative/gdnative_api.json
+++ b/modules/gdnative/gdnative_api.json
@@ -3221,209 +3221,209 @@
         ]
       },
       {
-        "name": "godot_rect3_new",
+        "name": "godot_aabb_new",
         "return_type": "void",
         "arguments": [
-          ["godot_rect3 *", "r_dest"],
+          ["godot_aabb *", "r_dest"],
           ["const godot_vector3 *", "p_pos"],
           ["const godot_vector3 *", "p_size"]
         ]
       },
       {
-        "name": "godot_rect3_get_position",
+        "name": "godot_aabb_get_position",
         "return_type": "godot_vector3",
         "arguments": [
-          ["const godot_rect3 *", "p_self"]
+          ["const godot_aabb *", "p_self"]
         ]
       },
       {
-        "name": "godot_rect3_set_position",
+        "name": "godot_aabb_set_position",
         "return_type": "void",
         "arguments": [
-          ["const godot_rect3 *", "p_self"],
+          ["const godot_aabb *", "p_self"],
           ["const godot_vector3 *", "p_v"]
         ]
       },
       {
-        "name": "godot_rect3_get_size",
+        "name": "godot_aabb_get_size",
         "return_type": "godot_vector3",
         "arguments": [
-          ["const godot_rect3 *", "p_self"]
+          ["const godot_aabb *", "p_self"]
         ]
       },
       {
-        "name": "godot_rect3_set_size",
+        "name": "godot_aabb_set_size",
         "return_type": "void",
         "arguments": [
-          ["const godot_rect3 *", "p_self"],
+          ["const godot_aabb *", "p_self"],
           ["const godot_vector3 *", "p_v"]
         ]
       },
       {
-        "name": "godot_rect3_as_string",
+        "name": "godot_aabb_as_string",
         "return_type": "godot_string",
         "arguments": [
-          ["const godot_rect3 *", "p_self"]
+          ["const godot_aabb *", "p_self"]
         ]
       },
       {
-        "name": "godot_rect3_get_area",
+        "name": "godot_aabb_get_area",
         "return_type": "godot_real",
         "arguments": [
-          ["const godot_rect3 *", "p_self"]
+          ["const godot_aabb *", "p_self"]
         ]
       },
       {
-        "name": "godot_rect3_has_no_area",
+        "name": "godot_aabb_has_no_area",
         "return_type": "godot_bool",
         "arguments": [
-          ["const godot_rect3 *", "p_self"]
+          ["const godot_aabb *", "p_self"]
         ]
       },
       {
-        "name": "godot_rect3_has_no_surface",
+        "name": "godot_aabb_has_no_surface",
         "return_type": "godot_bool",
         "arguments": [
-          ["const godot_rect3 *", "p_self"]
+          ["const godot_aabb *", "p_self"]
         ]
       },
       {
-        "name": "godot_rect3_intersects",
+        "name": "godot_aabb_intersects",
         "return_type": "godot_bool",
         "arguments": [
-          ["const godot_rect3 *", "p_self"],
-          ["const godot_rect3 *", "p_with"]
+          ["const godot_aabb *", "p_self"],
+          ["const godot_aabb *", "p_with"]
         ]
       },
       {
-        "name": "godot_rect3_encloses",
+        "name": "godot_aabb_encloses",
         "return_type": "godot_bool",
         "arguments": [
-          ["const godot_rect3 *", "p_self"],
-          ["const godot_rect3 *", "p_with"]
+          ["const godot_aabb *", "p_self"],
+          ["const godot_aabb *", "p_with"]
         ]
       },
       {
-        "name": "godot_rect3_merge",
-        "return_type": "godot_rect3",
+        "name": "godot_aabb_merge",
+        "return_type": "godot_aabb",
         "arguments": [
-          ["const godot_rect3 *", "p_self"],
-          ["const godot_rect3 *", "p_with"]
+          ["const godot_aabb *", "p_self"],
+          ["const godot_aabb *", "p_with"]
         ]
       },
       {
-        "name": "godot_rect3_intersection",
-        "return_type": "godot_rect3",
+        "name": "godot_aabb_intersection",
+        "return_type": "godot_aabb",
         "arguments": [
-          ["const godot_rect3 *", "p_self"],
-          ["const godot_rect3 *", "p_with"]
+          ["const godot_aabb *", "p_self"],
+          ["const godot_aabb *", "p_with"]
         ]
       },
       {
-        "name": "godot_rect3_intersects_plane",
+        "name": "godot_aabb_intersects_plane",
         "return_type": "godot_bool",
         "arguments": [
-          ["const godot_rect3 *", "p_self"],
+          ["const godot_aabb *", "p_self"],
           ["const godot_plane *", "p_plane"]
         ]
       },
       {
-        "name": "godot_rect3_intersects_segment",
+        "name": "godot_aabb_intersects_segment",
         "return_type": "godot_bool",
         "arguments": [
-          ["const godot_rect3 *", "p_self"],
+          ["const godot_aabb *", "p_self"],
           ["const godot_vector3 *", "p_from"],
           ["const godot_vector3 *", "p_to"]
         ]
       },
       {
-        "name": "godot_rect3_has_point",
+        "name": "godot_aabb_has_point",
         "return_type": "godot_bool",
         "arguments": [
-          ["const godot_rect3 *", "p_self"],
+          ["const godot_aabb *", "p_self"],
           ["const godot_vector3 *", "p_point"]
         ]
       },
       {
-        "name": "godot_rect3_get_support",
+        "name": "godot_aabb_get_support",
         "return_type": "godot_vector3",
         "arguments": [
-          ["const godot_rect3 *", "p_self"],
+          ["const godot_aabb *", "p_self"],
           ["const godot_vector3 *", "p_dir"]
         ]
       },
       {
-        "name": "godot_rect3_get_longest_axis",
+        "name": "godot_aabb_get_longest_axis",
         "return_type": "godot_vector3",
         "arguments": [
-          ["const godot_rect3 *", "p_self"]
+          ["const godot_aabb *", "p_self"]
         ]
       },
       {
-        "name": "godot_rect3_get_longest_axis_index",
+        "name": "godot_aabb_get_longest_axis_index",
         "return_type": "godot_int",
         "arguments": [
-          ["const godot_rect3 *", "p_self"]
+          ["const godot_aabb *", "p_self"]
         ]
       },
       {
-        "name": "godot_rect3_get_longest_axis_size",
+        "name": "godot_aabb_get_longest_axis_size",
         "return_type": "godot_real",
         "arguments": [
-          ["const godot_rect3 *", "p_self"]
+          ["const godot_aabb *", "p_self"]
         ]
       },
       {
-        "name": "godot_rect3_get_shortest_axis",
+        "name": "godot_aabb_get_shortest_axis",
         "return_type": "godot_vector3",
         "arguments": [
-          ["const godot_rect3 *", "p_self"]
+          ["const godot_aabb *", "p_self"]
         ]
       },
       {
-        "name": "godot_rect3_get_shortest_axis_index",
+        "name": "godot_aabb_get_shortest_axis_index",
         "return_type": "godot_int",
         "arguments": [
-          ["const godot_rect3 *", "p_self"]
+          ["const godot_aabb *", "p_self"]
         ]
       },
       {
-        "name": "godot_rect3_get_shortest_axis_size",
+        "name": "godot_aabb_get_shortest_axis_size",
         "return_type": "godot_real",
         "arguments": [
-          ["const godot_rect3 *", "p_self"]
+          ["const godot_aabb *", "p_self"]
         ]
       },
       {
-        "name": "godot_rect3_expand",
-        "return_type": "godot_rect3",
+        "name": "godot_aabb_expand",
+        "return_type": "godot_aabb",
         "arguments": [
-          ["const godot_rect3 *", "p_self"],
+          ["const godot_aabb *", "p_self"],
           ["const godot_vector3 *", "p_to_point"]
         ]
       },
       {
-        "name": "godot_rect3_grow",
-        "return_type": "godot_rect3",
+        "name": "godot_aabb_grow",
+        "return_type": "godot_aabb",
         "arguments": [
-          ["const godot_rect3 *", "p_self"],
+          ["const godot_aabb *", "p_self"],
           ["const godot_real", "p_by"]
         ]
       },
       {
-        "name": "godot_rect3_get_endpoint",
+        "name": "godot_aabb_get_endpoint",
         "return_type": "godot_vector3",
         "arguments": [
-          ["const godot_rect3 *", "p_self"],
+          ["const godot_aabb *", "p_self"],
           ["const godot_int", "p_idx"]
         ]
       },
       {
-        "name": "godot_rect3_operator_equal",
+        "name": "godot_aabb_operator_equal",
         "return_type": "godot_bool",
         "arguments": [
-          ["const godot_rect3 *", "p_self"],
-          ["const godot_rect3 *", "p_b"]
+          ["const godot_aabb *", "p_self"],
+          ["const godot_aabb *", "p_b"]
         ]
       },
       {
@@ -3632,19 +3632,19 @@
         ]
       },
       {
-        "name": "godot_transform_xform_rect3",
-        "return_type": "godot_rect3",
+        "name": "godot_transform_xform_aabb",
+        "return_type": "godot_aabb",
         "arguments": [
           ["const godot_transform *", "p_self"],
-          ["const godot_rect3 *", "p_v"]
+          ["const godot_aabb *", "p_v"]
         ]
       },
       {
-        "name": "godot_transform_xform_inv_rect3",
-        "return_type": "godot_rect3",
+        "name": "godot_transform_xform_inv_aabb",
+        "return_type": "godot_aabb",
         "arguments": [
           ["const godot_transform *", "p_self"],
-          ["const godot_rect3 *", "p_v"]
+          ["const godot_aabb *", "p_v"]
         ]
       },
       {
@@ -3930,11 +3930,11 @@
         ]
       },
       {
-        "name": "godot_variant_new_rect3",
+        "name": "godot_variant_new_aabb",
         "return_type": "void",
         "arguments": [
           ["godot_variant *", "r_dest"],
-          ["const godot_rect3 *", "p_rect3"]
+          ["const godot_aabb *", "p_aabb"]
         ]
       },
       {
@@ -4135,8 +4135,8 @@
         ]
       },
       {
-        "name": "godot_variant_as_rect3",
-        "return_type": "godot_rect3",
+        "name": "godot_variant_as_aabb",
+        "return_type": "godot_aabb",
         "arguments": [
           ["const godot_variant *", "p_self"]
         ]
diff --git a/modules/gdnative/include/gdnative/aabb.h b/modules/gdnative/include/gdnative/aabb.h
new file mode 100644
index 0000000000..34339fa242
--- /dev/null
+++ b/modules/gdnative/include/gdnative/aabb.h
@@ -0,0 +1,117 @@
+/*************************************************************************/
+/*  aabb.h                                                              */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2017 Godot Engine contributors (cf. AUTHORS.md)    */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+#ifndef GODOT_AABB_H
+#define GODOT_AABB_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <stdint.h>
+
+#define GODOT_AABB_SIZE 24
+
+#ifndef GODOT_CORE_API_GODOT_AABB_TYPE_DEFINED
+#define GODOT_CORE_API_GODOT_AABB_TYPE_DEFINED
+typedef struct {
+	uint8_t _dont_touch_that[GODOT_AABB_SIZE];
+} godot_aabb;
+#endif
+
+// reduce extern "C" nesting for VS2013
+#ifdef __cplusplus
+}
+#endif
+
+#include <gdnative/gdnative.h>
+#include <gdnative/plane.h>
+#include <gdnative/vector3.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void GDAPI godot_aabb_new(godot_aabb *r_dest, const godot_vector3 *p_pos, const godot_vector3 *p_size);
+
+godot_vector3 GDAPI godot_aabb_get_position(const godot_aabb *p_self);
+void GDAPI godot_aabb_set_position(const godot_aabb *p_self, const godot_vector3 *p_v);
+
+godot_vector3 GDAPI godot_aabb_get_size(const godot_aabb *p_self);
+void GDAPI godot_aabb_set_size(const godot_aabb *p_self, const godot_vector3 *p_v);
+
+godot_string GDAPI godot_aabb_as_string(const godot_aabb *p_self);
+
+godot_real GDAPI godot_aabb_get_area(const godot_aabb *p_self);
+
+godot_bool GDAPI godot_aabb_has_no_area(const godot_aabb *p_self);
+
+godot_bool GDAPI godot_aabb_has_no_surface(const godot_aabb *p_self);
+
+godot_bool GDAPI godot_aabb_intersects(const godot_aabb *p_self, const godot_aabb *p_with);
+
+godot_bool GDAPI godot_aabb_encloses(const godot_aabb *p_self, const godot_aabb *p_with);
+
+godot_aabb GDAPI godot_aabb_merge(const godot_aabb *p_self, const godot_aabb *p_with);
+
+godot_aabb GDAPI godot_aabb_intersection(const godot_aabb *p_self, const godot_aabb *p_with);
+
+godot_bool GDAPI godot_aabb_intersects_plane(const godot_aabb *p_self, const godot_plane *p_plane);
+
+godot_bool GDAPI godot_aabb_intersects_segment(const godot_aabb *p_self, const godot_vector3 *p_from, const godot_vector3 *p_to);
+
+godot_bool GDAPI godot_aabb_has_point(const godot_aabb *p_self, const godot_vector3 *p_point);
+
+godot_vector3 GDAPI godot_aabb_get_support(const godot_aabb *p_self, const godot_vector3 *p_dir);
+
+godot_vector3 GDAPI godot_aabb_get_longest_axis(const godot_aabb *p_self);
+
+godot_int GDAPI godot_aabb_get_longest_axis_index(const godot_aabb *p_self);
+
+godot_real GDAPI godot_aabb_get_longest_axis_size(const godot_aabb *p_self);
+
+godot_vector3 GDAPI godot_aabb_get_shortest_axis(const godot_aabb *p_self);
+
+godot_int GDAPI godot_aabb_get_shortest_axis_index(const godot_aabb *p_self);
+
+godot_real GDAPI godot_aabb_get_shortest_axis_size(const godot_aabb *p_self);
+
+godot_aabb GDAPI godot_aabb_expand(const godot_aabb *p_self, const godot_vector3 *p_to_point);
+
+godot_aabb GDAPI godot_aabb_grow(const godot_aabb *p_self, const godot_real p_by);
+
+godot_vector3 GDAPI godot_aabb_get_endpoint(const godot_aabb *p_self, const godot_int p_idx);
+
+godot_bool GDAPI godot_aabb_operator_equal(const godot_aabb *p_self, const godot_aabb *p_b);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // GODOT_AABB_H
diff --git a/modules/gdnative/include/gdnative/gdnative.h b/modules/gdnative/include/gdnative/gdnative.h
index a479eced16..38a42ab658 100644
--- a/modules/gdnative/include/gdnative/gdnative.h
+++ b/modules/gdnative/include/gdnative/gdnative.h
@@ -169,9 +169,9 @@ typedef void godot_object;
 
 #include <gdnative/quat.h>
 
-/////// Rect3
+/////// AABB
 
-#include <gdnative/rect3.h>
+#include <gdnative/aabb.h>
 
 /////// Basis
 
diff --git a/modules/gdnative/include/gdnative/rect3.h b/modules/gdnative/include/gdnative/rect3.h
deleted file mode 100644
index f603a9268a..0000000000
--- a/modules/gdnative/include/gdnative/rect3.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/*************************************************************************/
-/*  rect3.h                                                              */
-/*************************************************************************/
-/*                       This file is part of:                           */
-/*                           GODOT ENGINE                                */
-/*                      https://godotengine.org                          */
-/*************************************************************************/
-/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2017 Godot Engine contributors (cf. AUTHORS.md)    */
-/*                                                                       */
-/* Permission is hereby granted, free of charge, to any person obtaining */
-/* a copy of this software and associated documentation files (the       */
-/* "Software"), to deal in the Software without restriction, including   */
-/* without limitation the rights to use, copy, modify, merge, publish,   */
-/* distribute, sublicense, and/or sell copies of the Software, and to    */
-/* permit persons to whom the Software is furnished to do so, subject to */
-/* the following conditions:                                             */
-/*                                                                       */
-/* The above copyright notice and this permission notice shall be        */
-/* included in all copies or substantial portions of the Software.       */
-/*                                                                       */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
-/*************************************************************************/
-#ifndef GODOT_RECT3_H
-#define GODOT_RECT3_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stdint.h>
-
-#define GODOT_RECT3_SIZE 24
-
-#ifndef GODOT_CORE_API_GODOT_RECT3_TYPE_DEFINED
-#define GODOT_CORE_API_GODOT_RECT3_TYPE_DEFINED
-typedef struct {
-	uint8_t _dont_touch_that[GODOT_RECT3_SIZE];
-} godot_rect3;
-#endif
-
-// reduce extern "C" nesting for VS2013
-#ifdef __cplusplus
-}
-#endif
-
-#include <gdnative/gdnative.h>
-#include <gdnative/plane.h>
-#include <gdnative/vector3.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void GDAPI godot_rect3_new(godot_rect3 *r_dest, const godot_vector3 *p_pos, const godot_vector3 *p_size);
-
-godot_vector3 GDAPI godot_rect3_get_position(const godot_rect3 *p_self);
-void GDAPI godot_rect3_set_position(const godot_rect3 *p_self, const godot_vector3 *p_v);
-
-godot_vector3 GDAPI godot_rect3_get_size(const godot_rect3 *p_self);
-void GDAPI godot_rect3_set_size(const godot_rect3 *p_self, const godot_vector3 *p_v);
-
-godot_string GDAPI godot_rect3_as_string(const godot_rect3 *p_self);
-
-godot_real GDAPI godot_rect3_get_area(const godot_rect3 *p_self);
-
-godot_bool GDAPI godot_rect3_has_no_area(const godot_rect3 *p_self);
-
-godot_bool GDAPI godot_rect3_has_no_surface(const godot_rect3 *p_self);
-
-godot_bool GDAPI godot_rect3_intersects(const godot_rect3 *p_self, const godot_rect3 *p_with);
-
-godot_bool GDAPI godot_rect3_encloses(const godot_rect3 *p_self, const godot_rect3 *p_with);
-
-godot_rect3 GDAPI godot_rect3_merge(const godot_rect3 *p_self, const godot_rect3 *p_with);
-
-godot_rect3 GDAPI godot_rect3_intersection(const godot_rect3 *p_self, const godot_rect3 *p_with);
-
-godot_bool GDAPI godot_rect3_intersects_plane(const godot_rect3 *p_self, const godot_plane *p_plane);
-
-godot_bool GDAPI godot_rect3_intersects_segment(const godot_rect3 *p_self, const godot_vector3 *p_from, const godot_vector3 *p_to);
-
-godot_bool GDAPI godot_rect3_has_point(const godot_rect3 *p_self, const godot_vector3 *p_point);
-
-godot_vector3 GDAPI godot_rect3_get_support(const godot_rect3 *p_self, const godot_vector3 *p_dir);
-
-godot_vector3 GDAPI godot_rect3_get_longest_axis(const godot_rect3 *p_self);
-
-godot_int GDAPI godot_rect3_get_longest_axis_index(const godot_rect3 *p_self);
-
-godot_real GDAPI godot_rect3_get_longest_axis_size(const godot_rect3 *p_self);
-
-godot_vector3 GDAPI godot_rect3_get_shortest_axis(const godot_rect3 *p_self);
-
-godot_int GDAPI godot_rect3_get_shortest_axis_index(const godot_rect3 *p_self);
-
-godot_real GDAPI godot_rect3_get_shortest_axis_size(const godot_rect3 *p_self);
-
-godot_rect3 GDAPI godot_rect3_expand(const godot_rect3 *p_self, const godot_vector3 *p_to_point);
-
-godot_rect3 GDAPI godot_rect3_grow(const godot_rect3 *p_self, const godot_real p_by);
-
-godot_vector3 GDAPI godot_rect3_get_endpoint(const godot_rect3 *p_self, const godot_int p_idx);
-
-godot_bool GDAPI godot_rect3_operator_equal(const godot_rect3 *p_self, const godot_rect3 *p_b);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif // GODOT_RECT3_H
diff --git a/modules/gdnative/include/gdnative/string.h b/modules/gdnative/include/gdnative/string.h
index 29510313c9..cca3eb2672 100644
--- a/modules/gdnative/include/gdnative/string.h
+++ b/modules/gdnative/include/gdnative/string.h
@@ -51,6 +51,7 @@ typedef struct {
 }
 #endif
 
+#include <gdnative/array.h>
 #include <gdnative/gdnative.h>
 #include <gdnative/variant.h>
 
diff --git a/modules/gdnative/include/gdnative/transform.h b/modules/gdnative/include/gdnative/transform.h
index 8f50b01fb5..3b5c189bdf 100644
--- a/modules/gdnative/include/gdnative/transform.h
+++ b/modules/gdnative/include/gdnative/transform.h
@@ -98,9 +98,9 @@ godot_vector3 GDAPI godot_transform_xform_vector3(const godot_transform *p_self,
 
 godot_vector3 GDAPI godot_transform_xform_inv_vector3(const godot_transform *p_self, const godot_vector3 *p_v);
 
-godot_rect3 GDAPI godot_transform_xform_rect3(const godot_transform *p_self, const godot_rect3 *p_v);
+godot_aabb GDAPI godot_transform_xform_aabb(const godot_transform *p_self, const godot_aabb *p_v);
 
-godot_rect3 GDAPI godot_transform_xform_inv_rect3(const godot_transform *p_self, const godot_rect3 *p_v);
+godot_aabb GDAPI godot_transform_xform_inv_aabb(const godot_transform *p_self, const godot_aabb *p_v);
 
 #ifdef __cplusplus
 }
diff --git a/modules/gdnative/include/gdnative/variant.h b/modules/gdnative/include/gdnative/variant.h
index 3d744ef1f2..06cafcfa63 100644
--- a/modules/gdnative/include/gdnative/variant.h
+++ b/modules/gdnative/include/gdnative/variant.h
@@ -62,7 +62,7 @@ typedef enum godot_variant_type {
 	GODOT_VARIANT_TYPE_TRANSFORM2D,
 	GODOT_VARIANT_TYPE_PLANE,
 	GODOT_VARIANT_TYPE_QUAT, // 10
-	GODOT_VARIANT_TYPE_RECT3,
+	GODOT_VARIANT_TYPE_AABB,
 	GODOT_VARIANT_TYPE_BASIS,
 	GODOT_VARIANT_TYPE_TRANSFORM,
 
@@ -104,6 +104,7 @@ typedef struct godot_variant_call_error {
 }
 #endif
 
+#include <gdnative/aabb.h>
 #include <gdnative/array.h>
 #include <gdnative/basis.h>
 #include <gdnative/color.h>
@@ -113,7 +114,6 @@ typedef struct godot_variant_call_error {
 #include <gdnative/pool_arrays.h>
 #include <gdnative/quat.h>
 #include <gdnative/rect2.h>
-#include <gdnative/rect3.h>
 #include <gdnative/rid.h>
 #include <gdnative/string.h>
 #include <gdnative/transform.h>
@@ -145,7 +145,7 @@ void GDAPI godot_variant_new_vector3(godot_variant *r_dest, const godot_vector3
 void GDAPI godot_variant_new_transform2d(godot_variant *r_dest, const godot_transform2d *p_t2d);
 void GDAPI godot_variant_new_plane(godot_variant *r_dest, const godot_plane *p_plane);
 void GDAPI godot_variant_new_quat(godot_variant *r_dest, const godot_quat *p_quat);
-void GDAPI godot_variant_new_rect3(godot_variant *r_dest, const godot_rect3 *p_rect3);
+void GDAPI godot_variant_new_aabb(godot_variant *r_dest, const godot_aabb *p_aabb);
 void GDAPI godot_variant_new_basis(godot_variant *r_dest, const godot_basis *p_basis);
 void GDAPI godot_variant_new_transform(godot_variant *r_dest, const godot_transform *p_trans);
 void GDAPI godot_variant_new_color(godot_variant *r_dest, const godot_color *p_color);
@@ -173,7 +173,7 @@ godot_vector3 GDAPI godot_variant_as_vector3(const godot_variant *p_self);
 godot_transform2d GDAPI godot_variant_as_transform2d(const godot_variant *p_self);
 godot_plane GDAPI godot_variant_as_plane(const godot_variant *p_self);
 godot_quat GDAPI godot_variant_as_quat(const godot_variant *p_self);
-godot_rect3 GDAPI godot_variant_as_rect3(const godot_variant *p_self);
+godot_aabb GDAPI godot_variant_as_aabb(const godot_variant *p_self);
 godot_basis GDAPI godot_variant_as_basis(const godot_variant *p_self);
 godot_transform GDAPI godot_variant_as_transform(const godot_variant *p_self);
 godot_color GDAPI godot_variant_as_color(const godot_variant *p_self);
diff --git a/modules/gdnative/register_types.cpp b/modules/gdnative/register_types.cpp
index 29b0a6719c..8af643df50 100644
--- a/modules/gdnative/register_types.cpp
+++ b/modules/gdnative/register_types.cpp
@@ -371,7 +371,7 @@ void unregister_gdnative_types() {
 	print_line(String("poolarray:\t") + itos(sizeof(PoolByteArray)));
 	print_line(String("quat:\t")      + itos(sizeof(Quat)));
 	print_line(String("rect2:\t")     + itos(sizeof(Rect2)));
-	print_line(String("rect3:\t")     + itos(sizeof(Rect3)));
+	print_line(String("aabb:\t")     + itos(sizeof(AABB)));
 	print_line(String("rid:\t")       + itos(sizeof(RID)));
 	print_line(String("string:\t")    + itos(sizeof(String)));
 	print_line(String("transform:\t") + itos(sizeof(Transform)));