Minor renames and fix ups

Renamed a couple of keys in the keychain, and a property. Removed a now unused variable in the CKIClient.