Rename Module types and add some comments