Fix build file to ensure ModuleGlobals is added first
Rename ModuleGlobal to ModuleGlobals