diff --git a/device.cc b/device.cc
index 358c7db..b21d7c8 100644
--- a/device.cc
+++ b/device.cc
@@ -16,22 +16,22 @@
 namespace shill {
 Device::Device(ControlInterface *control_interface,
 		 EventDispatcher */* dispatcher */)
-  : proxy_(control_interface->CreateDeviceProxy(this)),
+  : adaptor_(control_interface->CreateDeviceAdaptor(this)),
     running_(false) {
 }
 
 Device::~Device() {
-  delete(proxy_);
+  delete(adaptor_);
 }
 
 void Device::Start() {
   running_ = true;
-  proxy_->UpdateEnabled();
+  adaptor_->UpdateEnabled();
 }
 
 void Device::Stop() {
   running_ = false;
-  proxy_->UpdateEnabled();
+  adaptor_->UpdateEnabled();
 }
 
 }  // namespace shill