Renamed read functions to be more appropriate.

Since both files  are the same structure with different data, there only
needs to be one set of functions.