Clean up type field names and accessors.