diff --git a/limelight-common/Limelight.h b/limelight-common/Limelight.h
index e1683c3..588563e 100644
--- a/limelight-common/Limelight.h
+++ b/limelight-common/Limelight.h
@@ -25,8 +25,9 @@ typedef struct _STREAM_CONFIGURATION {
 	// Max video packet size in bytes (use 1024 if unsure)
 	int packetSize;
 
-	// Enable remote optimizations
-	int remote;
+    // Set to non-zero value to enable remote (over the Internet)
+    // streaming optimizations. If unsure, set to 0.
+    int streamingRemotely;
 
 	// AES encryption data for the remote input stream. This must be
 	// the same as what was passed as rikey and rikeyid 
diff --git a/limelight-common/SdpGenerator.c b/limelight-common/SdpGenerator.c
index b77985c..fd70570 100644
--- a/limelight-common/SdpGenerator.c
+++ b/limelight-common/SdpGenerator.c
@@ -165,11 +165,11 @@ static PSDP_OPTION getAttributesList(char *urlSafeAddr) {
     err |= addAttributeString(&optionHead, "x-nv-video[0].packetSize", payloadStr);
 
 	err |= addAttributeString(&optionHead, "x-nv-video[0].rateControlMode", "4");
-    
-	if (StreamConfig.remote) {
-		err |= addAttributeString(&optionHead, "x-nv-video[0].averageBitrate", "4");
-        	err |= addAttributeString(&optionHead, "x-nv-video[0].peakBitrate", "4");
-    	}
+
+    if (StreamConfig.streamingRemotely) {
+        err |= addAttributeString(&optionHead, "x-nv-video[0].averageBitrate", "4");
+        err |= addAttributeString(&optionHead, "x-nv-video[0].peakBitrate", "4");
+    }
 
 	err |= addAttributeString(&optionHead, "x-nv-video[0].timeoutLengthMs", "7000");
 	err |= addAttributeString(&optionHead, "x-nv-video[0].framesWithInvalidRefThreshold", "0");
@@ -214,7 +214,7 @@ static PSDP_OPTION getAttributesList(char *urlSafeAddr) {
 
 	err |= addAttributeString(&optionHead, "x-nv-vqos[0].videoQualityScoreUpdateTime", "5000");
     
-    if (StreamConfig.remote) {
+    if (StreamConfig.streamingRemotely) {
         err |= addAttributeString(&optionHead, "x-nv-vqos[0].qosTrafficType", "0");
         err |= addAttributeString(&optionHead, "x-nv-aqos.qosTrafficType", "0");
     } else {