diff --git a/src/core/firebase.app.module.ts b/src/core/firebase.app.module.ts
index 5847c5144..3d9e0de03 100644
--- a/src/core/firebase.app.module.ts
+++ b/src/core/firebase.app.module.ts
@@ -1,6 +1,6 @@
 import { InjectionToken, } from '@angular/core';
 import { FirebaseAppConfig } from './';
-import { firebase } from '@firebase/app';
+import firebase from '@firebase/app';
 
 import { FirebaseApp as FBApp } from '@firebase/app-types';
 import { FirebaseAuth } from '@firebase/auth-types';
diff --git a/src/database-deprecated/firebase_list_factory.ts b/src/database-deprecated/firebase_list_factory.ts
index 1eafd8cd0..eee7666fc 100644
--- a/src/database-deprecated/firebase_list_factory.ts
+++ b/src/database-deprecated/firebase_list_factory.ts
@@ -1,7 +1,6 @@
 import * as database from '@firebase/database-types';
 import { ZoneScheduler } from 'angularfire2';
 import * as utils from './utils';
-import 'firebase/database';
 import { AFUnwrappedDataSnapshot } from './interfaces';
 import { FirebaseListObservable } from './firebase_list_observable';
 import { Observer } from 'rxjs/Observer';
diff --git a/tools/build.js b/tools/build.js
index af98c4145..05625eef6 100644
--- a/tools/build.js
+++ b/tools/build.js
@@ -54,11 +54,11 @@ const GLOBALS = {
   '@angular/core': 'ng.core',
   '@angular/compiler': 'ng.compiler',
   '@angular/platform-browser': 'ng.platformBrowser',
-  'firebase/auth': 'firebase',
-  'firebase/app': 'firebase',
-  'firebase/database': 'firebase',
-  'firebase/firestore': 'firebase',
-  'firebase/storage': 'firebase',
+  '@firebase/auth': 'firebase',
+  '@firebase/app': 'firebase',
+  '@firebase/database': 'firebase',
+  '@firebase/firestore': 'firebase',
+  '@firebase/storage': 'firebase',
   'rxjs/scheduler/queue': 'Rx.Scheduler',
   '@angular/core/testing': 'ng.core.testing',
   'angularfire2': 'angularfire2',
@@ -123,8 +123,8 @@ const TSC_TEST_ARGS = [`-p`, `${process.cwd()}/src/tsconfig-test.json`];
 
 /**
  * Create an Observable of a spawned child process.
- * @param {string} command 
- * @param {string[]} args 
+ * @param {string} command
+ * @param {string[]} args
  */
 function spawnObservable(command, args) {
   return Observable.create(observer => {
@@ -151,8 +151,8 @@ function generateBundle(entry, { dest, globals, moduleName }) {
 
 /**
  * Create a UMD bundle given a module name.
- * @param {string} name 
- * @param {Object} globals 
+ * @param {string} name
+ * @param {Object} globals
  */
 function createUmd(name, globals) {
   // core module is angularfire2 the rest are angularfire2.feature
@@ -177,7 +177,7 @@ function createTestUmd(globals) {
 
 /**
  * Get the file path of the src package.json for a module
- * @param {string} moduleName 
+ * @param {string} moduleName
  */
 function getSrcPackageFile(moduleName) {
   return SRC_PKG_PATHS[moduleName];
@@ -185,7 +185,7 @@ function getSrcPackageFile(moduleName) {
 
 /**
  * Get the file path of the dist package.json for a module
- * @param {string} moduleName 
+ * @param {string} moduleName
  */
 function getDestPackageFile(moduleName) {
   return DEST_PKG_PATHS[moduleName];
@@ -194,8 +194,8 @@ function getDestPackageFile(moduleName) {
 /**
  * Create an observable of package.json dependency version replacements.
  * This keeps the dependency versions across each package in sync.
- * @param {string} name 
- * @param {Object} versions 
+ * @param {string} name
+ * @param {Object} versions
  */
 function replaceVersionsObservable(name, versions) {
   return Observable.create((observer) => {
@@ -287,7 +287,7 @@ function buildModule(name, globals) {
 
 /**
  * Create an observable of module build status. This method builds
- * @param {Object} globals 
+ * @param {Object} globals
  */
 function buildModules(globals) {
   const core$ = buildModule('core', globals);