diff --git a/src/mod_pubsub/mod_pubsub.erl b/src/mod_pubsub/mod_pubsub.erl
index 43ca80b34..d826f551e 100644
--- a/src/mod_pubsub/mod_pubsub.erl
+++ b/src/mod_pubsub/mod_pubsub.erl
@@ -230,7 +230,7 @@ init([ServerHost, Opts]) ->
 %% <em>node_plugin</em>. The 'node_' prefix is mandatory.</p>
 %% <p>The modules are initialized in alphetical order and the list is checked
 %% and sorted to ensure that each module is initialized only once.</p>
-%% <p>See {@link node_default:init/1} for an example implementation.</p>
+%% <p>See {@link node_hometree:init/1} for an example implementation.</p>
 init_plugins(Host, ServerHost, Opts) ->
     TreePlugin = list_to_atom(?TREE_PREFIX ++
 			      gen_mod:get_opt(nodetree, Opts, ?STDTREE)),
@@ -1570,7 +1570,7 @@ delete_node(Host, Node, Owner) ->
 %%	 Node = pubsubNode()
 %%	 From = jid()
 %%	 JID = jid()
-%% @see node_default:subscribe_node/5
+%% @see node_hometree:subscribe_node/5
 %% @doc <p>Accepts or rejects subcription requests on a PubSub node.</p>
 %%<p>There are several reasons why the subscription request might fail:</p>
 %%<ul>
@@ -3017,7 +3017,7 @@ select_type(ServerHost, Host, Node) ->
 features() ->
 	[
 	 %TODO "access-authorize",   % OPTIONAL
-	 "access-open",   % OPTIONAL this relates to access_model option in node_default
+	 "access-open",   % OPTIONAL this relates to access_model option in node_hometree
 	 "access-presence",   % OPTIONAL this relates to access_model option in node_pep
 	 %TODO "access-roster",   % OPTIONAL
 	 "access-whitelist",   % OPTIONAL
diff --git a/src/mod_pubsub/pubsub.hrl b/src/mod_pubsub/pubsub.hrl
index dc95e3378..b896d4614 100644
--- a/src/mod_pubsub/pubsub.hrl
+++ b/src/mod_pubsub/pubsub.hrl
@@ -62,7 +62,7 @@
 %%% @type nodeType() = string().
 %%% <p>The <tt>nodeType</tt> is a string containing the name of the PubSub
 %%% plugin to use to manage a given node. For example, it can be
-%%% <tt>"default"</tt>, <tt>"collection"</tt> or <tt>"blog"</tt>.</p>
+%%% <tt>"flat"</tt>, <tt>"hometree"</tt> or <tt>"blog"</tt>.</p>
 
 %%% @type jid() = #jid{
 %%%    user = string(),
@@ -92,7 +92,7 @@
 -record(pubsub_node, {nodeid,
 		      id,
 		      parent,
-		      type = "default",
+		      type = "flat",
 		      owners = [],
 		      options = []
 		     }).