diff --git a/tradedb.py b/tradedb.py
index ee3cfd32..7b975fd3 100644
--- a/tradedb.py
+++ b/tradedb.py
@@ -292,7 +292,7 @@ def __init__(
         system.stations.append(self)
 
     def name(self):
-        return '%s/%s' % (self.system.name(), self.dbname)
+        return '%s/%s' % (self.system.dbname, self.dbname)
 
     def checkPadSize(self, maxPadSize):
         """
@@ -360,7 +360,7 @@ def isTrading(self):
         return (self.itemCount > 0 or self.market == 'Y')
 
     def str(self):
-        return self.dbname
+        return '%s/%s' % (self.system.dbname, self.dbname)
 
 
 ######################################################################