Rename and clean up the return format of cost estimator.