tweaks to module names