<anything>_data singularization returns unexpected result (<anything>_datum)

Singularization of foo_data returns foo_datum

Even if datum can be considered to be the singular form of data, I think in the case of the lib use it can be quite confusing. Singularization of data returns data, as one would expect.