More module name adjustment