Updated names of modules