rename fields to attributes