Bug fix for setting local names on conversion