fix the name/scope of properties whose names include single quotes (#386)