add braces and '#' to HB Helper names where appropriate