Standardized some token names, non-root user switching that doesn't inte...

...rfere with building Windows clients, properly functioning redaction