Changed default module names