Updated string interpolation syntax in some files
Further replacement of new string interpolation syntax