Match v8 wireframes

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
Fix hyper-defensive name escaping

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>