Fix various "DeprecationWarning, module not renaming, just have __virtual__ return True" messages