diff --git a/services/gunDB/contact-api/actions.js b/services/gunDB/contact-api/actions.js
index 5ac9f107..8e7850f6 100644
--- a/services/gunDB/contact-api/actions.js
+++ b/services/gunDB/contact-api/actions.js
@@ -25,9 +25,11 @@ const SchemaManager = require('../../schema')
 const LNDHealthMananger = require('../../../utils/lightningServices/errors')
 const { enrollContentTokens, selfContentToken } = require('../../seed')
 
+/// <reference path="../../../utils/GunSmith/GunT.ts" />
+
 /**
  * @typedef {import('./SimpleGUN').ISEA} ISEA
- * @typedef {import('./SimpleGUN').UserGUNNode} UserGUNNode
+ * @typedef {GunT.UserGUNNode} UserGUNNode
  */
 
 /**
diff --git a/services/gunDB/contact-api/events/index.js b/services/gunDB/contact-api/events/index.js
index 29a44a2b..440985a1 100644
--- a/services/gunDB/contact-api/events/index.js
+++ b/services/gunDB/contact-api/events/index.js
@@ -8,6 +8,7 @@ const {
 } = require('shock-common')
 
 const Key = require('../key')
+/// <reference path="../../../utils/GunSmith/GunT.ts" />
 
 const DEBOUNCE_WAIT_TIME = 500
 
@@ -16,7 +17,7 @@ let currentSeedBackup = null
 
 /**
  * @param {(seedBackup: string|null) => void} cb
- * @param {import('../SimpleGUN').UserGUNNode} user
+ * @param {GunT.UserGUNNode} user
  * @param {import('../SimpleGUN').ISEA} SEA
  * @throws {Error} If user hasn't been auth.
  * @returns {void}
diff --git a/services/gunDB/contact-api/jobs/lastSeenNode.js b/services/gunDB/contact-api/jobs/lastSeenNode.js
index 63e13572..d58c4f5d 100644
--- a/services/gunDB/contact-api/jobs/lastSeenNode.js
+++ b/services/gunDB/contact-api/jobs/lastSeenNode.js
@@ -11,12 +11,13 @@ const {
   }
 } = require('shock-common')
 const Key = require('../key')
+/// <reference path="../../../utils/GunSmith/GunT.ts" />
 
 /**
- * @typedef {import('../SimpleGUN').GUNNode} GUNNode
- * @typedef {import('../SimpleGUN').ListenerData} ListenerData
+ * @typedef {GunT.GUNNode} GUNNode
+ * @typedef {GunT.ListenerData} ListenerData
  * @typedef {import('../SimpleGUN').ISEA} ISEA
- * @typedef {import('../SimpleGUN').UserGUNNode} UserGUNNode
+ * @typedef {GunT.UserGUNNode} UserGUNNode
  */
 
 /**
diff --git a/services/gunDB/contact-api/jobs/onOrders.js b/services/gunDB/contact-api/jobs/onOrders.js
index e0484080..481778cc 100644
--- a/services/gunDB/contact-api/jobs/onOrders.js
+++ b/services/gunDB/contact-api/jobs/onOrders.js
@@ -17,7 +17,7 @@ const Key = require('../key')
 const Utils = require('../utils')
 const Gun = require('gun')
 const { selfContentToken, enrollContentTokens } = require('../../../seed')
-
+/// <reference path="../../../utils/GunSmith/GunT.ts" />
 const TipForwarder = require('../../../tipsCallback')
 
 const getUser = () => require('../../Mediator').getUser()
@@ -28,10 +28,10 @@ const getUser = () => require('../../Mediator').getUser()
 const ordersProcessed = new Set()
 
 /**
- * @typedef {import('../SimpleGUN').GUNNode} GUNNode
- * @typedef {import('../SimpleGUN').ListenerData} ListenerData
+ * @typedef {GunT.GUNNode} GUNNode
+ * @typedef {GunT.ListenerData} ListenerData
  * @typedef {import('../SimpleGUN').ISEA} ISEA
- * @typedef {import('../SimpleGUN').UserGUNNode} UserGUNNode
+ * @typedef {GunT.UserGUNNode} UserGUNNode
  */
 
 /**
diff --git a/services/gunDB/contact-api/utils/index.js b/services/gunDB/contact-api/utils/index.js
index bd4cd452..ab83a728 100644
--- a/services/gunDB/contact-api/utils/index.js
+++ b/services/gunDB/contact-api/utils/index.js
@@ -6,11 +6,12 @@ const logger = require('../../../../config/log')
 const { Constants, Utils: CommonUtils } = require('shock-common')
 
 const Key = require('../key')
+/// <reference path="../../../../utils/GunSmith/GunT.ts" />
 
 /**
- * @typedef {import('../SimpleGUN').GUNNode} GUNNode
+ * @typedef {GunT.GUNNode} GUNNode
  * @typedef {import('../SimpleGUN').ISEA} ISEA
- * @typedef {import('../SimpleGUN').UserGUNNode} UserGUNNode
+ * @typedef {GunT.UserGUNNode} UserGUNNode
  */
 
 /**
diff --git a/services/gunDB/sockets/index.js b/services/gunDB/sockets/index.js
index 171307be..131c5859 100644
--- a/services/gunDB/sockets/index.js
+++ b/services/gunDB/sockets/index.js
@@ -15,6 +15,7 @@ const {
   encryptedOn,
   encryptedCallback
 } = require('../../../utils/ECC/socket')
+/// <reference path="../../../utils/GunSmith/GunT.ts" />
 
 const ALLOWED_GUN_METHODS = [
   'map',
@@ -51,7 +52,7 @@ const getNode = root => {
 }
 
 /**
- * @param {import("../contact-api/SimpleGUN").GUNNode} node
+ * @param {GunT.GUNNode} node
  * @param {string} path
  */
 const getGunQuery = (node, path) => {