Fix renamings