Add more options for name interpolation