diff --git a/src/cli/domain/clean.ts b/src/cli/domain/clean.ts
index 609cbfb3b..a584e2392 100644
--- a/src/cli/domain/clean.ts
+++ b/src/cli/domain/clean.ts
@@ -5,19 +5,27 @@ import path from 'path';
 
 const getComponentsByDir = makeGetComponentsByDir();
 
-export function fetchList(dirPath: string, callback: Callback<string[]>): void {
+export function fetchList(
+  dirPath: string,
+  callback: (err: Error | null, data: string[]) => void
+): void {
   return getComponentsByDir(dirPath, (err, list) => {
     if (err) return (callback as any)(err);
     if (list.length === 0) return callback(null, []);
 
     const toRemove = list.map(folder => path.join(folder, 'node_modules'));
-    const folderExists = (folder: string, cb: Callback<boolean>) =>
-      fs.exists(folder, exists => cb(null, exists));
+    const folderExists = (
+      folder: string,
+      cb: (err: Error | null, data: boolean) => void
+    ) => fs.exists(folder, exists => cb(null, exists));
 
     async.filterSeries(toRemove, folderExists, callback as any);
   });
 }
 
-export function remove(list: string[], callback: Callback<string>): void {
+export function remove(
+  list: string[],
+  callback: (err: Error | null, data: string) => void
+): void {
   return async.eachSeries(list, fs.remove, callback as any);
 }
diff --git a/src/cli/domain/get-components-by-dir.ts b/src/cli/domain/get-components-by-dir.ts
index 7abc90c90..8a4cc7baf 100644
--- a/src/cli/domain/get-components-by-dir.ts
+++ b/src/cli/domain/get-components-by-dir.ts
@@ -3,7 +3,10 @@ import path from 'path';
 import { Component } from '../../types';
 
 export default function getComponentsByDir() {
-  return (componentsDir: string, callback: Callback<string[]>): void => {
+  return (
+    componentsDir: string,
+    callback: (err: Error | null, data: string[]) => void
+  ): void => {
     const isOcComponent = function (file: string) {
       const filePath = path.resolve(componentsDir, file);
       const packagePath = path.join(filePath, 'package.json');
diff --git a/src/cli/domain/get-mocked-plugins.ts b/src/cli/domain/get-mocked-plugins.ts
index aae8dbd01..d4364c961 100644
--- a/src/cli/domain/get-mocked-plugins.ts
+++ b/src/cli/domain/get-mocked-plugins.ts
@@ -45,7 +45,7 @@ const defaultRegister = (
 };
 
 const registerStaticMocks = (
-  mocks: Dictionary<string>,
+  mocks: Record<string, string>,
   logger: Logger
 ): PluginMock[] =>
   _.map(mocks, (mockedValue, pluginName) => {
@@ -62,7 +62,7 @@ const registerStaticMocks = (
 
 const registerDynamicMocks = (
   ocJsonLocation: string,
-  mocks: Dictionary<string>,
+  mocks: Record<string, string>,
   logger: Logger
 ) =>
   _.map(mocks, (source, pluginName) => {
diff --git a/src/cli/domain/handle-dependencies/ensure-compiler-is-declared-as-devDependency.ts b/src/cli/domain/handle-dependencies/ensure-compiler-is-declared-as-devDependency.ts
index 49d511d16..06bbb34ce 100644
--- a/src/cli/domain/handle-dependencies/ensure-compiler-is-declared-as-devDependency.ts
+++ b/src/cli/domain/handle-dependencies/ensure-compiler-is-declared-as-devDependency.ts
@@ -7,7 +7,7 @@ export default function ensureCompilerIsDeclaredAsDevDependency(
     pkg: Component;
     template: string;
   },
-  cb: Callback<string, string>
+  cb: (err: string | null, data: string) => void
 ): void {
   const { componentPath, pkg, template } = options;
   const compilerDep = `${template}-compiler`;
diff --git a/src/cli/domain/handle-dependencies/get-compiler.ts b/src/cli/domain/handle-dependencies/get-compiler.ts
index 03cc434fd..120ae11dc 100644
--- a/src/cli/domain/handle-dependencies/get-compiler.ts
+++ b/src/cli/domain/handle-dependencies/get-compiler.ts
@@ -10,9 +10,9 @@ export default function getCompiler(
     compilerDep: string;
     componentPath: string;
     logger: Logger;
-    pkg: { devDependencies: Dictionary<string> };
+    pkg: { devDependencies: Record<string, string> };
   },
-  cb: Callback<Template, string | number>
+  cb: (err: string | number | null, data: Template) => void
 ): void {
   const { compilerDep, componentPath, logger, pkg } = options;
   const compilerPath = path.join(componentPath, 'node_modules', compilerDep);
diff --git a/src/cli/domain/handle-dependencies/index.ts b/src/cli/domain/handle-dependencies/index.ts
index 7d6a1cbf0..6230048fa 100644
--- a/src/cli/domain/handle-dependencies/index.ts
+++ b/src/cli/domain/handle-dependencies/index.ts
@@ -14,7 +14,7 @@ import { Component } from '../../../types';
 
 const getComponentPackageJson = (
   componentPath: string,
-  cb: Callback<Component>
+  cb: (err: Error | null, data: Component) => void
 ) => fs.readJson(path.join(componentPath, 'package.json'), cb);
 
 const union = (a: ReadonlyArray<string>, b: ReadonlyArray<string>) => [
@@ -27,25 +27,25 @@ export default function handleDependencies(
     logger: Logger;
     useComponentDependencies?: boolean;
   },
-  callback: Callback<
-    {
+  callback: (
+    err: string | null,
+    data: {
       modules: string[];
       templates: Array<(...args: unknown[]) => unknown>;
-    },
-    string
-  >
+    }
+  ) => void
 ): void {
   const { components, logger, useComponentDependencies } = options;
 
-  const dependencies: Dictionary<string> = {};
-  const addDependencies = (componentDependencies?: Dictionary<string>) =>
+  const dependencies: Record<string, string> = {};
+  const addDependencies = (componentDependencies?: Record<string, string>) =>
     Object.entries(componentDependencies || {}).forEach(
       ([dependency, version]) => {
         dependencies[dependency] = version;
       }
     );
 
-  const templates: Dictionary<(...args: unknown[]) => unknown> = {};
+  const templates: Record<string, (...args: unknown[]) => unknown> = {};
   const addTemplate = (
     templateName: string,
     template: (...args: unknown[]) => unknown
@@ -59,15 +59,19 @@ export default function handleDependencies(
   ) =>
     async.waterfall(
       [
-        (cb: Callback<Component>) => getComponentPackageJson(componentPath, cb),
+        (cb: (err: Error | null, data: Component) => void) =>
+          getComponentPackageJson(componentPath, cb),
         (
           pkg: Component,
-          cb: Callback<{
-            componentPath: string;
-            logger: Logger;
-            pkg: Component;
-            template: string;
-          }>
+          cb: (
+            err: Error | null,
+            data: {
+              componentPath: string;
+              logger: Logger;
+              pkg: Component;
+              template: string;
+            }
+          ) => void
         ) => {
           addDependencies(pkg.dependencies);
 
@@ -96,7 +100,7 @@ export default function handleDependencies(
           options: {
             componentPath: string;
             logger: Logger;
-            pkg: Component & { devDependencies: Dictionary<string> };
+            pkg: Component & { devDependencies: Record<string, string> };
             template: string;
             compilerDep: string;
           },
diff --git a/src/cli/domain/handle-dependencies/install-compiler.ts b/src/cli/domain/handle-dependencies/install-compiler.ts
index 22e989cbe..9035ee73f 100644
--- a/src/cli/domain/handle-dependencies/install-compiler.ts
+++ b/src/cli/domain/handle-dependencies/install-compiler.ts
@@ -12,7 +12,7 @@ export default function installCompiler(
     dependency: string;
     logger: Logger;
   },
-  cb: Callback<Template, string | number>
+  cb: (err: string | number | null, data: Template) => void
 ): void {
   const { compilerPath, componentPath, dependency, logger } = options;
 
diff --git a/src/cli/domain/handle-dependencies/install-missing-dependencies.ts b/src/cli/domain/handle-dependencies/install-missing-dependencies.ts
index 202977ec2..315f80aaf 100644
--- a/src/cli/domain/handle-dependencies/install-missing-dependencies.ts
+++ b/src/cli/domain/handle-dependencies/install-missing-dependencies.ts
@@ -6,7 +6,7 @@ import strings from '../../../resources/index';
 import { Logger } from '../../logger';
 
 export default function installMissingDependencies(
-  options: { dependencies: Dictionary<string>; logger: Logger },
+  options: { dependencies: Record<string, string>; logger: Logger },
   callback: (err: string | null) => void
 ): void {
   const { dependencies, logger } = options;
diff --git a/src/cli/domain/handle-dependencies/link-missing-dependencies.ts b/src/cli/domain/handle-dependencies/link-missing-dependencies.ts
index fb6bf2f81..39704ad63 100644
--- a/src/cli/domain/handle-dependencies/link-missing-dependencies.ts
+++ b/src/cli/domain/handle-dependencies/link-missing-dependencies.ts
@@ -8,7 +8,7 @@ import { Logger } from '../../logger';
 export default function linkMissingDependencies(
   options: {
     componentPath: string;
-    dependencies: Dictionary<string>;
+    dependencies: Record<string, string>;
     logger: Logger;
   },
   callback: (err: string | null) => void
diff --git a/src/cli/domain/handle-dependencies/require-template.ts b/src/cli/domain/handle-dependencies/require-template.ts
index 16d8bcb4c..ed9a9b16e 100644
--- a/src/cli/domain/handle-dependencies/require-template.ts
+++ b/src/cli/domain/handle-dependencies/require-template.ts
@@ -17,7 +17,7 @@ interface Template {
       verbose: boolean;
       production: boolean | undefined;
     },
-    cb: Callback<Component>
+    cb: (err: Error | null, data: Component) => void
   ) => void;
 }
 
diff --git a/src/cli/domain/init-template/index.ts b/src/cli/domain/init-template/index.ts
index c9e58821d..5322fda4c 100644
--- a/src/cli/domain/init-template/index.ts
+++ b/src/cli/domain/init-template/index.ts
@@ -15,7 +15,7 @@ export default function initTemplate(
     compiler: string;
     logger: Logger;
   },
-  callback: Callback<{ ok: true }, string>
+  callback: (err: string | null, data: { ok: true }) => void
 ): void {
   const { compiler, componentPath } = options;
   const compilerPath = path.join(componentPath, 'node_modules', compiler);
diff --git a/src/cli/domain/init-template/install-template.ts b/src/cli/domain/init-template/install-template.ts
index 7eaa39ea7..91471b6fa 100644
--- a/src/cli/domain/init-template/install-template.ts
+++ b/src/cli/domain/init-template/install-template.ts
@@ -14,7 +14,7 @@ interface Options {
 
 export default function installTemplate(
   options: Options,
-  callback: Callback<{ ok: true }, string>
+  callback: (err: string | null, data: { ok: true }) => void
 ): void {
   const { compiler, componentPath, logger, templateType } = options;
 
diff --git a/src/cli/domain/init-template/scaffold.ts b/src/cli/domain/init-template/scaffold.ts
index 3aa69e351..c3491dd83 100644
--- a/src/cli/domain/init-template/scaffold.ts
+++ b/src/cli/domain/init-template/scaffold.ts
@@ -13,7 +13,7 @@ interface ScaffoldOptions {
 
 export default function scaffold(
   options: ScaffoldOptions,
-  callback: Callback<{ ok: true }, string>
+  callback: (err: string | null, data: { ok: true }) => void
 ): void {
   const { compiler, compilerPath, componentName, componentPath, templateType } =
     options;
diff --git a/src/cli/domain/package-components.ts b/src/cli/domain/package-components.ts
index 93e5fee60..0a4780a52 100644
--- a/src/cli/domain/package-components.ts
+++ b/src/cli/domain/package-components.ts
@@ -14,7 +14,10 @@ interface PackageOptions {
 
 const packageComponents =
   () =>
-  (options: PackageOptions, callback: Callback<Component>): void => {
+  (
+    options: PackageOptions,
+    callback: (err: Error | null, data: Component) => void
+  ): void => {
     const production = options.production;
     const componentPath = options.componentPath;
     const minify = options.minify === true;
diff --git a/src/cli/domain/registry.ts b/src/cli/domain/registry.ts
index 968385011..367c10cf7 100644
--- a/src/cli/domain/registry.ts
+++ b/src/cli/domain/registry.ts
@@ -28,7 +28,7 @@ export default function registry(opts: RegistryOptions = {}): RegistryCli {
   };
 
   return {
-    add(registry: string, callback: Callback<null, string>) {
+    add(registry: string, callback: (err: string | null, data: null) => void) {
       if (registry.slice(registry.length - 1) !== '/') {
         registry += '/';
       }
@@ -64,7 +64,7 @@ export default function registry(opts: RegistryOptions = {}): RegistryCli {
         }
       );
     },
-    get(callback: Callback<string[], string>) {
+    get(callback: (err: string | null, data: string[]) => void) {
       if (opts.registry) {
         return callback(null, [opts.registry]);
       }
@@ -79,7 +79,7 @@ export default function registry(opts: RegistryOptions = {}): RegistryCli {
     },
     getApiComponentByHref(
       href: string,
-      callback: Callback<unknown, Error | number>
+      callback: (err: Error | number | null, data: unknown) => void
     ) {
       request(
         {
@@ -92,7 +92,7 @@ export default function registry(opts: RegistryOptions = {}): RegistryCli {
     },
     getComponentPreviewUrlByUrl(
       componentHref: string,
-      callback: Callback<string, Error | number>
+      callback: (err: Error | number | null, data: string) => void
     ) {
       request(
         {
@@ -120,7 +120,7 @@ export default function registry(opts: RegistryOptions = {}): RegistryCli {
         route: string;
         path: string;
       },
-      callback: Callback<unknown, string>
+      callback: (err: string | null, data: unknown) => void
     ) {
       if (!!options.username && !!options.password) {
         requestsHeaders = Object.assign(requestsHeaders, {
@@ -157,7 +157,7 @@ export default function registry(opts: RegistryOptions = {}): RegistryCli {
         callback(err, res);
       });
     },
-    remove(registry: string, callback: Callback) {
+    remove(registry: string, callback: (err: Error | null) => void) {
       if (registry.slice(registry.length - 1) !== '/') {
         registry += '/';
       }
diff --git a/src/cli/facade/dev.ts b/src/cli/facade/dev.ts
index b020aaa4a..4425ab9d6 100644
--- a/src/cli/facade/dev.ts
+++ b/src/cli/facade/dev.ts
@@ -32,7 +32,7 @@ const dev =
       verbose?: boolean;
       production?: boolean;
     },
-    callback: Callback<Registry, Error | string>
+    callback: (err: Error | string | null, data: Registry) => void
   ): void => {
     const componentsDir = opts.dirPath;
     const port = opts.port || 3000;
diff --git a/src/cli/facade/init.ts b/src/cli/facade/init.ts
index 6b057ec8e..c4dfd2d78 100644
--- a/src/cli/facade/init.ts
+++ b/src/cli/facade/init.ts
@@ -12,7 +12,7 @@ const init =
       componentPath: string;
       templateType: string;
     },
-    callback: Callback<string>
+    callback: (err: Error | null, data: string) => void
   ): void => {
     const templateType =
       typeof opts.templateType === 'undefined'
diff --git a/src/cli/facade/package.ts b/src/cli/facade/package.ts
index c5cdfd379..5129f1fe9 100644
--- a/src/cli/facade/package.ts
+++ b/src/cli/facade/package.ts
@@ -12,7 +12,7 @@ const cliPackage =
       useComponentDependencies?: boolean;
       compress?: boolean;
     },
-    callback: Callback<Component, string>
+    callback: (err: string | null, data: Component) => void
   ): void => {
     const componentPath = opts.componentPath;
     const useComponentDependencies = opts.useComponentDependencies;
diff --git a/src/cli/facade/preview.ts b/src/cli/facade/preview.ts
index 5a0e54bc3..f2f46ee88 100644
--- a/src/cli/facade/preview.ts
+++ b/src/cli/facade/preview.ts
@@ -8,7 +8,7 @@ const preview =
   ({ logger, registry }: { logger: Logger; registry: RegistryCli }) =>
   (
     opts: { componentHref: string },
-    callback: Callback<string, string>
+    callback: (err: string | null, data: string) => void
   ): void => {
     registry.getComponentPreviewUrlByUrl(opts.componentHref, (err, href) => {
       if (err) {
diff --git a/src/cli/facade/publish.ts b/src/cli/facade/publish.ts
index 16c19671c..12769dd6a 100644
--- a/src/cli/facade/publish.ts
+++ b/src/cli/facade/publish.ts
@@ -36,11 +36,15 @@ const publish =
 
     let errorMessage;
 
-    const readPackageJson = (cb: Callback<Component>) =>
-      fs.readJson(path.join(packageDir, 'package.json'), cb);
+    const readPackageJson = (
+      cb: (err: Error | null, data: Component) => void
+    ) => fs.readJson(path.join(packageDir, 'package.json'), cb);
 
     const getCredentials = (
-      cb: Callback<{ username: string; password: string }>
+      cb: (
+        err: Error | null,
+        data: { username: string; password: string }
+      ) => void
     ) => {
       if (opts.username && opts.password) {
         logger.ok(strings.messages.cli.USING_CREDS);
@@ -62,7 +66,9 @@ const publish =
       local.compress(packageDir, compressedPackagePath, cb);
     };
 
-    const packageAndCompress = (cb: Callback<Component, Error | string>) => {
+    const packageAndCompress = (
+      cb: (err: Error | string | null, data: Component) => void
+    ) => {
       logger.warn(strings.messages.cli.PACKAGING(packageDir));
       const packageOptions = {
         production: true,
@@ -92,7 +98,7 @@ const publish =
         username?: string;
         password?: string;
       },
-      cb: Callback<'ok', string>
+      cb: (err: string | null, data: 'ok') => void
     ) => {
       logger.warn(strings.messages.cli.PUBLISHING(options.route));
 
diff --git a/src/cli/facade/registry-add.ts b/src/cli/facade/registry-add.ts
index dae724044..942ca60d7 100644
--- a/src/cli/facade/registry-add.ts
+++ b/src/cli/facade/registry-add.ts
@@ -4,7 +4,10 @@ import { Logger } from '../logger';
 
 const registryAdd =
   ({ registry, logger }: { logger: Logger; registry: RegistryCli }) =>
-  (opts: { registryUrl: string }, callback: Callback<string, string>): void => {
+  (
+    opts: { registryUrl: string },
+    callback: (err: string | null, data: string) => void
+  ): void => {
     registry.add(opts.registryUrl, err => {
       if (err) {
         logger.err(err);
diff --git a/src/cli/facade/registry-ls.ts b/src/cli/facade/registry-ls.ts
index 82b392922..dc653f5c5 100644
--- a/src/cli/facade/registry-ls.ts
+++ b/src/cli/facade/registry-ls.ts
@@ -4,7 +4,10 @@ import { Logger } from '../logger';
 
 const registryLs =
   ({ registry, logger }: { logger: Logger; registry: RegistryCli }) =>
-  (_opts: unknown, callback: Callback<string[], string>): void => {
+  (
+    _opts: unknown,
+    callback: (err: string | null, data: string[]) => void
+  ): void => {
     registry.get((err, registries) => {
       if (err) {
         logger.err(strings.errors.generic(err));
diff --git a/src/cli/facade/registry-remove.ts b/src/cli/facade/registry-remove.ts
index f9d9e1921..8a7bb9c52 100644
--- a/src/cli/facade/registry-remove.ts
+++ b/src/cli/facade/registry-remove.ts
@@ -4,7 +4,10 @@ import { Logger } from '../logger';
 
 const registryRemove =
   ({ registry, logger }: { logger: Logger; registry: RegistryCli }) =>
-  (opts: { registryUrl: string }, callback: Callback<string>): void => {
+  (
+    opts: { registryUrl: string },
+    callback: (err: Error | null, data: string) => void
+  ): void => {
     registry.remove(opts.registryUrl, err => {
       if (err) {
         logger.err(String(err));
diff --git a/src/cli/facade/registry.ts b/src/cli/facade/registry.ts
index 250ea3a1e..95f6ad83e 100644
--- a/src/cli/facade/registry.ts
+++ b/src/cli/facade/registry.ts
@@ -1,6 +1,6 @@
 const registry =
   () =>
-  (_opts: unknown, callback: Callback<'ok'>): void => {
+  (_opts: unknown, callback: (err: Error | null, data: 'ok') => void): void => {
     callback(null, 'ok');
   };
 
diff --git a/src/cli/index.ts b/src/cli/index.ts
index 6e8f049cc..6ed0f9ce6 100644
--- a/src/cli/index.ts
+++ b/src/cli/index.ts
@@ -61,7 +61,7 @@ type Command = {
     cmd: string;
   };
   options?: any;
-  commands?: Dictionary<Command>;
+  commands?: Record<string, Command>;
 };
 
 function processCommand(
diff --git a/src/globals.d.ts b/src/globals.d.ts
index c6dcbaa5b..154f162b7 100644
--- a/src/globals.d.ts
+++ b/src/globals.d.ts
@@ -20,9 +20,10 @@ declare module 'require-package-name' {
   export = requirePackageName;
 }
 declare module 'getport' {
-  function getPort(cb: Callback): void;
-  function getPort(start: number, cb: Callback): void;
-  function getPort(start: number, end: number, cb: Callback<number>): void;
+  function getPort(
+    start: number,
+    cb: (err: unknown, data: number) => void
+  ): void;
 
   export = getPort;
 }
@@ -44,7 +45,7 @@ declare module 'minimal-request' {
       method?: string;
       body?: unknown;
       url: string;
-      headers?: Dictionary<string | null | undefined | string[]>;
+      headers?: Record<string, string | null | undefined | string[]>;
       json?: boolean;
     },
     cb: (
@@ -52,7 +53,7 @@ declare module 'minimal-request' {
       body: T,
       details: {
         response: {
-          headers: Dictionary<string>;
+          headers: Record<string, string>;
         };
       }
     ) => void
@@ -62,10 +63,3 @@ declare module 'minimal-request' {
 
   export = request;
 }
-
-declare type Callback<T = undefined, E = Error> = (
-  err: E | null,
-  data: T
-) => void;
-
-declare type Dictionary<T> = Record<string, T>;
diff --git a/src/registry/app-start.ts b/src/registry/app-start.ts
index 91f596b4d..b96931f31 100644
--- a/src/registry/app-start.ts
+++ b/src/registry/app-start.ts
@@ -18,7 +18,7 @@ const packageInfo = fs.readJsonSync(
 export default function appStart(
   repository: Repository,
   options: Config,
-  callback: Callback<ComponentsDetails | string, any>
+  callback: (err: any | null, data: ComponentsDetails | string) => void
 ): void {
   if (options.local) {
     return callback(null, 'ok');
diff --git a/src/registry/domain/authentication.ts b/src/registry/domain/authentication.ts
index bfc5548ec..4ee99864b 100644
--- a/src/registry/domain/authentication.ts
+++ b/src/registry/domain/authentication.ts
@@ -35,7 +35,7 @@ const basicAuthentication: Authentication<{
   }
 };
 
-const builtin: Dictionary<Authentication> = {
+const builtin: Record<string, Authentication> = {
   basic: basicAuthentication
 };
 
diff --git a/src/registry/domain/components-cache/components-list.ts b/src/registry/domain/components-cache/components-list.ts
index 306c7e9ae..7199a7214 100644
--- a/src/registry/domain/components-cache/components-list.ts
+++ b/src/registry/domain/components-cache/components-list.ts
@@ -8,15 +8,17 @@ export default function componentsList(conf: Config, cdn: Cdn) {
     `${conf.storage.options.componentsDir}/components.json`;
 
   const componentsList = {
-    getFromJson: (callback: Callback<any, string>) =>
+    getFromJson: (callback: (err: string | null, data: any) => void) =>
       cdn.getJson(filePath(), true, callback),
 
-    getFromDirectories: (callback: Callback<ComponentsList, string>) => {
-      const componentsInfo: Dictionary<string[]> = {};
+    getFromDirectories: (
+      callback: (err: string | null, data: ComponentsList) => void
+    ) => {
+      const componentsInfo: Record<string, string[]> = {};
 
       const getVersionsForComponent = (
         componentName: string,
-        cb: Callback<string[]>
+        cb: (err: Error | null, data: string[]) => void
       ) => {
         cdn.listSubDirectories(
           `${conf.storage.options.componentsDir}/${componentName}`,
@@ -66,7 +68,7 @@ export default function componentsList(conf: Config, cdn: Cdn) {
       );
     },
 
-    refresh(callback: Callback<ComponentsList, string>) {
+    refresh(callback: (err: string | null, data: ComponentsList) => void) {
       componentsList.getFromDirectories((err, components) => {
         if (err) {
           return callback(err, undefined as any);
@@ -80,8 +82,10 @@ export default function componentsList(conf: Config, cdn: Cdn) {
       });
     },
 
-    save: (data: ComponentsList, callback: Callback<unknown, string>) =>
-      cdn.putFileContent(JSON.stringify(data), filePath(), true, callback)
+    save: (
+      data: ComponentsList,
+      callback: (err: string | null, data: unknown) => void
+    ) => cdn.putFileContent(JSON.stringify(data), filePath(), true, callback)
   };
 
   return componentsList;
diff --git a/src/registry/domain/components-cache/index.ts b/src/registry/domain/components-cache/index.ts
index 9fb40231e..e40f739e1 100644
--- a/src/registry/domain/components-cache/index.ts
+++ b/src/registry/domain/components-cache/index.ts
@@ -41,14 +41,14 @@ export default function componentsCache(conf: Config, cdn: Cdn) {
   const returnError = (
     code: string,
     message: string,
-    callback: Callback<any, any>
+    callback: (err: any | null, data: any) => void
   ) => {
     eventsHandler.fire('error', { code, message });
     return callback(code, undefined as any);
   };
 
   return {
-    get(callback: Callback<ComponentsList>) {
+    get(callback: (err: Error | null, data: ComponentsList) => void) {
       if (!cachedComponentsList) {
         return returnError(
           'components_cache_empty',
@@ -60,7 +60,7 @@ export default function componentsCache(conf: Config, cdn: Cdn) {
       callback(null, cachedComponentsList);
     },
 
-    load(callback: Callback<ComponentsList>) {
+    load(callback: (err: Error | null, data: ComponentsList) => void) {
       componentsList.getFromJson((jsonErr, jsonComponents) => {
         componentsList.getFromDirectories((dirErr, dirComponents) => {
           if (dirErr) {
@@ -81,7 +81,7 @@ export default function componentsCache(conf: Config, cdn: Cdn) {
         });
       });
     },
-    refresh(callback: Callback<ComponentsList>) {
+    refresh(callback: (err: Error | null, data: ComponentsList) => void) {
       clearTimeout(refreshLoop);
       componentsList.refresh((err, components) => {
         if (err) {
diff --git a/src/registry/domain/components-details.ts b/src/registry/domain/components-details.ts
index 6a159d917..8f89e132a 100644
--- a/src/registry/domain/components-details.ts
+++ b/src/registry/domain/components-details.ts
@@ -26,12 +26,13 @@ export default function componentsDetails(conf: Config, cdn: Cdn) {
   const filePath = (): string =>
     `${conf.storage.options.componentsDir}/components-details.json`;
 
-  const getFromJson = (callback: Callback<ComponentsDetails, string>) =>
-    cdn.getJson<ComponentsDetails>(filePath(), true, callback);
+  const getFromJson = (
+    callback: (err: string | null, data: ComponentsDetails) => void
+  ) => cdn.getJson<ComponentsDetails>(filePath(), true, callback);
 
   const getFromDirectories = (
     options: { componentsList: ComponentsList; details: ComponentsDetails },
-    callback: Callback<ComponentsDetails, Error | undefined>
+    callback: (err: Error | undefined | null, data: ComponentsDetails) => void
   ) => {
     const details = Object.assign({}, _.cloneDeep(options.details));
     details.components = details.components || {};
@@ -72,12 +73,14 @@ export default function componentsDetails(conf: Config, cdn: Cdn) {
     );
   };
 
-  const save = (data: ComponentsDetails, callback: Callback<unknown, string>) =>
-    cdn.putFileContent(JSON.stringify(data), filePath(), true, callback);
+  const save = (
+    data: ComponentsDetails,
+    callback: (err: string | null, data: unknown) => void
+  ) => cdn.putFileContent(JSON.stringify(data), filePath(), true, callback);
 
   const refresh = (
     componentsList: ComponentsList,
-    callback: Callback<ComponentsDetails>
+    callback: (err: Error | null, data: ComponentsDetails) => void
   ) => {
     getFromJson((jsonErr, details: ComponentsDetails) => {
       getFromDirectories(
diff --git a/src/registry/domain/extract-package.ts b/src/registry/domain/extract-package.ts
index 864762be6..d4b75f1dc 100644
--- a/src/registry/domain/extract-package.ts
+++ b/src/registry/domain/extract-package.ts
@@ -10,10 +10,13 @@ export default function extractPackage(
     | {
         [fieldname: string]: Express.Multer.File[];
       },
-  callback: Callback<{
-    outputFolder: string;
-    packageJson: PackageJson;
-  }>
+  callback: (
+    err: Error | null,
+    data: {
+      outputFolder: string;
+      packageJson: PackageJson;
+    }
+  ) => void
 ): void {
   const packageFile: Express.Multer.File = (files as any)[0];
   const packagePath = path.resolve(packageFile.path);
diff --git a/src/registry/domain/get-package-json-from-temp-dir.ts b/src/registry/domain/get-package-json-from-temp-dir.ts
index 729050477..103f88fba 100644
--- a/src/registry/domain/get-package-json-from-temp-dir.ts
+++ b/src/registry/domain/get-package-json-from-temp-dir.ts
@@ -4,7 +4,7 @@ import { PackageJson } from 'type-fest';
 
 export default function getPackageJsonFromTempDir(
   tempDirPath: string,
-  callback: Callback<PackageJson>
+  callback: (err: Error | null, data: PackageJson) => void
 ): void {
   return fs.readJson(path.join(tempDirPath, 'package.json'), callback);
 }
diff --git a/src/registry/domain/nested-renderer.ts b/src/registry/domain/nested-renderer.ts
index e4bd81644..8622782ea 100644
--- a/src/registry/domain/nested-renderer.ts
+++ b/src/registry/domain/nested-renderer.ts
@@ -5,12 +5,12 @@ import settings from '../../resources/settings';
 import strings from '../../resources';
 import { Config } from '../../types';
 
-type Cb = Callback<string, string>;
+type Cb = (err: string | null, data: string) => void;
 type Options = {
   version?: string;
   name?: string;
-  headers?: Dictionary<string>;
-  parameters?: Dictionary<string>;
+  headers?: Record<string, string>;
+  parameters?: Record<string, string>;
 };
 type Params = {
   components: Options[];
diff --git a/src/registry/domain/plugins-initialiser.ts b/src/registry/domain/plugins-initialiser.ts
index 0b8f5160e..065395842 100644
--- a/src/registry/domain/plugins-initialiser.ts
+++ b/src/registry/domain/plugins-initialiser.ts
@@ -55,9 +55,12 @@ const defer = function (plugin: Plugin, cb: (err?: Error) => void) {
 
 export function init(
   pluginsToRegister: unknown[],
-  callback: Callback<Dictionary<(...args: unknown[]) => void>, unknown>
+  callback: (
+    err: unknown,
+    data: Record<string, (...args: unknown[]) => void>
+  ) => void
 ): void {
-  const registered: Dictionary<(...args: unknown[]) => void> = {};
+  const registered: Record<string, (...args: unknown[]) => void> = {};
 
   try {
     validatePlugins(pluginsToRegister);
diff --git a/src/registry/domain/register-templates.ts b/src/registry/domain/register-templates.ts
index 820ca36fc..524c16c6b 100644
--- a/src/registry/domain/register-templates.ts
+++ b/src/registry/domain/register-templates.ts
@@ -5,7 +5,7 @@ import { Template, TemplateInfo } from '../../types';
 import _ from 'lodash';
 
 export default function registerTemplates(extraTemplates: Template[]): {
-  templatesHash: Dictionary<Template>;
+  templatesHash: Record<string, Template>;
   templatesInfo: TemplateInfo[];
 } {
   const coreTemplates: Template[] = [
@@ -18,7 +18,7 @@ export default function registerTemplates(extraTemplates: Template[]): {
     const type = template.getInfo().type;
     hash[type] = template;
     return hash;
-  }, {} as Dictionary<Template>);
+  }, {} as Record<string, Template>);
 
   const templatesInfo = templates.map(template => {
     return template.getInfo();
diff --git a/src/registry/domain/repository.ts b/src/registry/domain/repository.ts
index 1ecbcb65a..d529c013e 100644
--- a/src/registry/domain/repository.ts
+++ b/src/registry/domain/repository.ts
@@ -74,7 +74,7 @@ export default function repository(conf: Config): Repository {
     },
     getComponentVersions(
       componentName: string,
-      callback: Callback<string[], string>
+      callback: (err: string | null, data: string[]) => void
     ) {
       if (componentName === 'oc-client') {
         return callback(null, [
@@ -116,7 +116,7 @@ export default function repository(conf: Config): Repository {
     getCompiledView(
       componentName: string,
       componentVersion: string,
-      callback: Callback<string>
+      callback: (err: Error | null, data: string) => void
     ) {
       if (conf.local) {
         return callback(null, local.getCompiledView(componentName));
@@ -129,14 +129,16 @@ export default function repository(conf: Config): Repository {
     },
     getComponent(
       componentName: string,
-      componentVersionOrCallback: string | Callback<Component, string>,
-      callbackMaybe?: Callback<Component, string>
+      componentVersionOrCallback:
+        | string
+        | ((err: string | null, data: Component) => void),
+      callbackMaybe?: (err: string | null, data: Component) => void
     ) {
       const componentVersion: string | undefined =
         typeof componentVersionOrCallback === 'function'
           ? undefined
           : (componentVersionOrCallback as any);
-      const callback: Callback<Component, string> =
+      const callback: (err: string | null, data: Component) => void =
         typeof componentVersionOrCallback === 'function'
           ? (componentVersionOrCallback as any)
           : callbackMaybe!;
@@ -190,7 +192,7 @@ export default function repository(conf: Config): Repository {
     getComponentInfo(
       componentName: string,
       componentVersion: string,
-      callback: Callback<Component, string>
+      callback: (err: string | null, data: Component) => void
     ) {
       if (conf.local) {
         let componentInfo;
@@ -226,7 +228,7 @@ export default function repository(conf: Config): Repository {
         : `${options!['path']}${options!.componentsDir}/`;
       return `${prefix}${componentName}/${componentVersion}/`;
     },
-    getComponents(callback: Callback<string[]>) {
+    getComponents(callback: (err: Error | null, data: string[]) => void) {
       if (conf.local) {
         return callback(null, local.getComponents());
       }
@@ -235,7 +237,9 @@ export default function repository(conf: Config): Repository {
         callback(err, res ? Object.keys(res.components) : (null as any))
       );
     },
-    getComponentsDetails(callback: Callback<ComponentsDetails, string>) {
+    getComponentsDetails(
+      callback: (err: string | null, data: ComponentsDetails) => void
+    ) {
       if (conf.local) {
         return (callback as any)();
       }
@@ -244,7 +248,7 @@ export default function repository(conf: Config): Repository {
     },
     getComponentVersions(
       componentName: string,
-      callback: Callback<string[], string>
+      callback: (err: string | null, data: string[]) => void
     ) {
       if (conf.local) {
         return local.getComponentVersions(componentName, callback);
@@ -262,10 +266,13 @@ export default function repository(conf: Config): Repository {
     getDataProvider(
       componentName: string,
       componentVersion: string,
-      callback: Callback<{
-        content: string;
-        filePath: string;
-      }>
+      callback: (
+        err: Error | null,
+        data: {
+          content: string;
+          filePath: string;
+        }
+      ) => void
     ) {
       if (conf.local) {
         return callback(null, local.getDataProvider(componentName));
@@ -307,7 +314,7 @@ export default function repository(conf: Config): Repository {
     getTemplatesInfo: () => templatesInfo,
     getTemplate: (type: string) => templatesHash[type],
 
-    init(callback: Callback<ComponentsList | string>) {
+    init(callback: (err: Error | null, data: ComponentsList | string) => void) {
       if (conf.local) {
         return callback(null, 'ok');
       }
@@ -325,7 +332,10 @@ export default function repository(conf: Config): Repository {
       pkgDetails: any,
       componentName: string,
       componentVersion: string,
-      callback: Callback<ComponentsDetails, { code: string; msg: string }>
+      callback: (
+        err: { code: string; msg: string } | null,
+        data: ComponentsDetails
+      ) => void
     ) {
       if (conf.local) {
         return callback(
diff --git a/src/registry/domain/sanitiser.ts b/src/registry/domain/sanitiser.ts
index 50e364215..881c30b9c 100644
--- a/src/registry/domain/sanitiser.ts
+++ b/src/registry/domain/sanitiser.ts
@@ -34,10 +34,10 @@ const sanitise = {
 const toRemove = ['__ocAcceptLanguage'];
 
 export function sanitiseComponentParameters(
-  requestParameters: Dictionary<string | number | boolean>,
-  expectedParameters: Dictionary<OcParameter>
-): Dictionary<string | number | boolean> {
-  const result: Dictionary<string | number | boolean> = {};
+  requestParameters: Record<string, string | number | boolean>,
+  expectedParameters: Record<string, OcParameter>
+): Record<string, string | number | boolean> {
+  const result: Record<string, string | number | boolean> = {};
 
   for (const [requestParameterName, requestParameter] of Object.entries(
     requestParameters
diff --git a/src/registry/domain/url-builder.ts b/src/registry/domain/url-builder.ts
index 7343f0d21..35281cf68 100644
--- a/src/registry/domain/url-builder.ts
+++ b/src/registry/domain/url-builder.ts
@@ -4,7 +4,7 @@ import url from 'url';
 type Component = {
   name: string;
   version?: string;
-  parameters?: Dictionary<string>;
+  parameters?: Record<string, string>;
 };
 
 function componentForType(
@@ -61,7 +61,7 @@ export function componentPreview(
 
   return href;
 }
-export function queryString(parameters: Dictionary<string> = {}): string {
+export function queryString(parameters: Record<string, string> = {}): string {
   let qs = '';
 
   if (Object.keys(parameters).length > 0) {
diff --git a/src/registry/domain/validators/component-parameters.ts b/src/registry/domain/validators/component-parameters.ts
index 3073b6fde..5d93fb013 100644
--- a/src/registry/domain/validators/component-parameters.ts
+++ b/src/registry/domain/validators/component-parameters.ts
@@ -21,15 +21,15 @@ const validateParameter = function (
 interface ValidationResult {
   isValid: boolean;
   errors: {
-    mandatory?: Dictionary<string>;
-    types?: Dictionary<string>;
+    mandatory?: Record<string, string>;
+    types?: Record<string, string>;
     message?: string;
   };
 }
 
 export default function componentParameters(
-  requestParameters: Dictionary<string | number | boolean>,
-  expectedParameters: Dictionary<OcParameter> = {}
+  requestParameters: Record<string, string | number | boolean>,
+  expectedParameters: Record<string, OcParameter> = {}
 ): ValidationResult {
   const result: ValidationResult = { isValid: true, errors: {} };
   const mandatoryParameters: string[] = [];
diff --git a/src/registry/index.ts b/src/registry/index.ts
index 0ab4966d4..287baa6c0 100644
--- a/src/registry/index.ts
+++ b/src/registry/index.ts
@@ -46,7 +46,10 @@ export default function registry(inputOptions: Input) {
   };
 
   const start = (
-    callback: Callback<{ app: express.Express; server: http.Server }>
+    callback: (
+      err: Error | null,
+      data: { app: express.Express; server: http.Server }
+    ) => void
   ) => {
     // eslint-disable-next-line no-console
     const ok = (msg: string) => console.log(colors.green(msg));
@@ -56,12 +59,16 @@ export default function registry(inputOptions: Input) {
     router.create(app, options, repository);
     async.waterfall(
       [
-        (cb: Callback<Dictionary<(...args: unknown[]) => unknown>, unknown>) =>
-          pluginsInitialiser.init(plugins, cb),
+        (
+          cb: (
+            err: unknown,
+            data: Record<string, (...args: unknown[]) => unknown>
+          ) => void
+        ) => pluginsInitialiser.init(plugins, cb),
 
         (
-          plugins: Dictionary<(...args: unknown[]) => void>,
-          cb: Callback<ComponentsList | string>
+          plugins: Record<string, (...args: unknown[]) => void>,
+          cb: (err: Error | null, data: ComponentsList | string) => void
         ) => {
           options.plugins = plugins;
           repository.init(cb);
@@ -69,7 +76,7 @@ export default function registry(inputOptions: Input) {
 
         (
           componentsInfo: ComponentsList,
-          cb: Callback<ComponentsList, string>
+          cb: (err: string | null, data: ComponentsList) => void
         ) => {
           appStart(repository, options, (err: any) =>
             cb(err ? err.msg : null, componentsInfo)
diff --git a/src/registry/routes/components.ts b/src/registry/routes/components.ts
index 4c986a391..fcbadfa6b 100644
--- a/src/registry/routes/components.ts
+++ b/src/registry/routes/components.ts
@@ -11,7 +11,7 @@ import { Request, RequestHandler, Response } from 'express';
 type Component = {
   name: string;
   version: string;
-  parameters: Dictionary<string>;
+  parameters: Record<string, string>;
 };
 
 export default function components(
diff --git a/src/registry/routes/helpers/apply-default-values.ts b/src/registry/routes/helpers/apply-default-values.ts
index 842a89a53..6af51fffb 100644
--- a/src/registry/routes/helpers/apply-default-values.ts
+++ b/src/registry/routes/helpers/apply-default-values.ts
@@ -6,9 +6,9 @@ interface OptionalParameterWithDefault extends OcParameter {
 }
 
 export default function applyDefaultValues(
-  requestParameters: Dictionary<string | number | boolean> = {},
-  expectedParameters: Dictionary<OcParameter> = {}
-): Dictionary<string | number | boolean> {
+  requestParameters: Record<string, string | number | boolean> = {},
+  expectedParameters: Record<string, OcParameter> = {}
+): Record<string, string | number | boolean> {
   const optionalParametersWithDefaults = Object.entries(
     expectedParameters
   ).filter(
diff --git a/src/registry/routes/helpers/get-component-fallback.ts b/src/registry/routes/helpers/get-component-fallback.ts
index 36f8d5da8..4cd95ce8e 100644
--- a/src/registry/routes/helpers/get-component-fallback.ts
+++ b/src/registry/routes/helpers/get-component-fallback.ts
@@ -5,17 +5,17 @@ import url from 'url';
 import { Component, Config } from '../../../types';
 import * as urlBuilder from '../../domain/url-builder';
 
-type ComponentCallback = Callback<
-  Component,
-  { registryError: any; fallbackError: any }
->;
+type ComponentCallback = (
+  err: { registryError: any; fallbackError: any } | null,
+  data: Component
+) => void;
 
 function getComponentFallbackForViewType(
   buildUrl: (
     component: {
       name: string;
       version?: string;
-      parameters?: Dictionary<string>;
+      parameters?: Record<string, string>;
     },
     baseUrl: string
   ) => string,
diff --git a/src/registry/routes/helpers/get-component.ts b/src/registry/routes/helpers/get-component.ts
index 1b8648357..5f0cbecbe 100644
--- a/src/registry/routes/helpers/get-component.ts
+++ b/src/registry/routes/helpers/get-component.ts
@@ -26,14 +26,14 @@ interface Options {
   headers: IncomingHttpHeaders;
   ip: string;
   name: string;
-  parameters: Dictionary<string>;
+  parameters: Record<string, string>;
   version: string;
   omitHref?: boolean;
 }
 
 export type GetComponentResult = {
   status: number;
-  headers?: Dictionary<string>;
+  headers?: Record<string, string>;
   response: {
     type?: string;
     code?: string;
@@ -64,7 +64,7 @@ export default function getComponent(conf: Config, repository: Repository) {
   ) {
     const nestedRenderer = NestedRenderer(renderer, options.conf);
     const retrievingInfo = GetComponentRetrievingInfo(options);
-    let responseHeaders: Dictionary<string> = {};
+    let responseHeaders: Record<string, string> = {};
 
     const getLanguage = () => {
       const paramOverride =
@@ -197,7 +197,7 @@ export default function getComponent(conf: Config, repository: Repository) {
         }
 
         const filterCustomHeaders = (
-          headers: Dictionary<string>,
+          headers: Record<string, string>,
           requestedVersion: string,
           actualVersion: string
         ) => {
@@ -483,7 +483,10 @@ export default function getComponent(conf: Config, repository: Repository) {
                 const context = {
                   require: RequireWrapper(conf.dependencies),
                   module: {
-                    exports: {} as Dictionary<(...args: unknown[]) => unknown>
+                    exports: {} as Record<
+                      string,
+                      (...args: unknown[]) => unknown
+                    >
                   },
                   console: conf.local ? console : { log: _.noop },
                   setTimeout,
diff --git a/src/registry/routes/helpers/is-url-discoverable.ts b/src/registry/routes/helpers/is-url-discoverable.ts
index ab689c808..0f437adeb 100644
--- a/src/registry/routes/helpers/is-url-discoverable.ts
+++ b/src/registry/routes/helpers/is-url-discoverable.ts
@@ -2,7 +2,7 @@ import request from 'minimal-request';
 
 export default function isUrlDiscoverable(
   url: string,
-  callback: Callback<{ isDiscoverable: boolean }, null>
+  callback: (err: null | null, data: { isDiscoverable: boolean }) => void
 ): void {
   request(
     {
diff --git a/src/types.ts b/src/types.ts
index 00417992f..e9c800031 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -40,7 +40,7 @@ export interface ComponentsDetails {
 }
 
 export interface ComponentsList {
-  components: Dictionary<string[]>;
+  components: Record<string, string[]>;
   lastEdit: number;
 }
 
@@ -121,7 +121,7 @@ export interface Config {
   dependencies: string[];
   discovery: boolean;
   discoveryFunc?: (opts: { host?: string; secure: boolean }) => boolean;
-  env: Dictionary<string>;
+  env: Record<string, string>;
   executionTimeout?: number;
   fallbackRegistryUrl: string;
   hotReloading: boolean;
@@ -160,7 +160,7 @@ export interface Config {
   };
   storage: {
     adapter: any;
-    options: Dictionary<any> & { componentsDir: string };
+    options: Record<string, any> & { componentsDir: string };
   };
   tempDir: string;
   templates: any[];
@@ -170,20 +170,31 @@ export interface Config {
 
 export interface Cdn {
   adapterType: string;
-  getFile: (filePath: string, cb: Callback<string>) => void;
-  getJson<T>(filePath: string, force: boolean, cb: Callback<T, string>): void;
-  getJson<T>(filePath: string, cb: Callback<T, string>): void;
+  getFile: (
+    filePath: string,
+    cb: (err: Error | null, data: string) => void
+  ) => void;
+  getJson<T>(
+    filePath: string,
+    force: boolean,
+    cb: (err: string | null, data: T) => void
+  ): void;
+  getJson<T>(filePath: string, cb: (err: string | null, data: T) => void): void;
   listSubDirectories: (
     dir: string,
-    cb: Callback<string[], Error & { code?: string }>
+    cb: (err: (Error & { code?: string }) | null, data: string[]) => void
   ) => void;
   maxConcurrentRequests: number;
-  putDir: (folderPath: string, filePath: string, cb: Callback) => void;
+  putDir: (
+    folderPath: string,
+    filePath: string,
+    cb: (err: Error | null) => void
+  ) => void;
   putFileContent: (
     data: unknown,
     path: string,
     isPrivate: boolean,
-    callback: Callback<unknown, string>
+    callback: (err: string | null, data: unknown) => void
   ) => void;
 }
 
@@ -203,7 +214,7 @@ interface CompilerOptions {
 }
 
 export interface Template {
-  compile?: (options: CompilerOptions, cb: Callback) => void;
+  compile?: (options: CompilerOptions, cb: (err: Error | null) => void) => void;
   getCompiledTemplate: (
     templateString: string,
     key: string,
@@ -212,7 +223,7 @@ export interface Template {
   getInfo: () => TemplateInfo;
   render: (
     options: { model: unknown; template: CompiledTemplate },
-    cb: Callback<string>
+    cb: (err: Error | null, data: string) => void
   ) => void;
 }
 
@@ -233,15 +244,18 @@ export interface Plugin {
 }
 
 export interface RegistryCli {
-  add(registry: string, callback: Callback<null, string>): void;
-  get(callback: Callback<string[], string>): void;
+  add(
+    registry: string,
+    callback: (err: string | null, data: null) => void
+  ): void;
+  get(callback: (err: string | null, data: string[]) => void): void;
   getApiComponentByHref(
     href: string,
-    callback: Callback<unknown, Error | number>
+    callback: (err: Error | number | null, data: unknown) => void
   ): void;
   getComponentPreviewUrlByUrl(
     componentHref: string,
-    callback: Callback<string, Error | number>
+    callback: (err: Error | number | null, data: string) => void
   ): void;
   putComponent(
     options: {
@@ -250,15 +264,21 @@ export interface RegistryCli {
       route: string;
       path: string;
     },
-    callback: Callback<unknown, string>
+    callback: (err: string | null, data: unknown) => void
   ): void;
-  remove(registry: string, callback: Callback): void;
+  remove(registry: string, callback: (err: Error | null) => void): void;
 }
 
 export interface Local {
   clean: {
-    fetchList: (dirPath: string, callback: Callback<string[]>) => void;
-    remove: (list: string[], callback: Callback<string>) => void;
+    fetchList: (
+      dirPath: string,
+      callback: (err: Error | null, data: string[]) => void
+    ) => void;
+    remove: (
+      list: string[],
+      callback: (err: Error | null, data: string) => void
+    ) => void;
   };
   cleanup: (
     compressedPackagePath: string,
@@ -271,7 +291,7 @@ export interface Local {
   ) => void;
   getComponentsByDir: (
     componentsDir: string,
-    callback: Callback<string[]>
+    callback: (err: Error | null, data: string[]) => void
   ) => void;
   init: (
     options: {
@@ -280,7 +300,7 @@ export interface Local {
       componentPath: string;
       templateType: string;
     },
-    callback: Callback<string, string>
+    callback: (err: string | null, data: string) => void
   ) => void;
   mock: (
     params: { targetType: string; targetValue: string; targetName: string },
@@ -293,7 +313,7 @@ export interface Local {
       verbose?: boolean;
       production?: boolean;
     },
-    callback: Callback<Component>
+    callback: (err: Error | null, data: Component) => void
   ) => void;
 }
 
@@ -301,36 +321,41 @@ export interface Repository {
   getCompiledView(
     componentName: string,
     componentVersion: string,
-    callback: Callback<string>
+    callback: (err: Error | null, data: string) => void
   ): void;
   getComponent(
     componentName: string,
     componentVersion: string,
-    calllback: Callback<Component, string>
+    calllback: (err: string | null, data: Component) => void
   ): void;
   getComponent(
     componentName: string,
-    calllback: Callback<Component, string>
+    calllback: (err: string | null, data: Component) => void
   ): void;
   getComponentInfo(
     componentName: string,
     componentVersion: string,
-    callback: Callback<Component, string>
+    callback: (err: string | null, data: Component) => void
   ): void;
   getComponentPath(componentName: string, componentVersion: string): void;
-  getComponents(callback: Callback<string[]>): void;
-  getComponentsDetails(callback: Callback<ComponentsDetails, string>): void;
+  getComponents(callback: (err: Error | null, data: string[]) => void): void;
+  getComponentsDetails(
+    callback: (err: string | null, data: ComponentsDetails) => void
+  ): void;
   getComponentVersions(
     componentName: string,
-    callback: Callback<string[], string>
+    callback: (err: string | null, data: string[]) => void
   ): void;
   getDataProvider(
     componentName: string,
     componentVersion: string,
-    callback: Callback<{
-      content: string;
-      filePath: string;
-    }>
+    callback: (
+      err: Error | null,
+      data: {
+        content: string;
+        filePath: string;
+      }
+    ) => void
   ): void;
   getStaticClientMapPath: () => string;
   getStaticClientPath: () => string;
@@ -341,12 +366,17 @@ export interface Repository {
   ) => string;
   getTemplate: (type: string) => Template;
   getTemplatesInfo: () => TemplateInfo[];
-  init(callback: Callback<ComponentsList | string>): void;
+  init(
+    callback: (err: Error | null, data: ComponentsList | string) => void
+  ): void;
   publishComponent(
     pkgDetails: any,
     componentName: string,
     componentVersion: string,
-    callback: Callback<ComponentsDetails, { code: string; msg: string }>
+    callback: (
+      err: { code: string; msg: string } | null,
+      data: ComponentsDetails
+    ) => void
   ): void;
 }
 
diff --git a/src/utils/npm-utils.ts b/src/utils/npm-utils.ts
index 485b920db..b62d1520e 100644
--- a/src/utils/npm-utils.ts
+++ b/src/utils/npm-utils.ts
@@ -65,7 +65,7 @@ export const installDependencies = (
     silent: boolean;
     usePrefix: boolean;
   },
-  callback: Callback<{ dest: string }, string | number>
+  callback: (err: string | number | null, data: { dest: string }) => void
 ): void => {
   const { dependencies, installPath, silent } = options;
   const npmi = buildInstallCommand(options);
@@ -91,7 +91,7 @@ export const installDependency = (
     silent?: boolean;
     usePrefix: boolean;
   },
-  callback: Callback<{ dest: string }, string | number>
+  callback: (err: string | number | null, data: { dest: string }) => void
 ): void => {
   const { dependency, installPath, silent } = options;
   const npmi = buildInstallCommand(options);
diff --git a/src/utils/put.ts b/src/utils/put.ts
index dad591030..838b3eaec 100644
--- a/src/utils/put.ts
+++ b/src/utils/put.ts
@@ -6,8 +6,10 @@ import url from 'url';
 export default function put(
   urlPath: string,
   files: string | string[],
-  headers: Record<string, string> | Callback<any, Error | string>,
-  callback: Callback<any, Error | string>
+  headers:
+    | Record<string, string>
+    | ((err: Error | string | null, data: any) => void),
+  callback: (err: Error | string | null, data: any) => void
 ): void {
   if (typeof headers === 'function') {
     callback = headers;