renamed a few more modules to improve the readbility