diff --git a/src/xmpp_stream_in.erl b/src/xmpp_stream_in.erl
index b30439723..86b180de1 100644
--- a/src/xmpp_stream_in.erl
+++ b/src/xmpp_stream_in.erl
@@ -20,7 +20,7 @@
 %%%
 %%%-------------------------------------------------------------------
 -module(xmpp_stream_in).
--define(GEN_SERVER, gen_server).
+-define(GEN_SERVER, p1_server).
 -behaviour(?GEN_SERVER).
 
 -protocol({rfc, 6120}).
diff --git a/src/xmpp_stream_out.erl b/src/xmpp_stream_out.erl
index c7be31728..893742a5c 100644
--- a/src/xmpp_stream_out.erl
+++ b/src/xmpp_stream_out.erl
@@ -20,7 +20,7 @@
 %%%
 %%%-------------------------------------------------------------------
 -module(xmpp_stream_out).
--define(GEN_SERVER, gen_server).
+-define(GEN_SERVER, p1_server).
 -behaviour(?GEN_SERVER).
 
 -protocol({rfc, 6120}).