diff --git a/sopel_modules/SpiceBot/Database.py b/sopel_modules/SpiceBot/Database.py
index 68283c1..e082150 100644
--- a/sopel_modules/SpiceBot/Database.py
+++ b/sopel_modules/SpiceBot/Database.py
@@ -45,7 +45,7 @@ class NickValues(BASE):
     """
     __tablename__ = 'spice_nick_values'
     nick_id = Column(Integer, ForeignKey('nick_ids.nick_id'), primary_key=True)
-    namespace = Column(String(255), primary_key=True)
+    # namespace = Column(String(255), primary_key=True)
     key = Column(String(255), primary_key=True)
     value = Column(Text())
 
@@ -56,7 +56,7 @@ class ChannelValues(BASE):
     """
     __tablename__ = 'spice_channel_values'
     channel = Column(String(255), primary_key=True)
-    namespace = Column(String(255), primary_key=True)
+    # namespace = Column(String(255), primary_key=True)
     key = Column(String(255), primary_key=True)
     value = Column(Text())
 
@@ -67,7 +67,7 @@ class PluginValues(BASE):
     """
     __tablename__ = 'spice_plugin_values'
     plugin = Column(String(255), primary_key=True)
-    namespace = Column(String(255), primary_key=True)
+    # namespace = Column(String(255), primary_key=True)
     key = Column(String(255), primary_key=True)
     value = Column(Text())
 
@@ -83,9 +83,10 @@ class SpiceDB(object):
         nick_id = self.get_nick_id(nick)
         session = self.ssession()
         try:
+            # .filter(NickValues.namespace == namespace)\
+            key = namespace + "_" + key
             result = session.query(NickValues) \
                 .filter(NickValues.nick_id == nick_id) \
-                .filter(NickValues.namespace == namespace)\
                 .filter(NickValues.key == key) \
                 .one_or_none()
             # NickValue exists, update
@@ -94,7 +95,7 @@ class SpiceDB(object):
                 session.commit()
             # DNE - Insert
             else:
-                new_nickvalue = NickValues(nick_id=nick_id, namespace=namespace, key=key, value=value)
+                new_nickvalue = NickValues(nick_id=nick_id, key=key, value=value)
                 session.add(new_nickvalue)
                 session.commit()
         except SQLAlchemyError:
@@ -108,10 +109,11 @@ class SpiceDB(object):
         nick = Identifier(nick)
         session = self.ssession()
         try:
+            # .filter(NickValues.namespace == namespace)\
+            key = namespace + "_" + key
             result = session.query(NickValues) \
                 .filter(Nicknames.nick_id == NickValues.nick_id) \
                 .filter(Nicknames.slug == nick.lower()) \
-                .filter(NickValues.namespace == namespace)\
                 .filter(NickValues.key == key) \
                 .one_or_none()
             if result is not None:
@@ -129,9 +131,10 @@ class SpiceDB(object):
         nick_id = self.get_nick_id(nick)
         session = self.ssession()
         try:
+            # .filter(NickValues.namespace == namespace)\
+            key = namespace + "_" + key
             result = session.query(NickValues) \
                 .filter(NickValues.nick_id == nick_id) \
-                .filter(NickValues.namespace == namespace)\
                 .filter(NickValues.key == key) \
                 .one_or_none()
             # NickValue exists, delete
@@ -151,9 +154,10 @@ class SpiceDB(object):
         nick_id = self.get_nick_id(nick)
         session = self.ssession()
         try:
+            # .filter(NickValues.namespace == namespace)\
+            key = namespace + "_" + key
             result = session.query(NickValues) \
                 .filter(NickValues.nick_id == nick_id) \
-                .filter(NickValues.namespace == namespace)\
                 .filter(NickValues.key == key) \
                 .one_or_none()
             # NickValue exists, update
@@ -162,7 +166,7 @@ class SpiceDB(object):
                 session.commit()
             # DNE - Insert
             else:
-                new_nickvalue = NickValues(nick_id=nick_id, namespace=namespace, key=key, value=float(value))
+                new_nickvalue = NickValues(nick_id=nick_id, key=key, value=float(value))
                 session.add(new_nickvalue)
                 session.commit()
         except SQLAlchemyError:
@@ -180,9 +184,10 @@ class SpiceDB(object):
         nick_id = self.get_nick_id(nick)
         session = self.ssession()
         try:
+            # .filter(NickValues.namespace == namespace)\
+            key = namespace + "_" + key
             result = session.query(NickValues) \
                 .filter(NickValues.nick_id == nick_id) \
-                .filter(NickValues.namespace == namespace)\
                 .filter(NickValues.key == key) \
                 .one_or_none()
             # NickValue exists, update
@@ -207,7 +212,7 @@ class SpiceDB(object):
                     for entry in entries:
                         while entry in values:
                             values.remove(entry)
-                new_nickvalue = NickValues(nick_id=nick_id, namespace=namespace, key=key, value=values)
+                new_nickvalue = NickValues(nick_id=nick_id, key=key, value=values)
                 session.add(new_nickvalue)
                 session.commit()
         except SQLAlchemyError:
@@ -224,9 +229,10 @@ class SpiceDB(object):
         value = json.dumps(value, ensure_ascii=False)
         session = self.ssession()
         try:
+            # .filter(ChannelValues.namespace == namespace)\
+            key = namespace + "_" + key
             result = session.query(ChannelValues) \
                 .filter(ChannelValues.channel == channel)\
-                .filter(ChannelValues.namespace == namespace)\
                 .filter(ChannelValues.key == key) \
                 .one_or_none()
             # ChannelValue exists, update
@@ -235,7 +241,7 @@ class SpiceDB(object):
                 session.commit()
             # DNE - Insert
             else:
-                new_channelvalue = ChannelValues(channel=channel, namespace=namespace, key=key, value=value)
+                new_channelvalue = ChannelValues(channel=channel, key=key, value=value)
                 session.add(new_channelvalue)
                 session.commit()
         except SQLAlchemyError:
@@ -249,9 +255,10 @@ class SpiceDB(object):
         channel = Identifier(channel).lower()
         session = self.ssession()
         try:
+            # .filter(ChannelValues.namespace == namespace)\
+            key = namespace + "_" + key
             result = session.query(ChannelValues) \
                 .filter(ChannelValues.channel == channel)\
-                .filter(ChannelValues.namespace == namespace)\
                 .filter(ChannelValues.key == key) \
                 .one_or_none()
             if result is not None:
@@ -268,9 +275,10 @@ class SpiceDB(object):
         channel = Identifier(channel).lower()
         session = self.ssession()
         try:
+            # .filter(ChannelValues.namespace == namespace)\
+            key = namespace + "_" + key
             result = session.query(ChannelValues) \
                 .filter(ChannelValues.channel == channel)\
-                .filter(ChannelValues.namespace == namespace)\
                 .filter(ChannelValues.key == key) \
                 .one_or_none()
             # ChannelValue exists, delete
@@ -289,9 +297,10 @@ class SpiceDB(object):
         value = json.dumps(value, ensure_ascii=False)
         session = self.ssession()
         try:
+            # .filter(ChannelValues.namespace == namespace)\
+            key = namespace + "_" + key
             result = session.query(ChannelValues) \
                 .filter(ChannelValues.channel == channel)\
-                .filter(ChannelValues.namespace == namespace)\
                 .filter(ChannelValues.key == key) \
                 .one_or_none()
             # ChannelValue exists, update
@@ -300,7 +309,7 @@ class SpiceDB(object):
                 session.commit()
             # DNE - Insert
             else:
-                new_channelvalue = ChannelValues(channel=channel, namespace=namespace, key=key, value=float(value))
+                new_channelvalue = ChannelValues(channel=channel, key=key, value=float(value))
                 session.add(new_channelvalue)
                 session.commit()
         except SQLAlchemyError:
@@ -317,9 +326,10 @@ class SpiceDB(object):
         entries = json.dumps(entries, ensure_ascii=False)
         session = self.ssession()
         try:
+            # .filter(ChannelValues.namespace == namespace)\
+            key = namespace + "_" + key
             result = session.query(ChannelValues) \
                 .filter(ChannelValues.channel == channel)\
-                .filter(ChannelValues.namespace == namespace)\
                 .filter(ChannelValues.key == key) \
                 .one_or_none()
             # ChannelValue exists, update
@@ -344,7 +354,7 @@ class SpiceDB(object):
                     for entry in entries:
                         while entry in values:
                             values.remove(entry)
-                new_channelvalue = ChannelValues(channel=channel, namespace=namespace, key=key, value=values)
+                new_channelvalue = ChannelValues(channel=channel, key=key, value=values)
                 session.add(new_channelvalue)
                 session.commit()
         except SQLAlchemyError:
@@ -361,9 +371,10 @@ class SpiceDB(object):
         value = json.dumps(value, ensure_ascii=False)
         session = self.ssession()
         try:
+            # .filter(PluginValues.namespace == namespace)\
+            key = namespace + "_" + key
             result = session.query(PluginValues) \
                 .filter(PluginValues.plugin == plugin)\
-                .filter(PluginValues.namespace == namespace)\
                 .filter(PluginValues.key == key) \
                 .one_or_none()
             # PluginValues exists, update
@@ -372,7 +383,7 @@ class SpiceDB(object):
                 session.commit()
             # DNE - Insert
             else:
-                new_pluginvalue = PluginValues(plugin=plugin, namespace=namespace, key=key, value=value)
+                new_pluginvalue = PluginValues(plugin=plugin, key=key, value=value)
                 session.add(new_pluginvalue)
                 session.commit()
         except SQLAlchemyError:
@@ -386,9 +397,10 @@ class SpiceDB(object):
         plugin = Identifier(plugin).lower()
         session = self.ssession()
         try:
+            # .filter(PluginValues.namespace == namespace)\
+            key = namespace + "_" + key
             result = session.query(PluginValues) \
                 .filter(PluginValues.plugin == plugin)\
-                .filter(PluginValues.namespace == namespace)\
                 .filter(PluginValues.key == key) \
                 .one_or_none()
             if result is not None:
@@ -405,9 +417,10 @@ class SpiceDB(object):
         plugin = Identifier(plugin).lower()
         session = self.ssession()
         try:
+            # .filter(PluginValues.namespace == namespace)\
+            key = namespace + "_" + key
             result = session.query(PluginValues) \
                 .filter(PluginValues.plugin == plugin)\
-                .filter(PluginValues.namespace == namespace)\
                 .filter(PluginValues.key == key) \
                 .one_or_none()
             # PluginValues exists, delete
@@ -426,9 +439,10 @@ class SpiceDB(object):
         value = json.dumps(value, ensure_ascii=False)
         session = self.ssession()
         try:
+            # .filter(PluginValues.namespace == namespace)\
+            key = namespace + "_" + key
             result = session.query(PluginValues) \
                 .filter(PluginValues.plugin == plugin)\
-                .filter(PluginValues.namespace == namespace)\
                 .filter(PluginValues.key == key) \
                 .one_or_none()
             # ChannelValue exists, update
@@ -437,7 +451,7 @@ class SpiceDB(object):
                 session.commit()
             # DNE - Insert
             else:
-                new_pluginvalue = PluginValues(plugin=plugin, namespace=namespace, key=key, value=float(value))
+                new_pluginvalue = PluginValues(plugin=plugin, key=key, value=float(value))
                 session.add(new_pluginvalue)
                 session.commit()
         except SQLAlchemyError:
@@ -454,9 +468,10 @@ class SpiceDB(object):
         entries = json.dumps(entries, ensure_ascii=False)
         session = self.ssession()
         try:
+            # .filter(PluginValues.namespace == namespace)\
+            key = namespace + "_" + key
             result = session.query(PluginValues) \
                 .filter(PluginValues.plugin == plugin)\
-                .filter(PluginValues.namespace == namespace)\
                 .filter(PluginValues.key == key) \
                 .one_or_none()
             # ChannelValue exists, update
@@ -481,7 +496,8 @@ class SpiceDB(object):
                     for entry in entries:
                         while entry in values:
                             values.remove(entry)
-                new_pluginvalue = PluginValues(plugin=plugin, namespace=namespace, key=key, value=values)
+                new_pluginvalue = PluginValues(plugin=plugin, key=key, value=values)
+                # new_pluginvalue = PluginValues(plugin=plugin, namespace=namespace, key=key, value=values)
                 session.add(new_pluginvalue)
                 session.commit()
         except SQLAlchemyError: