Adjustments to module names

deprecated an awkward way of fixing this.