some other name changes forgotten in 4f131f4