Rename policy

 * This is actually opportunistic.