Adjustments to list name escaping.