Change name of modules for coding convention