Fix name translation logic.