Made name resolving per module