Rename and introduce new cost model