diff --git a/src/views/designer/DesignDrawer/helpers.tsx b/src/views/designer/DesignDrawer/helpers.tsx
index ccf655f4..f8f268f1 100644
--- a/src/views/designer/DesignDrawer/helpers.tsx
+++ b/src/views/designer/DesignDrawer/helpers.tsx
@@ -61,14 +61,14 @@ export function buildDefinitionQueries(previous: TableInfo, current: TableInfo)
 			query += " SCHEMALESS";
 		}
 
-		query + ` TYPE ${tableType}`;
+		query += ` TYPE ${tableType}`;
 
 		if (tableType === "RELATION" && current.schema.kind.in) {
-			query += ` IN ${current.schema.kind.in.join(", ")}`;
+			query += ` IN ${current.schema.kind.in.map(name => tb(name)).join(", ")}`;
 		}
 
 		if (tableType === "RELATION" && current.schema.kind.out) {
-			query += ` OUT ${current.schema.kind.out.join(", ")}`;
+			query += ` OUT ${current.schema.kind.out.map(name => tb(name)).join(", ")}`;
 		}
 
 		if (current.schema.view) {