7 files changed, 28 insertions, 28 deletions
diff --git a/core/core_constants.cpp b/core/core_constants.cpp
index 8585078722..555908ea79 100644
--- a/core/core_constants.cpp
+++ b/core/core_constants.cpp
@@ -112,10 +112,10 @@ VARIANT_ENUM_CAST(JoyAxisList);
 VARIANT_ENUM_CAST(MidiMessageList);
 
 void register_global_constants() {
-	BIND_CORE_ENUM_CONSTANT(MARGIN_LEFT);
-	BIND_CORE_ENUM_CONSTANT(MARGIN_TOP);
-	BIND_CORE_ENUM_CONSTANT(MARGIN_RIGHT);
-	BIND_CORE_ENUM_CONSTANT(MARGIN_BOTTOM);
+	BIND_CORE_ENUM_CONSTANT(SIDE_LEFT);
+	BIND_CORE_ENUM_CONSTANT(SIDE_TOP);
+	BIND_CORE_ENUM_CONSTANT(SIDE_RIGHT);
+	BIND_CORE_ENUM_CONSTANT(SIDE_BOTTOM);
 
 	BIND_CORE_ENUM_CONSTANT(CORNER_TOP_LEFT);
 	BIND_CORE_ENUM_CONSTANT(CORNER_TOP_RIGHT);
diff --git a/core/math/math_defs.h b/core/math/math_defs.h
index 4d97f72ebf..0478de732a 100644
--- a/core/math/math_defs.h
+++ b/core/math/math_defs.h
@@ -83,11 +83,11 @@ enum VAlign {
 	VALIGN_BOTTOM
 };
 
-enum Margin {
-	MARGIN_LEFT,
-	MARGIN_TOP,
-	MARGIN_RIGHT,
-	MARGIN_BOTTOM
+enum Side {
+	SIDE_LEFT,
+	SIDE_TOP,
+	SIDE_RIGHT,
+	SIDE_BOTTOM
 };
 
 enum Corner {
diff --git a/core/math/rect2.h b/core/math/rect2.h
index f36084ec74..aecba9e88c 100644
--- a/core/math/rect2.h
+++ b/core/math/rect2.h
@@ -189,17 +189,17 @@ struct Rect2 {
 		return g;
 	}
 
-	inline Rect2 grow_margin(Margin p_margin, real_t p_amount) const {
+	inline Rect2 grow_margin(Side p_side, real_t p_amount) const {
 		Rect2 g = *this;
-		g = g.grow_individual((MARGIN_LEFT == p_margin) ? p_amount : 0,
-				(MARGIN_TOP == p_margin) ? p_amount : 0,
-				(MARGIN_RIGHT == p_margin) ? p_amount : 0,
-				(MARGIN_BOTTOM == p_margin) ? p_amount : 0);
+		g = g.grow_individual((SIDE_LEFT == p_side) ? p_amount : 0,
+				(SIDE_TOP == p_side) ? p_amount : 0,
+				(SIDE_RIGHT == p_side) ? p_amount : 0,
+				(SIDE_BOTTOM == p_side) ? p_amount : 0);
 		return g;
 	}
 
-	inline Rect2 grow_margin_bind(uint32_t p_margin, real_t p_amount) const {
-		return grow_margin(Margin(p_margin), p_amount);
+	inline Rect2 grow_margin_bind(uint32_t p_side, real_t p_amount) const {
+		return grow_margin(Side(p_side), p_amount);
 	}
 
 	inline Rect2 grow_individual(real_t p_left, real_t p_top, real_t p_right, real_t p_bottom) const {
@@ -431,17 +431,17 @@ struct Rect2i {
 		return g;
 	}
 
-	inline Rect2i grow_margin(Margin p_margin, int p_amount) const {
+	inline Rect2i grow_margin(Side p_side, int p_amount) const {
 		Rect2i g = *this;
-		g = g.grow_individual((MARGIN_LEFT == p_margin) ? p_amount : 0,
-				(MARGIN_TOP == p_margin) ? p_amount : 0,
-				(MARGIN_RIGHT == p_margin) ? p_amount : 0,
-				(MARGIN_BOTTOM == p_margin) ? p_amount : 0);
+		g = g.grow_individual((SIDE_LEFT == p_side) ? p_amount : 0,
+				(SIDE_TOP == p_side) ? p_amount : 0,
+				(SIDE_RIGHT == p_side) ? p_amount : 0,
+				(SIDE_BOTTOM == p_side) ? p_amount : 0);
 		return g;
 	}
 
-	inline Rect2i grow_margin_bind(uint32_t p_margin, int p_amount) const {
-		return grow_margin(Margin(p_margin), p_amount);
+	inline Rect2i grow_margin_bind(uint32_t p_side, int p_amount) const {
+		return grow_margin(Side(p_side), p_amount);
 	}
 
 	inline Rect2i grow_individual(int p_left, int p_top, int p_right, int p_bottom) const {
diff --git a/core/variant/binder_common.h b/core/variant/binder_common.h
index e950709526..95113c89ba 100644
--- a/core/variant/binder_common.h
+++ b/core/variant/binder_common.h
@@ -87,7 +87,7 @@ VARIANT_ENUM_CAST(Object::ConnectFlags);
 VARIANT_ENUM_CAST(Vector3::Axis);
 
 VARIANT_ENUM_CAST(Error);
-VARIANT_ENUM_CAST(Margin);
+VARIANT_ENUM_CAST(Side);
 VARIANT_ENUM_CAST(Corner);
 VARIANT_ENUM_CAST(Orientation);
 VARIANT_ENUM_CAST(HAlign);
diff --git a/core/variant/variant.cpp b/core/variant/variant.cpp
index 741d05c139..9eb512f71d 100644
--- a/core/variant/variant.cpp
+++ b/core/variant/variant.cpp
@@ -2338,8 +2338,8 @@ Variant::operator Vector<StringName>() const {
 	return to;
 }
 
-Variant::operator Margin() const {
-	return (Margin) operator int();
+Variant::operator Side() const {
+	return (Side) operator int();
 }
 
 Variant::operator Orientation() const {
diff --git a/core/variant/variant.h b/core/variant/variant.h
index 76c936a7bd..b22488a877 100644
--- a/core/variant/variant.h
+++ b/core/variant/variant.h
@@ -356,7 +356,7 @@ public:
 	operator Vector<Vector2>() const;
 
 	// some core type enums to convert to
-	operator Margin() const;
+	operator Side() const;
 	operator Orientation() const;
 
 	operator IP_Address() const;
diff --git a/core/variant/variant_internal.h b/core/variant/variant_internal.h
index 804abf8fbc..57e8f8813f 100644
--- a/core/variant/variant_internal.h
+++ b/core/variant/variant_internal.h
@@ -743,7 +743,7 @@ VARIANT_ACCESSOR_NUMBER(int64_t)
 VARIANT_ACCESSOR_NUMBER(uint64_t)
 VARIANT_ACCESSOR_NUMBER(char32_t)
 VARIANT_ACCESSOR_NUMBER(Error)
-VARIANT_ACCESSOR_NUMBER(Margin)
+VARIANT_ACCESSOR_NUMBER(Side)
 
 template <>
 struct VariantInternalAccessor<ObjectID> {