diff --git a/src/thermostat/Device.java b/src/thermostat/Deviceable.java
similarity index 71%
rename from src/thermostat/Device.java
rename to src/thermostat/Deviceable.java
index 1640fe4..de11cfd 100644
--- a/src/thermostat/Device.java
+++ b/src/thermostat/Deviceable.java
@@ -1,5 +1,5 @@
 package thermostat;
 
-public interface Device {
+public interface Deviceable {
 	public void sensorUpdateEvent(Sensorable sensor);
 }
diff --git a/src/thermostat/TemperatureSensor.java b/src/thermostat/TemperatureSensor.java
index ab33d85..c16fb78 100644
--- a/src/thermostat/TemperatureSensor.java
+++ b/src/thermostat/TemperatureSensor.java
@@ -2,9 +2,9 @@
 
 public class TemperatureSensor implements Sensorable{
 	
-	Device owner;
+	Deviceable owner;
 	
-	public TemperatureSensor(Device owner){
+	public TemperatureSensor(Deviceable owner){
 		this.owner = owner;
 	}
 	
diff --git a/src/thermostat/ThermostatDevice.java b/src/thermostat/ThermostatDevice.java
index d8698c1..ff8d545 100644
--- a/src/thermostat/ThermostatDevice.java
+++ b/src/thermostat/ThermostatDevice.java
@@ -5,7 +5,7 @@
 
 import networking.*;
 
-public class ThermostatDevice implements Device {
+public class ThermostatDevice implements Deviceable {
 	
 	List<Sensorable> sensorList;
 	List<Actuatorable> actuatorList;