Be able to differentiate better between the schema name of the entity and the field

So while this isn't exclusively a North52 error, when you have a field with the same schema name as the entity it causes confusion with the serialization.  It would be nice to be able to use the same in both.