Switch to using constants for keychain & defaults keys