Fix naming to conform to previous writers