diff --git a/modules/navigation/nav_map.h b/modules/navigation/nav_map.h
index 9f0d4594c..dadc891b6 100644
--- a/modules/navigation/nav_map.h
+++ b/modules/navigation/nav_map.h
@@ -1,5 +1,6 @@
-#ifndef RVO_SPACE_H
-#define RVO_SPACE_H
+#ifndef NAV_MAP_H
+#define NAV_MAP_H
+
 /*************************************************************************/
 /*  nav_map.h                                                            */
 /*************************************************************************/
@@ -143,4 +144,4 @@ private:
 	void clip_path(const std::vector<gd::NavigationPoly> &p_navigation_polys, Vector<Vector3> &path, const gd::NavigationPoly *from_poly, const Vector3 &p_to_point, const gd::NavigationPoly *p_to_poly) const;
 };
 
-#endif // RVO_SPACE_H
+#endif // NAV_MAP_H
diff --git a/thirdparty/README.md b/thirdparty/README.md
index 2afda9575..02c7312bd 100644
--- a/thirdparty/README.md
+++ b/thirdparty/README.md
@@ -437,7 +437,7 @@ Files extracted from upstream source:
 ## rvo2
 
 - Upstream: https://github.com/snape/RVO2-3D
-- Version: 1.0.1 (e3883f288a9e55ecfed3633a01af3e12778c6acf, 2016)
+- Version: git (bfc048670a4e85066e86a1f923d8ea92e3add3b2, 2021)
 - License: Apache 2.0
 
 Files extracted from upstream source: