diff --git a/wpilibc/src/main/native/cpp/SmartDashboard/SmartDashboard.cpp b/wpilibc/src/main/native/cpp/SmartDashboard/SmartDashboard.cpp
index 0a3b62138a..1c5c5a6c81 100644
--- a/wpilibc/src/main/native/cpp/SmartDashboard/SmartDashboard.cpp
+++ b/wpilibc/src/main/native/cpp/SmartDashboard/SmartDashboard.cpp
@@ -162,10 +162,12 @@ void SmartDashboard::PutData(llvm::StringRef key, Sendable* data) {
   auto& sddata = inst.tablesToData[key];
   if (!sddata.sendable || sddata.sendable != data) {
     sddata = SmartDashboardData(data);
-    sddata.builder.SetTable(inst.table->GetSubTable(key));
+    auto dataTable = inst.table->GetSubTable(key);
+    sddata.builder.SetTable(dataTable);
     data->InitSendable(sddata.builder);
     sddata.builder.UpdateTable();
     sddata.builder.StartListeners();
+    dataTable->GetEntry(".name").SetString(key);
   }
 }
 
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/smartdashboard/SmartDashboard.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/smartdashboard/SmartDashboard.java
index 690e70abc0..e8ab5fd634 100644
--- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/smartdashboard/SmartDashboard.java
+++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/smartdashboard/SmartDashboard.java
@@ -67,10 +67,12 @@ public class SmartDashboard {
       }
       sddata = new Data(data);
       tablesToData.put(key, sddata);
-      sddata.m_builder.setTable(table.getSubTable(key));
+      NetworkTable dataTable = table.getSubTable(key);
+      sddata.m_builder.setTable(dataTable);
       data.initSendable(sddata.m_builder);
       sddata.m_builder.updateTable();
       sddata.m_builder.startListeners();
+      dataTable.getEntry(".name").setString(key);
     }
   }