Rename and fix error on refines