diff --git a/fixtures/program/licensetype.json b/fixtures/program/licensetype.json
index 715e0e3e7c8738cc9eaaad5251f2f2df1972d39a..8661b1d2bf3a7ca57c44e079251e56e325f1fa83 100644
--- a/fixtures/program/licensetype.json
+++ b/fixtures/program/licensetype.json
@@ -3,15 +3,15 @@
     "model": "program.licensetype",
     "pk": 1,
     "fields": {
-      "name": "cc0",
-      "type": "No Rights Reserved"
+      "name": "pd",
+      "type": "Public Domain"
     }
   },
   {
     "model": "program.licensetype",
     "pk": 2,
     "fields": {
-      "name": "by",
+      "name": "cc-by",
       "type": "Creative Commons Attribution"
     }
   },
@@ -19,7 +19,7 @@
     "model": "program.licensetype",
     "pk": 3,
     "fields": {
-      "name": "by-sa",
+      "name": "cc-by-sa",
       "type": "Creative Commons Attribution-ShareAlike"
     }
   },
@@ -27,7 +27,7 @@
     "model": "program.licensetype",
     "pk": 4,
     "fields": {
-      "name": "by-nc",
+      "name": "cc-by-nc",
       "type": "Creative Commons Attribution-NonCommercial"
     }
   },
@@ -35,7 +35,7 @@
     "model": "program.licensetype",
     "pk": 5,
     "fields": {
-      "name": "by-nc-sa",
+      "name": "cc-by-nc-sa",
       "type": "Creative Commons Attribution-NonCommercial-ShareAlike"
     }
   },
@@ -43,7 +43,7 @@
     "model": "program.licensetype",
     "pk": 6,
     "fields": {
-      "name": "by-nd",
+      "name": "cc-by-nd",
       "type": "Creative Commons Attribution-NoDerivatives"
     }
   },
@@ -51,8 +51,16 @@
     "model": "program.licensetype",
     "pk": 7,
     "fields": {
-      "name": "by-nc-nd",
+      "name": "cc-by-nc-nd",
       "type": "Creative Commons Attribution-NonCommercial-NoDerivatives"
     }
+  },
+  {
+    "model": "program.licensetype",
+    "pk": 8,
+    "fields": {
+      "name": "gfdl",
+      "type": "GNU Free Documentation License"
+    }
   }
 ]
\ No newline at end of file
diff --git a/fixtures/program/linktype.json b/fixtures/program/linktype.json
index 9af62522dd6a5558ed037d7a92ff1863f2eb563a..c5b6968193551fee00e8c45bb80d5d4ad993560d 100644
--- a/fixtures/program/linktype.json
+++ b/fixtures/program/linktype.json
@@ -20,7 +20,7 @@
     "pk": 3,
     "fields": {
       "name": "cba-podcast",
-      "type": "CBA podcast"
+      "type": "Cultural Broadcasting Archive Podcast"
     }
   },
   {
@@ -28,7 +28,7 @@
     "pk": 4,
     "fields": {
       "name": "cba-post",
-      "type": "CBA post"
+      "type": "Cultural Broadcasting Archive Post"
     }
   },
   {