fix naming bug, and use packages instead of module