Fixed #32: regression after old renamings (thanks Davo Smith)