Clean up field naming.
Add index to array field names.