Issue #504: Renamed field labels to group like fields together.
Merge pull request #612 from BWPanda/504/group-fields

Issue #504: Renamed field labels to group like fields together.