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

Fixes https://github.com/backdrop/backdrop-issues/issues/504.