Separating references to labels and field names to avoid confusion

Also attempts to be more accurate in usage of labels for POD and DCAT

Author: philipashlock