diff --git a/composer.json b/composer.json
index a4aad45..daed21b 100644
--- a/composer.json
+++ b/composer.json
@@ -1,5 +1,5 @@
 {
-    "name": "agaric/sites/geo",
+    "name": "agaric-sites/geo",
     "description": "Drutopia-based site for the Grassroots Economic Organizing collective.",
     "type": "project",
     "license": "GPL-2.0+",
diff --git a/config/sync/config_snapshot.snapshot.config_sync.module.geo_upgrade.yml b/config/sync/config_snapshot.snapshot.config_sync.module.geo_upgrade.yml
deleted file mode 100644
index f9ac5b8..0000000
--- a/config/sync/config_snapshot.snapshot.config_sync.module.geo_upgrade.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-uuid: 371cab72-414d-48bb-8bd9-2fd973d6860b
-langcode: en
-status: true
-dependencies:
-  module:
-    - geo_upgrade
-id: config_sync.module.geo_upgrade
-snapshotSet: config_sync
-extensionType: module
-extensionName: geo_upgrade
-items:
-  -
-    collection: ''
-    name: migrate_plus.migration_group.migrate_drupal_7_geo
-    data:
-      langcode: en
-      id: migrate_drupal_7_geo
-      label: 'Import from Drupal 7'
-      description: 'Migrate from the D7 version of the site'
-      source_type: 'Drupal 7'
-      shared_configuration:
-        source:
-          key: drupal7
-      dependencies:
-        enforced:
-          module:
-            - geo_upgrade
diff --git a/config/sync/core.entity_form_display.comment.comment.default.yml b/config/sync/core.entity_form_display.comment.comment.default.yml
index b2bc914..03267ae 100644
--- a/config/sync/core.entity_form_display.comment.comment.default.yml
+++ b/config/sync/core.entity_form_display.comment.comment.default.yml
@@ -15,22 +15,17 @@ bundle: comment
 mode: default
 content:
   author:
-    weight: -2
+    weight: 0
     region: content
+    settings: {  }
+    third_party_settings: {  }
   comment_body:
     type: text_textarea
-    weight: 11
+    weight: 1
     settings:
       rows: 5
       placeholder: ''
     third_party_settings: {  }
     region: content
-  subject:
-    type: string_textfield
-    weight: 10
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-    region: content
-hidden: {  }
+hidden:
+  subject: true
diff --git a/config/sync/core.extension.yml b/config/sync/core.extension.yml
index b9430f2..523414e 100644
--- a/config/sync/core.extension.yml
+++ b/config/sync/core.extension.yml
@@ -58,7 +58,6 @@ module:
   fixed_block_content: 0
   focal_point: 0
   gdpr: 0
-  geo_upgrade: 0
   hal: 0
   help: 0
   history: 0
diff --git a/config/sync/field.field.node.article.comment.yml b/config/sync/field.field.node.article.comment.yml
index 90ebf67..b4353db 100644
--- a/config/sync/field.field.node.article.comment.yml
+++ b/config/sync/field.field.node.article.comment.yml
@@ -15,7 +15,7 @@ entity_type: node
 bundle: article
 label: Comments
 description: ''
-required: true
+required: false
 translatable: true
 default_value:
   -
@@ -29,7 +29,7 @@ default_value_callback: ''
 settings:
   default_mode: 1
   per_page: 50
-  anonymous: 0
-  form_location: false
-  preview: 1
+  anonymous: 1
+  form_location: true
+  preview: 0
 field_type: comment
diff --git a/config/sync/field.field.node.blog.comment.yml b/config/sync/field.field.node.blog.comment.yml
index 93e05e8..e44a9e0 100644
--- a/config/sync/field.field.node.blog.comment.yml
+++ b/config/sync/field.field.node.blog.comment.yml
@@ -29,7 +29,7 @@ default_value_callback: ''
 settings:
   default_mode: 1
   per_page: 50
-  anonymous: 0
-  form_location: false
-  preview: 1
+  anonymous: 1
+  form_location: true
+  preview: 0
 field_type: comment