Regression after old renamings (thanks Davo Smith)