@@ -139,11 +139,11 @@
 
 	if ((buf = malloc(BUFFER_SIZE)) == NULL)
 		return NULL;
 
 	for (;;) {
-		if (stream->ops->eof(stream)) {
+		if (stream->ops->at_end(stream)) {
 			free(buf);
 
 			if (stream->cache == NULL)
 				return NULL;
 
@@ -272,21 +272,21 @@
 	free(tmp);
 	return true;
 }
 
 bool
-cfw_stream_eof(void *ptr)
+cfw_stream_at_end(void *ptr)
 {
 	CFWStream *stream = ptr;
 
 	if (stream == NULL || stream->ops == NULL)
 		return true;
 
 	if (stream->cache != NULL)
 		return false;
 
-	return stream->ops->eof(stream);
+	return stream->ops->at_end(stream);
 }
 
 void
 cfw_stream_close(void *ptr)
 {