Fix module name
Support aliases