diff --git a/BUILD.gn b/BUILD.gn
index 6456ac95cfc..ed65c7de5a2 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -479,8 +479,8 @@ config("common_config") {
     ]
   }
 
-  if (owt_cloud_gaming) {
-    defines += [ "OWT_CLOUD_GAMING" ]
+  if (owt_cg_server) {
+    defines += [ "OWT_CG_SERVER" ]
   }
 }
 
diff --git a/api/audio_codecs/opus/audio_decoder_opus.cc b/api/audio_codecs/opus/audio_decoder_opus.cc
index 88aa708d1ff..8a2dd402a11 100644
--- a/api/audio_codecs/opus/audio_decoder_opus.cc
+++ b/api/audio_codecs/opus/audio_decoder_opus.cc
@@ -44,7 +44,7 @@ absl::optional<AudioDecoderOpus::Config> AudioDecoderOpus::SdpToConfig(
         return absl::nullopt;  // Bad stereo parameter.
       }
     }
-#ifdef OWT_CLOUD_GAMING
+#ifdef OWT_CG_SERVER
     return 2;
 #endif
     return 1;  // Default to mono.
diff --git a/api/transport/bitrate_settings.h b/api/transport/bitrate_settings.h
index 1aadfaaa989..a5906d289a9 100644
--- a/api/transport/bitrate_settings.h
+++ b/api/transport/bitrate_settings.h
@@ -42,7 +42,7 @@ struct BitrateConstraints {
   int max_bitrate_bps = -1;
 
  private:
-#ifdef OWT_CLOUD_GAMING
+#ifdef OWT_CG_SERVER
   static constexpr int kDefaultStartBitrateBps = 5000000;
 #else
   static constexpr int kDefaultStartBitrateBps = 300000;