Woohooo! Some more cleaning up!

- Follow up to 80510a0 { Corrected name placeholders }
- Vas cleanup on name placeholders
- Small change in /doc/permissions.txt