rename, simplify, fix all tests