Make writer variable names consistent with everything else