misc patching of module names