No there's no need to write the HWID into the RGN file and your naming of it is correct for safe flashing.