fix name resolution