There are now more than just File to the model package. This change disambiguates types like Error to FileError, etc. It also helps line things up with GoDoc.