diff --git a/src/client/stabber.c b/src/client/stabber.c
index 61a9552..75ea6e5 100644
--- a/src/client/stabber.c
+++ b/src/client/stabber.c
@@ -48,8 +48,8 @@ stbbr_auth_passwd(char *password)
 }
 
 int
-stbbr_for(char *id, char *stanza)
+stbbr_for(char *id, char *stream)
 {
-    prime_for(id, stanza);
+    prime_for(id, stream);
     return 1;
 }
diff --git a/src/server/prime.c b/src/server/prime.c
index 7618395..7fe3dc8 100644
--- a/src/server/prime.c
+++ b/src/server/prime.c
@@ -19,13 +19,13 @@ prime_get_passwd(void)
 }
 
 void
-prime_for(char *id, char *stanza)
+prime_for(char *id, char *stream)
 {
     if (!idstubs) {
         idstubs = g_hash_table_new_full(g_str_hash, g_str_equal, free, free);
     }
 
-    g_hash_table_insert(idstubs, strdup(id), strdup(stanza));
+    g_hash_table_insert(idstubs, strdup(id), strdup(stream));
 }
 
 char*
diff --git a/src/server/prime.h b/src/server/prime.h
index 5fa0355..719261f 100644
--- a/src/server/prime.h
+++ b/src/server/prime.h
@@ -4,7 +4,7 @@
 void prime_required_passwd(char *password);
 char* prime_get_passwd(void);
 
-int prime_for(char *id, char *stanza);
+int prime_for(char *id, char *stream);
 char* prime_get_for(const char *id);
 
 #endif
diff --git a/src/server/server.c b/src/server/server.c
index 49e204c..3a9b634 100644
--- a/src/server/server.c
+++ b/src/server/server.c
@@ -169,11 +169,11 @@ auth_callback(XMPPStanza *stanza, XMPPClient *client)
 void
 id_callback(const char *id, XMPPClient *client)
 {
-    char *stanza_ret = prime_get_for(id);
-    if (stanza_ret) {
+    char *stream = prime_get_for(id);
+    if (stream) {
         log_print_chars("\n");
         log_println("--> ID callback fired for '%s'", id);
-        send_to(client, stanza_ret);
+        send_to(client, stream);
         log_print("RECV: ");
     }
 }
diff --git a/stabber.h b/stabber.h
index 9f21e12..89cc58a 100644
--- a/stabber.h
+++ b/stabber.h
@@ -5,6 +5,6 @@ int stbbr_main(int port);
 int stbbr_start(int port);
 
 int stbbr_auth_passwd(char *password);
-void stbbr_for(char *id, char *stanza);
+void stbbr_for(char *id, char *stream);
 
 #endif