diff --git a/src/tox-weechat-data.c b/src/tox-weechat-data.c
index 67fbd09..31d8962 100644
--- a/src/tox-weechat-data.c
+++ b/src/tox-weechat-data.c
@@ -17,6 +17,11 @@
  * along with Tox-WeeChat.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
+/////// TODO //////////
+// get rid of data from deleted/nonexisting identities so it doesn't accumulate
+///////////////////////
+
 #include <weechat/weechat-plugin.h>
 #include <tox/tox.h>
 #include <jansson.h>
diff --git a/src/tox-weechat-friend-requests.c b/src/tox-weechat-friend-requests.c
index 4360059..a3ba524 100644
--- a/src/tox-weechat-friend-requests.c
+++ b/src/tox-weechat-friend-requests.c
@@ -27,7 +27,6 @@
 #include "tox-weechat.h"
 #include "tox-weechat-identities.h"
 #include "tox-weechat-utils.h"
-#include "tox-weechat-json.h"
 
 #include "tox-weechat-friend-requests.h"
 
diff --git a/src/tox-weechat-identities.c b/src/tox-weechat-identities.c
index 9c9d982..de6e5b0 100644
--- a/src/tox-weechat-identities.c
+++ b/src/tox-weechat-identities.c
@@ -262,8 +262,8 @@ tox_weechat_identity_connect(struct t_tox_weechat_identity *identity)
                      (uint8_t *)name, strlen(name));
     }
 
-    // load JSON data
-    tox_weechat_json_identity_load(identity);
+    // load data
+    tox_weechat_data_identity_load(identity);
 
     // bootstrap DHT
     int max_bootstrap_nodes = 5;
@@ -292,8 +292,8 @@ tox_weechat_identity_disconnect(struct t_tox_weechat_identity *identity)
     if (!identity->tox)
         return;
 
-    // save JSON data
-    tox_weechat_json_identity_save(identity);
+    // save data
+    tox_weechat_data_identity_save(identity);
 
     // save and kill tox
     int result = tox_weechat_save_identity_data_file(identity);
diff --git a/src/tox-weechat.c b/src/tox-weechat.c
index 7e30e1f..f87e991 100644
--- a/src/tox-weechat.c
+++ b/src/tox-weechat.c
@@ -48,7 +48,7 @@ weechat_plugin_init(struct t_weechat_plugin *plugin, int argc, char *argv[])
 
     tox_weechat_config_init();
     tox_weechat_config_read();
-    tox_weechat_json_load();
+    tox_weechat_data_load();
     tox_weechat_commands_init();
     tox_weechat_gui_init();
     tox_weechat_completion_init();
@@ -62,7 +62,7 @@ int
 weechat_plugin_end(struct t_weechat_plugin *plugin)
 {
     tox_weechat_config_write();
-    tox_weechat_json_save();
+    tox_weechat_data_save();
     tox_weechat_identity_free_all();
 
     return WEECHAT_RC_OK;