APOLLO-3179 Added in displayName for all composite types
APOLLO-3179 Renamed fields to more sensible one