diff --git a/README.MD b/README.MD
index bd999ed..7ff3df9 100644
--- a/README.MD
+++ b/README.MD
@@ -11,7 +11,7 @@ A collection of example applications built on top of Aidbox FHIR platform
 - [Aidbox Forms Renderer with Angular.js](aidbox-forms-renderer-angular)
 - [Aidbox Forms Renderer with Angular.js (controlled mode)](aidbox-forms-renderer-angular-controlled)
 - [Aidbox Notify via Custom Resources](/aidbox-notify-via-custom-resources) ([demo](https://aidbox.github.io/app-examples/aidbox-notify-via-custom-resources/))
-- [Aidbox Forms & Kafka Topic Destination](/aidbox-forms-and-kafka-topic-destination)
+- [Aidbox Subscriptions & Kafka TopicDestination](/aidbox-subscriptions-to-kafka/)
 
 ## Documentation
 
diff --git a/aidbox-forms-and-kafka-topic-destination/.env.tpl b/aidbox-subscriptions-to-kafka/.env.tpl
similarity index 100%
rename from aidbox-forms-and-kafka-topic-destination/.env.tpl
rename to aidbox-subscriptions-to-kafka/.env.tpl
diff --git a/aidbox-forms-and-kafka-topic-destination/.gitignore b/aidbox-subscriptions-to-kafka/.gitignore
similarity index 100%
rename from aidbox-forms-and-kafka-topic-destination/.gitignore
rename to aidbox-subscriptions-to-kafka/.gitignore
diff --git a/aidbox-forms-and-kafka-topic-destination/README.md b/aidbox-subscriptions-to-kafka/README.md
similarity index 96%
rename from aidbox-forms-and-kafka-topic-destination/README.md
rename to aidbox-subscriptions-to-kafka/README.md
index b4e13b2..0f7facc 100644
--- a/aidbox-forms-and-kafka-topic-destination/README.md
+++ b/aidbox-subscriptions-to-kafka/README.md
@@ -1,4 +1,4 @@
-# Aidbox Forms & Kafka TopicDestination
+# Aidbox Subscriptions & Kafka TopicDestination
 
 This is a demo of [Aidbox SubscriptionTopic](https://docs.aidbox.app/modules-1/topic-based-subscriptions/wip-dynamic-subscriptiontopic-with-destinations) integrated with Kafka.
 
@@ -13,7 +13,7 @@ Objectives:
 <!-- markdown-toc start - Don't edit this section. Run M-x markdown-toc-refresh-toc -->
 **Table of Contents**
 
-- [Aidbox Forms & Kafka TopicDestination](#aidbox-forms--kafka-topicdestination)
+- [Aidbox Subscriptions & Kafka TopicDestination](#aidbox-subscriptions--kafka-topicdestination)
     - [Prerequisites](#prerequisites)
     - [Step 1: Set Up the Environment](#step-1-set-up-the-environment)
         - [Set Up Aidbox](#set-up-aidbox)
diff --git a/aidbox-forms-and-kafka-topic-destination/docker-compose.yaml b/aidbox-subscriptions-to-kafka/docker-compose.yaml
similarity index 100%
rename from aidbox-forms-and-kafka-topic-destination/docker-compose.yaml
rename to aidbox-subscriptions-to-kafka/docker-compose.yaml
diff --git a/aidbox-forms-and-kafka-topic-destination/kafka-ui-config.yml b/aidbox-subscriptions-to-kafka/kafka-ui-config.yml
similarity index 100%
rename from aidbox-forms-and-kafka-topic-destination/kafka-ui-config.yml
rename to aidbox-subscriptions-to-kafka/kafka-ui-config.yml
diff --git a/aidbox-forms-and-kafka-topic-destination/resources/questionnaire.json b/aidbox-subscriptions-to-kafka/resources/questionnaire.json
similarity index 100%
rename from aidbox-forms-and-kafka-topic-destination/resources/questionnaire.json
rename to aidbox-subscriptions-to-kafka/resources/questionnaire.json