diff --git a/Source/Editor/Content/Proxy/PrefabProxy.cs b/Source/Editor/Content/Proxy/PrefabProxy.cs
index 410df23b0..e5cf053d6 100644
--- a/Source/Editor/Content/Proxy/PrefabProxy.cs
+++ b/Source/Editor/Content/Proxy/PrefabProxy.cs
@@ -140,7 +140,7 @@ namespace FlaxEditor.Content
                 actor is SpriteRender ||
                 actor is TextRender)
             {
-                actorBounds = actor.EditorBox;
+                actorBounds = actor.EditorBoundingBox;
             }
             if (actorBounds != BoundingBox.Empty)
             {
@@ -182,7 +182,7 @@ namespace FlaxEditor.Content
                 // Update some actors data (some actor types update bounds/data later but its required to be done before rendering)
                 var bounds = BoundingBox.Empty;
                 Prepare(_preview.Instance, ref bounds);
-                //bounds = _preview.Instance.EditorBoxChildren;
+                //bounds = _preview.Instance.EditorBoundingBoxWithChildren;
 
                 // Auto fit actor to camera
                 if (bounds != BoundingBox.Empty)
diff --git a/Source/Editor/CustomEditors/Dedicated/NavMeshBoundsVolumeEditor.cs b/Source/Editor/CustomEditors/Dedicated/NavMeshBoundsVolumeEditor.cs
index 2cbf01e41..3c101453f 100644
--- a/Source/Editor/CustomEditors/Dedicated/NavMeshBoundsVolumeEditor.cs
+++ b/Source/Editor/CustomEditors/Dedicated/NavMeshBoundsVolumeEditor.cs
@@ -29,7 +29,7 @@ namespace FlaxEditor.CustomEditors.Dedicated
             {
                 if (value is NavMeshBoundsVolume volume)
                 {
-                    Navigation.BuildNavMesh(volume.Box, volume.Scene);
+                    Navigation.BuildNavMesh(volume.BoundingBox, volume.Scene);
                     Editor.Instance.Scene.MarkSceneEdited(volume.Scene);
                 }
             }
diff --git a/Source/Editor/CustomEditors/Dedicated/TerrainEditor.cs b/Source/Editor/CustomEditors/Dedicated/TerrainEditor.cs
index 448c55443..bfcb8bc57 100644
--- a/Source/Editor/CustomEditors/Dedicated/TerrainEditor.cs
+++ b/Source/Editor/CustomEditors/Dedicated/TerrainEditor.cs
@@ -24,7 +24,7 @@ namespace FlaxEditor.CustomEditors.Dedicated
                 var patchesCount = terrain.PatchesCount;
                 var chunkSize = terrain.ChunkSize;
                 var resolution = terrain.Scale;
-                var totalSize = terrain.Box.Size;
+                var totalSize = terrain.BoundingBox.Size;
                 string text = string.Format("Patches: {0}\nTotal Chunks: {1}\nChunk Size: {2}\nResolution: {3}m x {4}m\nTotal size: {5}km x {6}km",
                                             patchesCount,
                                             patchesCount * 16,
diff --git a/Source/Editor/Gizmo/TransformGizmo.cs b/Source/Editor/Gizmo/TransformGizmo.cs
index 91e37ca25..4b40caecd 100644
--- a/Source/Editor/Gizmo/TransformGizmo.cs
+++ b/Source/Editor/Gizmo/TransformGizmo.cs
@@ -128,7 +128,7 @@ namespace FlaxEditor.Gizmo
                     {
                         if (_selectionParents[i] is ActorNode actorNode)
                         {
-                            var b = actorNode.Actor.EditorBoxChildren;
+                            var b = actorNode.Actor.EditorBoundingBoxWithChildren;
                             BoundingBox.Merge(ref editorBounds, ref b, out editorBounds);
                             bottomToCenter = Mathf.Min(bottomToCenter, actorNode.Actor.Position.Y - editorBounds.Minimum.Y);
                         }
@@ -299,7 +299,7 @@ namespace FlaxEditor.Gizmo
             {
                 if (_selectionParents[i] is ActorNode actorNode)
                 {
-                    bounds = BoundingBox.Merge(bounds, actorNode.Actor.BoxWithChildren);
+                    bounds = BoundingBox.Merge(bounds, actorNode.Actor.BoundingBoxWithChildren);
                     navigationDirty |= actorNode.AffectsNavigationWithChildren;
                 }
             }
diff --git a/Source/Editor/Gizmo/ViewportRubberBandSelector.cs b/Source/Editor/Gizmo/ViewportRubberBandSelector.cs
index 66e835fac..1d85fcf77 100644
--- a/Source/Editor/Gizmo/ViewportRubberBandSelector.cs
+++ b/Source/Editor/Gizmo/ViewportRubberBandSelector.cs
@@ -182,7 +182,7 @@ public sealed class ViewportRubberBandSelector
             var a = node.Actor;
 
             // Skip actor if outside of view frustum
-            var actorBox = a.EditorBox;
+            var actorBox = a.EditorBoundingBox;
             if (projection.FrustumCull(ref actorBox) == ContainmentType.Disjoint)
                 continue;
 
diff --git a/Source/Editor/Managed/ManagedEditor.Internal.cpp b/Source/Editor/Managed/ManagedEditor.Internal.cpp
index 2220fb0f3..78217e6be 100644
--- a/Source/Editor/Managed/ManagedEditor.Internal.cpp
+++ b/Source/Editor/Managed/ManagedEditor.Internal.cpp
@@ -333,7 +333,7 @@ DEFINE_INTERNAL_CALL(void) EditorInternal_GetCollisionWires(CollisionData* colli
 DEFINE_INTERNAL_CALL(void) EditorInternal_GetEditorBoxWithChildren(Actor* obj, BoundingBox* result)
 {
     INTERNAL_CALL_CHECK(obj);
-    *result = obj->GetEditorBoxChildren();
+    *result = obj->GetEditorBoundingBoxWithChildren();
 }
 
 DEFINE_INTERNAL_CALL(void) EditorInternal_SetOptions(ManagedEditor::InternalOptions* options)
diff --git a/Source/Editor/Modules/SceneEditingModule.cs b/Source/Editor/Modules/SceneEditingModule.cs
index f6643f4f2..9697a099f 100644
--- a/Source/Editor/Modules/SceneEditingModule.cs
+++ b/Source/Editor/Modules/SceneEditingModule.cs
@@ -244,7 +244,7 @@ namespace FlaxEditor.Modules
             // Auto NavMesh rebuild
             if (!isPlayMode && options.General.AutoRebuildNavMesh && actor.Scene && node.AffectsNavigationWithChildren)
             {
-                var bounds = actor.BoxWithChildren;
+                var bounds = actor.BoundingBoxWithChildren;
                 Navigation.BuildNavMesh(bounds, options.General.AutoRebuildNavMeshTimeoutMs);
             }
         }
diff --git a/Source/Editor/SceneGraph/ActorNode.cs b/Source/Editor/SceneGraph/ActorNode.cs
index f25659303..67f671756 100644
--- a/Source/Editor/SceneGraph/ActorNode.cs
+++ b/Source/Editor/SceneGraph/ActorNode.cs
@@ -233,7 +233,7 @@ namespace FlaxEditor.SceneGraph
         /// <returns>The points to use if the actor can be selected.</returns>
         public virtual Vector3[] GetActorSelectionPoints()
         {
-            return Actor.EditorBox.GetCorners();
+            return Actor.EditorBoundingBox.GetCorners();
         }
 
         /// <summary>
diff --git a/Source/Editor/SceneGraph/Actors/SplineNode.cs b/Source/Editor/SceneGraph/Actors/SplineNode.cs
index 515939526..73ef65f7c 100644
--- a/Source/Editor/SceneGraph/Actors/SplineNode.cs
+++ b/Source/Editor/SceneGraph/Actors/SplineNode.cs
@@ -555,7 +555,7 @@ namespace FlaxEditor.SceneGraph.Actors
                 var options = Editor.Instance.Options.Options.General;
                 if (options.AutoRebuildNavMesh)
                 {
-                    Navigation.BuildNavMesh(collider.Box, options.AutoRebuildNavMeshTimeoutMs);
+                    Navigation.BuildNavMesh(collider.BoundingBox, options.AutoRebuildNavMeshTimeoutMs);
                 }
             }
         }
@@ -572,7 +572,7 @@ namespace FlaxEditor.SceneGraph.Actors
             var viewBounds = sceneContext.Viewport.ViewFrustum;
             foreach (var s in splines)
             {
-                var contains = viewBounds.Contains(s.EditorBox);
+                var contains = viewBounds.Contains(s.EditorBoundingBox);
                 if (contains == ContainmentType.Contains || contains == ContainmentType.Intersects)
                     result.Add(s);
             }
diff --git a/Source/Editor/SceneGraph/Actors/StaticModelNode.cs b/Source/Editor/SceneGraph/Actors/StaticModelNode.cs
index 4cd63f05d..391222b6a 100644
--- a/Source/Editor/SceneGraph/Actors/StaticModelNode.cs
+++ b/Source/Editor/SceneGraph/Actors/StaticModelNode.cs
@@ -319,7 +319,7 @@ namespace FlaxEditor.SceneGraph.Actors
 
         private void CreateSphere(StaticModel actor, Spawner spawner, bool singleNode)
         {
-            var bounds = actor.Sphere;
+            var bounds = actor.BoundingSphere;
             var collider = new SphereCollider
             {
                 Transform = actor.Transform,
@@ -336,10 +336,10 @@ namespace FlaxEditor.SceneGraph.Actors
             var collider = new CapsuleCollider
             {
                 Transform = actor.Transform,
-                Position = actor.Box.Center,
+                Position = actor.BoundingBox.Center,
 
                 // Size the capsule to best fit the actor
-                Radius = (float)actor.Sphere.Radius / Mathf.Max((float)actor.Scale.MaxValue, 0.0001f) * 0.707f,
+                Radius = (float)actor.BoundingSphere.Radius / Mathf.Max((float)actor.Scale.MaxValue, 0.0001f) * 0.707f,
                 Height = 100f,
             };
             spawner(collider);
diff --git a/Source/Editor/Tools/ClothPainting.cs b/Source/Editor/Tools/ClothPainting.cs
index e8ab67039..caaa64d93 100644
--- a/Source/Editor/Tools/ClothPainting.cs
+++ b/Source/Editor/Tools/ClothPainting.cs
@@ -231,7 +231,7 @@ namespace FlaxEngine.Tools
 
         public override bool IsControllingMouse => IsPainting;
 
-        public override BoundingSphere FocusBounds => _cloth?.Sphere ?? base.FocusBounds;
+        public override BoundingSphere FocusBounds => _cloth?.BoundingSphere ?? base.FocusBounds;
 
         public override void Update(float dt)
         {
diff --git a/Source/Editor/Tools/Foliage/FoliageTools.cpp b/Source/Editor/Tools/Foliage/FoliageTools.cpp
index 4a545e9d5..19a3330a8 100644
--- a/Source/Editor/Tools/Foliage/FoliageTools.cpp
+++ b/Source/Editor/Tools/Foliage/FoliageTools.cpp
@@ -67,7 +67,7 @@ struct GeometryLookup
     static bool Search(Actor* actor, GeometryLookup& lookup)
     {
         // Early out if object is not intersecting with the foliage brush bounds
-        if (!actor->GetIsActive() || !actor->GetBox().Intersects(lookup.Brush))
+        if (!actor->GetIsActive() || !actor->GetBoundingBox().Intersects(lookup.Brush))
             return true;
 
         const auto brush = lookup.Brush;
diff --git a/Source/Editor/Tools/VertexPainting.cs b/Source/Editor/Tools/VertexPainting.cs
index dea5247f4..b0a9c6fb6 100644
--- a/Source/Editor/Tools/VertexPainting.cs
+++ b/Source/Editor/Tools/VertexPainting.cs
@@ -487,7 +487,7 @@ namespace FlaxEditor.Tools
         public override bool IsControllingMouse => IsPainting;
 
         /// <inheritdoc />
-        public override BoundingSphere FocusBounds => _selectedModel != null ? _selectedModel.Sphere : base.FocusBounds;
+        public override BoundingSphere FocusBounds => _selectedModel != null ? _selectedModel.BoundingSphere : base.FocusBounds;
 
         /// <inheritdoc />
         public override void Update(float dt)
@@ -598,7 +598,7 @@ namespace FlaxEditor.Tools
                     var vertexScale = Mathf.Lerp(0.005f, 0.01f, Mathf.Saturate(distanceScale));
                     var modelScaleMatrix = Matrix.Scaling(_gizmoMode.PreviewVertexSize * vertexScale);
                     var brushSphere = new BoundingSphere(_hitLocation, _gizmoMode.BrushSize * 0.5f);
-                    var lodIndex = _gizmoMode.ModelLOD == -1 ? RenderTools.ComputeModelLOD(_selectedModel.Model, ref renderContext.View.Position, (float)_selectedModel.Sphere.Radius, ref renderContext) : _gizmoMode.ModelLOD;
+                    var lodIndex = _gizmoMode.ModelLOD == -1 ? RenderTools.ComputeModelLOD(_selectedModel.Model, ref renderContext.View.Position, (float)_selectedModel.BoundingSphere.Radius, ref renderContext) : _gizmoMode.ModelLOD;
                     lodIndex = Mathf.Clamp(lodIndex, 0, meshDatas.Length - 1);
                     var lodData = meshDatas[lodIndex];
                     if (lodData != null)
diff --git a/Source/Editor/Undo/Actions/DeleteActorsAction.cs b/Source/Editor/Undo/Actions/DeleteActorsAction.cs
index 19ffb1e3f..06729d5fb 100644
--- a/Source/Editor/Undo/Actions/DeleteActorsAction.cs
+++ b/Source/Editor/Undo/Actions/DeleteActorsAction.cs
@@ -302,7 +302,7 @@ namespace FlaxEditor.Actions
                 {
                     if (_nodeParents[i] is ActorNode node && node.Actor && node.Actor.Scene && node.AffectsNavigationWithChildren)
                     {
-                        var bounds = node.Actor.BoxWithChildren;
+                        var bounds = node.Actor.BoundingBoxWithChildren;
                         Navigation.BuildNavMesh(bounds, options.General.AutoRebuildNavMeshTimeoutMs);
                     }
                 }
diff --git a/Source/Editor/Utilities/Utils.cs b/Source/Editor/Utilities/Utils.cs
index 8f5df866d..21794412c 100644
--- a/Source/Editor/Utilities/Utils.cs
+++ b/Source/Editor/Utilities/Utils.cs
@@ -387,7 +387,7 @@ namespace FlaxEditor.Utilities
                 transforms[i] = nodes[i].Transform;
                 if (nodes[i] is ActorNode actorNode)
                 {
-                    bounds = BoundingBox.Merge(bounds, actorNode.Actor.BoxWithChildren);
+                    bounds = BoundingBox.Merge(bounds, actorNode.Actor.BoundingBoxWithChildren);
                 }
             }
             return transforms;
diff --git a/Source/Editor/Viewport/Previews/AnimatedModelPreview.cs b/Source/Editor/Viewport/Previews/AnimatedModelPreview.cs
index 721b8504d..83e8917fb 100644
--- a/Source/Editor/Viewport/Previews/AnimatedModelPreview.cs
+++ b/Source/Editor/Viewport/Previews/AnimatedModelPreview.cs
@@ -361,7 +361,7 @@ namespace FlaxEditor.Viewport.Previews
                     if (_showNodes)
                     {
                         // Draw bounding box at the node locations
-                        var boxSize = Mathf.Min(1.0f, _previewModel.Sphere.Radius / 100.0f);
+                        var boxSize = Mathf.Min(1.0f, _previewModel.BoundingSphere.Radius / 100.0f);
                         var localBox = new OrientedBoundingBox(new Vector3(-boxSize), new Vector3(boxSize));
                         for (int nodeIndex = 0; nodeIndex < pose.Length; nodeIndex++)
                         {
@@ -405,7 +405,7 @@ namespace FlaxEditor.Viewport.Previews
             // Draw bounds
             if (_showBounds)
             {
-                DebugDrawBounds(_previewModel.Box);
+                DebugDrawBounds(_previewModel.BoundingBox);
             }
         }
 
@@ -433,7 +433,7 @@ namespace FlaxEditor.Viewport.Previews
         /// </summary>
         public void ResetCamera()
         {
-            ViewportCamera.SetArcBallView(_previewModel.Box);
+            ViewportCamera.SetArcBallView(_previewModel.BoundingBox);
         }
 
         /// <inheritdoc />
diff --git a/Source/Editor/Viewport/Previews/ModelBasePreview.cs b/Source/Editor/Viewport/Previews/ModelBasePreview.cs
index 47a2aec97..d4fab6f02 100644
--- a/Source/Editor/Viewport/Previews/ModelBasePreview.cs
+++ b/Source/Editor/Viewport/Previews/ModelBasePreview.cs
@@ -62,7 +62,7 @@ namespace FlaxEditor.Viewport.Previews
         /// </summary>
         public void ResetCamera()
         {
-            ViewportCamera.SetArcBallView(StaticModel.Model != null ? StaticModel.Box : AnimatedModel.Box);
+            ViewportCamera.SetArcBallView(StaticModel.Model != null ? StaticModel.BoundingBox : AnimatedModel.BoundingBox);
         }
 
         private void OnBegin(RenderTask task, GPUContext context)
diff --git a/Source/Editor/Viewport/Previews/ModelPreview.cs b/Source/Editor/Viewport/Previews/ModelPreview.cs
index b6306b905..026cd94ed 100644
--- a/Source/Editor/Viewport/Previews/ModelPreview.cs
+++ b/Source/Editor/Viewport/Previews/ModelPreview.cs
@@ -302,7 +302,7 @@ namespace FlaxEditor.Viewport.Previews
             // Draw bounds
             if (_showBounds)
             {
-                DebugDrawBounds(_previewModel.Box);
+                DebugDrawBounds(_previewModel.BoundingBox);
             }
 
             // Draw normals
@@ -395,7 +395,7 @@ namespace FlaxEditor.Viewport.Previews
             // Based on RenderTools::ComputeModelLOD
             CreateProjectionMatrix(out var projectionMatrix);
             float screenMultiple = 0.5f * Mathf.Max(projectionMatrix.M11, projectionMatrix.M22);
-            var sphere = PreviewActor.Sphere;
+            var sphere = PreviewActor.BoundingSphere;
             var viewOrigin = ViewPosition;
             var distSqr = Vector3.DistanceSquared(ref sphere.Center, ref viewOrigin);
             var screenRadiusSquared = Mathf.Square(screenMultiple * sphere.Radius) / Mathf.Max(1.0f, distSqr);
@@ -461,11 +461,11 @@ namespace FlaxEditor.Viewport.Previews
         }
 
         /// <summary>
-        /// Resets the camera to focus on a object.
+        /// Resets the camera to focus on an object.
         /// </summary>
         public void ResetCamera()
         {
-            ViewportCamera.SetArcBallView(_previewModel.Box);
+            ViewportCamera.SetArcBallView(_previewModel.BoundingBox);
         }
 
         /// <inheritdoc />
diff --git a/Source/Editor/Viewport/Previews/ParticleSystemPreview.cs b/Source/Editor/Viewport/Previews/ParticleSystemPreview.cs
index 74c7c435b..13987157e 100644
--- a/Source/Editor/Viewport/Previews/ParticleSystemPreview.cs
+++ b/Source/Editor/Viewport/Previews/ParticleSystemPreview.cs
@@ -207,7 +207,7 @@ namespace FlaxEditor.Viewport.Previews
 
         private void UpdateBoundsModel()
         {
-            var bounds = _previewEffect.Box;
+            var bounds = _previewEffect.BoundingBox;
             Transform t = Transform.Identity;
             t.Translation = bounds.Center;
             t.Scale = bounds.Size;
@@ -221,7 +221,7 @@ namespace FlaxEditor.Viewport.Previews
         public void FitIntoView(float targetSize = 300.0f)
         {
             _previewEffect.Scale = Float3.One;
-            float maxSize = Mathf.Max(0.001f, (float)_previewEffect.Box.Size.MaxValue);
+            float maxSize = Mathf.Max(0.001f, (float)_previewEffect.BoundingBox.Size.MaxValue);
             _previewEffect.Scale = new Float3(targetSize / maxSize);
         }
 
@@ -278,7 +278,7 @@ namespace FlaxEditor.Viewport.Previews
             switch (key)
             {
             case KeyboardKeys.F:
-                ViewportCamera.SetArcBallView(_previewEffect.Box);
+                ViewportCamera.SetArcBallView(_previewEffect.BoundingBox);
                 return true;
             case KeyboardKeys.Spacebar:
                 PlaySimulation = !PlaySimulation;
diff --git a/Source/Editor/Viewport/Previews/SkinnedModelPreview.cs b/Source/Editor/Viewport/Previews/SkinnedModelPreview.cs
index d394190ce..903326ab6 100644
--- a/Source/Editor/Viewport/Previews/SkinnedModelPreview.cs
+++ b/Source/Editor/Viewport/Previews/SkinnedModelPreview.cs
@@ -93,7 +93,7 @@ namespace FlaxEditor.Viewport.Previews
             // Based on RenderTools::ComputeModelLOD
             CreateProjectionMatrix(out var projectionMatrix);
             float screenMultiple = 0.5f * Mathf.Max(projectionMatrix.M11, projectionMatrix.M22);
-            var sphere = PreviewActor.Sphere;
+            var sphere = PreviewActor.BoundingSphere;
             var viewOrigin = ViewPosition;
             var distSqr = Vector3.DistanceSquared(ref sphere.Center, ref viewOrigin);
             var screenRadiusSquared = Mathf.Square(screenMultiple * sphere.Radius) / Mathf.Max(1.0f, distSqr);
diff --git a/Source/Editor/Viewport/ViewportDraggingHelper.cs b/Source/Editor/Viewport/ViewportDraggingHelper.cs
index 5c68b399a..bdd85024a 100644
--- a/Source/Editor/Viewport/ViewportDraggingHelper.cs
+++ b/Source/Editor/Viewport/ViewportDraggingHelper.cs
@@ -185,7 +185,7 @@ namespace FlaxEditor.Viewport
 
             // Place the object
             //var location = hitLocation - (box.Size.Length * 0.5f) * ViewDirection;
-            var editorBounds = actor.EditorBoxChildren;
+            var editorBounds = actor.EditorBoundingBoxWithChildren;
             var bottomToCenter = actor.Position.Y - editorBounds.Minimum.Y;
             var location = hitLocation + new Vector3(0, bottomToCenter, 0);
 
diff --git a/Source/Editor/ViewportDebugDrawData.cs b/Source/Editor/ViewportDebugDrawData.cs
index d70ec9cfb..073a41844 100644
--- a/Source/Editor/ViewportDebugDrawData.cs
+++ b/Source/Editor/ViewportDebugDrawData.cs
@@ -125,7 +125,7 @@ namespace FlaxEditor
                     if (model == null)
                         continue;
                     staticModel.Transform.GetWorld(out world);
-                    var bounds = BoundingSphere.FromBox(staticModel.Box);
+                    var bounds = BoundingSphere.FromBox(staticModel.BoundingBox);
 
                     // Pick a proper LOD
                     Float3 center = bounds.Center - renderContext.View.Origin;
diff --git a/Source/Editor/Windows/Assets/AnimationWindow.cs b/Source/Editor/Windows/Assets/AnimationWindow.cs
index 69da1f9e9..9ab94bcb4 100644
--- a/Source/Editor/Windows/Assets/AnimationWindow.cs
+++ b/Source/Editor/Windows/Assets/AnimationWindow.cs
@@ -137,7 +137,7 @@ namespace FlaxEditor.Windows.Assets
                     {
                         // Focus model
                         value.WaitForLoaded(500);
-                        Window._preview.ViewportCamera.SetArcBallView(Window._preview.PreviewActor.Sphere);
+                        Window._preview.ViewportCamera.SetArcBallView(Window._preview.PreviewActor.BoundingSphere);
                     }
 
                     if (EnablePreviewModelCache)
diff --git a/Source/Editor/Windows/EditGameWindow.cs b/Source/Editor/Windows/EditGameWindow.cs
index 8d0c146d9..44c07be21 100644
--- a/Source/Editor/Windows/EditGameWindow.cs
+++ b/Source/Editor/Windows/EditGameWindow.cs
@@ -189,7 +189,7 @@ namespace FlaxEditor.Windows
 
             _pilotActor = actor;
             _pilotStart = actor.Transform;
-            _pilotBounds = actor.BoxWithChildren;
+            _pilotBounds = actor.BoundingBoxWithChildren;
             Viewport.ViewTransform = _pilotStart;
             if (_pilotWidget == null)
             {
diff --git a/Source/Engine/AI/BehaviorTreeNodes.cpp b/Source/Engine/AI/BehaviorTreeNodes.cpp
index d62210072..21cfe4c95 100644
--- a/Source/Engine/AI/BehaviorTreeNodes.cpp
+++ b/Source/Engine/AI/BehaviorTreeNodes.cpp
@@ -394,8 +394,8 @@ void BehaviorTreeMoveToNode::GetAgentSize(Actor* agent, float& outRadius, float&
     }
 
     // Estimate actor bounds to extract capsule information
-    const BoundingBox box = agent->GetBox();
-    const BoundingSphere sphere = agent->GetSphere();
+    const BoundingBox box = agent->GetBoundingBox();
+    const BoundingSphere sphere = agent->GetBoundingSphere();
     outRadius = (float)sphere.Radius;
     outHeight = (float)box.GetSize().Y;
 }
diff --git a/Source/Engine/Animations/SceneAnimations/SceneAnimationPlayer.h b/Source/Engine/Animations/SceneAnimations/SceneAnimationPlayer.h
index df649f299..6a15eb4cb 100644
--- a/Source/Engine/Animations/SceneAnimations/SceneAnimationPlayer.h
+++ b/Source/Engine/Animations/SceneAnimations/SceneAnimationPlayer.h
@@ -221,7 +221,7 @@ public:
     void Serialize(SerializeStream& stream, const void* otherObj) override;
     void Deserialize(DeserializeStream& stream, ISerializeModifier* modifier) override;
 #if USE_EDITOR
-    BoundingBox GetEditorBox() const override
+    BoundingBox GetEditorBoundingBox() const override
     {
         const Vector3 size(50);
         return BoundingBox(_transform.Translation - size, _transform.Translation + size);
diff --git a/Source/Engine/Audio/AudioListener.h b/Source/Engine/Audio/AudioListener.h
index 7bb4299a5..89f4ba5af 100644
--- a/Source/Engine/Audio/AudioListener.h
+++ b/Source/Engine/Audio/AudioListener.h
@@ -30,7 +30,7 @@ private:
 public:
     // [Actor]
 #if USE_EDITOR
-    BoundingBox GetEditorBox() const override
+    BoundingBox GetEditorBoundingBox() const override
     {
         const Vector3 size(50);
         return BoundingBox(_transform.Translation - size, _transform.Translation + size);
diff --git a/Source/Engine/Audio/AudioSource.h b/Source/Engine/Audio/AudioSource.h
index 07762be2f..db698f3ba 100644
--- a/Source/Engine/Audio/AudioSource.h
+++ b/Source/Engine/Audio/AudioSource.h
@@ -318,7 +318,7 @@ private:
 public:
     // [Actor]
 #if USE_EDITOR
-    BoundingBox GetEditorBox() const override
+    BoundingBox GetEditorBoundingBox() const override
     {
         const Vector3 size(50);
         return BoundingBox(_transform.Translation - size, _transform.Translation + size);
diff --git a/Source/Engine/Level/Actor.h b/Source/Engine/Level/Actor.h
index 072077fe4..4271393ce 100644
--- a/Source/Engine/Level/Actor.h
+++ b/Source/Engine/Level/Actor.h
@@ -689,7 +689,7 @@ public:
 public:
     /// <summary>
     /// Gets actor bounding sphere that defines 3D space intersecting with the actor (for determination of the visibility for actor).
-    /// [DEPRECATED IN 1.13]
+    /// [Deprecated in 1.13]
     /// </summary>
     API_PROPERTY() DEPRECATED("Use GetBoundingSphere instead.") FORCE_INLINE const BoundingSphere& GetSphere() const
     {
@@ -706,7 +706,7 @@ public:
 
     /// <summary>
     /// Gets actor bounding box that defines 3D space intersecting with the actor (for determination of the visibility for actor).
-    /// [DEPRECATED IN 1.13]
+    /// [Deprecated in 1.13]
     /// </summary>
     API_PROPERTY() DEPRECATED("Use GetBoundingBox instead.") FORCE_INLINE const BoundingBox& GetBox() const
     {
@@ -723,7 +723,7 @@ public:
 
     /// <summary>
     /// Gets actor bounding box of the actor including all child actors (children included in recursive way)
-    /// [DEPRECATED IN 1.13]
+    /// [Deprecated in 1.13]
     /// </summary>
     API_PROPERTY() DEPRECATED("Use GetBoundingBoxWithChildren instead.") BoundingBox GetBoxWithChildren() const;
     
@@ -735,7 +735,7 @@ public:
 #if USE_EDITOR
     /// <summary>
     /// Gets actor bounding box (single actor, no children included) for editor tools.
-    /// [DEPRECATED IN 1.13]
+    /// [Deprecated in 1.13]
     /// </summary>
     API_PROPERTY() DEPRECATED("Use GetEditorBoundingBox instead.") virtual BoundingBox GetEditorBox() const;
     
@@ -746,7 +746,7 @@ public:
 
     /// <summary>
     /// Gets actor bounding box of the actor including all child actors for editor tools.
-    /// [DEPRECATED IN 1.13]
+    /// [Deprecated in 1.13]
     /// </summary>
     API_PROPERTY() DEPRECATED("Use GetEditorBoundingBoxWithChildren instead.") BoundingBox GetEditorBoxChildren() const;
     
diff --git a/Source/Engine/Level/Actors/AnimatedModel.cpp b/Source/Engine/Level/Actors/AnimatedModel.cpp
index 2f878f3d6..90d978af0 100644
--- a/Source/Engine/Level/Actors/AnimatedModel.cpp
+++ b/Source/Engine/Level/Actors/AnimatedModel.cpp
@@ -1216,7 +1216,7 @@ void AnimatedModel::OnDebugDraw()
     ModelInstanceActor::OnDebugDraw();
 }
 
-BoundingBox AnimatedModel::GetEditorBox() const
+BoundingBox AnimatedModel::GetEditorBoundingBox() const
 {
     if (SkinnedModel)
         SkinnedModel->WaitForLoaded(100);
diff --git a/Source/Engine/Level/Actors/AnimatedModel.h b/Source/Engine/Level/Actors/AnimatedModel.h
index bbfa6f0ea..806e0fcdf 100644
--- a/Source/Engine/Level/Actors/AnimatedModel.h
+++ b/Source/Engine/Level/Actors/AnimatedModel.h
@@ -479,7 +479,7 @@ public:
 #if USE_EDITOR
     void OnDebugDrawSelected() override;
     void OnDebugDraw() override;
-    BoundingBox GetEditorBox() const override;
+    BoundingBox GetEditorBoundingBox() const override;
 #endif
     bool IntersectsItself(const Ray& ray, Real& distance, Vector3& normal) override;
     void Serialize(SerializeStream& stream, const void* otherObj) override;
diff --git a/Source/Engine/Level/Actors/Camera.cpp b/Source/Engine/Level/Actors/Camera.cpp
index fa4c2abfb..5ac227c2f 100644
--- a/Source/Engine/Level/Actors/Camera.cpp
+++ b/Source/Engine/Level/Actors/Camera.cpp
@@ -333,7 +333,7 @@ void Camera::BeginPlay(SceneBeginData* data)
     Actor::BeginPlay(data);
 }
 
-BoundingBox Camera::GetEditorBox() const
+BoundingBox Camera::GetEditorBoundingBox() const
 {
     const Vector3 size(100);
     const Vector3 pos = _transform.Translation + _transform.Orientation * Vector3::Forward * 30.0f;
diff --git a/Source/Engine/Level/Actors/Camera.h b/Source/Engine/Level/Actors/Camera.h
index 81531bd37..1f17f8575 100644
--- a/Source/Engine/Level/Actors/Camera.h
+++ b/Source/Engine/Level/Actors/Camera.h
@@ -257,7 +257,7 @@ private:
 public:
     // [Actor]
 #if USE_EDITOR
-    BoundingBox GetEditorBox() const override;
+    BoundingBox GetEditorBoundingBox() const override;
     bool HasContentLoaded() const override;
     void Draw(RenderContext& renderContext) override;
     void OnDebugDrawSelected() override;
diff --git a/Source/Engine/Level/Actors/Decal.cpp b/Source/Engine/Level/Actors/Decal.cpp
index 78066133c..f29063a9b 100644
--- a/Source/Engine/Level/Actors/Decal.cpp
+++ b/Source/Engine/Level/Actors/Decal.cpp
@@ -53,7 +53,7 @@ void Decal::OnDebugDrawSelected()
     Actor::OnDebugDrawSelected();
 }
 
-BoundingBox Decal::GetEditorBox() const
+BoundingBox Decal::GetEditorBoundingBox() const
 {
     const Vector3 size(10.0f);
     return BoundingBox(_transform.Translation - size, _transform.Translation + size);
diff --git a/Source/Engine/Level/Actors/Decal.h b/Source/Engine/Level/Actors/Decal.h
index 068a4447e..838f31af6 100644
--- a/Source/Engine/Level/Actors/Decal.h
+++ b/Source/Engine/Level/Actors/Decal.h
@@ -71,7 +71,7 @@ public:
     // [Actor]
 #if USE_EDITOR
     void OnDebugDrawSelected() override;
-    BoundingBox GetEditorBox() const override;
+    BoundingBox GetEditorBoundingBox() const override;
 #endif
     void OnLayerChanged() override;
     void Draw(RenderContext& renderContext) override;
diff --git a/Source/Engine/Level/Actors/EmptyActor.cpp b/Source/Engine/Level/Actors/EmptyActor.cpp
index fde7531f4..477e04d0a 100644
--- a/Source/Engine/Level/Actors/EmptyActor.cpp
+++ b/Source/Engine/Level/Actors/EmptyActor.cpp
@@ -9,7 +9,7 @@ EmptyActor::EmptyActor(const SpawnParams& params)
 
 #if USE_EDITOR
 
-BoundingBox EmptyActor::GetEditorBox() const
+BoundingBox EmptyActor::GetEditorBoundingBox() const
 {
     const Vector3 size(50);
     return BoundingBox(_transform.Translation - size, _transform.Translation + size);
diff --git a/Source/Engine/Level/Actors/EmptyActor.h b/Source/Engine/Level/Actors/EmptyActor.h
index 9149b698e..6515a70e4 100644
--- a/Source/Engine/Level/Actors/EmptyActor.h
+++ b/Source/Engine/Level/Actors/EmptyActor.h
@@ -14,7 +14,7 @@ class FLAXENGINE_API EmptyActor : public Actor
 public:
     // [Actor]
 #if USE_EDITOR
-    BoundingBox GetEditorBox() const override;
+    BoundingBox GetEditorBoundingBox() const override;
 #endif
 
 protected:
diff --git a/Source/Engine/Level/Actors/EnvironmentProbe.h b/Source/Engine/Level/Actors/EnvironmentProbe.h
index bf65222ee..c5f06c573 100644
--- a/Source/Engine/Level/Actors/EnvironmentProbe.h
+++ b/Source/Engine/Level/Actors/EnvironmentProbe.h
@@ -152,7 +152,7 @@ private:
 public:
     // [Actor]
 #if USE_EDITOR
-    BoundingBox GetEditorBox() const override
+    BoundingBox GetEditorBoundingBox() const override
     {
         const Vector3 size(50);
         return BoundingBox(_transform.Translation - size, _transform.Translation + size);
diff --git a/Source/Engine/Level/Actors/ExponentialHeightFog.h b/Source/Engine/Level/Actors/ExponentialHeightFog.h
index c0e5407d2..bf89c6e60 100644
--- a/Source/Engine/Level/Actors/ExponentialHeightFog.h
+++ b/Source/Engine/Level/Actors/ExponentialHeightFog.h
@@ -141,7 +141,7 @@ private:
 public:
     // [Actor]
 #if USE_EDITOR
-    BoundingBox GetEditorBox() const override
+    BoundingBox GetEditorBoundingBox() const override
     {
         const Vector3 size(50);
         return BoundingBox(_transform.Translation - size, _transform.Translation + size);
diff --git a/Source/Engine/Level/Actors/Light.h b/Source/Engine/Level/Actors/Light.h
index 0e2a441db..3b7527095 100644
--- a/Source/Engine/Level/Actors/Light.h
+++ b/Source/Engine/Level/Actors/Light.h
@@ -75,7 +75,7 @@ public:
     void OnEnable() override;
     void OnDisable() override;
 #if USE_EDITOR
-    BoundingBox GetEditorBox() const override
+    BoundingBox GetEditorBoundingBox() const override
     {
         const Vector3 size(50);
         return BoundingBox(_transform.Translation - size, _transform.Translation + size);
diff --git a/Source/Engine/Level/Actors/Sky.h b/Source/Engine/Level/Actors/Sky.h
index 61bb048ef..c52651666 100644
--- a/Source/Engine/Level/Actors/Sky.h
+++ b/Source/Engine/Level/Actors/Sky.h
@@ -63,7 +63,7 @@ private:
 public:
     // [Actor]
 #if USE_EDITOR
-    BoundingBox GetEditorBox() const override
+    BoundingBox GetEditorBoundingBox() const override
     {
         const Vector3 size(50);
         return BoundingBox(_transform.Translation - size, _transform.Translation + size);
diff --git a/Source/Engine/Level/Actors/Skybox.h b/Source/Engine/Level/Actors/Skybox.h
index fb831df44..d18b49f7a 100644
--- a/Source/Engine/Level/Actors/Skybox.h
+++ b/Source/Engine/Level/Actors/Skybox.h
@@ -57,7 +57,7 @@ private:
 public:
     // [Actor]
 #if USE_EDITOR
-    BoundingBox GetEditorBox() const override
+    BoundingBox GetEditorBoundingBox() const override
     {
         const Vector3 size(50);
         return BoundingBox(_transform.Translation - size, _transform.Translation + size);
diff --git a/Source/Engine/Level/Scene/Scene.cpp b/Source/Engine/Level/Scene/Scene.cpp
index b45424a3d..98f1bc76c 100644
--- a/Source/Engine/Level/Scene/Scene.cpp
+++ b/Source/Engine/Level/Scene/Scene.cpp
@@ -44,9 +44,9 @@ BoundingBox SceneNavigation::GetNavigationBounds()
     if (Volumes.IsEmpty())
         return BoundingBox::Empty;
     PROFILE_CPU_NAMED("GetNavigationBounds");
-    auto box = Volumes[0]->GetBox();
+    auto box = Volumes[0]->GetBoundingBox();
     for (int32 i = 1; i < Volumes.Count(); i++)
-        BoundingBox::Merge(box, Volumes[i]->GetBox(), box);
+        BoundingBox::Merge(box, Volumes[i]->GetBoundingBox(), box);
     return box;
 }
 
@@ -55,7 +55,7 @@ NavMeshBoundsVolume* SceneNavigation::FindNavigationBoundsOverlap(const Bounding
     NavMeshBoundsVolume* result = nullptr;
     for (int32 i = 0; i < Volumes.Count(); i++)
     {
-        if (Volumes[i]->GetBox().Intersects(bounds))
+        if (Volumes[i]->GetBoundingBox().Intersects(bounds))
         {
             result = Volumes[i];
             break;
diff --git a/Source/Engine/Level/Scene/SceneRendering.cpp b/Source/Engine/Level/Scene/SceneRendering.cpp
index d87e5580c..6227d3517 100644
--- a/Source/Engine/Level/Scene/SceneRendering.cpp
+++ b/Source/Engine/Level/Scene/SceneRendering.cpp
@@ -184,7 +184,7 @@ void SceneRendering::AddActor(Actor* a, int32& key)
     auto& e = list[key];
     e.Actor = a;
     e.LayerMask = a->GetLayerMask();
-    e.Bounds = a->GetSphere();
+    e.Bounds = a->GetBoundingSphere();
     e.NoCulling = a->_drawNoCulling;
     for (auto* listener : _listeners)
         listener->OnSceneRenderingAddActor(a);
@@ -207,7 +207,7 @@ void SceneRendering::UpdateActor(Actor* a, int32& key, ISceneRenderingListener::
             if (flags & ISceneRenderingListener::Layer)
                 e.LayerMask = a->GetLayerMask();
             if (flags & ISceneRenderingListener::Bounds)
-                e.Bounds = a->GetSphere();
+                e.Bounds = a->GetBoundingSphere();
         }
     }
     if (lock)
diff --git a/Source/Engine/Navigation/NavMeshBuilder.cpp b/Source/Engine/Navigation/NavMeshBuilder.cpp
index 896cf4217..0c4d10589 100644
--- a/Source/Engine/Navigation/NavMeshBuilder.cpp
+++ b/Source/Engine/Navigation/NavMeshBuilder.cpp
@@ -251,7 +251,7 @@ struct NavSceneRasterizer
                 return;
             PROFILE_CPU_NAMED("SphereCollider");
 
-            const BoundingSphere sphere = sphereCollider->GetSphere();
+            const BoundingSphere sphere = sphereCollider->GetBoundingSphere();
             TriangulateSphere(VertexBuffer, IndexBuffer, sphere);
             RasterizeTriangles();
         }
@@ -261,7 +261,7 @@ struct NavSceneRasterizer
                 return;
             PROFILE_CPU_NAMED("CapsuleCollider");
 
-            const BoundingBox box = capsuleCollider->GetBox();
+            const BoundingBox box = capsuleCollider->GetBoundingBox();
             TriangulateBox(VertexBuffer, IndexBuffer, box);
             RasterizeTriangles();
         }
@@ -411,7 +411,7 @@ bool GenerateTile(NavMesh* navMesh, NavMeshRuntime* runtime, int32 x, int32 y, B
                 for (Actor* actor : scene->Navigation.Actors)
                 {
                     BoundingBox actorBoxNavMesh;
-                    BoundingBox::Transform(actor->GetBox(), rasterizer.WorldToNavMesh, actorBoxNavMesh);
+                    BoundingBox::Transform(actor->GetBoundingBox(), rasterizer.WorldToNavMesh, actorBoxNavMesh);
                     if (actorBoxNavMesh.Intersects(rasterizer.TileBoundsNavMesh) &&
                         actor->IsActiveInHierarchy() &&
                         EnumHasAllFlags(actor->GetStaticFlags(), StaticFlags::Navigation))
@@ -963,10 +963,10 @@ void BuildDirtyBounds(Scene* scene, NavMesh* navMesh, const BoundingBox& dirtyBo
         for (const NavMeshBoundsVolume* volume : scene->Navigation.Volumes)
         {
             if (!volume->AgentsMask.IsNavMeshSupported(navMesh->Properties) ||
-                !volume->GetBox().Intersects(dirtyBoundsNavMesh))
+                !volume->GetBoundingBox().Intersects(dirtyBoundsNavMesh))
                 continue;
             auto& bounds = volumes.AddOne();
-            BoundingBox::Transform(volume->GetBox(), worldToNavMesh, bounds);
+            BoundingBox::Transform(volume->GetBoundingBox(), worldToNavMesh, bounds);
         }
 
         Array<TileId> unusedTiles;
diff --git a/Source/Engine/Particles/ParticleEffect.h b/Source/Engine/Particles/ParticleEffect.h
index 5ae56603a..491a23b0c 100644
--- a/Source/Engine/Particles/ParticleEffect.h
+++ b/Source/Engine/Particles/ParticleEffect.h
@@ -424,7 +424,7 @@ public:
     void Serialize(SerializeStream& stream, const void* otherObj) override;
     void Deserialize(DeserializeStream& stream, ISerializeModifier* modifier) override;
 #if USE_EDITOR
-    BoundingBox GetEditorBox() const override
+    BoundingBox GetEditorBoundingBox() const override
     {
         const Vector3 size(50);
         return BoundingBox(_transform.Translation - size, _transform.Translation + size);
diff --git a/Source/Engine/Particles/Particles.cpp b/Source/Engine/Particles/Particles.cpp
index 3c41cd243..b1e28190b 100644
--- a/Source/Engine/Particles/Particles.cpp
+++ b/Source/Engine/Particles/Particles.cpp
@@ -1141,7 +1141,7 @@ void Particles::DrawParticles(RenderContextBatch& renderContextBatch, ParticleEf
 
     // Drawing assumes that all views within a batch have the same Origin
     const Vector3& viewOrigin = renderContextBatch.GetMainContext().View.Origin;
-    BoundingSphere bounds = effect->GetSphere();
+    BoundingSphere bounds = effect->GetBoundingSphere();
     bounds.Center -= viewOrigin;
 
     // Cull particles against all views
diff --git a/Source/Engine/Physics/Colliders/BoxCollider.cpp b/Source/Engine/Physics/Colliders/BoxCollider.cpp
index 47e551b37..95890e268 100644
--- a/Source/Engine/Physics/Colliders/BoxCollider.cpp
+++ b/Source/Engine/Physics/Colliders/BoxCollider.cpp
@@ -34,13 +34,13 @@ void BoxCollider::AutoResize(bool globalOrientation = true)
     // Hacky way to get unrotated bounded box of parent
     const Quaternion parentOrientation = parent->GetOrientation();
     parent->SetOrientation(Quaternion::Identity);
-    BoundingBox parentBox = parent->GetBox();
+    BoundingBox parentBox = parent->GetBoundingBox();
     parent->SetOrientation(parentOrientation);
 
     for (const Actor* sibling : parent->Children)
     {
         if (sibling != this)
-            BoundingBox::Merge(parentBox, sibling->GetBoxWithChildren(), parentBox);
+            BoundingBox::Merge(parentBox, sibling->GetBoundingBoxWithChildren(), parentBox);
     }
     const Vector3 parentSize = parentBox.GetSize();
     const Vector3 parentCenter = parentBox.GetCenter() - parent->GetPosition();
diff --git a/Source/Engine/Physics/PhysX/PhysicsBackendPhysX.cpp b/Source/Engine/Physics/PhysX/PhysicsBackendPhysX.cpp
index 18ed6effd..f2f6d3968 100644
--- a/Source/Engine/Physics/PhysX/PhysicsBackendPhysX.cpp
+++ b/Source/Engine/Physics/PhysX/PhysicsBackendPhysX.cpp
@@ -216,8 +216,8 @@ struct ClothSettings
             clothTrans.LocalToWorld(c, c);
 
         // Setup bounds
-        BoundingBox::FromPoints(boundsCorners, 8, const_cast<BoundingBox&>(Actor->GetBox()));
-        BoundingSphere::FromBox(Actor->GetBox(), const_cast<BoundingSphere&>(Actor->GetSphere()));
+        BoundingBox::FromPoints(boundsCorners, 8, const_cast<BoundingBox&>(Actor->GetBoundingBox()));
+        BoundingSphere::FromBox(Actor->GetBoundingBox(), const_cast<BoundingSphere&>(Actor->GetBoundingSphere()));
         return false;
     }
 };
diff --git a/Source/Engine/Renderer/GlobalSignDistanceFieldPass.cpp b/Source/Engine/Renderer/GlobalSignDistanceFieldPass.cpp
index ae6e8a9a8..7c46aa268 100644
--- a/Source/Engine/Renderer/GlobalSignDistanceFieldPass.cpp
+++ b/Source/Engine/Renderer/GlobalSignDistanceFieldPass.cpp
@@ -399,7 +399,7 @@ public:
         if (GLOBAL_SDF_ACTOR_IS_STATIC(a) && ObjectTypes.Contains(a->GetTypeHandle()))
         {
             ScopeWriteLock lock(Locker);
-            OnSceneRenderingDirty(a->GetBox());
+            OnSceneRenderingDirty(a->GetBoundingBox());
         }
     }
 
@@ -410,7 +410,7 @@ public:
             ScopeWriteLock lock(Locker);
             if (flags != DrawModes && flags != Layer && flags != StaticFlags)
                 OnSceneRenderingDirty(BoundingBox::FromSphere(prevBounds));
-            OnSceneRenderingDirty(a->GetBox());
+            OnSceneRenderingDirty(a->GetBoundingBox());
         }
     }
 
@@ -419,7 +419,7 @@ public:
         if (GLOBAL_SDF_ACTOR_IS_STATIC(a) && ObjectTypes.Contains(a->GetTypeHandle()))
         {
             ScopeWriteLock lock(Locker);
-            OnSceneRenderingDirty(a->GetBox());
+            OnSceneRenderingDirty(a->GetBoundingBox());
         }
     }
 
diff --git a/Source/Engine/Renderer/ProbesRenderer.cpp b/Source/Engine/Renderer/ProbesRenderer.cpp
index 5ed2af5d9..40b0a4496 100644
--- a/Source/Engine/Renderer/ProbesRenderer.cpp
+++ b/Source/Engine/Renderer/ProbesRenderer.cpp
@@ -450,7 +450,7 @@ void ProbesRendererService::OnRender(RenderTask* task, GPUContext* context)
         {
             auto envProbe = (EnvironmentProbe*)_current.Actor.Get();
             Vector3 position = envProbe->GetTransform().LocalToWorld(envProbe->CaptureOffset);
-            float radius = (float)envProbe->GetSphere().Radius;
+            float radius = (float)envProbe->GetBoundingSphere().Radius;
             float nearPlane = Math::Max(METERS_TO_UNITS(0.001f), envProbe->CaptureNearPlane);
 
             // Adjust far plane distance
diff --git a/Source/Engine/Renderer/ShadowsPass.cpp b/Source/Engine/Renderer/ShadowsPass.cpp
index 12848ed47..21bbd138b 100644
--- a/Source/Engine/Renderer/ShadowsPass.cpp
+++ b/Source/Engine/Renderer/ShadowsPass.cpp
@@ -396,7 +396,7 @@ public:
     void OnSceneRenderingAddActor(Actor* a) override
     {
         if (a->HasStaticFlag(StaticFlags::Shadow))
-            DirtyStaticBounds(a->GetSphere());
+            DirtyStaticBounds(a->GetBoundingSphere());
     }
 
     void OnSceneRenderingUpdateActor(Actor* a, const BoundingSphere& prevBounds, UpdateFlags flags) override
@@ -405,7 +405,7 @@ public:
         if (a->HasStaticFlag(StaticFlags::Shadow))
         {
             // TODO: skip actors that don't cast shadows (eg. particles)
-            BoundingSphere bounds = a->GetSphere();
+            BoundingSphere bounds = a->GetBoundingSphere();
             if (bounds != prevBounds)
             {
                 // Avoid dirtying twice when bounds are close to each other
@@ -418,14 +418,14 @@ public:
         }
         else if (flags & StaticFlags)
         {
-            DirtyStaticBounds(a->GetSphere());
+            DirtyStaticBounds(a->GetBoundingSphere());
         }
     }
 
     void OnSceneRenderingRemoveActor(Actor* a) override
     {
         if (a->HasStaticFlag(StaticFlags::Shadow))
-            DirtyStaticBounds(a->GetSphere());
+            DirtyStaticBounds(a->GetBoundingSphere());
     }
 
     void OnSceneRenderingClear(SceneRendering* scene) override
diff --git a/Source/Engine/UI/UICanvas.cpp b/Source/Engine/UI/UICanvas.cpp
index bf87fd676..be54260da 100644
--- a/Source/Engine/UI/UICanvas.cpp
+++ b/Source/Engine/UI/UICanvas.cpp
@@ -63,7 +63,7 @@ UICanvas::UICanvas(const SpawnParams& params)
 
 #if USE_EDITOR
 
-BoundingBox UICanvas::GetEditorBox() const
+BoundingBox UICanvas::GetEditorBoundingBox() const
 {
     const Vector3 size(50);
     return BoundingBox(_transform.Translation - size, _transform.Translation + size);
diff --git a/Source/Engine/UI/UICanvas.h b/Source/Engine/UI/UICanvas.h
index d654991bb..e8c757a3e 100644
--- a/Source/Engine/UI/UICanvas.h
+++ b/Source/Engine/UI/UICanvas.h
@@ -14,7 +14,7 @@ class FLAXENGINE_API UICanvas : public Actor
 public:
     // [Actor]
 #if USE_EDITOR
-    BoundingBox GetEditorBox() const override;
+    BoundingBox GetEditorBoundingBox() const override;
 #endif
     void Serialize(SerializeStream& stream, const void* otherObj) override;
     void Deserialize(DeserializeStream& stream, ISerializeModifier* modifier) override;
diff --git a/Source/Engine/UI/UIControl.cpp b/Source/Engine/UI/UIControl.cpp
index 06554542b..aace1ce52 100644
--- a/Source/Engine/UI/UIControl.cpp
+++ b/Source/Engine/UI/UIControl.cpp
@@ -60,7 +60,7 @@ UIControl::UIControl(const SpawnParams& params)
 
 #if USE_EDITOR
 
-BoundingBox UIControl::GetEditorBox() const
+BoundingBox UIControl::GetEditorBoundingBox() const
 {
     const Vector3 size(50);
     return BoundingBox(_transform.Translation - size, _transform.Translation + size);
diff --git a/Source/Engine/UI/UIControl.h b/Source/Engine/UI/UIControl.h
index e7739781d..141753104 100644
--- a/Source/Engine/UI/UIControl.h
+++ b/Source/Engine/UI/UIControl.h
@@ -18,7 +18,7 @@ private:
 public:
     // [Actor]
 #if USE_EDITOR
-    BoundingBox GetEditorBox() const override;
+    BoundingBox GetEditorBoundingBox() const override;
 #endif
     void Serialize(SerializeStream& stream, const void* otherObj) override;
     void Deserialize(DeserializeStream& stream, ISerializeModifier* modifier) override;
diff --git a/Source/Engine/Video/VideoPlayer.h b/Source/Engine/Video/VideoPlayer.h
index ecae37e61..b754969eb 100644
--- a/Source/Engine/Video/VideoPlayer.h
+++ b/Source/Engine/Video/VideoPlayer.h
@@ -241,12 +241,11 @@ private:
 public:
     // [Actor]
 #if USE_EDITOR
-    BoundingBox GetEditorBox() const override
+    BoundingBox GetEditorBoundingBox() const override
     {
         const Vector3 size(50);
         return BoundingBox(_transform.Translation - size, _transform.Translation + size);
     }
-
     void OnDebugDrawSelected() override;
 #endif
     bool IntersectsItself(const Ray& ray, Real& distance, Vector3& normal) override;