diff --git a/objects/TokenSource.124381/ClueDoom.a3fb6c.json b/objects/TokenSource.124381/ClueDoom.a3fb6c.json
index 48b61ac0..3e32ac21 100644
--- a/objects/TokenSource.124381/ClueDoom.a3fb6c.json
+++ b/objects/TokenSource.124381/ClueDoom.a3fb6c.json
@@ -40,7 +40,7 @@
   "Nickname": "ClueDoom",
   "Snap": false,
   "Sticky": true,
-  "Tooltip": false,
+  "Tooltip": true,
   "Transform": {
     "posX": 78.661,
     "posY": 2.398,
diff --git a/objects/TokenSource.124381/ClueDoom.a40a48.json b/objects/TokenSource.124381/ClueDoom.a40a48.json
index 9720c15b..c501cd2f 100644
--- a/objects/TokenSource.124381/ClueDoom.a40a48.json
+++ b/objects/TokenSource.124381/ClueDoom.a40a48.json
@@ -40,7 +40,7 @@
   "Nickname": "ClueDoom",
   "Snap": false,
   "Sticky": true,
-  "Tooltip": false,
+  "Tooltip": true,
   "Transform": {
     "posX": 78.738,
     "posY": 2.287,
diff --git a/objects/TokenSource.124381/Resource.00d19a.json b/objects/TokenSource.124381/Resource.00d19a.json
index ac96f326..0d1c5508 100644
--- a/objects/TokenSource.124381/Resource.00d19a.json
+++ b/objects/TokenSource.124381/Resource.00d19a.json
@@ -40,7 +40,7 @@
   "Nickname": "Resource",
   "Snap": false,
   "Sticky": true,
-  "Tooltip": false,
+  "Tooltip": true,
   "Transform": {
     "posX": 78.848,
     "posY": 2.273,
diff --git a/src/core/token/TokenManager.ttslua b/src/core/token/TokenManager.ttslua
index e5c62cb4..7a7916e1 100644
--- a/src/core/token/TokenManager.ttslua
+++ b/src/core/token/TokenManager.ttslua
@@ -248,6 +248,8 @@ do
     else
       rot.y = 270
     end
+
+    tokenTemplate.Nickname = ""
     return spawnObjectData({
       data = tokenTemplate,
       position = position,