Renaming the module
Fixing some type bugs