add curly braces around suffix-ed names