diff --git a/device_user_access_manager.py b/device_user_access_manager.py
index fa989c9..1d14c73 100644
--- a/device_user_access_manager.py
+++ b/device_user_access_manager.py
@@ -25,14 +25,14 @@
 import sys
 from pyndn.name import Name
 from device_profile import DeviceProfile
-from device_user_access_storage import DeviceUserAccessStorage
+from device_storage import DeviceStorage
 
 class DeviceUserAccessManager(object):
     """
     Create a new DeviceUserAccessManager
     """
     def __init__(self, databaseFilePath = None):
-        deviceUserAccessStorage = DeviceUserAccessStorage(databaseFilePath)
+        deviceUserAccessStorage = DeviceStorage(databaseFilePath)
         self._deviceUserAccessStorage = deviceUserAccessStorage
     
     def createDevice(self, deviceProfile, seed, configurationToken, commandList = None):