Naming and nomenclature updates

I've begun to update the field names and type conventions that were agreed upon.