diff --git a/src/acl.erl b/src/acl.erl
index 012918f14..8ab703514 100644
--- a/src/acl.erl
+++ b/src/acl.erl
@@ -233,7 +233,7 @@ match_acl(ACLName, JID, Host) ->
 	_ ->
 	    User = exmpp_jid:prep_node_as_list(JID),
 	    Server = exmpp_jid:prep_domain_as_list(JID),
-	    Resource = exmpp_jid:lresource_as_list(JID),
+	    Resource = exmpp_jid:prep_resource_as_list(JID),
 	    lists:any(fun(#acl{aclspec = Spec}) ->
 			      case Spec of
 				  all ->
diff --git a/src/ejabberd_s2s_in.erl b/src/ejabberd_s2s_in.erl
index 024708d9d..973107a16 100644
--- a/src/ejabberd_s2s_in.erl
+++ b/src/ejabberd_s2s_in.erl
@@ -644,7 +644,7 @@ get_cert_domains(Cert) ->
                   JID  = exmpp_jid:parse(D),
 			      case {exmpp_jid:prep_node_as_list(JID),
                         exmpp_jid:prep_domain_as_list(JID),
-                        exmpp_jid:lresource_as_list(JID)} of
+                        exmpp_jid:prep_resource_as_list(JID)} of
 				      {undefined, LD, undefined} ->
 				      [LD];
 				  _ ->
@@ -680,7 +680,7 @@ get_cert_domains(Cert) ->
                         JID2 = exmpp_jid:parse(binary_to_list(D)),  
 					    case {exmpp_jid:prep_node_as_list(JID2),
                               exmpp_jid:prep_domain_as_list(JID2),
-                              exmpp_jid:lresource_as_list(JID2)} of
+                              exmpp_jid:prep_resource_as_list(JID2)} of
 						    { undefined, LD, undefined} ->
 						    case idna:domain_utf8_to_ascii(LD) of
 							false ->
@@ -698,7 +698,7 @@ get_cert_domains(Cert) ->
                     JID3 = exmpp_jid:parse(D),
 				    case {exmpp_jid:prep_node_as_list(JID3),
                           exmpp_jid:prep_domain_as_list(JID3),
-                          exmpp_jid:lresource_as_list(JID3)} of
+                          exmpp_jid:prep_resource_as_list(JID3)} of
 					{undefined, LD, undefined} ->
 					    [LD];
 					_ ->
diff --git a/src/mod_configure.erl b/src/mod_configure.erl
index 4f16a2a46..7b1e909bf 100644
--- a/src/mod_configure.erl
+++ b/src/mod_configure.erl
@@ -1593,7 +1593,7 @@ set_form(From, Host, ?NS_ADMINL("end-user-session"), _Lang, XData) ->
     LServer = exmpp_jid:prep_domain_as_list(JID), 
     true = (LServer == Host) orelse (get_permission_level(From) == global),
     %% Code copied from ejabberd_sm.erl
-    case exmpp_jid:lresource_as_list(JID) of
+    case exmpp_jid:prep_resource_as_list(JID) of
 	undefined -> 
 	    SIDs = mnesia:dirty_select(session,
 				       [{#session{sid = '$1', usr = {LUser, LServer, '_'}, _ = '_'}, [], ['$1']}]),
diff --git a/src/mod_register.erl b/src/mod_register.erl
index f1dfa3bcf..218abdad5 100644
--- a/src/mod_register.erl
+++ b/src/mod_register.erl
@@ -89,7 +89,7 @@ unauthenticated_iq_register(Acc, _Server, _IQ, _IP) ->
 process_iq(From, To, IQ) ->
     process_iq(From, To, IQ, {exmpp_jid:prep_node_as_list(From),
                               exmpp_jid:prep_domain_as_list(From),
-                              exmpp_jid:lresource_as_list(From)}).
+                              exmpp_jid:prep_resource_as_list(From)}).
 
 process_iq(From, To,
 	   #iq{type = Type, lang = Lang, payload = SubEl} = IQ_Rec,