diff --git a/services/gunDB/contact-api/actions.js b/services/gunDB/contact-api/actions.js
index 708dbd92..d3ed3750 100644
--- a/services/gunDB/contact-api/actions.js
+++ b/services/gunDB/contact-api/actions.js
@@ -25,11 +25,11 @@ const SchemaManager = require('../../schema')
 const LNDHealthMananger = require('../../../utils/lightningServices/errors')
 const { enrollContentTokens, selfContentToken } = require('../../seed')
 
-/// <reference path="../../../utils/GunSmith/GunT.ts" />
+/// <reference path="../../../utils/GunSmith/Smith.ts" />
 
 /**
  * @typedef {import('./SimpleGUN').ISEA} ISEA
- * @typedef {GunT.UserGUNNode} UserGUNNode
+ * @typedef {Smith.UserSmithNode} UserGUNNode
  */
 
 /**
diff --git a/services/gunDB/contact-api/events/index.js b/services/gunDB/contact-api/events/index.js
index 440985a1..d060cb34 100644
--- a/services/gunDB/contact-api/events/index.js
+++ b/services/gunDB/contact-api/events/index.js
@@ -8,7 +8,7 @@ const {
 } = require('shock-common')
 
 const Key = require('../key')
-/// <reference path="../../../utils/GunSmith/GunT.ts" />
+/// <reference path="../../../utils/GunSmith/Smith.ts" />
 
 const DEBOUNCE_WAIT_TIME = 500
 
@@ -17,7 +17,7 @@ let currentSeedBackup = null
 
 /**
  * @param {(seedBackup: string|null) => void} cb
- * @param {GunT.UserGUNNode} user
+ * @param {Smith.UserSmithNode} 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 d58c4f5d..1842ef30 100644
--- a/services/gunDB/contact-api/jobs/lastSeenNode.js
+++ b/services/gunDB/contact-api/jobs/lastSeenNode.js
@@ -11,13 +11,13 @@ const {
   }
 } = require('shock-common')
 const Key = require('../key')
-/// <reference path="../../../utils/GunSmith/GunT.ts" />
+/// <reference path="../../../utils/GunSmith/Smith.ts" />
 
 /**
- * @typedef {GunT.GUNNode} GUNNode
+ * @typedef {Smith.GunSmithNode} GUNNode
  * @typedef {GunT.ListenerData} ListenerData
  * @typedef {import('../SimpleGUN').ISEA} ISEA
- * @typedef {GunT.UserGUNNode} UserGUNNode
+ * @typedef {Smith.UserSmithNode} UserGUNNode
  */
 
 /**
diff --git a/services/gunDB/contact-api/jobs/onOrders.js b/services/gunDB/contact-api/jobs/onOrders.js
index 732a741c..d2557f17 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" />
+/// <reference path="../../../utils/GunSmith/Smith.ts" />
 const TipForwarder = require('../../../tipsCallback')
 
 const getUser = () => require('../../Mediator').getUser()
@@ -28,10 +28,10 @@ const getUser = () => require('../../Mediator').getUser()
 const ordersProcessed = new Set()
 
 /**
- * @typedef {GunT.GUNNode} GUNNode
+ * @typedef {Smith.GunSmithNode} GUNNode
  * @typedef {GunT.ListenerData} ListenerData
  * @typedef {import('../SimpleGUN').ISEA} ISEA
- * @typedef {GunT.UserGUNNode} UserGUNNode
+ * @typedef {Smith.UserSmithNode} UserGUNNode
  */
 
 /**
diff --git a/services/gunDB/contact-api/utils/index.js b/services/gunDB/contact-api/utils/index.js
index 6243a933..23090361 100644
--- a/services/gunDB/contact-api/utils/index.js
+++ b/services/gunDB/contact-api/utils/index.js
@@ -6,12 +6,12 @@ const logger = require('../../../../config/log')
 const { Constants, Utils: CommonUtils } = require('shock-common')
 
 const Key = require('../key')
-/// <reference path="../../../../utils/GunSmith/GunT.ts" />
+/// <reference path="../../../../utils/GunSmith/Smith.ts" />
 
 /**
- * @typedef {GunT.GUNNode} GUNNode
+ * @typedef {Smith.GunSmithNode} GUNNode
  * @typedef {import('../SimpleGUN').ISEA} ISEA
- * @typedef {GunT.UserGUNNode} UserGUNNode
+ * @typedef {Smith.UserSmithNode} UserGUNNode
  */
 
 /**
diff --git a/services/gunDB/sockets/index.js b/services/gunDB/sockets/index.js
index 131c5859..2295399e 100644
--- a/services/gunDB/sockets/index.js
+++ b/services/gunDB/sockets/index.js
@@ -15,7 +15,7 @@ const {
   encryptedOn,
   encryptedCallback
 } = require('../../../utils/ECC/socket')
-/// <reference path="../../../utils/GunSmith/GunT.ts" />
+/// <reference path="../../../utils/GunSmith/Smith.ts" />
 
 const ALLOWED_GUN_METHODS = [
   'map',
@@ -52,7 +52,7 @@ const getNode = root => {
 }
 
 /**
- * @param {GunT.GUNNode} node
+ * @param {Smith.GunSmithNode} node
  * @param {string} path
  */
 const getGunQuery = (node, path) => {