Can't argue with the dictionary... The best thing to do would be to insert either term in where it fits best, in terms of "roll-off-the-tongueyness". However, there are a lot of sayings that rely on one of those, and if interchanged would sound stupid.
I feel like someone should resolve this...