diff --git a/src/account.c b/src/account.c
index 08029b9..1bff693 100644
--- a/src/account.c
+++ b/src/account.c
@@ -76,10 +76,10 @@ void content_account(mastodont_t* api, char** data, size_t size)
     size_t status_len;
     int lookup_type = config_experimental_lookup ? MSTDNT_LOOKUP_ACCT : MSTDNT_LOOKUP_ID;
 
-    if (mastodont_account(api, lookup_type, data[0],
-                          &acct, &storage, NULL) ||
-        mastodont_account_statuses(api, acct.id, NULL,
-                                   &status_storage, &statuses, &status_len))
+    if (mastodont_get_account(api, lookup_type, data[0],
+                              &acct, &storage, NULL) ||
+        mastodont_get_account_statuses(api, acct.id, NULL,
+                                       &status_storage, &statuses, &status_len))
     {
         account_page = "Couldn't load account info";
     }
diff --git a/src/status.c b/src/status.c
index 81c3e55..81dd4fb 100644
--- a/src/status.c
+++ b/src/status.c
@@ -188,9 +188,9 @@ void content_status(mastodont_t* api, char** data, size_t data_size, int is_repl
 #include "test/status_test.h"
 #else
     // Get information
-    mastodont_status_context(api, data[0], &storage, &statuses_before, &statuses_after,
+    mastodont_get_status_context(api, data[0], &storage, &statuses_before, &statuses_after,
                              &stat_before_len, &stat_after_len);
-    mastodont_view_status(api, data[0], &status_storage, &status);
+    mastodont_get_status(api, data[0], &status_storage, &status);
 
     // Before...
     before_html = construct_statuses(statuses_before, stat_before_len, NULL);