ENH: Added aliases to resolve modules