Fix class / documentation naming inconsistencies

[mikelieberman]

The terminology needs to be made consistent throughout the codebase for table names, key lists, etc.

[mikelieberman]

This is partially done but needs updating still.