Closes #154 and updates #77 - Separates out confusing field name labels

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