diff --git a/connections/clients/swift/NearbyCoreAdapter/Sources/Public/NearbyCoreAdapter/GNCAdvertisingOptions.h b/connections/clients/swift/NearbyCoreAdapter/Sources/Public/NearbyCoreAdapter/GNCAdvertisingOptions.h
index ff3cc60c..01414da0 100644
--- a/connections/clients/swift/NearbyCoreAdapter/Sources/Public/NearbyCoreAdapter/GNCAdvertisingOptions.h
+++ b/connections/clients/swift/NearbyCoreAdapter/Sources/Public/NearbyCoreAdapter/GNCAdvertisingOptions.h
@@ -14,7 +14,7 @@
 
 #import <Foundation/Foundation.h>
 
-typedef NS_ENUM(NSInteger, GNCStrategy);
+typedef NS_CLOSED_ENUM(NSInteger, GNCStrategy);
 
 // TODO(b/239609583): Current sdk only exposes `strategy`, but we should add full support.
 /**
diff --git a/connections/clients/swift/NearbyCoreAdapter/Sources/Public/NearbyCoreAdapter/GNCConnectionDelegate.h b/connections/clients/swift/NearbyCoreAdapter/Sources/Public/NearbyCoreAdapter/GNCConnectionDelegate.h
index 2050c872..f98214be 100644
--- a/connections/clients/swift/NearbyCoreAdapter/Sources/Public/NearbyCoreAdapter/GNCConnectionDelegate.h
+++ b/connections/clients/swift/NearbyCoreAdapter/Sources/Public/NearbyCoreAdapter/GNCConnectionDelegate.h
@@ -17,7 +17,7 @@
 /**
  * Indicates the status of a connection.
  */
-typedef NS_ENUM(NSInteger, GNCStatus) {
+typedef NS_CLOSED_ENUM(NSInteger, GNCStatus) {
   GNCStatusSuccess,
   GNCStatusError,
   GNCStatusOutOfOrderApiCall,
diff --git a/connections/clients/swift/NearbyCoreAdapter/Sources/Public/NearbyCoreAdapter/GNCDiscoveryOptions.h b/connections/clients/swift/NearbyCoreAdapter/Sources/Public/NearbyCoreAdapter/GNCDiscoveryOptions.h
index ada67e1c..c467d61a 100644
--- a/connections/clients/swift/NearbyCoreAdapter/Sources/Public/NearbyCoreAdapter/GNCDiscoveryOptions.h
+++ b/connections/clients/swift/NearbyCoreAdapter/Sources/Public/NearbyCoreAdapter/GNCDiscoveryOptions.h
@@ -14,7 +14,7 @@
 
 #import <Foundation/Foundation.h>
 
-typedef NS_ENUM(NSInteger, GNCStrategy);
+typedef NS_CLOSED_ENUM(NSInteger, GNCStrategy);
 
 // TODO(b/239610253): Current sdk only exposes `strategy`, but we should add full support.
 /**
diff --git a/connections/clients/swift/NearbyCoreAdapter/Sources/Public/NearbyCoreAdapter/GNCPayloadDelegate.h b/connections/clients/swift/NearbyCoreAdapter/Sources/Public/NearbyCoreAdapter/GNCPayloadDelegate.h
index 28e0347e..25735c37 100644
--- a/connections/clients/swift/NearbyCoreAdapter/Sources/Public/NearbyCoreAdapter/GNCPayloadDelegate.h
+++ b/connections/clients/swift/NearbyCoreAdapter/Sources/Public/NearbyCoreAdapter/GNCPayloadDelegate.h
@@ -19,7 +19,7 @@
 /**
  * Indicates the status of a payload transfer.
  */
-typedef NS_ENUM(NSInteger, GNCPayloadStatus) {
+typedef NS_CLOSED_ENUM(NSInteger, GNCPayloadStatus) {
   GNCPayloadStatusSuccess,
   GNCPayloadStatusFailure,
   GNCPayloadStatusInProgress,
diff --git a/connections/clients/swift/NearbyCoreAdapter/Sources/Public/NearbyCoreAdapter/GNCStrategy.h b/connections/clients/swift/NearbyCoreAdapter/Sources/Public/NearbyCoreAdapter/GNCStrategy.h
index e3eb8593..ca2c3975 100644
--- a/connections/clients/swift/NearbyCoreAdapter/Sources/Public/NearbyCoreAdapter/GNCStrategy.h
+++ b/connections/clients/swift/NearbyCoreAdapter/Sources/Public/NearbyCoreAdapter/GNCStrategy.h
@@ -17,7 +17,7 @@
 /**
  * Indicates the strategy or advertisement or discovery.
  */
-typedef NS_ENUM(NSInteger, GNCStrategy) {
+typedef NS_CLOSED_ENUM(NSInteger, GNCStrategy) {
   GNCStrategyCluster,       // M-to-N
   GNCStrategyStar,          // 1-to-N
   GNCStrategyPointToPoint,  // 1-to-1