Make manifest discovery include module names too