Rename reader/writer to generics