Demo names escaping fix.