fix an issue that we miss a token on saving to disk
rename file to better names