some more apiname fixes