Remove Ord instance, modify function names