Added name interpolation