diff --git a/moonlight-common/src/main/java/com/limelight/nvstream/http/ComputerDetails.java b/moonlight-common/src/main/java/com/limelight/nvstream/http/ComputerDetails.java
index 31890de4..ebf7419a 100644
--- a/moonlight-common/src/main/java/com/limelight/nvstream/http/ComputerDetails.java
+++ b/moonlight-common/src/main/java/com/limelight/nvstream/http/ComputerDetails.java
@@ -16,8 +16,8 @@ public class ComputerDetails {
 	public Reachability reachability;
 	public String name;
 	public UUID uuid;
-	public InetAddress localIp;
-	public InetAddress remoteIp;
+	public InetAddress localAddress;
+	public InetAddress remoteAddress;
 	public PairingManager.PairState pairState;
 	public String macAddress;
 	public int runningGameId;
@@ -39,8 +39,8 @@ public class ComputerDetails {
 		this.reachability = details.reachability;
 		this.name = details.name;
 		this.uuid = details.uuid;
-		this.localIp = details.localIp;
-		this.remoteIp = details.remoteIp;
+		this.localAddress = details.localAddress;
+		this.remoteAddress = details.remoteAddress;
 		this.macAddress = details.macAddress;
 		this.pairState = details.pairState;
 		this.runningGameId = details.runningGameId;
@@ -54,8 +54,8 @@ public class ComputerDetails {
 		str.append("Reachability: ").append(reachability).append("\n");
 		str.append("Name: ").append(name).append("\n");
 		str.append("UUID: ").append(uuid).append("\n");
-		str.append("Local IP: ").append(localIp).append("\n");
-		str.append("Remote IP: ").append(remoteIp).append("\n");
+		str.append("Local IP: ").append(localAddress).append("\n");
+		str.append("Remote IP: ").append(remoteAddress).append("\n");
 		str.append("MAC Address: ").append(macAddress).append("\n");
 		str.append("Pair State: ").append(pairState).append("\n");
 		str.append("Running Game ID: ").append(runningGameId).append("\n");
diff --git a/moonlight-common/src/main/java/com/limelight/nvstream/http/NvHTTP.java b/moonlight-common/src/main/java/com/limelight/nvstream/http/NvHTTP.java
index c41e6d10..2dede3ae 100644
--- a/moonlight-common/src/main/java/com/limelight/nvstream/http/NvHTTP.java
+++ b/moonlight-common/src/main/java/com/limelight/nvstream/http/NvHTTP.java
@@ -223,8 +223,8 @@ public class NvHTTP {
 			externalIpStr = address.getHostAddress();
 		}
 		
-		details.localIp = InetAddress.getByName(localIpStr);
-		details.remoteIp = InetAddress.getByName(externalIpStr);
+		details.localAddress = InetAddress.getByName(localIpStr);
+		details.remoteAddress = InetAddress.getByName(externalIpStr);
 		
 		try {
 			details.pairState = Integer.parseInt(getXmlString(serverInfo, "PairStatus")) == 1 ?
diff --git a/moonlight-common/src/main/java/com/limelight/nvstream/wol/WakeOnLanSender.java b/moonlight-common/src/main/java/com/limelight/nvstream/wol/WakeOnLanSender.java
index e2367720..0eee7348 100644
--- a/moonlight-common/src/main/java/com/limelight/nvstream/wol/WakeOnLanSender.java
+++ b/moonlight-common/src/main/java/com/limelight/nvstream/wol/WakeOnLanSender.java
@@ -23,10 +23,10 @@ public class WakeOnLanSender {
 		for (int i = 0; i < 2; i++) {
 			InetAddress addr;
 			if (i == 0) {
-				addr = computer.localIp;
+				addr = computer.localAddress;
 			}
 			else {
-				addr = computer.remoteIp;
+				addr = computer.remoteAddress;
 			}
 			
 			// Try all the ports for each address