Fix river creation race condition and rename rake tasks