Update interface method names
Reorder methods