Added replacing of &Amp; in module name