Untangle rename ms12-020

This PR replicates the changes in #1427 but does it in a way that preserves git blame.