diff --git a/src/rustdoc/astsrv.rs b/src/rustdoc/astsrv.rs
index 3397691d5e3..b34a01e86a5 100644
--- a/src/rustdoc/astsrv.rs
+++ b/src/rustdoc/astsrv.rs
@@ -22,8 +22,8 @@ import rustc::middle::resolve;
 export ctxt;
 export ctxt_handler;
 export srv;
-export mk_srv_from_str;
-export mk_srv_from_file;
+export from_str;
+export from_file;
 export exec;
 
 type ctxt = {
@@ -38,7 +38,7 @@ type srv = {
     ctxt: ctxt
 };
 
-fn mk_srv_from_str(source: str) -> srv {
+fn from_str(source: str) -> srv {
     let (sess, ignore_errors) = build_session();
     {
         ctxt: build_ctxt(sess, parse::from_str_sess(sess, source),
@@ -46,7 +46,7 @@ fn mk_srv_from_str(source: str) -> srv {
     }
 }
 
-fn mk_srv_from_file(file: str) -> srv {
+fn from_file(file: str) -> srv {
     let (sess, ignore_errors) = build_session();
     {
         ctxt: build_ctxt(sess, parse::from_file_sess(sess, file),
@@ -172,7 +172,7 @@ fn build_error_handlers(
 #[test]
 fn should_prune_unconfigured_items() {
     let source = "#[cfg(shut_up_and_leave_me_alone)]fn a() { }";
-    let srv = mk_srv_from_str(source);
+    let srv = from_str(source);
     exec(srv) {|ctxt|
         assert vec::is_empty(ctxt.ast.node.module.items);
     }
@@ -181,7 +181,7 @@ fn should_prune_unconfigured_items() {
 #[test]
 fn srv_should_build_ast_map() {
     let source = "fn a() { }";
-    let srv = mk_srv_from_str(source);
+    let srv = from_str(source);
     exec(srv) {|ctxt|
         assert ctxt.ast_map.size() != 0u
     };
@@ -190,7 +190,7 @@ fn srv_should_build_ast_map() {
 #[test]
 fn srv_should_build_reexport_map() {
     let source = "import a::b; export b; mod a { mod b { } }";
-    let srv = mk_srv_from_str(source);
+    let srv = from_str(source);
     exec(srv) {|ctxt|
         assert ctxt.exp_map.size() != 0u
     };
@@ -202,14 +202,14 @@ fn srv_should_resolve_external_crates() {
                   fn f() -> std::sha1::sha1 {\
                   std::sha1::mk_sha1() }";
     // Just testing that resolve doesn't crash
-    mk_srv_from_str(source);
+    from_str(source);
 }
 
 #[test]
 fn srv_should_resolve_core_crate() {
     let source = "fn a() -> option { fail }";
     // Just testing that resolve doesn't crash
-    mk_srv_from_str(source);
+    from_str(source);
 }
 
 #[test]
@@ -217,19 +217,19 @@ fn srv_should_resolve_non_existant_imports() {
     // We want to ignore things we can't resolve. Shouldn't
     // need to be able to find external crates to create docs.
     let source = "import wooboo; fn a() { }";
-    mk_srv_from_str(source);
+    from_str(source);
 }
 
 #[test]
 fn srv_should_resolve_non_existant_uses() {
     let source = "use forble; fn a() { }";
-    mk_srv_from_str(source);
+    from_str(source);
 }
 
 #[test]
 fn should_ignore_external_import_paths_that_dont_exist() {
     let source = "use forble; import forble::bippy;";
-    mk_srv_from_str(source);
+    from_str(source);
 }
 
 fn exec<T:send>(
@@ -242,7 +242,7 @@ fn exec<T:send>(
 #[test]
 fn srv_should_return_request_result() {
     let source = "fn a() { }";
-    let srv = mk_srv_from_str(source);
+    let srv = from_str(source);
     let result = exec(srv) {|_ctxt| 1000};
     assert result == 1000;
 }
diff --git a/src/rustdoc/attr_pass.rs b/src/rustdoc/attr_pass.rs
index 2d0db9cf472..b2a0b176b79 100644
--- a/src/rustdoc/attr_pass.rs
+++ b/src/rustdoc/attr_pass.rs
@@ -183,7 +183,7 @@ fn should_extract_fn_arg_attributes() {
 #[test]
 fn should_extract_fn_return_attributes() {
     let source = "#[doc(return = \"what\")] fn a() -> int { }";
-    let srv = astsrv::mk_srv_from_str(source);
+    let srv = astsrv::from_str(source);
     let doc = extract::from_srv(srv, "");
     let doc = tystr_pass::mk_pass()(srv, doc);
     let fold = fold::default_seq_fold(srv);
@@ -194,7 +194,7 @@ fn should_extract_fn_return_attributes() {
 #[test]
 fn should_preserve_fn_sig() {
     let source = "fn a() -> int { }";
-    let srv = astsrv::mk_srv_from_str(source);
+    let srv = astsrv::from_str(source);
     let doc = extract::from_srv(srv, "");
     let doc = tystr_pass::mk_pass()(srv, doc);
     let fold = fold::default_seq_fold(srv);
@@ -448,7 +448,7 @@ fn should_extract_type_docs() {
 #[cfg(test)]
 mod test {
     fn mk_doc(source: str) -> doc::cratedoc {
-        let srv = astsrv::mk_srv_from_str(source);
+        let srv = astsrv::from_str(source);
         let doc = extract::from_srv(srv, "");
         run(srv, doc)
     }
diff --git a/src/rustdoc/desc_pass.rs b/src/rustdoc/desc_pass.rs
index 1187c17809d..9e0cc33ac81 100644
--- a/src/rustdoc/desc_pass.rs
+++ b/src/rustdoc/desc_pass.rs
@@ -279,7 +279,7 @@ fn should_execute_op_on_type_desc() {
 #[cfg(test)]
 mod test {
     fn mk_doc(source: str) -> doc::cratedoc {
-        let srv = astsrv::mk_srv_from_str(source);
+        let srv = astsrv::from_str(source);
         let doc = extract::from_srv(srv, "");
         let doc = attr_pass::mk_pass()(srv, doc);
         mk_pass(str::trim)(srv, doc)
diff --git a/src/rustdoc/desc_to_brief_pass.rs b/src/rustdoc/desc_to_brief_pass.rs
index f45e3f9c543..1e8e48bf3e2 100644
--- a/src/rustdoc/desc_to_brief_pass.rs
+++ b/src/rustdoc/desc_to_brief_pass.rs
@@ -147,7 +147,7 @@ fn should_promote_type_desc() {
 #[cfg(test)]
 mod test {
     fn mk_doc(source: str) -> doc::cratedoc {
-        let srv = astsrv::mk_srv_from_str(source);
+        let srv = astsrv::from_str(source);
         let doc = extract::from_srv(srv, "");
         let doc = attr_pass::mk_pass()(srv, doc);
         run(srv, doc)
diff --git a/src/rustdoc/extract.rs b/src/rustdoc/extract.rs
index 0c44e249dfa..a264e507d27 100644
--- a/src/rustdoc/extract.rs
+++ b/src/rustdoc/extract.rs
@@ -379,7 +379,7 @@ mod test {
     #[test]
     fn extract_from_seq_srv() {
         let source = "";
-        let srv = astsrv::mk_srv_from_str(source);
+        let srv = astsrv::from_str(source);
         let doc = from_srv(srv, "name");
         assert doc.topmod.name() == "name";
     }
diff --git a/src/rustdoc/markdown_pass.rs b/src/rustdoc/markdown_pass.rs
index e59382b9d80..93d0ca97595 100644
--- a/src/rustdoc/markdown_pass.rs
+++ b/src/rustdoc/markdown_pass.rs
@@ -790,7 +790,7 @@ mod test {
     }
 
     fn create_doc_srv(source: str) -> (astsrv::srv, doc::cratedoc) {
-        let srv = astsrv::mk_srv_from_str(source);
+        let srv = astsrv::from_str(source);
         let doc = extract::from_srv(srv, "");
         #debug("doc (extract): %?", doc);
         let doc = tystr_pass::mk_pass()(srv, doc);
@@ -836,7 +836,7 @@ mod test {
 
     #[test]
     fn write_markdown_should_write_crate_header() {
-        let srv = astsrv::mk_srv_from_str("");
+        let srv = astsrv::from_str("");
         let doc = extract::from_srv(srv, "belch");
         let doc = attr_pass::mk_pass()(srv, doc);
         let markdown = write_markdown_str(doc);
diff --git a/src/rustdoc/path_pass.rs b/src/rustdoc/path_pass.rs
index b1e156932df..a0ba492a57c 100644
--- a/src/rustdoc/path_pass.rs
+++ b/src/rustdoc/path_pass.rs
@@ -45,7 +45,7 @@ fn fold_mod(fold: fold::fold<ctxt>, doc: doc::moddoc) -> doc::moddoc {
 #[test]
 fn should_record_mod_paths() {
     let source = "mod a { mod b { mod c { } } mod d { mod e { } } }";
-    let srv = astsrv::mk_srv_from_str(source);
+    let srv = astsrv::from_str(source);
     let doc = extract::from_srv(srv, "");
     let doc = run(srv, doc);
     assert doc.topmod.mods()[0].mods()[0].mods()[0].path() == ["a", "b"];
@@ -55,7 +55,7 @@ fn should_record_mod_paths() {
 #[test]
 fn should_record_fn_paths() {
     let source = "mod a { fn b() { } }";
-    let srv = astsrv::mk_srv_from_str(source);
+    let srv = astsrv::from_str(source);
     let doc = extract::from_srv(srv, "");
     let doc = run(srv, doc);
     assert doc.topmod.mods()[0].fns()[0].path() == ["a"];
diff --git a/src/rustdoc/prune_undoc_details_pass.rs b/src/rustdoc/prune_undoc_details_pass.rs
index 0dd66ffcdd8..f399f36622e 100644
--- a/src/rustdoc/prune_undoc_details_pass.rs
+++ b/src/rustdoc/prune_undoc_details_pass.rs
@@ -64,7 +64,7 @@ fn should_elide_undocumented_arguments() {
 #[test]
 fn should_elide_undocumented_return_values() {
     let source = "#[doc = \"fonz\"] fn a() -> int { }";
-    let srv = astsrv::mk_srv_from_str(source);
+    let srv = astsrv::from_str(source);
     let doc = extract::from_srv(srv, "");
     let doc = tystr_pass::mk_pass()(srv, doc);
     let doc = attr_pass::mk_pass()(srv, doc);
@@ -154,7 +154,7 @@ fn should_elide_undocumented_impl_method_return_values() {
 #[cfg(test)]
 mod test {
     fn mk_doc(source: str) -> doc::cratedoc {
-        let srv = astsrv::mk_srv_from_str(source);
+        let srv = astsrv::from_str(source);
         let doc = extract::from_srv(srv, "");
         let doc = attr_pass::mk_pass()(srv, doc);
         run(srv, doc)
diff --git a/src/rustdoc/prune_undoc_items_pass.rs b/src/rustdoc/prune_undoc_items_pass.rs
index f7985044b12..956017a4378 100644
--- a/src/rustdoc/prune_undoc_items_pass.rs
+++ b/src/rustdoc/prune_undoc_items_pass.rs
@@ -365,7 +365,7 @@ fn should_elide_undocumented_types() {
 #[cfg(test)]
 mod test {
     fn mk_doc(source: str) -> doc::cratedoc {
-        let srv = astsrv::mk_srv_from_str(source);
+        let srv = astsrv::from_str(source);
         let doc = extract::from_srv(srv, "");
         let doc = attr_pass::mk_pass()(srv, doc);
         run(srv, doc)
diff --git a/src/rustdoc/prune_unexported_pass.rs b/src/rustdoc/prune_unexported_pass.rs
index 9bac44d3f9f..c48b1176dfc 100644
--- a/src/rustdoc/prune_unexported_pass.rs
+++ b/src/rustdoc/prune_unexported_pass.rs
@@ -229,7 +229,7 @@ fn should_prune_unexported_types() {
 #[cfg(test)]
 mod test {
     fn mk_doc(source: str) -> doc::cratedoc {
-        let srv = astsrv::mk_srv_from_str(source);
+        let srv = astsrv::from_str(source);
         let doc = extract::from_srv(srv, "");
         run(srv, doc)
     }
diff --git a/src/rustdoc/reexport_pass.rs b/src/rustdoc/reexport_pass.rs
index 6e199d88c4b..c8dd4541381 100644
--- a/src/rustdoc/reexport_pass.rs
+++ b/src/rustdoc/reexport_pass.rs
@@ -289,7 +289,7 @@ fn should_duplicate_multiple_reexported_items() {
                   import a::b; import a::c; \
                   export b; export c; \
                   }";
-    let srv = astsrv::mk_srv_from_str(source);
+    let srv = astsrv::from_str(source);
     let doc = extract::from_srv(srv, "");
     let doc = path_pass::mk_pass()(srv, doc);
     let doc = run(srv, doc);
@@ -310,7 +310,7 @@ fn should_rename_items_reexported_with_different_names() {
 #[cfg(test)]
 mod test {
     fn mk_doc(source: str) -> doc::cratedoc {
-        let srv = astsrv::mk_srv_from_str(source);
+        let srv = astsrv::from_str(source);
         let doc = extract::from_srv(srv, "");
         let doc = path_pass::mk_pass()(srv, doc);
         run(srv, doc)
diff --git a/src/rustdoc/rustdoc.rs b/src/rustdoc/rustdoc.rs
index f9a63b87389..fc07d290d2c 100755
--- a/src/rustdoc/rustdoc.rs
+++ b/src/rustdoc/rustdoc.rs
@@ -71,7 +71,7 @@ fn test_run_passes() {
         }
     }
     let source = "";
-    let srv = astsrv::mk_srv_from_str(source);
+    let srv = astsrv::from_str(source);
     let passes = [pass1, pass2];
     let doc = extract::from_srv(srv, "one");
     let doc = run_passes(srv, doc, passes);
@@ -93,7 +93,7 @@ fn main(argv: [str]) {
 fn run(source_file: str) {
 
     let default_name = source_file;
-    let srv = astsrv::mk_srv_from_file(source_file);
+    let srv = astsrv::from_file(source_file);
     let doc = extract::from_srv(srv, default_name);
     run_passes(srv, doc, [
         prune_unexported_pass::mk_pass(),
diff --git a/src/rustdoc/sort_item_name_pass.rs b/src/rustdoc/sort_item_name_pass.rs
index be0478f3302..466d234c891 100644
--- a/src/rustdoc/sort_item_name_pass.rs
+++ b/src/rustdoc/sort_item_name_pass.rs
@@ -11,7 +11,7 @@ fn mk_pass() -> pass {
 #[test]
 fn test() {
     let source = "mod z { } fn y() { }";
-    let srv = astsrv::mk_srv_from_str(source);
+    let srv = astsrv::from_str(source);
     let doc = extract::from_srv(srv, "");
     let doc = mk_pass()(srv, doc);
     assert doc.topmod.items[0].name() == "y";
diff --git a/src/rustdoc/sort_item_type_pass.rs b/src/rustdoc/sort_item_type_pass.rs
index af6212c24dd..766c1d545df 100644
--- a/src/rustdoc/sort_item_type_pass.rs
+++ b/src/rustdoc/sort_item_type_pass.rs
@@ -33,7 +33,7 @@ fn test() {
          iface iiface { fn a(); } \
          impl iimpl for int { fn a() { } } \
          type itype = int;";
-    let srv = astsrv::mk_srv_from_str(source);
+    let srv = astsrv::from_str(source);
     let doc = extract::from_srv(srv, "");
     let doc = mk_pass()(srv, doc);
     assert doc.topmod.items[0].name() == "iconst";
diff --git a/src/rustdoc/sort_pass.rs b/src/rustdoc/sort_pass.rs
index 11df208729e..faf91bc288b 100644
--- a/src/rustdoc/sort_pass.rs
+++ b/src/rustdoc/sort_pass.rs
@@ -42,7 +42,7 @@ fn test() {
     }
 
     let source = "mod z { mod y { } fn x() { } } mod w { }";
-    let srv = astsrv::mk_srv_from_str(source);
+    let srv = astsrv::from_str(source);
     let doc = extract::from_srv(srv, "");
     let doc = mk_pass(name_lteq)(srv, doc);
     assert doc.topmod.mods()[0].name() == "w";
@@ -58,7 +58,7 @@ fn should_be_stable() {
     }
 
     let source = "mod a { mod b { } } mod c { mod d { } }";
-    let srv = astsrv::mk_srv_from_str(source);
+    let srv = astsrv::from_str(source);
     let doc = extract::from_srv(srv, "");
     let doc = mk_pass(always_eq)(srv, doc);
     assert doc.topmod.mods()[0].items[0].name() == "b";
diff --git a/src/rustdoc/trim_pass.rs b/src/rustdoc/trim_pass.rs
index 9c9fe5f83ae..57c2b25a41c 100644
--- a/src/rustdoc/trim_pass.rs
+++ b/src/rustdoc/trim_pass.rs
@@ -61,7 +61,7 @@ fn should_trim_failure_conditions() {
 #[cfg(test)]
 mod test {
     fn mk_doc(source: str) -> doc::cratedoc {
-        let srv = astsrv::mk_srv_from_str(source);
+        let srv = astsrv::from_str(source);
         let doc = extract::from_srv(srv, "");
         let doc = attr_pass::mk_pass()(srv, doc);
         mk_pass()(srv, doc)
diff --git a/src/rustdoc/tystr_pass.rs b/src/rustdoc/tystr_pass.rs
index 662d2ca8380..401db0a2c5a 100644
--- a/src/rustdoc/tystr_pass.rs
+++ b/src/rustdoc/tystr_pass.rs
@@ -558,7 +558,7 @@ fn should_add_type_signatures() {
 #[cfg(test)]
 mod test {
     fn mk_doc(source: str) -> doc::cratedoc {
-        let srv = astsrv::mk_srv_from_str(source);
+        let srv = astsrv::from_str(source);
         let doc = extract::from_srv(srv, "");
         run(srv, doc)
     }