Map COMMAND module triggers to mappedTriggers

Also unmap them