4 files changed, 5 insertions, 5 deletions
diff --git a/src/command.c b/src/command.c
index dc25ce71..a45f9564 100644
--- a/src/command.c
+++ b/src/command.c
@@ -1828,7 +1828,7 @@ _cmd_join(gchar **args, struct cmd_help_t help)
         jid_destroy(jid);
     }
 
-    Jid *room_jid = jid_create_room_jid(room, nick);
+    Jid *room_jid = jid_create_from_bare_and_resource(room, nick);
 
     if (!muc_room_is_active(room_jid)) {
         jabber_join(room_jid);
diff --git a/src/jid.c b/src/jid.c
index 0b468674..54196410 100644
--- a/src/jid.c
+++ b/src/jid.c
@@ -92,7 +92,7 @@ jid_create(const gchar * const str)
 }
 
 Jid *
-jid_create_room_jid(const char * const room, const char * const nick)
+jid_create_from_bare_and_resource(const char * const room, const char * const nick)
 {
     Jid *result;
     char *jid = create_full_room_jid(room, nick);
diff --git a/src/jid.h b/src/jid.h
index 175c9ff3..135aec09 100644
--- a/src/jid.h
+++ b/src/jid.h
@@ -37,7 +37,7 @@ struct jid_t {
 typedef struct jid_t Jid;
 
 Jid * jid_create(const gchar * const str);
-Jid * jid_create_room_jid(const char * const room, const char * const nick);
+Jid * jid_create_from_bare_and_resource(const char * const room, const char * const nick);
 void jid_destroy(Jid *jid);
 
 gboolean jid_is_valid_room_form(Jid *jid);
diff --git a/tests/test_jid.c b/tests/test_jid.c
index ce33909a..0b9da5ab 100644
--- a/tests/test_jid.c
+++ b/tests/test_jid.c
@@ -107,14 +107,14 @@ void create_jid_from_bare_returns_domainpart(void)
 
 void create_room_jid_returns_room(void)
 {
-    Jid *result = jid_create_room_jid("room@conference.domain.org", "myname");
+    Jid *result = jid_create_from_bare_and_resource("room@conference.domain.org", "myname");
 
     assert_string_equals("room@conference.domain.org", result->barejid);
 }
 
 void create_room_jid_returns_nick(void)
 {
-    Jid *result = jid_create_room_jid("room@conference.domain.org", "myname");
+    Jid *result = jid_create_from_bare_and_resource("room@conference.domain.org", "myname");
 
     assert_string_equals("myname", result->resourcepart);
 }