Another go at mapping same module references to exports