Affiliations Round 3

Change labels to be dynamic by type.