Fixed some bugs due to wrong naming of submodules