Rename module, fix some bugs