Minor changes to risk.rename