Add more options for name interpolation
Merge branch 'name_interpolation' into develop