         return value
     }
     
-    fileprivate func deleteValue(forEntry entry:String) throws {
-        let query = commonConfigurationDictionary(forEntry: entry)
+    fileprivate func deleteValue(forKey key:String) throws {
+        let query = commonConfigurationDictionary(forKey: key)
         let status = SecItemDelete(query as CFDictionary)
         guard status == noErr || status == errSecItemNotFound else { throw WMFKeychainCredentialsError.unhandledError(status: status) }
     }
     
-    fileprivate func set(value:String?, forEntry entry:String) throws {
-        // nil value causes the entry to be removed from the keychain
+    fileprivate func set(value:String?, forKey key:String) throws {
+        // nil value causes the key/value pair to be removed from the keychain
         guard let value = value else {
             do {
-                try deleteValue(forEntry: entry)
+                try deleteValue(forKey: key)
             } catch  {
                 throw WMFKeychainCredentialsError.couldNotDeleteData
             }
             return
         }
         
-        var query = commonConfigurationDictionary(forEntry: entry)
+        var query = commonConfigurationDictionary(forKey: key)
         let valueData = value.data(using: String.Encoding.utf8)!
         query[kSecValueData as String] = valueData as AnyObject?
         query[kSecAttrAccessible as String] = kSecAttrAccessibleWhenUnlocked

        
        if (status == errSecDuplicateItem) {
            do {
                return try update(value: value, forEntry: entry)
            } catch  {
                throw WMFKeychainCredentialsError.unhandledError(status: status)
            }

    public var password: String? {
        get {
            do {
                return try getValue(forKey: passwordKey)
            } catch  {
                return nil
            }
        }
        set(newPassword) {
            do {
                return try set(value: newPassword, forKey: passwordKey)
            } catch  {
                assert(false, "\(error)")
            }
