Fix rename files - refs BT#9041