diff --git a/types/ansi-styles/ansi-styles-tests.ts b/types/ansi-styles/ansi-styles-tests.ts
index d1d21719b4..afc4a07802 100644
--- a/types/ansi-styles/ansi-styles-tests.ts
+++ b/types/ansi-styles/ansi-styles-tests.ts
@@ -1,4 +1,3 @@
-import { EscapeCode } from './escape-code';
 import AnsiStyles = require('ansi-styles');
 
 let ansiStyles = AnsiStyles as any,
diff --git a/types/baidumap-web-sdk/baidumap-web-sdk-tests.ts b/types/baidumap-web-sdk/baidumap-web-sdk-tests.ts
index 8368f15ce8..6f6259e576 100644
--- a/types/baidumap-web-sdk/baidumap-web-sdk-tests.ts
+++ b/types/baidumap-web-sdk/baidumap-web-sdk-tests.ts
@@ -1,4 +1,4 @@
-import "./index";
+import "baidumap-web-sdk";
 
 class TestFixture {
 	// document: http://lbsyun.baidu.com/index.php?title=jspopular3.0
diff --git a/types/behavior3/behavior3-tests.ts b/types/behavior3/behavior3-tests.ts
index b612209a09..3b73a8903c 100644
--- a/types/behavior3/behavior3-tests.ts
+++ b/types/behavior3/behavior3-tests.ts
@@ -1,4 +1,4 @@
-import '../behavior3';
+import 'behavior3';
 
 // Test decode
 const blackboard = new b3.Blackboard();
diff --git a/types/braintree-web/test/web.ts b/types/braintree-web/test/web.ts
index 7cdb0dfc47..ee1aa9ef45 100644
--- a/types/braintree-web/test/web.ts
+++ b/types/braintree-web/test/web.ts
@@ -1,5 +1,5 @@
-import { ApplePay } from "..";
-import * as braintree from "..";
+import { ApplePay } from "braintree-web";
+import * as braintree from "braintree-web";
 
 let version: string = braintree.VERSION;
 
diff --git a/types/clearbladejs-node/clearbladejs-node-tests.ts b/types/clearbladejs-node/clearbladejs-node-tests.ts
index e9cb585d50..7d59fc8222 100644
--- a/types/clearbladejs-node/clearbladejs-node-tests.ts
+++ b/types/clearbladejs-node/clearbladejs-node-tests.ts
@@ -3,7 +3,7 @@
 // Definitions by: Jim Bouquet <https://github.com/ClearBlade>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-import { ClearBlade, Resp, QuerySortDirections, QueryConditions } from ".";
+import { ClearBlade, Resp, QuerySortDirections, QueryConditions } from "clearbladejs-node";
 
 // Sample code for clearbladejs Node SDK v1.0.0 used to test typescript definitions
 
diff --git a/types/config/config-tests.ts b/types/config/config-tests.ts
index dfbc695dd7..f43da222f4 100644
--- a/types/config/config-tests.ts
+++ b/types/config/config-tests.ts
@@ -1,7 +1,7 @@
 
 import * as config from "config";
-import { deferConfig } from './defer';
-import { raw } from './raw';
+import { deferConfig } from 'config/defer';
+import { raw } from 'config/raw';
 
 var class1: config.IConfig = config;
 
diff --git a/types/crypto-js/test/submodule-tests.ts b/types/crypto-js/test/submodule-tests.ts
index 423d094143..19849aeb37 100644
--- a/types/crypto-js/test/submodule-tests.ts
+++ b/types/crypto-js/test/submodule-tests.ts
@@ -1,55 +1,55 @@
-import Core = require('../core');
-import X64Core = require('../x64-core');
-import LibTypedarrays = require('../lib-typedarrays');
+import Core = require('crypto-js/core');
+import X64Core = require('crypto-js/x64-core');
+import LibTypedarrays = require('crypto-js/lib-typedarrays');
 // ---
-import MD5 = require('../md5');
-import SHA1 = require('../sha1');
-import SHA256 = require('../sha256');
-import SHA224 = require('../sha224');
-import SHA512 = require('../sha512');
-import SHA384 = require('../sha384');
-import SHA3 = require('../sha3');
-import RIPEMD160 = require('../ripemd160');
+import MD5 = require('crypto-js/md5');
+import SHA1 = require('crypto-js/sha1');
+import SHA256 = require('crypto-js/sha256');
+import SHA224 = require('crypto-js/sha224');
+import SHA512 = require('crypto-js/sha512');
+import SHA384 = require('crypto-js/sha384');
+import SHA3 = require('crypto-js/sha3');
+import RIPEMD160 = require('crypto-js/ripemd160');
 // ---
-import HmacMD5 = require('../hmac-md5');
-import HmacSHA1 = require('../hmac-sha1');
-import HmacSHA256 = require('../hmac-sha256');
-import HmacSHA224 = require('../hmac-sha224');
-import HmacSHA512 = require('../hmac-sha512');
-import HmacSHA384 = require('../hmac-sha384');
-import HmacSHA3 = require('../hmac-sha3');
-import HmacRIPEMD160 = require('../hmac-ripemd160');
+import HmacMD5 = require('crypto-js/hmac-md5');
+import HmacSHA1 = require('crypto-js/hmac-sha1');
+import HmacSHA256 = require('crypto-js/hmac-sha256');
+import HmacSHA224 = require('crypto-js/hmac-sha224');
+import HmacSHA512 = require('crypto-js/hmac-sha512');
+import HmacSHA384 = require('crypto-js/hmac-sha384');
+import HmacSHA3 = require('crypto-js/hmac-sha3');
+import HmacRIPEMD160 = require('crypto-js/hmac-ripemd160');
 // ---
-import PBKDF2 = require('../pbkdf2');
+import PBKDF2 = require('crypto-js/pbkdf2');
 // ---
-import AES = require('../aes');
-import TripleDES = require('../tripledes');
-import RC4 = require('../rc4');
-import Rabbit = require('../rabbit');
-import RabbitLegacy = require('../rabbit-legacy');
-import EvpKDF = require('../evpkdf');
+import AES = require('crypto-js/aes');
+import TripleDES = require('crypto-js/tripledes');
+import RC4 = require('crypto-js/rc4');
+import Rabbit = require('crypto-js/rabbit');
+import RabbitLegacy = require('crypto-js/rabbit-legacy');
+import EvpKDF = require('crypto-js/evpkdf');
 // ---
-import FormatOpenSSL = require('../format-openssl');
-import FormatHex = require('../format-hex');
+import FormatOpenSSL = require('crypto-js/format-openssl');
+import FormatHex = require('crypto-js/format-hex');
 // ---
-import EncLatin1 = require('../enc-latin1');
-import EncUtf8 = require('../enc-utf8');
-import EncHex = require('../enc-hex');
-import EncUtf16 = require('../enc-utf16');
-import EncBase64 = require('../enc-base64');
+import EncLatin1 = require('crypto-js/enc-latin1');
+import EncUtf8 = require('crypto-js/enc-utf8');
+import EncHex = require('crypto-js/enc-hex');
+import EncUtf16 = require('crypto-js/enc-utf16');
+import EncBase64 = require('crypto-js/enc-base64');
 // ---
-import ModeCFB = require('../mode-cfb');
-import ModeCTR = require('../mode-ctr');
-import ModeCTRGladman = require('../mode-ctr-gladman');
-import ModeOFB = require('../mode-ofb');
-import ModeECB = require('../mode-ecb');
+import ModeCFB = require('crypto-js/mode-cfb');
+import ModeCTR = require('crypto-js/mode-ctr');
+import ModeCTRGladman = require('crypto-js/mode-ctr-gladman');
+import ModeOFB = require('crypto-js/mode-ofb');
+import ModeECB = require('crypto-js/mode-ecb');
 // ---
-import PadPkcs7 = require('../pad-pkcs7');
-import PadAnsiX923 = require('../pad-ansix923');
-import PadIso10126 = require('../pad-iso10126');
-import PadIso97971 = require('../pad-iso97971');
-import PadZeroPadding = require('../pad-zeropadding');
-import PadNoPadding = require('../pad-nopadding');
+import PadPkcs7 = require('crypto-js/pad-pkcs7');
+import PadAnsiX923 = require('crypto-js/pad-ansix923');
+import PadIso10126 = require('crypto-js/pad-iso10126');
+import PadIso97971 = require('crypto-js/pad-iso97971');
+import PadZeroPadding = require('crypto-js/pad-zeropadding');
+import PadNoPadding = require('crypto-js/pad-nopadding');
 
 // Hashers
 var wordArray: CryptoJS.WordArray;
diff --git a/types/cssbeautify/cssbeautify-tests.ts b/types/cssbeautify/cssbeautify-tests.ts
index d68c713bad..c982f5492c 100644
--- a/types/cssbeautify/cssbeautify-tests.ts
+++ b/types/cssbeautify/cssbeautify-tests.ts
@@ -1,4 +1,4 @@
-import cssbeautify = require('./index');
+import cssbeautify = require('cssbeautify');
 
 var str = '';
 
diff --git a/types/d3-cloud/d3-cloud-tests.ts b/types/d3-cloud/d3-cloud-tests.ts
index 19a140959f..fd0b4768ae 100644
--- a/types/d3-cloud/d3-cloud-tests.ts
+++ b/types/d3-cloud/d3-cloud-tests.ts
@@ -1,4 +1,4 @@
-import d3Cloud = require('./index.d');
+import d3Cloud = require('d3-cloud');
 import d3 = require('d3');
 
 // $ExpectType Cloud<Word>
diff --git a/types/eonasdan-bootstrap-datetimepicker/eonasdan-bootstrap-datetimepicker-tests.ts b/types/eonasdan-bootstrap-datetimepicker/eonasdan-bootstrap-datetimepicker-tests.ts
index da7838c9b2..f24fa80298 100644
--- a/types/eonasdan-bootstrap-datetimepicker/eonasdan-bootstrap-datetimepicker-tests.ts
+++ b/types/eonasdan-bootstrap-datetimepicker/eonasdan-bootstrap-datetimepicker-tests.ts
@@ -1,5 +1,5 @@
 import * as moment from 'moment';
-import * as EonasdanBootstrapDatetimepicker from './index';
+import * as EonasdanBootstrapDatetimepicker from 'eonasdan-bootstrap-datetimepicker';
 
 // Minimum Setup
 $("#datetimepicker1").datetimepicker();
diff --git a/types/google-protobuf/google-protobuf-tests.ts b/types/google-protobuf/google-protobuf-tests.ts
index 1f1c69cc6c..f13377393e 100644
--- a/types/google-protobuf/google-protobuf-tests.ts
+++ b/types/google-protobuf/google-protobuf-tests.ts
@@ -1,17 +1,17 @@
-import * as jspb from "./index";
+import * as jspb from "google-protobuf";
 
-import * as google_protobuf_compiler_plugin_pb from "./google/protobuf/compiler/plugin_pb";
-import * as google_protobuf_any_pb from "./google/protobuf/any_pb";
-import * as google_protobuf_api_pb from "./google/protobuf/api_pb";
-import * as google_protobuf_descriptor_pb from "./google/protobuf/descriptor_pb";
-import * as google_protobuf_duration_pb from "./google/protobuf/duration_pb";
-import * as google_protobuf_empty_pb from "./google/protobuf/empty_pb";
-import * as google_protobuf_field_mask_pb from "./google/protobuf/field_mask_pb";
-import * as google_protobuf_source_context_pb from "./google/protobuf/source_context_pb";
-import * as google_protobuf_struct_pb from "./google/protobuf/struct_pb";
-import * as google_protobuf_timestamp_pb from "./google/protobuf/timestamp_pb";
-import * as google_protobuf_type_pb from "./google/protobuf/type_pb";
-import * as google_protobuf_wrappers_pb from "./google/protobuf/wrappers_pb";
+import * as google_protobuf_compiler_plugin_pb from "google-protobuf/google/protobuf/compiler/plugin_pb";
+import * as google_protobuf_any_pb from "google-protobuf/google/protobuf/any_pb";
+import * as google_protobuf_api_pb from "google-protobuf/google/protobuf/api_pb";
+import * as google_protobuf_descriptor_pb from "google-protobuf/google/protobuf/descriptor_pb";
+import * as google_protobuf_duration_pb from "google-protobuf/google/protobuf/duration_pb";
+import * as google_protobuf_empty_pb from "google-protobuf/google/protobuf/empty_pb";
+import * as google_protobuf_field_mask_pb from "google-protobuf/google/protobuf/field_mask_pb";
+import * as google_protobuf_source_context_pb from "google-protobuf/google/protobuf/source_context_pb";
+import * as google_protobuf_struct_pb from "google-protobuf/google/protobuf/struct_pb";
+import * as google_protobuf_timestamp_pb from "google-protobuf/google/protobuf/timestamp_pb";
+import * as google_protobuf_type_pb from "google-protobuf/google/protobuf/type_pb";
+import * as google_protobuf_wrappers_pb from "google-protobuf/google/protobuf/wrappers_pb";
 
 /* This is a typescript version of a simple generated class from a proto file that is shown below. In order to make
  this ES5 JS file into TypeScript there have been quite a few modifications, but the same calls are made to the library
diff --git a/types/hapi/v16/test/connection/table.ts b/types/hapi/v16/test/connection/table.ts
index 3ead170c90..24eaa28ddc 100644
--- a/types/hapi/v16/test/connection/table.ts
+++ b/types/hapi/v16/test/connection/table.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#servertablehost
 
-import * as Hapi from '../../';
+import * as Hapi from 'hapi';
 const server = new Hapi.Server();
 server.connection({ port: 80, host: 'example.com' });
 server.route({ method: 'GET', path: '/example', handler: function (request, reply) { return reply(); } });
diff --git a/types/hapi/v16/test/path/catch-all.ts b/types/hapi/v16/test/path/catch-all.ts
index e38a67ec96..c9002392b1 100644
--- a/types/hapi/v16/test/path/catch-all.ts
+++ b/types/hapi/v16/test/path/catch-all.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#catch-all-route
 
-import * as Hapi from '../../';
+import * as Hapi from 'hapi';
 const server = new Hapi.Server();
 server.connection({ port: 80 });
 
diff --git a/types/hapi/v16/test/path/parameters.ts b/types/hapi/v16/test/path/parameters.ts
index 6bbba522db..62bbfcc638 100644
--- a/types/hapi/v16/test/path/parameters.ts
+++ b/types/hapi/v16/test/path/parameters.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#path-parameters
 
-import * as Hapi from '../../';
+import * as Hapi from 'hapi';
 const server = new Hapi.Server();
 server.connection({ port: 80 });
 
diff --git a/types/hapi/v16/test/plugins/options.ts b/types/hapi/v16/test/plugins/options.ts
index 7f6ad6c13c..cd192f1996 100644
--- a/types/hapi/v16/test/plugins/options.ts
+++ b/types/hapi/v16/test/plugins/options.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#serverinfo
 
-import * as Hapi from '../../';
+import * as Hapi from 'hapi';
 
 // added in addition to code from docs
 interface PluginOptions {
diff --git a/types/hapi/v16/test/reply/continue.ts b/types/hapi/v16/test/reply/continue.ts
index 5f23cb039a..de6994fbd0 100644
--- a/types/hapi/v16/test/reply/continue.ts
+++ b/types/hapi/v16/test/reply/continue.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#replycontinueresult
 
-import * as Hapi from '../../';
+import * as Hapi from 'hapi';
 const server = new Hapi.Server();
 server.connection({ port: 80 });
 
diff --git a/types/hapi/v16/test/reply/entity.ts b/types/hapi/v16/test/reply/entity.ts
index 5cb187fa1e..cfcce6de25 100644
--- a/types/hapi/v16/test/reply/entity.ts
+++ b/types/hapi/v16/test/reply/entity.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#replyentityoptions
 
-import * as Hapi from '../../';
+import * as Hapi from 'hapi';
 const server = new Hapi.Server();
 server.connection({ port: 80 });
 
diff --git a/types/hapi/v16/test/reply/redirect.ts b/types/hapi/v16/test/reply/redirect.ts
index 934092868b..5baf892ac1 100644
--- a/types/hapi/v16/test/reply/redirect.ts
+++ b/types/hapi/v16/test/reply/redirect.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#replyredirecturi
 
-import * as Hapi from '../../';
+import * as Hapi from 'hapi';
 const handler: Hapi.RouteHandler = function (request, reply) {
 
     return reply.redirect('http://example.com');
diff --git a/types/hapi/v16/test/reply/reply.ts b/types/hapi/v16/test/reply/reply.ts
index bf92621986..ab62c53bc6 100644
--- a/types/hapi/v16/test/reply/reply.ts
+++ b/types/hapi/v16/test/reply/reply.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#replyerr-result
 
-import * as Hapi from '../../';
+import * as Hapi from 'hapi';
 
 // verbose notation
 
diff --git a/types/hapi/v16/test/reply/state_cookie.ts b/types/hapi/v16/test/reply/state_cookie.ts
index 8a0be7da34..bf94219311 100644
--- a/types/hapi/v16/test/reply/state_cookie.ts
+++ b/types/hapi/v16/test/reply/state_cookie.ts
@@ -1,7 +1,7 @@
 
 // from https://hapijs.com/tutorials/cookies?lang=en_US
 
-import * as Hapi from '../../';
+import * as Hapi from 'hapi';
 
 const server = new Hapi.Server();
 server.connection({ port: 80 });
diff --git a/types/hapi/v16/test/request/event-types.ts b/types/hapi/v16/test/request/event-types.ts
index d9ee4dab33..0946f0a0ed 100644
--- a/types/hapi/v16/test/request/event-types.ts
+++ b/types/hapi/v16/test/request/event-types.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#requestsetmethodmethod
 
-import * as Hapi from '../../';
+import * as Hapi from 'hapi';
 const Crypto = require('crypto');
 const server = new Hapi.Server();
 server.connection({ port: 80 });
diff --git a/types/hapi/v16/test/request/generate-response.ts b/types/hapi/v16/test/request/generate-response.ts
index f731961a68..c30c3a7be5 100644
--- a/types/hapi/v16/test/request/generate-response.ts
+++ b/types/hapi/v16/test/request/generate-response.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#requestgenerateresponsesource-options
 
-import * as Hapi from '../../';
+import * as Hapi from 'hapi';
 
 // Added in addition to code from docs
 function promiseMethod() {
diff --git a/types/hapi/v16/test/request/get-log.ts b/types/hapi/v16/test/request/get-log.ts
index 996866a279..b241202525 100644
--- a/types/hapi/v16/test/request/get-log.ts
+++ b/types/hapi/v16/test/request/get-log.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#requestgetlogtags-internal
 
-import * as Hapi from '../../';
+import * as Hapi from 'hapi';
 
 declare const request: Hapi.Request;
 
diff --git a/types/hapi/v16/test/request/log.ts b/types/hapi/v16/test/request/log.ts
index f9b044eafc..1c2da1f3b0 100644
--- a/types/hapi/v16/test/request/log.ts
+++ b/types/hapi/v16/test/request/log.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#requestlogtags-data-timestamp
 
-import * as Hapi from '../../';
+import * as Hapi from 'hapi';
 const server = new Hapi.Server();
 server.connection({ port: 80, routes: { log: true, security: false } });
 
diff --git a/types/hapi/v16/test/request/query.ts b/types/hapi/v16/test/request/query.ts
index 1aa801b69d..c6507c2da0 100644
--- a/types/hapi/v16/test/request/query.ts
+++ b/types/hapi/v16/test/request/query.ts
@@ -1,6 +1,6 @@
 // Added test in addition to docs, for request.query
 
-import * as Hapi from '../../';
+import * as Hapi from 'hapi';
 
 interface GetThingQuery {
     name: string;
diff --git a/types/hapi/v16/test/request/set-method.ts b/types/hapi/v16/test/request/set-method.ts
index aa78eeaecf..7269e6255f 100644
--- a/types/hapi/v16/test/request/set-method.ts
+++ b/types/hapi/v16/test/request/set-method.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#requestsetmethodmethod
 
-import * as Hapi from '../../';
+import * as Hapi from 'hapi';
 const server = new Hapi.Server();
 server.connection({ port: 80 });
 
diff --git a/types/hapi/v16/test/request/set-url.ts b/types/hapi/v16/test/request/set-url.ts
index 1c3a0a047b..5ba1a7a9d7 100644
--- a/types/hapi/v16/test/request/set-url.ts
+++ b/types/hapi/v16/test/request/set-url.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#requestseturlurl-striptrailingslash
 
-import * as Hapi from '../../';
+import * as Hapi from 'hapi';
 const server = new Hapi.Server();
 server.connection({ port: 80 });
 
@@ -17,7 +17,7 @@ server.ext('onRequest', onRequest);
 // Example 2
 
 const Url = require('url');
-const Qs = require('../../../../qs');
+const Qs = require('hapi../../qs');
 
 onRequest = function (request, reply) {
 
diff --git a/types/hapi/v16/test/request/tail.ts b/types/hapi/v16/test/request/tail.ts
index 426c0cd835..9c68ccb8f2 100644
--- a/types/hapi/v16/test/request/tail.ts
+++ b/types/hapi/v16/test/request/tail.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#requestsetmethodmethod
 
-import * as Hapi from '../../';
+import * as Hapi from 'hapi';
 const server = new Hapi.Server();
 server.connection({ port: 80 });
 
diff --git a/types/hapi/v16/test/response/error-representation.ts b/types/hapi/v16/test/response/error-representation.ts
index 88c170eae1..27b90330dd 100644
--- a/types/hapi/v16/test/response/error-representation.ts
+++ b/types/hapi/v16/test/response/error-representation.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#error-transformation
 
-import * as Hapi from '../../';
+import * as Hapi from 'hapi';
 const server = new Hapi.Server();
 server.connection({ port: 80 });
 
diff --git a/types/hapi/v16/test/response/error.ts b/types/hapi/v16/test/response/error.ts
index f426de66e0..8b3278994c 100644
--- a/types/hapi/v16/test/response/error.ts
+++ b/types/hapi/v16/test/response/error.ts
@@ -1,8 +1,8 @@
 
 // From https://hapijs.com/api/16.1.1#error-response
 
-import * as Hapi from '../../';
-const Boom = require('../../../../boom');
+import * as Hapi from 'hapi';
+const Boom = require('hapi../../boom');
 
 const server = new Hapi.Server();
 
diff --git a/types/hapi/v16/test/response/events.ts b/types/hapi/v16/test/response/events.ts
index 07d4e0a65b..2d1658087b 100644
--- a/types/hapi/v16/test/response/events.ts
+++ b/types/hapi/v16/test/response/events.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#response-events
 
-import * as Hapi from '../../';
+import * as Hapi from 'hapi';
 const Crypto = require('crypto');
 const server = new Hapi.Server();
 server.connection({ port: 80 });
diff --git a/types/hapi/v16/test/response/flow-control.ts b/types/hapi/v16/test/response/flow-control.ts
index 321d198825..bc18a36aff 100644
--- a/types/hapi/v16/test/response/flow-control.ts
+++ b/types/hapi/v16/test/response/flow-control.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#flow-control
 
-import * as Hapi from '../../';
+import * as Hapi from 'hapi';
 
 const handler = function (request: Hapi.Request, reply: Hapi.ReplyWithContinue) {
 
diff --git a/types/hapi/v16/test/route/additional-options.ts b/types/hapi/v16/test/route/additional-options.ts
index 7ab2171776..49466873e6 100644
--- a/types/hapi/v16/test/route/additional-options.ts
+++ b/types/hapi/v16/test/route/additional-options.ts
@@ -1,6 +1,6 @@
 'use strict';
 
-import * as Hapi from '../../';
+import * as Hapi from 'hapi';
 
 var authConfig: Hapi.RouteAdditionalConfigurationOptions = {
     app: {},
diff --git a/types/hapi/v16/test/route/auth.ts b/types/hapi/v16/test/route/auth.ts
index e8d41cf47d..e5239322da 100644
--- a/types/hapi/v16/test/route/auth.ts
+++ b/types/hapi/v16/test/route/auth.ts
@@ -1,6 +1,6 @@
 'use strict';
 
-import * as Hapi from '../../';
+import * as Hapi from 'hapi';
 
 var routeMoreConfig: Hapi.RouteAdditionalConfigurationOptions = {
     auth: false,
diff --git a/types/hapi/v16/test/route/config.ts b/types/hapi/v16/test/route/config.ts
index 680ee4c043..16457395f8 100644
--- a/types/hapi/v16/test/route/config.ts
+++ b/types/hapi/v16/test/route/config.ts
@@ -1,6 +1,6 @@
 'use strict';
 
-import * as Hapi from '../../';
+import * as Hapi from 'hapi';
 
 // different methods
 var routeConfig: Hapi.RouteConfiguration = {
diff --git a/types/hapi/v16/test/route/handler.ts b/types/hapi/v16/test/route/handler.ts
index 401bf35eab..c66d17018e 100644
--- a/types/hapi/v16/test/route/handler.ts
+++ b/types/hapi/v16/test/route/handler.ts
@@ -1,6 +1,6 @@
 'use strict';
 
-import * as Hapi from '../../';
+import * as Hapi from 'hapi';
 
 var handler: Hapi.RouteHandler = function(request, reply) {
     reply('success');
diff --git a/types/hapi/v16/test/route/plugins.ts b/types/hapi/v16/test/route/plugins.ts
index ba7abdb777..2449fc84c0 100644
--- a/types/hapi/v16/test/route/plugins.ts
+++ b/types/hapi/v16/test/route/plugins.ts
@@ -1,9 +1,9 @@
 // Added in addition to code from https://hapijs.com/api/16.1.1#route-options > plugins
 
-import * as Hapi from '../../';
+import * as Hapi from 'hapi';
 
 // In the plugin code
-declare module '../../' {
+declare module 'hapi' {
     interface PluginSpecificConfiguration {
         coolPlugin: {
             optionA: string;
diff --git a/types/hapi/v16/test/route/prerequisites.ts b/types/hapi/v16/test/route/prerequisites.ts
index 15a16af2c0..c4ca7650fa 100644
--- a/types/hapi/v16/test/route/prerequisites.ts
+++ b/types/hapi/v16/test/route/prerequisites.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#route-prerequisites
 
-import * as Hapi from '../../';
+import * as Hapi from 'hapi';
 const server = new Hapi.Server();
 server.connection({ port: 80 });
 
diff --git a/types/hapi/v16/test/route/public-interface.ts b/types/hapi/v16/test/route/public-interface.ts
index dad79e7306..32d7612426 100644
--- a/types/hapi/v16/test/route/public-interface.ts
+++ b/types/hapi/v16/test/route/public-interface.ts
@@ -1,6 +1,6 @@
 'use strict';
 
-import * as Hapi from '../../';
+import * as Hapi from 'hapi';
 
 var route = {} as Hapi.RoutePublicInterface;
 
diff --git a/types/hapi/v16/test/route/validate.ts b/types/hapi/v16/test/route/validate.ts
index 42d6872570..1428477dcd 100644
--- a/types/hapi/v16/test/route/validate.ts
+++ b/types/hapi/v16/test/route/validate.ts
@@ -1,8 +1,8 @@
 
 // Added from: https://github.com/DefinitelyTyped/DefinitelyTyped/pull/16065#issuecomment-302216131
 
-import * as Hapi from '../../';
-import * as Joi from '../../../../joi';
+import * as Hapi from 'hapi';
+import * as Joi from 'hapi../../joi';
 
 const validate: Hapi.RouteValidationConfigurationObject = {
     headers: true,
diff --git a/types/hapi/v16/test/server/app.ts b/types/hapi/v16/test/server/app.ts
index 7ed57fe6e8..dac8921c20 100644
--- a/types/hapi/v16/test/server/app.ts
+++ b/types/hapi/v16/test/server/app.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#serverapp
 
-import * as Hapi from '../../';
+import * as Hapi from 'hapi';
 var server = new Hapi.Server();
 server.app.key = 'value';
 
diff --git a/types/hapi/v16/test/server/auth.ts b/types/hapi/v16/test/server/auth.ts
index c699a63c1b..7e009ce1a6 100644
--- a/types/hapi/v16/test/server/auth.ts
+++ b/types/hapi/v16/test/server/auth.ts
@@ -1,8 +1,8 @@
 
 // From https://hapijs.com/api/16.1.1#serverauthapi
 
-import * as Hapi from '../../';
-import * as Boom from '../../../../boom';
+import * as Hapi from 'hapi';
+import * as Boom from 'hapi../../boom';
 const server = new Hapi.Server();
 server.connection({ port: 80 });
 
diff --git a/types/hapi/v16/test/server/bind.ts b/types/hapi/v16/test/server/bind.ts
index c8e0ba0016..2741e16c82 100644
--- a/types/hapi/v16/test/server/bind.ts
+++ b/types/hapi/v16/test/server/bind.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#serverbindcontext
 
-import * as Hapi from '../../';
+import * as Hapi from 'hapi';
 
 interface HandlerThis {
     message: string;
diff --git a/types/hapi/v16/test/server/cache.ts b/types/hapi/v16/test/server/cache.ts
index 18d7cbbd3a..4cb9eaa4b7 100644
--- a/types/hapi/v16/test/server/cache.ts
+++ b/types/hapi/v16/test/server/cache.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#servercacheoptions
 
-import * as Hapi from '../../';
+import * as Hapi from 'hapi';
 const server = new Hapi.Server();
 server.connection({ port: 80 });
 
diff --git a/types/hapi/v16/test/server/connection-options.ts b/types/hapi/v16/test/server/connection-options.ts
index e4b5582598..3a526307db 100644
--- a/types/hapi/v16/test/server/connection-options.ts
+++ b/types/hapi/v16/test/server/connection-options.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#serverconnectionoptions
 
-import * as Hapi from '../../';
+import * as Hapi from 'hapi';
 const server = new Hapi.Server();
 
 const web = server.connection({ port: 8000, host: 'example.com', labels: ['web'] });
diff --git a/types/hapi/v16/test/server/connections.ts b/types/hapi/v16/test/server/connections.ts
index 0674c3b72f..fb2f9f303e 100644
--- a/types/hapi/v16/test/server/connections.ts
+++ b/types/hapi/v16/test/server/connections.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#serverconnections
 
-import * as Hapi from '../../';
+import * as Hapi from 'hapi';
 var server = new Hapi.Server();
 server.connection({ port: 80, labels: 'a' });
 server.connection({ port: 8080, labels: 'b' });
diff --git a/types/hapi/v16/test/server/decoder.ts b/types/hapi/v16/test/server/decoder.ts
index 7a9eadd1e6..edd52485ea 100644
--- a/types/hapi/v16/test/server/decoder.ts
+++ b/types/hapi/v16/test/server/decoder.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#serverdecoderencoding-decoder
 
-import * as Hapi from '../../';
+import * as Hapi from 'hapi';
 import * as Zlib from 'zlib';
 const server = new Hapi.Server();
 server.connection({ port: 80, routes: { payload: { compression: { special: { chunkSize: 16 * 1024 } } } } });
diff --git a/types/hapi/v16/test/server/decorate.ts b/types/hapi/v16/test/server/decorate.ts
index d946f6132e..540e29c951 100644
--- a/types/hapi/v16/test/server/decorate.ts
+++ b/types/hapi/v16/test/server/decorate.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#serverdecoratetype-property-method-options
 
-import * as Hapi from '../../';
+import * as Hapi from 'hapi';
 const server = new Hapi.Server();
 server.connection({ port: 80 });
 
@@ -12,7 +12,7 @@ const success = function (this: Hapi.ReplyNoContinue) {
 
 server.decorate('reply', 'success', success);
 
-declare module '../../' {
+declare module 'hapi' {
     interface Base_Reply {
         success: () => Response;
     }
@@ -36,7 +36,7 @@ server.decorate('request', 'some_request_method', (request) => {
     }
 }, {apply: true});
 
-declare module '../../' {
+declare module 'hapi' {
     interface Request {
         some_request_method(): void;
     }
@@ -59,7 +59,7 @@ server.decorate('server', 'some_server_method', (server: Hapi.Server) => {
     }
 });
 
-declare module '../../' {
+declare module 'hapi' {
     interface Server {
         some_server_method(arg1: number): string;
     }
diff --git a/types/hapi/v16/test/server/dependency.ts b/types/hapi/v16/test/server/dependency.ts
index 175b3242b9..1d63397cf2 100644
--- a/types/hapi/v16/test/server/dependency.ts
+++ b/types/hapi/v16/test/server/dependency.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#serverdependencydependencies-after
 
-import * as Hapi from '../../';
+import * as Hapi from 'hapi';
 
 const after: Hapi.AfterDependencyLoadCallback = function (server, next) {
 
diff --git a/types/hapi/v16/test/server/emit.ts b/types/hapi/v16/test/server/emit.ts
index 0f1f37de2d..d248f7d4ab 100644
--- a/types/hapi/v16/test/server/emit.ts
+++ b/types/hapi/v16/test/server/emit.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#serveremitcriteria-data-callback
 
-import * as Hapi from '../../';
+import * as Hapi from 'hapi';
 const server = new Hapi.Server();
 server.connection({ port: 80 });
 
diff --git a/types/hapi/v16/test/server/encoder.ts b/types/hapi/v16/test/server/encoder.ts
index cacc5f2c8b..f35102b776 100644
--- a/types/hapi/v16/test/server/encoder.ts
+++ b/types/hapi/v16/test/server/encoder.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#serverencoderencoding-encoder
 
-import * as Hapi from '../../';
+import * as Hapi from 'hapi';
 import * as Zlib from 'zlib';
 const server = new Hapi.Server();
 server.connection({ port: 80, routes: { compression: { special: { chunkSize: 16 * 1024 } } } });
diff --git a/types/hapi/v16/test/server/event.ts b/types/hapi/v16/test/server/event.ts
index cbe7128de3..f0c2215f12 100644
--- a/types/hapi/v16/test/server/event.ts
+++ b/types/hapi/v16/test/server/event.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#servereventevents
 
-import * as Hapi from '../../';
+import * as Hapi from 'hapi';
 const server = new Hapi.Server();
 server.connection({ port: 80 });
 
diff --git a/types/hapi/v16/test/server/expose.ts b/types/hapi/v16/test/server/expose.ts
index abaade677c..effbc1ae49 100644
--- a/types/hapi/v16/test/server/expose.ts
+++ b/types/hapi/v16/test/server/expose.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#serverexposekey-value
 
-import * as Hapi from '../../';
+import * as Hapi from 'hapi';
 var register: Hapi.PluginFunction<{}> = function (server, options, next) {
 
     server.expose('util', function () { console.log('something'); });
diff --git a/types/hapi/v16/test/server/ext.ts b/types/hapi/v16/test/server/ext.ts
index 318fe3fe0b..500ac1d4af 100644
--- a/types/hapi/v16/test/server/ext.ts
+++ b/types/hapi/v16/test/server/ext.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#serverextevents
 
-import * as Hapi from '../../';
+import * as Hapi from 'hapi';
 const server = new Hapi.Server();
 server.connection({ port: 80 });
 
diff --git a/types/hapi/v16/test/server/handler.ts b/types/hapi/v16/test/server/handler.ts
index 20fb003ce4..713fe7f114 100644
--- a/types/hapi/v16/test/server/handler.ts
+++ b/types/hapi/v16/test/server/handler.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#serverhandlername-method
 
-import * as Hapi from '../../';
+import * as Hapi from 'hapi';
 const server = new Hapi.Server();
 server.connection({ host: 'localhost', port: 8000 });
 
@@ -20,7 +20,7 @@ interface TestPluginConfig {
     msg: string;
 }
 
-declare module '../../' {
+declare module 'hapi' {
     interface RouteHandlerPlugins {
         test?: TestPluginConfig;
     }
diff --git a/types/hapi/v16/test/server/info.ts b/types/hapi/v16/test/server/info.ts
index aa0bc7014d..eaf1b39747 100644
--- a/types/hapi/v16/test/server/info.ts
+++ b/types/hapi/v16/test/server/info.ts
@@ -2,7 +2,7 @@
 // From https://hapijs.com/api/16.1.1#serverinfo
 
 import assert = require('assert');
-import * as Hapi from '../../';
+import * as Hapi from 'hapi';
 const server = new Hapi.Server();
 var options: Hapi.ServerConnectionOptions = { port: 80 };
 server.connection(options);
diff --git a/types/hapi/v16/test/server/initialize.ts b/types/hapi/v16/test/server/initialize.ts
index f7a1482fac..13a45636cc 100644
--- a/types/hapi/v16/test/server/initialize.ts
+++ b/types/hapi/v16/test/server/initialize.ts
@@ -1,8 +1,8 @@
 
 // From https://hapijs.com/api/16.1.1#serverinitializecallback
 
-import * as Hapi from '../../';
-const Hoek = require('../../../../hoek');
+import * as Hapi from 'hapi';
+const Hoek = require('hapi../../hoek');
 const server = new Hapi.Server();
 server.connection({ port: 80 });
 
diff --git a/types/hapi/v16/test/server/inject.ts b/types/hapi/v16/test/server/inject.ts
index a9fc0bdf5e..7010faa3dc 100644
--- a/types/hapi/v16/test/server/inject.ts
+++ b/types/hapi/v16/test/server/inject.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#serverinjectoptions-callback
 
-import * as Hapi from '../../';
+import * as Hapi from 'hapi';
 const server = new Hapi.Server();
 server.connection({ port: 80 });
 
diff --git a/types/hapi/v16/test/server/listener.ts b/types/hapi/v16/test/server/listener.ts
index 84eda35ed5..418b347f62 100644
--- a/types/hapi/v16/test/server/listener.ts
+++ b/types/hapi/v16/test/server/listener.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#serverlistener
 
-import * as Hapi from '../../';
+import * as Hapi from 'hapi';
 import SocketIO = require('socket.io');
 
 const server = new Hapi.Server();
diff --git a/types/hapi/v16/test/server/load.ts b/types/hapi/v16/test/server/load.ts
index 7ecb25fce7..ee204c864f 100644
--- a/types/hapi/v16/test/server/load.ts
+++ b/types/hapi/v16/test/server/load.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#serverload
 
-import * as Hapi from '../../';
+import * as Hapi from 'hapi';
 const server = new Hapi.Server({ load: { sampleInterval: 1000 } });
 
 var d: number = server.load.rss;
diff --git a/types/hapi/v16/test/server/log.ts b/types/hapi/v16/test/server/log.ts
index 1a89b2149b..4507358d60 100644
--- a/types/hapi/v16/test/server/log.ts
+++ b/types/hapi/v16/test/server/log.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#serverlogtags-data-timestamp
 
-import * as Hapi from '../../';
+import * as Hapi from 'hapi';
 const server = new Hapi.Server();
 server.connection({ port: 80 });
 
diff --git a/types/hapi/v16/test/server/lookup.ts b/types/hapi/v16/test/server/lookup.ts
index 2d3729b210..89ce852700 100644
--- a/types/hapi/v16/test/server/lookup.ts
+++ b/types/hapi/v16/test/server/lookup.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#serverlookupid
 
-import * as Hapi from '../../';
+import * as Hapi from 'hapi';
 const server = new Hapi.Server();
 server.connection();
 server.route({
diff --git a/types/hapi/v16/test/server/match.ts b/types/hapi/v16/test/server/match.ts
index f446dd0e7e..f322a31494 100644
--- a/types/hapi/v16/test/server/match.ts
+++ b/types/hapi/v16/test/server/match.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#servermatchmethod-path-host
 
-import * as Hapi from '../../';
+import * as Hapi from 'hapi';
 const server = new Hapi.Server();
 server.connection();
 server.route({
diff --git a/types/hapi/v16/test/server/method.ts b/types/hapi/v16/test/server/method.ts
index 9e3efbf7c7..e1cc2ce487 100644
--- a/types/hapi/v16/test/server/method.ts
+++ b/types/hapi/v16/test/server/method.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#servermethodname-method-options
 
-import * as Hapi from '../../';
+import * as Hapi from 'hapi';
 const server = new Hapi.Server();
 server.connection({ port: 80 });
 
diff --git a/types/hapi/v16/test/server/methods.ts b/types/hapi/v16/test/server/methods.ts
index 0595d522de..1e2060c3e8 100644
--- a/types/hapi/v16/test/server/methods.ts
+++ b/types/hapi/v16/test/server/methods.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#servermethods
 
-import * as Hapi from '../../';
+import * as Hapi from 'hapi';
 const server = new Hapi.Server();
 
 const add = function (a: number, b: number, next: (err: Error | null, result: number) => void) {
diff --git a/types/hapi/v16/test/server/mime.ts b/types/hapi/v16/test/server/mime.ts
index a97af5de7a..e2dd25529b 100644
--- a/types/hapi/v16/test/server/mime.ts
+++ b/types/hapi/v16/test/server/mime.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#servermime
 
-import * as Hapi from '../../';
+import * as Hapi from 'hapi';
 
 const options: Hapi.ServerOptions = {
     mime: {
diff --git a/types/hapi/v16/test/server/new.ts b/types/hapi/v16/test/server/new.ts
index 59f0a8f189..95f1ce9006 100644
--- a/types/hapi/v16/test/server/new.ts
+++ b/types/hapi/v16/test/server/new.ts
@@ -1,6 +1,6 @@
 'use strict';
 
-import * as Hapi from '../../';
+import * as Hapi from 'hapi';
 
 new Hapi.Server();
 new Hapi.Server({
@@ -45,7 +45,7 @@ new Hapi.Server({
 });
 
 //+ Code added in addition to docs
-declare module '../../' {
+declare module 'hapi' {
     interface PluginSpecificConfiguration {
         // Set this to non optional if plugin config is non optional
         'some-plugin-name'?: {options: string;};
diff --git a/types/hapi/v16/test/server/on.ts b/types/hapi/v16/test/server/on.ts
index 301cc0b423..08802fda96 100644
--- a/types/hapi/v16/test/server/on.ts
+++ b/types/hapi/v16/test/server/on.ts
@@ -2,7 +2,7 @@
 // From https://hapijs.com/api/16.1.1#serveroncriteria-listener
 // From https://hapijs.com/api/16.1.1#server-events
 
-import * as Hapi from '../../';
+import * as Hapi from 'hapi';
 
 const server = new Hapi.Server();
 server.connection({ port: 80 });
diff --git a/types/hapi/v16/test/server/once.ts b/types/hapi/v16/test/server/once.ts
index 59465a41ec..55fdb08ec2 100644
--- a/types/hapi/v16/test/server/once.ts
+++ b/types/hapi/v16/test/server/once.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#serveroncecriteria-listener
 
-import * as Hapi from '../../';
+import * as Hapi from 'hapi';
 
 const server = new Hapi.Server();
 server.connection({ port: 80 });
diff --git a/types/hapi/v16/test/server/path.ts b/types/hapi/v16/test/server/path.ts
index 09c525d5dc..2f76e42cf5 100644
--- a/types/hapi/v16/test/server/path.ts
+++ b/types/hapi/v16/test/server/path.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#serverpathrelativeto
 
-import * as Hapi from '../../';
+import * as Hapi from 'hapi';
 
 var register: Hapi.PluginFunction<{}> = function (server, options, next) {
 
diff --git a/types/hapi/v16/test/server/plugins.ts b/types/hapi/v16/test/server/plugins.ts
index 02488a1d5a..2ce13ffb2f 100644
--- a/types/hapi/v16/test/server/plugins.ts
+++ b/types/hapi/v16/test/server/plugins.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#serverplugins
 
-import * as Hapi from '../../';
+import * as Hapi from 'hapi';
 
 var registerFunction: Hapi.PluginFunction<{}> = function(server, options, next) {
 
diff --git a/types/hapi/v16/test/server/realm.ts b/types/hapi/v16/test/server/realm.ts
index 4a2eceffd0..31f764b7ef 100644
--- a/types/hapi/v16/test/server/realm.ts
+++ b/types/hapi/v16/test/server/realm.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#serverrealm
 
-import * as Hapi from '../../';
+import * as Hapi from 'hapi';
 
 var registerFunction: Hapi.PluginFunction<{}> = function(server, options, next) {
 
diff --git a/types/hapi/v16/test/server/register.ts b/types/hapi/v16/test/server/register.ts
index 1d0ab5a2e7..c04e0b16bc 100644
--- a/types/hapi/v16/test/server/register.ts
+++ b/types/hapi/v16/test/server/register.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#serverregisterplugins-options-callback
 
-import * as Hapi from '../../';
+import * as Hapi from 'hapi';
 
 const server = new Hapi.Server();
 
diff --git a/types/hapi/v16/test/server/route.ts b/types/hapi/v16/test/server/route.ts
index 0fa9fd8cc8..0402fd3e89 100644
--- a/types/hapi/v16/test/server/route.ts
+++ b/types/hapi/v16/test/server/route.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#serverrouteoptions
 
-import * as Hapi from '../../';
+import * as Hapi from 'hapi';
 const server = new Hapi.Server();
 server.connection({ port: 80 });
 
diff --git a/types/hapi/v16/test/server/select.ts b/types/hapi/v16/test/server/select.ts
index 03af599fcc..8a25f45abd 100644
--- a/types/hapi/v16/test/server/select.ts
+++ b/types/hapi/v16/test/server/select.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#serverselectlabels
 
-import * as Hapi from '../../';
+import * as Hapi from 'hapi';
 const server = new Hapi.Server();
 server.connection({ port: 80, labels: ['a', 'b'] });
 server.connection({ port: 8080, labels: ['a', 'c'] });
diff --git a/types/hapi/v16/test/server/settings.ts b/types/hapi/v16/test/server/settings.ts
index f250c8e8fd..c2ec9ce3ed 100644
--- a/types/hapi/v16/test/server/settings.ts
+++ b/types/hapi/v16/test/server/settings.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#serversettings
 
-import * as Hapi from '../../';
+import * as Hapi from 'hapi';
 const server = new Hapi.Server({
     app: {
         key: 'value'
diff --git a/types/hapi/v16/test/server/start.ts b/types/hapi/v16/test/server/start.ts
index a9408a57aa..4c1444c6ea 100644
--- a/types/hapi/v16/test/server/start.ts
+++ b/types/hapi/v16/test/server/start.ts
@@ -1,8 +1,8 @@
 
 // From https://hapijs.com/api/16.1.1#serverstartcallback
 
-import * as Hapi from '../../';
-import * as Hoek from '../../../../hoek';
+import * as Hapi from 'hapi';
+import * as Hoek from 'hapi../../hoek';
 const server = new Hapi.Server();
 server.connection({ port: 80 });
 
diff --git a/types/hapi/v16/test/server/state.ts b/types/hapi/v16/test/server/state.ts
index 19c10cfae3..2035343a17 100644
--- a/types/hapi/v16/test/server/state.ts
+++ b/types/hapi/v16/test/server/state.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#serverstatename-options
 
-import * as Hapi from '../../';
+import * as Hapi from 'hapi';
 const server = new Hapi.Server();
 server.connection({ port: 80 });
 
diff --git a/types/hapi/v16/test/server/stop.ts b/types/hapi/v16/test/server/stop.ts
index ca14a70dfa..ddfd07aa8f 100644
--- a/types/hapi/v16/test/server/stop.ts
+++ b/types/hapi/v16/test/server/stop.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#serverstopoptions-callback
 
-import * as Hapi from '../../';
+import * as Hapi from 'hapi';
 const server = new Hapi.Server();
 server.connection({ port: 80 });
 
diff --git a/types/hapi/v16/test/server/table.ts b/types/hapi/v16/test/server/table.ts
index c1410f95db..abe0707c76 100644
--- a/types/hapi/v16/test/server/table.ts
+++ b/types/hapi/v16/test/server/table.ts
@@ -1,7 +1,7 @@
 
 // From https://hapijs.com/api/16.1.1#servertablehost
 
-import * as Hapi from '../../';
+import * as Hapi from 'hapi';
 const server = new Hapi.Server();
 server.connection({ port: 80, host: 'example.com' });
 server.route({ method: 'GET', path: '/example', handler: function (request, reply) { return reply(); } });
diff --git a/types/hapi/v16/test/server/version.ts b/types/hapi/v16/test/server/version.ts
index 2ee1f57841..064e87e3cd 100644
--- a/types/hapi/v16/test/server/version.ts
+++ b/types/hapi/v16/test/server/version.ts
@@ -1,6 +1,6 @@
 
 // From http://hapijs.com/api#serversettings
 
-import * as Hapi from '../../';
+import * as Hapi from 'hapi';
 const server = new Hapi.Server();
 server.version === '8.0.0'