Renamed heaps to priority queues.
And back to heaps.