rename and fix one_true