Updated remap for registered modules