diff --git a/Language-Conventions.md b/Language-Conventions.md
index 2b10825..22bf32f 100644
--- a/Language-Conventions.md
+++ b/Language-Conventions.md
@@ -3,13 +3,16 @@
 ## OpenPGP not PGP/GPG
 OpenPGP is the open standard, PGP is a program developed by Phil Zimmermann, GPG is a program developed primarily by Werner Koch. Wikipedia clearly differentiates between the program and the standard.
 
-## OpenKeychain specific
+## OpenKeychain terminology
 We try to provide a better terminology when we think that the traditional one is flawed:
-* identities instead of user ids
-* instead of "sign keys"/"certify keys", we speak of "confirm key", german: "Schlüssel bestätigen"
-* we don't use "passphrase". Most people don't know what that is. We speak of "passwords".
-* don't speak of public and private keys, only keys (only in rare circumstances (in export?): private key?)
 
+| Traditional/technical phrase | Replacement in OpenKeychain | Comment |
+|-------                       |----                         |---      |
+| User ID                      | Identity                    |  |
+| Passphrase                   | Password                    | People don't know what a passphrase is, but they know passwords. Renaming passwords to passphrases doesn't help to increase their strength. |
+| Public/private key           | key                         | Don't try to explain the concept of public key cryptography. People don't want to know it, it should work seamlessly |
+| Sign/Certify key             | Confirm key  | Key signing makes no sense without knowing public key crypto. Certify is more appropriate, but also difficult to understand. (Confirm in german: Schlüssel bestätigen) |
+| Cache password               | Remember password          | |
 
 # Other languages
 Help us translating at [OpenKeychain on Transifex](https://www.transifex.com/projects/p/open-keychain/).