Make some adjustments to clean up structural field names. Add type and