diff --git a/yoga/Yoga.cpp b/yoga/Yoga.cpp
index dae5bb41..c3580bb0 100644
--- a/yoga/Yoga.cpp
+++ b/yoga/Yoga.cpp
@@ -1364,7 +1364,7 @@ static void YGNodeComputeFlexBasisForChild(
         ownerWidth,
         ownerHeight,
         false,
-        kMeasureChild,
+        LayoutPassReason::kMeasureChild,
         config,
         layoutMarkerData,
         layoutContext,
@@ -1492,7 +1492,7 @@ static void YGNodeAbsoluteLayoutChild(
         childWidth,
         childHeight,
         false,
-        kAbsMeasureChild,
+        LayoutPassReason::kAbsMeasureChild,
         config,
         layoutMarkerData,
         layoutContext,
@@ -1514,7 +1514,7 @@ static void YGNodeAbsoluteLayoutChild(
       childWidth,
       childHeight,
       true,
-      kAbsLayout,
+      LayoutPassReason::kAbsLayout,
       config,
       layoutMarkerData,
       layoutContext,
@@ -2187,7 +2187,7 @@ static float YGDistributeFreeSpaceSecondPass(
         availableInnerWidth,
         availableInnerHeight,
         performLayout && !requiresStretchLayout,
-        kFlex,
+        LayoutPassReason::kFlex,
         config,
         layoutMarkerData,
         layoutContext,
@@ -3121,7 +3121,7 @@ static void YGNodelayoutImpl(
                   availableInnerWidth,
                   availableInnerHeight,
                   true,
-                  kStretch,
+                  LayoutPassReason::kStretch,
                   config,
                   layoutMarkerData,
                   layoutContext,
@@ -3331,7 +3331,7 @@ static void YGNodelayoutImpl(
                         availableInnerWidth,
                         availableInnerHeight,
                         true,
-                        kMultilineStretch,
+                        LayoutPassReason::kMultilineStretch,
                         config,
                         layoutMarkerData,
                         layoutContext,
@@ -3835,7 +3835,7 @@ bool YGLayoutNodeInternal(
           availableHeight,
           cachedResults->computedWidth,
           cachedResults->computedHeight,
-          LayoutPassReason(reason));
+          LayoutPassReasonToString(reason));
     }
   } else {
     if (gPrintChanges) {
@@ -3857,7 +3857,7 @@ bool YGLayoutNodeInternal(
           YGMeasureModeName(heightMeasureMode, performLayout),
           availableWidth,
           availableHeight,
-          LayoutPassToString(reason));
+          LayoutPassReasonToString(reason));
     }
 
     YGNodelayoutImpl(
@@ -3896,7 +3896,7 @@ bool YGLayoutNodeInternal(
           YGMeasureModeName(heightMeasureMode, performLayout),
           layout->measuredDimensions[YGDimensionWidth],
           layout->measuredDimensions[YGDimensionHeight],
-          LayoutPassToString(reason));
+          LayoutPassReasonToString(reason));
     }
 
     layout->lastOwnerDirection = ownerDirection;
@@ -4126,7 +4126,7 @@ void YGNodeCalculateLayoutWithContext(
           ownerWidth,
           ownerHeight,
           true,
-          kInitial,
+          LayoutPassReason::kInitial,
           node->getConfig(),
           markerData,
           layoutContext,
@@ -4176,7 +4176,7 @@ void YGNodeCalculateLayoutWithContext(
             ownerWidth,
             ownerHeight,
             true,
-            kInitial,
+            LayoutPassReason::kInitial,
             nodeWithoutLegacyFlag->getConfig(),
             layoutMarkerData,
             layoutContext,
diff --git a/yoga/event/event.cpp b/yoga/event/event.cpp
index 86031476..326214fc 100644
--- a/yoga/event/event.cpp
+++ b/yoga/event/event.cpp
@@ -12,21 +12,21 @@
 namespace facebook {
 namespace yoga {
 
-const char* LayoutPassToString(const LayoutPassReason value) {
+const char* LayoutPassReasonToString(const LayoutPassReason value) {
   switch (value) {
-    case kInitial:
+    case LayoutPassReason::kInitial:
       return "initial";
-    case kMeasureChild:
+    case LayoutPassReason::kMeasureChild:
       return "measure";
-    case kAbsMeasureChild:
+    case LayoutPassReason::kAbsMeasureChild:
       return "abs_measure";
-    case kFlex:
+    case LayoutPassReason::kFlex:
       return "flex";
-    case kAbsLayout:
+    case LayoutPassReason::kAbsLayout:
       return "abs_layout";
-    case kStretch:
+    case LayoutPassReason::kStretch:
       return "stretch";
-    case kMultilineStretch:
+    case LayoutPassReason::kMultilineStretch:
       return "multiline_stretch";
     default:
       return "unknown";
diff --git a/yoga/event/event.h b/yoga/event/event.h
index 8e6bc972..618574e8 100644
--- a/yoga/event/event.h
+++ b/yoga/event/event.h
@@ -16,7 +16,7 @@ struct YGNode;
 namespace facebook {
 namespace yoga {
 
-enum LayoutType : int {
+enum struct LayoutType : int {
   kLayout = 0,
   kMeasure = 1,
   kCachedLayout = 2,
@@ -32,7 +32,7 @@ struct LayoutData {
   int measureCallbacks;
 };
 
-enum LayoutPassReason : int {
+enum struct LayoutPassReason : int {
   kInitial = 0,
   kMeasureChild = 1,
   kAbsMeasureChild = 2,
@@ -42,7 +42,7 @@ enum LayoutPassReason : int {
   kMultilineStretch = 6
 };
 
-const char* LayoutPassToString(const LayoutPassReason value);
+const char* LayoutPassReasonToString(const LayoutPassReason value);
 
 struct Event {
   enum Type {