Minor imporvement to fw_name setting.