Changed keychain key names for more clarity/cleanliness