Rename sigils from __ to sigil_$, closes #1301