Rename "pass phrase" to "passphrase"
Rename "armour" to "armor"
Rename "canEdit" to "canBeEdited"
Merge pull request #508 from thi/naming-adjustments

Naming adjustments