diff --git a/webrtc/api/objc/RTCPeerConnection.h b/webrtc/api/objc/RTCPeerConnection.h
index 68db191bff..2c5c19e00f 100644
--- a/webrtc/api/objc/RTCPeerConnection.h
+++ b/webrtc/api/objc/RTCPeerConnection.h
@@ -33,6 +33,7 @@ typedef NS_ENUM(NSInteger, RTCSignalingState) {
   RTCSignalingStateHaveLocalPrAnswer,
   RTCSignalingStateHaveRemoteOffer,
   RTCSignalingStateHaveRemotePrAnswer,
+  // Not an actual state, represents the total number of states.
   RTCSignalingStateClosed,
 };
 
@@ -45,7 +46,7 @@ typedef NS_ENUM(NSInteger, RTCIceConnectionState) {
   RTCIceConnectionStateFailed,
   RTCIceConnectionStateDisconnected,
   RTCIceConnectionStateClosed,
-  RTCIceConnectionStateMax,
+  RTCIceConnectionStateCount,
 };
 
 /** Represents the ice gathering state of the peer connection. */
diff --git a/webrtc/api/objc/RTCPeerConnection.mm b/webrtc/api/objc/RTCPeerConnection.mm
index 20a893948e..50d05f1bc6 100644
--- a/webrtc/api/objc/RTCPeerConnection.mm
+++ b/webrtc/api/objc/RTCPeerConnection.mm
@@ -383,7 +383,7 @@ void PeerConnectionDelegateAdapter::OnIceCandidate(
       return webrtc::PeerConnectionInterface::kIceConnectionDisconnected;
     case RTCIceConnectionStateClosed:
       return webrtc::PeerConnectionInterface::kIceConnectionClosed;
-    case RTCIceConnectionStateMax:
+    case RTCIceConnectionStateCount:
       return webrtc::PeerConnectionInterface::kIceConnectionMax;
   }
 }
@@ -406,7 +406,7 @@ void PeerConnectionDelegateAdapter::OnIceCandidate(
     case webrtc::PeerConnectionInterface::kIceConnectionClosed:
       return RTCIceConnectionStateClosed;
     case webrtc::PeerConnectionInterface::kIceConnectionMax:
-      return RTCIceConnectionStateMax;
+      return RTCIceConnectionStateCount;
   }
 }
 
@@ -426,8 +426,8 @@ void PeerConnectionDelegateAdapter::OnIceCandidate(
       return @"DISCONNECTED";
     case RTCIceConnectionStateClosed:
       return @"CLOSED";
-    case RTCIceConnectionStateMax:
-      return @"MAX";
+    case RTCIceConnectionStateCount:
+      return @"COUNT";
   }
 }
 
diff --git a/webrtc/examples/objc/AppRTCDemo/ios/ARDVideoCallViewController.m b/webrtc/examples/objc/AppRTCDemo/ios/ARDVideoCallViewController.m
index 5fad762aa6..60448b7f78 100644
--- a/webrtc/examples/objc/AppRTCDemo/ios/ARDVideoCallViewController.m
+++ b/webrtc/examples/objc/AppRTCDemo/ios/ARDVideoCallViewController.m
@@ -203,7 +203,7 @@
     case RTCIceConnectionStateFailed:
     case RTCIceConnectionStateDisconnected:
     case RTCIceConnectionStateClosed:
-    case RTCIceConnectionStateMax:
+    case RTCIceConnectionStateCount:
       return nil;
   }
 }