fix test
renamings