fix test, unify names