diff --git a/trustgraph/model/prompt/generic/service.py b/trustgraph/model/prompt/generic/service.py
index dc75c7cf..16986980 100755
--- a/trustgraph/model/prompt/generic/service.py
+++ b/trustgraph/model/prompt/generic/service.py
@@ -6,6 +6,7 @@ import json
 import re
 
 from .... schema import Definition, Relationship, Triple
+from .... schema import Topic
 from .... schema import PromptRequest, PromptResponse, Error
 from .... schema import TextCompletionRequest, TextCompletionResponse
 from .... schema import text_completion_request_queue
@@ -202,7 +203,7 @@ class Processor(ConsumerProducer):
                     if d is None: continue
 
                     output.append(
-                        Definition(
+                        Topic(
                             name=e, definition=d
                         )
                     )
diff --git a/trustgraph/model/prompt/template/service.py b/trustgraph/model/prompt/template/service.py
index fdfa2740..14b65d5a 100755
--- a/trustgraph/model/prompt/template/service.py
+++ b/trustgraph/model/prompt/template/service.py
@@ -7,6 +7,7 @@ import json
 import re
 
 from .... schema import Definition, Relationship, Triple
+from .... schema import Topic
 from .... schema import PromptRequest, PromptResponse, Error
 from .... schema import TextCompletionRequest, TextCompletionResponse
 from .... schema import text_completion_request_queue
@@ -216,7 +217,7 @@ class Processor(ConsumerProducer):
                     if d is None: continue
 
                     output.append(
-                        Definition(
+                        Topic(
                             name=e, definition=d
                         )
                     )