91f4400c26
- Resolves a conflict with the user ID designators, and makes the interface more consistent. - Fixes #385.