diff --git a/src/mako/cli/lib/engine.mako b/src/mako/cli/lib/engine.mako
index b336fb0064..c4ab313ea3 100644
--- a/src/mako/cli/lib/engine.mako
+++ b/src/mako/cli/lib/engine.mako
@@ -44,7 +44,7 @@ use clap::ArgMatches;
 
 enum DoitError {
     IoError(String, io::Error),
-    ApiError(api::Error),
+    ApiError(Error),
 }
 
 struct Engine<'n> {
diff --git a/src/mako/cli/main.rs.mako b/src/mako/cli/main.rs.mako
index 4badc0a592..8b12f54732 100644
--- a/src/mako/cli/main.rs.mako
+++ b/src/mako/cli/main.rs.mako
@@ -24,12 +24,14 @@ extern crate serde_json;
 extern crate hyper;
 extern crate mime;
 extern crate strsim;
-extern crate ${to_extern_crate_name(library_to_crate_name(library_name(name, version), make.depends_on_suffix))} as api;
+extern crate ${to_extern_crate_name(library_to_crate_name(library_name(name, version), make.depends_on_suffix))};
 
 use std::env;
 use std::io::{self, Write};
 use clap::{App, SubCommand, Arg};
 
+use ${to_extern_crate_name(library_to_crate_name(library_name(name, version), make.depends_on_suffix))}::{api, Error};
+
 mod client;
 
 ${engine.new(c)}\
@@ -65,4 +67,4 @@ fn main() {
     }
 
     std::process::exit(exit_status);
-}
\ No newline at end of file
+}