diff --git a/README.md b/README.md
index 367dcd8..84cdbf0 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 Install as you normally would. This module creates the following entity types:
 
   * Taxonomy vocabulary
-    * Licences (licenses) - Includes License Link and License Icon fields
+    * Licences (media_attribution_licenses) - Includes License Link and License Icon fields
   * Paragraphs type
     * License Attribution (license_attribution)
     
diff --git a/config/install/core.entity_view_display.taxonomy_term.licenses.default.yml b/config/install/core.entity_view_display.taxonomy_term.media_attribution_licenses.default.yml
similarity index 70%
rename from config/install/core.entity_view_display.taxonomy_term.licenses.default.yml
rename to config/install/core.entity_view_display.taxonomy_term.media_attribution_licenses.default.yml
index 43c67da..248fb84 100644
--- a/config/install/core.entity_view_display.taxonomy_term.licenses.default.yml
+++ b/config/install/core.entity_view_display.taxonomy_term.media_attribution_licenses.default.yml
@@ -2,17 +2,16 @@ langcode: en
 status: true
 dependencies:
   config:
-    - field.field.taxonomy_term.licenses.field_license_icon
-    - field.field.taxonomy_term.licenses.field_license_link
-    - taxonomy.vocabulary.licenses
+    - field.field.taxonomy_term.media_attribution_licenses.field_license_icon
+    - field.field.taxonomy_term.media_attribution_licenses.field_license_link
+    - taxonomy.vocabulary.media_attribution_licenses
   module:
     - image
     - link
     - text
-third_party_settings:
-id: taxonomy_term.licenses.default
+id: taxonomy_term.media_attribution_licenses.default
 targetEntityType: taxonomy_term
-bundle: licenses
+bundle: media_attribution_licenses
 mode: default
 content:
   description:
diff --git a/config/install/field.field.media.image.field_image_attribution.yml b/config/install/field.field.media.image.field_image_attribution.yml
index 7d38835..6c543c1 100644
--- a/config/install/field.field.media.image.field_image_attribution.yml
+++ b/config/install/field.field.media.image.field_image_attribution.yml
@@ -7,7 +7,6 @@ dependencies:
     - paragraphs.paragraphs_type.license_attribution
   module:
     - entity_reference_revisions
-third_party_settings:
 id: media.image.field_image_attribution
 field_name: field_image_attribution
 entity_type: media
diff --git a/config/install/field.field.paragraph.license_attribution.field_attribution_author.yml b/config/install/field.field.paragraph.license_attribution.field_attribution_author.yml
index 38b96d1..d14903b 100644
--- a/config/install/field.field.paragraph.license_attribution.field_attribution_author.yml
+++ b/config/install/field.field.paragraph.license_attribution.field_attribution_author.yml
@@ -10,7 +10,7 @@ id: paragraph.license_attribution.field_attribution_author
 field_name: field_attribution_author
 entity_type: paragraph
 bundle: license_attribution
-label: Author
+label: Original Author
 description: 'Link to the author''s home page.'
 required: false
 translatable: false
diff --git a/config/install/field.field.paragraph.license_attribution.field_attribution_source.yml b/config/install/field.field.paragraph.license_attribution.field_attribution_source.yml
index c2b65ae..c35f6a9 100644
--- a/config/install/field.field.paragraph.license_attribution.field_attribution_source.yml
+++ b/config/install/field.field.paragraph.license_attribution.field_attribution_source.yml
@@ -10,7 +10,7 @@ id: paragraph.license_attribution.field_attribution_source
 field_name: field_attribution_source
 entity_type: paragraph
 bundle: license_attribution
-label: Source
+label: Media Source
 description: 'Link to the work''s original source. Set the link text as the title of the work.'
 required: false
 translatable: false
diff --git a/config/install/field.field.paragraph.license_attribution.field_license.yml b/config/install/field.field.paragraph.license_attribution.field_license.yml
index 3d68520..29b53a6 100644
--- a/config/install/field.field.paragraph.license_attribution.field_license.yml
+++ b/config/install/field.field.paragraph.license_attribution.field_license.yml
@@ -4,7 +4,7 @@ dependencies:
   config:
     - field.storage.paragraph.field_license
     - paragraphs.paragraphs_type.license_attribution
-    - taxonomy.vocabulary.licenses
+    - taxonomy.vocabulary.media_attribution_licenses
 id: paragraph.license_attribution.field_license
 field_name: field_license
 entity_type: paragraph
@@ -19,7 +19,7 @@ settings:
   handler: 'default:taxonomy_term'
   handler_settings:
     target_bundles:
-      licenses: licenses
+      media_attribution_licenses: media_attribution_licenses
     sort:
       field: name
       direction: asc
diff --git a/config/install/field.field.taxonomy_term.licenses.field_license_icon.yml b/config/install/field.field.taxonomy_term.media_attribution_licenses.field_license_icon.yml
similarity index 84%
rename from config/install/field.field.taxonomy_term.licenses.field_license_icon.yml
rename to config/install/field.field.taxonomy_term.media_attribution_licenses.field_license_icon.yml
index 4640b3b..9553c37 100644
--- a/config/install/field.field.taxonomy_term.licenses.field_license_icon.yml
+++ b/config/install/field.field.taxonomy_term.media_attribution_licenses.field_license_icon.yml
@@ -3,13 +3,13 @@ status: true
 dependencies:
   config:
     - field.storage.taxonomy_term.field_license_icon
-    - taxonomy.vocabulary.licenses
+    - taxonomy.vocabulary.media_attribution_licenses
   module:
     - image
-id: taxonomy_term.licenses.field_license_icon
+id: taxonomy_term.media_attribution_licenses.field_license_icon
 field_name: field_license_icon
 entity_type: taxonomy_term
-bundle: licenses
+bundle: media_attribution_licenses
 label: 'License Icon'
 description: 'Icon used to identify license rights, standardized by <a href="https://www.creativecommons.org/">Creative Commons.</a>.'
 required: false
diff --git a/config/install/field.field.taxonomy_term.licenses.field_license_link.yml b/config/install/field.field.taxonomy_term.media_attribution_licenses.field_license_link.yml
similarity index 70%
rename from config/install/field.field.taxonomy_term.licenses.field_license_link.yml
rename to config/install/field.field.taxonomy_term.media_attribution_licenses.field_license_link.yml
index 250e28d..a2818af 100644
--- a/config/install/field.field.taxonomy_term.licenses.field_license_link.yml
+++ b/config/install/field.field.taxonomy_term.media_attribution_licenses.field_license_link.yml
@@ -3,13 +3,13 @@ status: true
 dependencies:
   config:
     - field.storage.taxonomy_term.field_license_link
-    - taxonomy.vocabulary.licenses
+    - taxonomy.vocabulary.media_attribution_licenses
   module:
     - link
-id: taxonomy_term.licenses.field_license_link
+id: taxonomy_term.media_attribution_licenses.field_license_link
 field_name: field_license_link
 entity_type: taxonomy_term
-bundle: licenses
+bundle: media_attribution_licenses
 label: 'License link'
 description: ''
 required: true
diff --git a/config/install/taxonomy.vocabulary.licenses.yml b/config/install/taxonomy.vocabulary.media_attribution_licenses.yml
similarity index 80%
rename from config/install/taxonomy.vocabulary.licenses.yml
rename to config/install/taxonomy.vocabulary.media_attribution_licenses.yml
index 609b635..087a7df 100644
--- a/config/install/taxonomy.vocabulary.licenses.yml
+++ b/config/install/taxonomy.vocabulary.media_attribution_licenses.yml
@@ -2,7 +2,7 @@ langcode: en
 status: true
 dependencies: {  }
 name: Licenses
-vid: licenses
+vid: media_attribution_licenses
 description: 'Licenses for content and attribution.'
 hierarchy: 0
 weight: 0
diff --git a/config/optional/core.entity_form_display.taxonomy_term.licenses.default.yml b/config/optional/core.entity_form_display.taxonomy_term.licenses.default.yml
deleted file mode 100644
index d6af2f3..0000000
--- a/config/optional/core.entity_form_display.taxonomy_term.licenses.default.yml
+++ /dev/null
@@ -1,59 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - entity_browser.browser.image_browser
-    - field.field.taxonomy_term.licenses.field_license_icon
-    - field.field.taxonomy_term.licenses.field_license_link
-    - taxonomy.vocabulary.licenses
-  module:
-    - entity_browser
-    - link
-    - text
-_core:
-  default_config_hash: GeroQ_nB3tqP5g0Z5B4UShGyIomjdHA8hDn73kSFYgc
-id: taxonomy_term.licenses.default
-targetEntityType: taxonomy_term
-bundle: licenses
-mode: default
-content:
-  description:
-    type: text_textarea
-    weight: 3
-    region: content
-    settings:
-      placeholder: ''
-      rows: 5
-    third_party_settings: {  }
-  field_license_icon:
-    type: entity_browser_file
-    weight: 2
-    settings:
-      entity_browser: image_browser
-      field_widget_edit: true
-      field_widget_remove: true
-      view_mode: default
-      preview_image_style: thumbnail
-      open: true
-      field_widget_replace: false
-      selection_mode: selection_append
-    region: content
-    third_party_settings: {  }
-  field_license_link:
-    weight: 1
-    settings:
-      placeholder_url: ''
-      placeholder_title: ''
-    third_party_settings: {  }
-    type: link_default
-    region: content
-  name:
-    type: string_textfield
-    weight: 0
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-hidden:
-  path: true
diff --git a/media_attribution.default.licenses.yml b/media_attribution.default.licenses.yml
index 92f8dbf..d6f8e14 100644
--- a/media_attribution.default.licenses.yml
+++ b/media_attribution.default.licenses.yml
@@ -3,7 +3,7 @@
   title: Attribution 4.0 International (CC BY 4.0)
   short_label: CC BY 4.0
   icon_file: by.png
-  url: https://creativecommons.org/licenses/by/4.0/
+  url: https://creativecommons.org/icenses/by/4.0/
 -
   title: Attribution-NonCommercial 4.0 International (CC BY-NC 4.0)
   short_label: CC BY-NC 4.0
diff --git a/media_attribution.module b/media_attribution.module
index 3e623ab..e3bef37 100644
--- a/media_attribution.module
+++ b/media_attribution.module
@@ -132,7 +132,7 @@ function media_attribution_preprocess_entity_embed_container(&$variables) {
 }
 
 /**
- * Read the list of pre-defined Creative Commons licenses and create corresponding taxonomy terms.
+ * Read the list of pre-defined Creative Commons media_attribution_licenses and create corresponding taxonomy terms.
  */
 function media_attribution_load_default_licenses() {
   $file_path = drupal_get_path('module', 'media_attribution') . '/media_attribution.default.licenses.yml';
@@ -162,7 +162,7 @@ function media_attribution_create_license_term($term_title, $term_short_label, $
 
   $tid = Term::create([
     'name' =>  $term_title,
-    'vid' => 'licenses',
+    'vid' => 'media_attribution_licenses',
     'field_license_link' =>  ['title' => $term_short_label, 'uri' => $license_url],
     'field_license_icon' => [
       'target_id' => $icon_file->id(),