Fixing more issues on module rename -- leaving failing test behind to remember next step :)