fix some leftover renamings