rename and retype dispatch parametrs
fix tests @ builder (3.2.0)