Fixed string replacements of identifiers with $ char