Fix broken name resolving