rename and reorder methods