diff --git a/src/mac/ActivatePane/ActivatePane.mm b/src/mac/ActivatePane/ActivatePane.mm
index 8a5fa0943..b1eb14ca1 100644
--- a/src/mac/ActivatePane/ActivatePane.mm
+++ b/src/mac/ActivatePane/ActivatePane.mm
@@ -293,13 +293,13 @@ - (void)willExitPane:(InstallerSectionDirection)dir {
   if (!_alreadyActivated && dir == InstallerDirectionForward) {
     // Make the package visible from i18n system preference
     RegisterGoogleJapaneseInput();
-    if ([_activateCell state] == NSOnState && [_doNotActivateCell state] == NSOffState) {
+    if ([_activateCell state] == NSControlStateValueOn && [_doNotActivateCell state] == NSControlStateValueOff) {
       // means clicks "next page" when "activate" menu is on
       ActivateGoogleJapaneseInput();
       _alreadyActivated = YES;
     }
 #ifdef GOOGLE_JAPANESE_INPUT_BUILD
-    if (!_hasUsageStatsDB && [_putUsageStatsDB state] == NSOnState) {
+    if (!_hasUsageStatsDB && [_putUsageStatsDB state] == NSControlStateValueOn) {
       StoreDefaultConfigWithSendingUsageStats();
     }
 #endif  // GOOGLE_JAPANESE_INPUT_BUILD
diff --git a/src/mac/DevConfirmPane/DevConfirmPane.mm b/src/mac/DevConfirmPane/DevConfirmPane.mm
index 569fb41e8..596ddbfc4 100644
--- a/src/mac/DevConfirmPane/DevConfirmPane.mm
+++ b/src/mac/DevConfirmPane/DevConfirmPane.mm
@@ -47,8 +47,8 @@ - (void)awakeFromNib {
 }
 
 - (IBAction)checkBoxClicked:(id)sender {
-  _understandFlag = ([_understandCheckBox state] == NSOnState);
-  _agreeFlag = ([_agreeCheckBox state] == NSOnState);
+  _understandFlag = ([_understandCheckBox state] == NSControlStateValueOn);
+  _agreeFlag = ([_agreeCheckBox state] == NSControlStateValueOn);
   if (_understandFlag && _agreeFlag) {
     [self setNextEnabled:YES];
   } else {
@@ -85,10 +85,10 @@ - (void)willEnterPane:(InstallerSectionDirection)dir {
   }
 
   if (_understandFlag) {
-    [_understandCheckBox setState:NSOnState];
+    [_understandCheckBox setState:NSControlStateValueOn];
   }
   if (_agreeFlag) {
-    [_agreeCheckBox setState:NSOnState];
+    [_agreeCheckBox setState:NSControlStateValueOn];
   }
 
   if (_understandFlag && _agreeFlag) {