Fixed regression after old renamings (thanks Davo Smith)