Fix #258: fix names