use refactored interpolateName function and update tests