Renamed functions
[UNSTABLE] Simplified rearrangement check as part of rearrangement overhaul