Rewrote the module namer so that each module is unique