Clean up toast identifiers
- Fix up naming for consistency with other keys
- Add ability to print out visible keys in demo app.