diff --git a/web/modules/custom/opdavies_blog/config/schema/opdavies_blog.schema.yml b/web/modules/custom/blog/config/schema/opdavies_blog.schema.yml
similarity index 100%
rename from web/modules/custom/opdavies_blog/config/schema/opdavies_blog.schema.yml
rename to web/modules/custom/blog/config/schema/opdavies_blog.schema.yml
diff --git a/web/modules/custom/opdavies_blog/drush.services.yml b/web/modules/custom/blog/drush.services.yml
similarity index 100%
rename from web/modules/custom/opdavies_blog/drush.services.yml
rename to web/modules/custom/blog/drush.services.yml
diff --git a/web/modules/custom/opdavies_blog/hooks/entity_type/build.inc b/web/modules/custom/blog/hooks/entity_type/build.inc
similarity index 100%
rename from web/modules/custom/opdavies_blog/hooks/entity_type/build.inc
rename to web/modules/custom/blog/hooks/entity_type/build.inc
diff --git a/web/modules/custom/opdavies_blog/hooks/node_links/alter.inc b/web/modules/custom/blog/hooks/node_links/alter.inc
similarity index 100%
rename from web/modules/custom/opdavies_blog/hooks/node_links/alter.inc
rename to web/modules/custom/blog/hooks/node_links/alter.inc
diff --git a/web/modules/custom/opdavies_blog/hooks/preprocess/block.inc b/web/modules/custom/blog/hooks/preprocess/block.inc
similarity index 100%
rename from web/modules/custom/opdavies_blog/hooks/preprocess/block.inc
rename to web/modules/custom/blog/hooks/preprocess/block.inc
diff --git a/web/modules/custom/opdavies_blog/hooks/preprocess/node.inc b/web/modules/custom/blog/hooks/preprocess/node.inc
similarity index 100%
rename from web/modules/custom/opdavies_blog/hooks/preprocess/node.inc
rename to web/modules/custom/blog/hooks/preprocess/node.inc
diff --git a/web/modules/custom/opdavies_blog/opdavies_blog.info.yml b/web/modules/custom/blog/opdavies_blog.info.yml
similarity index 100%
rename from web/modules/custom/opdavies_blog/opdavies_blog.info.yml
rename to web/modules/custom/blog/opdavies_blog.info.yml
diff --git a/web/modules/custom/opdavies_blog/opdavies_blog.install b/web/modules/custom/blog/opdavies_blog.install
similarity index 100%
rename from web/modules/custom/opdavies_blog/opdavies_blog.install
rename to web/modules/custom/blog/opdavies_blog.install
diff --git a/web/modules/custom/opdavies_blog/opdavies_blog.module b/web/modules/custom/blog/opdavies_blog.module
similarity index 100%
rename from web/modules/custom/opdavies_blog/opdavies_blog.module
rename to web/modules/custom/blog/opdavies_blog.module
diff --git a/web/modules/custom/opdavies_blog/opdavies_blog.services.yml b/web/modules/custom/blog/opdavies_blog.services.yml
similarity index 100%
rename from web/modules/custom/opdavies_blog/opdavies_blog.services.yml
rename to web/modules/custom/blog/opdavies_blog.services.yml
diff --git a/web/modules/custom/opdavies_blog/src/Command/ExportBodyValuesForThemePurgingCommand.php b/web/modules/custom/blog/src/Command/ExportBodyValuesForThemePurgingCommand.php
similarity index 100%
rename from web/modules/custom/opdavies_blog/src/Command/ExportBodyValuesForThemePurgingCommand.php
rename to web/modules/custom/blog/src/Command/ExportBodyValuesForThemePurgingCommand.php
diff --git a/web/modules/custom/opdavies_blog/src/Command/FormatTagNamesCommand.php b/web/modules/custom/blog/src/Command/FormatTagNamesCommand.php
similarity index 100%
rename from web/modules/custom/opdavies_blog/src/Command/FormatTagNamesCommand.php
rename to web/modules/custom/blog/src/Command/FormatTagNamesCommand.php
diff --git a/web/modules/custom/opdavies_blog/src/Entity/Node/Post.php b/web/modules/custom/blog/src/Entity/Node/Post.php
similarity index 100%
rename from web/modules/custom/opdavies_blog/src/Entity/Node/Post.php
rename to web/modules/custom/blog/src/Entity/Node/Post.php
diff --git a/web/modules/custom/opdavies_blog/src/EventSubscriber/PushBlogPostToSocialMedia.php b/web/modules/custom/blog/src/EventSubscriber/PushBlogPostToSocialMedia.php
similarity index 100%
rename from web/modules/custom/opdavies_blog/src/EventSubscriber/PushBlogPostToSocialMedia.php
rename to web/modules/custom/blog/src/EventSubscriber/PushBlogPostToSocialMedia.php
diff --git a/web/modules/custom/opdavies_blog/src/EventSubscriber/ReorderBlogTags.php b/web/modules/custom/blog/src/EventSubscriber/ReorderBlogTags.php
similarity index 100%
rename from web/modules/custom/opdavies_blog/src/EventSubscriber/ReorderBlogTags.php
rename to web/modules/custom/blog/src/EventSubscriber/ReorderBlogTags.php
diff --git a/web/modules/custom/opdavies_blog/src/Repository/PostRepository.php b/web/modules/custom/blog/src/Repository/PostRepository.php
similarity index 100%
rename from web/modules/custom/opdavies_blog/src/Repository/PostRepository.php
rename to web/modules/custom/blog/src/Repository/PostRepository.php
diff --git a/web/modules/custom/opdavies_blog/tests/modules/opdavies_blog_test/config/install/field.field.node.post.field_external_link.yml b/web/modules/custom/blog/tests/modules/blog_test/config/install/field.field.node.post.field_external_link.yml
similarity index 100%
rename from web/modules/custom/opdavies_blog/tests/modules/opdavies_blog_test/config/install/field.field.node.post.field_external_link.yml
rename to web/modules/custom/blog/tests/modules/blog_test/config/install/field.field.node.post.field_external_link.yml
diff --git a/web/modules/custom/opdavies_blog/tests/modules/opdavies_blog_test/config/install/field.field.node.post.field_has_tweet.yml b/web/modules/custom/blog/tests/modules/blog_test/config/install/field.field.node.post.field_has_tweet.yml
similarity index 100%
rename from web/modules/custom/opdavies_blog/tests/modules/opdavies_blog_test/config/install/field.field.node.post.field_has_tweet.yml
rename to web/modules/custom/blog/tests/modules/blog_test/config/install/field.field.node.post.field_has_tweet.yml
diff --git a/web/modules/custom/opdavies_blog/tests/modules/opdavies_blog_test/config/install/field.field.node.post.field_sent_to_social_media.yml b/web/modules/custom/blog/tests/modules/blog_test/config/install/field.field.node.post.field_sent_to_social_media.yml
similarity index 100%
rename from web/modules/custom/opdavies_blog/tests/modules/opdavies_blog_test/config/install/field.field.node.post.field_sent_to_social_media.yml
rename to web/modules/custom/blog/tests/modules/blog_test/config/install/field.field.node.post.field_sent_to_social_media.yml
diff --git a/web/modules/custom/opdavies_blog/tests/modules/opdavies_blog_test/config/install/field.field.node.post.field_tags.yml b/web/modules/custom/blog/tests/modules/blog_test/config/install/field.field.node.post.field_tags.yml
similarity index 100%
rename from web/modules/custom/opdavies_blog/tests/modules/opdavies_blog_test/config/install/field.field.node.post.field_tags.yml
rename to web/modules/custom/blog/tests/modules/blog_test/config/install/field.field.node.post.field_tags.yml
diff --git a/web/modules/custom/opdavies_blog/tests/modules/opdavies_blog_test/config/install/field.storage.node.field_external_link.yml b/web/modules/custom/blog/tests/modules/blog_test/config/install/field.storage.node.field_external_link.yml
similarity index 100%
rename from web/modules/custom/opdavies_blog/tests/modules/opdavies_blog_test/config/install/field.storage.node.field_external_link.yml
rename to web/modules/custom/blog/tests/modules/blog_test/config/install/field.storage.node.field_external_link.yml
diff --git a/web/modules/custom/opdavies_blog/tests/modules/opdavies_blog_test/config/install/field.storage.node.field_has_tweet.yml b/web/modules/custom/blog/tests/modules/blog_test/config/install/field.storage.node.field_has_tweet.yml
similarity index 100%
rename from web/modules/custom/opdavies_blog/tests/modules/opdavies_blog_test/config/install/field.storage.node.field_has_tweet.yml
rename to web/modules/custom/blog/tests/modules/blog_test/config/install/field.storage.node.field_has_tweet.yml
diff --git a/web/modules/custom/opdavies_blog/tests/modules/opdavies_blog_test/config/install/field.storage.node.field_sent_to_social_media.yml b/web/modules/custom/blog/tests/modules/blog_test/config/install/field.storage.node.field_sent_to_social_media.yml
similarity index 100%
rename from web/modules/custom/opdavies_blog/tests/modules/opdavies_blog_test/config/install/field.storage.node.field_sent_to_social_media.yml
rename to web/modules/custom/blog/tests/modules/blog_test/config/install/field.storage.node.field_sent_to_social_media.yml
diff --git a/web/modules/custom/opdavies_blog/tests/modules/opdavies_blog_test/config/install/field.storage.node.field_tags.yml b/web/modules/custom/blog/tests/modules/blog_test/config/install/field.storage.node.field_tags.yml
similarity index 100%
rename from web/modules/custom/opdavies_blog/tests/modules/opdavies_blog_test/config/install/field.storage.node.field_tags.yml
rename to web/modules/custom/blog/tests/modules/blog_test/config/install/field.storage.node.field_tags.yml
diff --git a/web/modules/custom/opdavies_blog/tests/modules/opdavies_blog_test/config/install/node.type.post.yml b/web/modules/custom/blog/tests/modules/blog_test/config/install/node.type.post.yml
similarity index 100%
rename from web/modules/custom/opdavies_blog/tests/modules/opdavies_blog_test/config/install/node.type.post.yml
rename to web/modules/custom/blog/tests/modules/blog_test/config/install/node.type.post.yml
diff --git a/web/modules/custom/opdavies_blog/tests/modules/opdavies_blog_test/config/install/taxonomy.vocabulary.tags.yml b/web/modules/custom/blog/tests/modules/blog_test/config/install/taxonomy.vocabulary.tags.yml
similarity index 100%
rename from web/modules/custom/opdavies_blog/tests/modules/opdavies_blog_test/config/install/taxonomy.vocabulary.tags.yml
rename to web/modules/custom/blog/tests/modules/blog_test/config/install/taxonomy.vocabulary.tags.yml
diff --git a/web/modules/custom/opdavies_blog/tests/modules/opdavies_blog_test/opdavies_blog_test.info.yml b/web/modules/custom/blog/tests/modules/blog_test/opdavies_blog_test.info.yml
similarity index 100%
rename from web/modules/custom/opdavies_blog/tests/modules/opdavies_blog_test/opdavies_blog_test.info.yml
rename to web/modules/custom/blog/tests/modules/blog_test/opdavies_blog_test.info.yml
diff --git a/web/modules/custom/opdavies_blog/tests/modules/opdavies_blog_test/src/Factory/PostFactory.php b/web/modules/custom/blog/tests/modules/blog_test/src/Factory/PostFactory.php
similarity index 100%
rename from web/modules/custom/opdavies_blog/tests/modules/opdavies_blog_test/src/Factory/PostFactory.php
rename to web/modules/custom/blog/tests/modules/blog_test/src/Factory/PostFactory.php
diff --git a/web/modules/custom/opdavies_blog/tests/src/Kernel/Entity/Node/PostTest.php b/web/modules/custom/blog/tests/src/Kernel/Entity/Node/PostTest.php
similarity index 100%
rename from web/modules/custom/opdavies_blog/tests/src/Kernel/Entity/Node/PostTest.php
rename to web/modules/custom/blog/tests/src/Kernel/Entity/Node/PostTest.php
diff --git a/web/modules/custom/opdavies_blog/tests/src/Kernel/ReorderBlogTagsTest.php b/web/modules/custom/blog/tests/src/Kernel/ReorderBlogTagsTest.php
similarity index 100%
rename from web/modules/custom/opdavies_blog/tests/src/Kernel/ReorderBlogTagsTest.php
rename to web/modules/custom/blog/tests/src/Kernel/ReorderBlogTagsTest.php
diff --git a/web/modules/custom/opdavies_talks/opdavies_talks.info.yml b/web/modules/custom/talks/opdavies_talks.info.yml
similarity index 100%
rename from web/modules/custom/opdavies_talks/opdavies_talks.info.yml
rename to web/modules/custom/talks/opdavies_talks.info.yml
diff --git a/web/modules/custom/opdavies_talks/opdavies_talks.install b/web/modules/custom/talks/opdavies_talks.install
similarity index 100%
rename from web/modules/custom/opdavies_talks/opdavies_talks.install
rename to web/modules/custom/talks/opdavies_talks.install
diff --git a/web/modules/custom/opdavies_talks/opdavies_talks.module b/web/modules/custom/talks/opdavies_talks.module
similarity index 100%
rename from web/modules/custom/opdavies_talks/opdavies_talks.module
rename to web/modules/custom/talks/opdavies_talks.module
diff --git a/web/modules/custom/opdavies_talks/opdavies_talks.services.yml b/web/modules/custom/talks/opdavies_talks.services.yml
similarity index 100%
rename from web/modules/custom/opdavies_talks/opdavies_talks.services.yml
rename to web/modules/custom/talks/opdavies_talks.services.yml
diff --git a/web/modules/custom/opdavies_talks/src/Entity/Node/Talk.php b/web/modules/custom/talks/src/Entity/Node/Talk.php
similarity index 100%
rename from web/modules/custom/opdavies_talks/src/Entity/Node/Talk.php
rename to web/modules/custom/talks/src/Entity/Node/Talk.php
diff --git a/web/modules/custom/opdavies_talks/src/EventSubscriber/UpdateTalkNodeBeforeSave.php b/web/modules/custom/talks/src/EventSubscriber/UpdateTalkNodeBeforeSave.php
similarity index 100%
rename from web/modules/custom/opdavies_talks/src/EventSubscriber/UpdateTalkNodeBeforeSave.php
rename to web/modules/custom/talks/src/EventSubscriber/UpdateTalkNodeBeforeSave.php
diff --git a/web/modules/custom/opdavies_talks/src/Plugin/views/sort/Event.php b/web/modules/custom/talks/src/Plugin/views/sort/Event.php
similarity index 100%
rename from web/modules/custom/opdavies_talks/src/Plugin/views/sort/Event.php
rename to web/modules/custom/talks/src/Plugin/views/sort/Event.php
diff --git a/web/modules/custom/opdavies_talks/src/Repository/TalkRepository.php b/web/modules/custom/talks/src/Repository/TalkRepository.php
similarity index 100%
rename from web/modules/custom/opdavies_talks/src/Repository/TalkRepository.php
rename to web/modules/custom/talks/src/Repository/TalkRepository.php
diff --git a/web/modules/custom/opdavies_talks/src/Service/TalkCounter.php b/web/modules/custom/talks/src/Service/TalkCounter.php
similarity index 100%
rename from web/modules/custom/opdavies_talks/src/Service/TalkCounter.php
rename to web/modules/custom/talks/src/Service/TalkCounter.php
diff --git a/web/modules/custom/opdavies_talks/src/Service/TalkDateUpdater.php b/web/modules/custom/talks/src/Service/TalkDateUpdater.php
similarity index 100%
rename from web/modules/custom/opdavies_talks/src/Service/TalkDateUpdater.php
rename to web/modules/custom/talks/src/Service/TalkDateUpdater.php
diff --git a/web/modules/custom/opdavies_talks/tests/modules/opdavies_talks_test/config/install/field.field.node.talk.field_event_date.yml b/web/modules/custom/talks/tests/modules/opdavies_talks_test/config/install/field.field.node.talk.field_event_date.yml
similarity index 100%
rename from web/modules/custom/opdavies_talks/tests/modules/opdavies_talks_test/config/install/field.field.node.talk.field_event_date.yml
rename to web/modules/custom/talks/tests/modules/opdavies_talks_test/config/install/field.field.node.talk.field_event_date.yml
diff --git a/web/modules/custom/opdavies_talks/tests/modules/opdavies_talks_test/config/install/field.field.node.talk.field_events.yml b/web/modules/custom/talks/tests/modules/opdavies_talks_test/config/install/field.field.node.talk.field_events.yml
similarity index 100%
rename from web/modules/custom/opdavies_talks/tests/modules/opdavies_talks_test/config/install/field.field.node.talk.field_events.yml
rename to web/modules/custom/talks/tests/modules/opdavies_talks_test/config/install/field.field.node.talk.field_events.yml
diff --git a/web/modules/custom/opdavies_talks/tests/modules/opdavies_talks_test/config/install/field.field.paragraph.event.field_date.yml b/web/modules/custom/talks/tests/modules/opdavies_talks_test/config/install/field.field.paragraph.event.field_date.yml
similarity index 100%
rename from web/modules/custom/opdavies_talks/tests/modules/opdavies_talks_test/config/install/field.field.paragraph.event.field_date.yml
rename to web/modules/custom/talks/tests/modules/opdavies_talks_test/config/install/field.field.paragraph.event.field_date.yml
diff --git a/web/modules/custom/opdavies_talks/tests/modules/opdavies_talks_test/config/install/field.field.paragraph.event.field_name.yml b/web/modules/custom/talks/tests/modules/opdavies_talks_test/config/install/field.field.paragraph.event.field_name.yml
similarity index 100%
rename from web/modules/custom/opdavies_talks/tests/modules/opdavies_talks_test/config/install/field.field.paragraph.event.field_name.yml
rename to web/modules/custom/talks/tests/modules/opdavies_talks_test/config/install/field.field.paragraph.event.field_name.yml
diff --git a/web/modules/custom/opdavies_talks/tests/modules/opdavies_talks_test/config/install/field.storage.node.field_event_date.yml b/web/modules/custom/talks/tests/modules/opdavies_talks_test/config/install/field.storage.node.field_event_date.yml
similarity index 100%
rename from web/modules/custom/opdavies_talks/tests/modules/opdavies_talks_test/config/install/field.storage.node.field_event_date.yml
rename to web/modules/custom/talks/tests/modules/opdavies_talks_test/config/install/field.storage.node.field_event_date.yml
diff --git a/web/modules/custom/opdavies_talks/tests/modules/opdavies_talks_test/config/install/field.storage.node.field_events.yml b/web/modules/custom/talks/tests/modules/opdavies_talks_test/config/install/field.storage.node.field_events.yml
similarity index 100%
rename from web/modules/custom/opdavies_talks/tests/modules/opdavies_talks_test/config/install/field.storage.node.field_events.yml
rename to web/modules/custom/talks/tests/modules/opdavies_talks_test/config/install/field.storage.node.field_events.yml
diff --git a/web/modules/custom/opdavies_talks/tests/modules/opdavies_talks_test/config/install/field.storage.paragraph.field_date.yml b/web/modules/custom/talks/tests/modules/opdavies_talks_test/config/install/field.storage.paragraph.field_date.yml
similarity index 100%
rename from web/modules/custom/opdavies_talks/tests/modules/opdavies_talks_test/config/install/field.storage.paragraph.field_date.yml
rename to web/modules/custom/talks/tests/modules/opdavies_talks_test/config/install/field.storage.paragraph.field_date.yml
diff --git a/web/modules/custom/opdavies_talks/tests/modules/opdavies_talks_test/config/install/field.storage.paragraph.field_name.yml b/web/modules/custom/talks/tests/modules/opdavies_talks_test/config/install/field.storage.paragraph.field_name.yml
similarity index 100%
rename from web/modules/custom/opdavies_talks/tests/modules/opdavies_talks_test/config/install/field.storage.paragraph.field_name.yml
rename to web/modules/custom/talks/tests/modules/opdavies_talks_test/config/install/field.storage.paragraph.field_name.yml
diff --git a/web/modules/custom/opdavies_talks/tests/modules/opdavies_talks_test/config/install/node.type.talk.yml b/web/modules/custom/talks/tests/modules/opdavies_talks_test/config/install/node.type.talk.yml
similarity index 100%
rename from web/modules/custom/opdavies_talks/tests/modules/opdavies_talks_test/config/install/node.type.talk.yml
rename to web/modules/custom/talks/tests/modules/opdavies_talks_test/config/install/node.type.talk.yml
diff --git a/web/modules/custom/opdavies_talks/tests/modules/opdavies_talks_test/config/install/paragraphs.paragraphs_type.event.yml b/web/modules/custom/talks/tests/modules/opdavies_talks_test/config/install/paragraphs.paragraphs_type.event.yml
similarity index 100%
rename from web/modules/custom/opdavies_talks/tests/modules/opdavies_talks_test/config/install/paragraphs.paragraphs_type.event.yml
rename to web/modules/custom/talks/tests/modules/opdavies_talks_test/config/install/paragraphs.paragraphs_type.event.yml
diff --git a/web/modules/custom/opdavies_talks/tests/modules/opdavies_talks_test/config/install/views.view.talks.yml b/web/modules/custom/talks/tests/modules/opdavies_talks_test/config/install/views.view.talks.yml
similarity index 100%
rename from web/modules/custom/opdavies_talks/tests/modules/opdavies_talks_test/config/install/views.view.talks.yml
rename to web/modules/custom/talks/tests/modules/opdavies_talks_test/config/install/views.view.talks.yml
diff --git a/web/modules/custom/opdavies_talks/tests/modules/opdavies_talks_test/opdavies_talks_test.info.yml b/web/modules/custom/talks/tests/modules/opdavies_talks_test/opdavies_talks_test.info.yml
similarity index 100%
rename from web/modules/custom/opdavies_talks/tests/modules/opdavies_talks_test/opdavies_talks_test.info.yml
rename to web/modules/custom/talks/tests/modules/opdavies_talks_test/opdavies_talks_test.info.yml
diff --git a/web/modules/custom/opdavies_talks/tests/src/Kernel/CountPreviousTalksTest.php b/web/modules/custom/talks/tests/src/Kernel/CountPreviousTalksTest.php
similarity index 100%
rename from web/modules/custom/opdavies_talks/tests/src/Kernel/CountPreviousTalksTest.php
rename to web/modules/custom/talks/tests/src/Kernel/CountPreviousTalksTest.php
diff --git a/web/modules/custom/opdavies_talks/tests/src/Kernel/EventsAreReorderedByDateTest.php b/web/modules/custom/talks/tests/src/Kernel/EventsAreReorderedByDateTest.php
similarity index 100%
rename from web/modules/custom/opdavies_talks/tests/src/Kernel/EventsAreReorderedByDateTest.php
rename to web/modules/custom/talks/tests/src/Kernel/EventsAreReorderedByDateTest.php
diff --git a/web/modules/custom/opdavies_talks/tests/src/Kernel/Repository/TalkRepositoryTest.php b/web/modules/custom/talks/tests/src/Kernel/Repository/TalkRepositoryTest.php
similarity index 100%
rename from web/modules/custom/opdavies_talks/tests/src/Kernel/Repository/TalkRepositoryTest.php
rename to web/modules/custom/talks/tests/src/Kernel/Repository/TalkRepositoryTest.php
diff --git a/web/modules/custom/opdavies_talks/tests/src/Kernel/TalkEventDateTest.php b/web/modules/custom/talks/tests/src/Kernel/TalkEventDateTest.php
similarity index 100%
rename from web/modules/custom/opdavies_talks/tests/src/Kernel/TalkEventDateTest.php
rename to web/modules/custom/talks/tests/src/Kernel/TalkEventDateTest.php
diff --git a/web/modules/custom/opdavies_talks/tests/src/Kernel/TalksPageSortTest.php b/web/modules/custom/talks/tests/src/Kernel/TalksPageSortTest.php
similarity index 100%
rename from web/modules/custom/opdavies_talks/tests/src/Kernel/TalksPageSortTest.php
rename to web/modules/custom/talks/tests/src/Kernel/TalksPageSortTest.php
diff --git a/web/modules/custom/opdavies_talks/tests/src/Kernel/TalksTestBase.php b/web/modules/custom/talks/tests/src/Kernel/TalksTestBase.php
similarity index 100%
rename from web/modules/custom/opdavies_talks/tests/src/Kernel/TalksTestBase.php
rename to web/modules/custom/talks/tests/src/Kernel/TalksTestBase.php
diff --git a/web/modules/custom/opdavies_talks/tests/src/Kernel/UpdatesTalkCreatedDateTest.php b/web/modules/custom/talks/tests/src/Kernel/UpdatesTalkCreatedDateTest.php
similarity index 100%
rename from web/modules/custom/opdavies_talks/tests/src/Kernel/UpdatesTalkCreatedDateTest.php
rename to web/modules/custom/talks/tests/src/Kernel/UpdatesTalkCreatedDateTest.php