     [appId, version] = [@_applicationID, @_applicationVersion]
 
     unless @_storage
-      KD.whoami().fetchStorage {appId, version}, (error, storage) =>
+      KD.whoami().fetchAppStorage {appId, version}, (error, storage) =>
         unless error
           callback? @_storage = storage or {appId, version, bucket:{}}
           @emit "storageFetched"

    super
    @appStorages = {}

  storage:(appName, version)->

    if @appStorages[appName]?
      storage = @appStorages[appName]
    else
      storage = @appStorages[appName] = new AppStorage appName, version

    storage.fetchStorage()
    return storage


class AppStorage extends KDObject

  constructor: (appId, version)->
