diff --git a/src/librustc_driver/lib.rs b/src/librustc_driver/lib.rs
index 796cf82c77511..2a4b30e016f28 100644
--- a/src/librustc_driver/lib.rs
+++ b/src/librustc_driver/lib.rs
@@ -467,17 +467,17 @@ impl<'a> CompilerCalls<'a> for RustcDefaultCalls {
                     state.krate = Some(pretty::fold_crate(state.krate.take().unwrap(), ppm));
                 };
                 control.after_hir_lowering.callback = box move |state| {
-                    pretty::print_after_ast(state.session,
-                                            state.ast_map.unwrap(),
-                                            state.analysis.unwrap(),
-                                            state.resolutions.unwrap(),
-                                            state.input,
-                                            &state.expanded_crate.take().unwrap(),
-                                            state.crate_name.unwrap(),
-                                            ppm,
-                                            state.arenas.unwrap(),
-                                            opt_uii.clone(),
-                                            state.out_file);
+                    pretty::print_after_hir_lowering(state.session,
+                                                     state.ast_map.unwrap(),
+                                                     state.analysis.unwrap(),
+                                                     state.resolutions.unwrap(),
+                                                     state.input,
+                                                     &state.expanded_crate.take().unwrap(),
+                                                     state.crate_name.unwrap(),
+                                                     ppm,
+                                                     state.arenas.unwrap(),
+                                                     opt_uii.clone(),
+                                                     state.out_file);
                 };
             } else {
                 control.after_parse.stop = Compilation::Stop;
diff --git a/src/librustc_driver/pretty.rs b/src/librustc_driver/pretty.rs
index 2fd015bf5b80e..d3716af205396 100644
--- a/src/librustc_driver/pretty.rs
+++ b/src/librustc_driver/pretty.rs
@@ -812,17 +812,17 @@ pub fn print_after_parsing(sess: &Session,
     write_output(out, ofile);
 }
 
-pub fn print_after_ast<'tcx, 'a: 'tcx>(sess: &'a Session,
-                                       ast_map: &hir_map::Map<'tcx>,
-                                       analysis: &ty::CrateAnalysis,
-                                       resolutions: &Resolutions,
-                                       input: &Input,
-                                       krate: &ast::Crate,
-                                       crate_name: &str,
-                                       ppm: PpMode,
-                                       arenas: &'tcx ty::CtxtArenas<'tcx>,
-                                       opt_uii: Option<UserIdentifiedItem>,
-                                       ofile: Option<&Path>) {
+pub fn print_after_hir_lowering<'tcx, 'a: 'tcx>(sess: &'a Session,
+                                                ast_map: &hir_map::Map<'tcx>,
+                                                analysis: &ty::CrateAnalysis,
+                                                resolutions: &Resolutions,
+                                                input: &Input,
+                                                krate: &ast::Crate,
+                                                crate_name: &str,
+                                                ppm: PpMode,
+                                                arenas: &'tcx ty::CtxtArenas<'tcx>,
+                                                opt_uii: Option<UserIdentifiedItem>,
+                                                ofile: Option<&Path>) {
     let dep_graph = DepGraph::new(false);
     let _ignore = dep_graph.in_ignore();