just add "-2.0" to the names of all of the ex-core modules, except sysvwm, which should be sysvwm-7.0
so hotkey should be hotkey-2.0, shortcut2 should be shortcut2-2.0, and popup2 should be popup2-2.0