[WIP] Tidy up names
[FOLD] add stub for eof on read
[FOLD] rename