Fix the replacement strings, too