Fix various "__virtual__ not renamed" DeprecationWarnings

@thatch45, this is all that was needed, correct?