Fix error in stage1 emulator module names,  add missing L1Extra collections

Fix error in module names; add missing L1Extra collections