46 files changed, 242 insertions, 240 deletions
diff --git a/src/background/controllers/AddonEnabledController.js b/src/background/controllers/AddonEnabledController.js
new file mode 100644
index 0000000..9a3a521
--- /dev/null
+++ b/src/background/controllers/AddonEnabledController.js
@@ -0,0 +1,11 @@
+import AddonEnabledUseCase from '../usecases/AddonEnabledUseCase';
+
+export default class AddonEnabledController {
+  constructor() {
+    this.addonEnabledUseCase = new AddonEnabledUseCase();
+  }
+
+  indicate(enabled) {
+    return this.addonEnabledUseCase.indicate(enabled);
+  }
+}
diff --git a/src/background/controllers/command.js b/src/background/controllers/CommandController.js
index 9ab1054..b113709 100644
--- a/src/background/controllers/command.js
+++ b/src/background/controllers/CommandController.js
@@ -1,6 +1,6 @@
-import CompletionsInteractor from '../usecases/completions';
-import CommandInteractor from '../usecases/command';
-import Completions from '../domains/completions';
+import CompletionsUseCase from '../usecases/CompletionsUseCase';
+import CommandUseCase from '../usecases/CommandUseCase';
+import Completions from '../domains/Completions';
 
 const trimStart = (str) => {
   // NOTE String.trimStart is available on Firefox 61
@@ -9,8 +9,8 @@ const trimStart = (str) => {
 
 export default class CommandController {
   constructor() {
-    this.completionsInteractor = new CompletionsInteractor();
-    this.commandIndicator = new CommandInteractor();
+    this.completionsUseCase = new CompletionsUseCase();
+    this.commandIndicator = new CommandUseCase();
   }
 
   getCompletions(line) {
@@ -18,7 +18,7 @@ export default class CommandController {
     let words = trimmed.split(/ +/);
     let name = words[0];
     if (words.length === 1) {
-      return this.completionsInteractor.queryConsoleCommand(name);
+      return this.completionsUseCase.queryConsoleCommand(name);
     }
     let keywords = trimStart(trimmed.slice(name.length));
     switch (words[0]) {
@@ -28,22 +28,22 @@ export default class CommandController {
     case 'tabopen':
     case 'w':
     case 'winopen':
-      return this.completionsInteractor.queryOpen(name, keywords);
+      return this.completionsUseCase.queryOpen(name, keywords);
     case 'b':
     case 'buffer':
-      return this.completionsInteractor.queryBuffer(name, keywords);
+      return this.completionsUseCase.queryBuffer(name, keywords);
     case 'bd':
     case 'bdel':
     case 'bdelete':
     case 'bdeletes':
-      return this.completionsInteractor.queryBdelete(name, keywords);
+      return this.completionsUseCase.queryBdelete(name, keywords);
     case 'bd!':
     case 'bdel!':
     case 'bdelete!':
     case 'bdeletes!':
-      return this.completionsInteractor.queryBdeleteForce(name, keywords);
+      return this.completionsUseCase.queryBdeleteForce(name, keywords);
     case 'set':
-      return this.completionsInteractor.querySet(name, keywords);
+      return this.completionsUseCase.querySet(name, keywords);
     }
     return Promise.resolve(Completions.empty());
   }
diff --git a/src/background/controllers/FindController.js b/src/background/controllers/FindController.js
new file mode 100644
index 0000000..caeff98
--- /dev/null
+++ b/src/background/controllers/FindController.js
@@ -0,0 +1,15 @@
+import FindUseCase from '../usecases/FindUseCase';
+
+export default class FindController {
+  constructor() {
+    this.findUseCase = new FindUseCase();
+  }
+
+  getKeyword() {
+    return this.findUseCase.getKeyword();
+  }
+
+  setKeyword(keyword) {
+    return this.findUseCase.setKeyword(keyword);
+  }
+}
diff --git a/src/background/controllers/LinkController.js b/src/background/controllers/LinkController.js
new file mode 100644
index 0000000..7e395b1
--- /dev/null
+++ b/src/background/controllers/LinkController.js
@@ -0,0 +1,15 @@
+import LinkUseCase from '../usecases/LinkUseCase';
+
+export default class LinkController {
+  constructor() {
+    this.linkUseCase = new LinkUseCase();
+  }
+
+  openToTab(url, tabId) {
+    this.linkUseCase.openToTab(url, tabId);
+  }
+
+  openNewTab(url, openerId, background) {
+    this.linkUseCase.openNewTab(url, openerId, background);
+  }
+}
diff --git a/src/background/controllers/MarkController.js b/src/background/controllers/MarkController.js
new file mode 100644
index 0000000..0478369
--- /dev/null
+++ b/src/background/controllers/MarkController.js
@@ -0,0 +1,15 @@
+import MarkUseCase from '../usecases/MarkUseCase';
+
+export default class MarkController {
+  constructor() {
+    this.markUseCase = new MarkUseCase();
+  }
+
+  setGlobal(key, x, y) {
+    this.markUseCase.setGlobal(key, x, y);
+  }
+
+  jumpGlobal(key) {
+    this.markUseCase.jumpGlobal(key);
+  }
+}
diff --git a/src/background/controllers/OperationController.js b/src/background/controllers/OperationController.js
new file mode 100644
index 0000000..609599e
--- /dev/null
+++ b/src/background/controllers/OperationController.js
@@ -0,0 +1,69 @@
+import operations from '../../shared/operations';
+import OperationUseCase from '../usecases/OperationUseCase';
+
+export default class OperationController {
+  constructor() {
+    this.operationUseCase = new OperationUseCase();
+  }
+
+  // eslint-disable-next-line complexity, max-lines-per-function
+  exec(operation) {
+    switch (operation.type) {
+    case operations.TAB_CLOSE:
+      return this.operationUseCase.close(false);
+    case operations.TAB_CLOSE_RIGHT:
+      return this.operationUseCase.closeRight();
+    case operations.TAB_CLOSE_FORCE:
+      return this.operationUseCase.close(true);
+    case operations.TAB_REOPEN:
+      return this.operationUseCase.reopen();
+    case operations.TAB_PREV:
+      return this.operationUseCase.selectPrev(1);
+    case operations.TAB_NEXT:
+      return this.operationUseCase.selectNext(1);
+    case operations.TAB_FIRST:
+      return this.operationUseCase.selectFirst();
+    case operations.TAB_LAST:
+      return this.operationUseCase.selectLast();
+    case operations.TAB_PREV_SEL:
+      return this.operationUseCase.selectPrevSelected();
+    case operations.TAB_RELOAD:
+      return this.operationUseCase.reload(operation.cache);
+    case operations.TAB_PIN:
+      return this.operationUseCase.setPinned(true);
+    case operations.TAB_UNPIN:
+      return this.operationUseCase.setPinned(false);
+    case operations.TAB_TOGGLE_PINNED:
+      return this.operationUseCase.togglePinned();
+    case operations.TAB_DUPLICATE:
+      return this.operationUseCase.duplicate();
+    case operations.PAGE_SOURCE:
+      return this.operationUseCase.openPageSource();
+    case operations.PAGE_HOME:
+      return this.operationUseCase.openHome(operation.newTab);
+    case operations.ZOOM_IN:
+      return this.operationUseCase.zoomIn();
+    case operations.ZOOM_OUT:
+      return this.operationUseCase.zoomOut();
+    case operations.ZOOM_NEUTRAL:
+      return this.operationUseCase.zoomNutoral();
+    case operations.COMMAND_SHOW:
+      return this.operationUseCase.showCommand();
+    case operations.COMMAND_SHOW_OPEN:
+      return this.operationUseCase.showOpenCommand(operation.alter);
+    case operations.COMMAND_SHOW_TABOPEN:
+      return this.operationUseCase.showTabopenCommand(operation.alter);
+    case operations.COMMAND_SHOW_WINOPEN:
+      return this.operationUseCase.showWinopenCommand(operation.alter);
+    case operations.COMMAND_SHOW_BUFFER:
+      return this.operationUseCase.showBufferCommand();
+    case operations.COMMAND_SHOW_ADDBOOKMARK:
+      return this.operationUseCase.showAddbookmarkCommand(operation.alter);
+    case operations.FIND_START:
+      return this.operationUseCase.findStart();
+    case operations.CANCEL:
+      return this.operationUseCase.hideConsole();
+    }
+  }
+}
+
diff --git a/src/background/controllers/SettingController.js b/src/background/controllers/SettingController.js
new file mode 100644
index 0000000..e895d72
--- /dev/null
+++ b/src/background/controllers/SettingController.js
@@ -0,0 +1,18 @@
+import SettingUseCase from '../usecases/SettingUseCase';
+import ContentMessageClient from '../infrastructures/ContentMessageClient';
+
+export default class SettingController {
+  constructor() {
+    this.settingUseCase = new SettingUseCase();
+    this.contentMessageClient = new ContentMessageClient();
+  }
+
+  getSetting() {
+    return this.settingUseCase.get();
+  }
+
+  async reload() {
+    await this.settingUseCase.reload();
+    this.contentMessageClient.broadcastSettingsChanged();
+  }
+}
diff --git a/src/background/controllers/VersionController.js b/src/background/controllers/VersionController.js
new file mode 100644
index 0000000..1bcac4c
--- /dev/null
+++ b/src/background/controllers/VersionController.js
@@ -0,0 +1,11 @@
+import VersionUseCase from '../usecases/VersionUseCase';
+
+export default class VersionController {
+  constructor() {
+    this.versionUseCase = new VersionUseCase();
+  }
+
+  notifyIfUpdated() {
+    this.versionUseCase.notifyIfUpdated();
+  }
+}
diff --git a/src/background/controllers/addon-enabled.js b/src/background/controllers/addon-enabled.js
deleted file mode 100644
index 6a9b776..0000000
--- a/src/background/controllers/addon-enabled.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import AddonEnabledInteractor from '../usecases/addon-enabled';
-
-export default class AddonEnabledController {
-  constructor() {
-    this.addonEnabledInteractor = new AddonEnabledInteractor();
-  }
-
-  indicate(enabled) {
-    return this.addonEnabledInteractor.indicate(enabled);
-  }
-}
diff --git a/src/background/controllers/find.js b/src/background/controllers/find.js
deleted file mode 100644
index 7096014..0000000
--- a/src/background/controllers/find.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import FindInteractor from '../usecases/find';
-
-export default class FindController {
-  constructor() {
-    this.findInteractor = new FindInteractor();
-  }
-
-  getKeyword() {
-    return this.findInteractor.getKeyword();
-  }
-
-  setKeyword(keyword) {
-    return this.findInteractor.setKeyword(keyword);
-  }
-}
diff --git a/src/background/controllers/link.js b/src/background/controllers/link.js
deleted file mode 100644
index 7ebbb34..0000000
--- a/src/background/controllers/link.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import LinkInteractor from '../usecases/link';
-
-export default class LinkController {
-  constructor() {
-    this.linkInteractor = new LinkInteractor();
-  }
-
-  openToTab(url, tabId) {
-    this.linkInteractor.openToTab(url, tabId);
-  }
-
-  openNewTab(url, openerId, background) {
-    this.linkInteractor.openNewTab(url, openerId, background);
-  }
-}
diff --git a/src/background/controllers/mark.js b/src/background/controllers/mark.js
deleted file mode 100644
index 8d0cefd..0000000
--- a/src/background/controllers/mark.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import MarkInteractor from '../usecases/mark';
-
-export default class MarkController {
-  constructor() {
-    this.markInteractor = new MarkInteractor();
-  }
-
-  setGlobal(key, x, y) {
-    this.markInteractor.setGlobal(key, x, y);
-  }
-
-  jumpGlobal(key) {
-    this.markInteractor.jumpGlobal(key);
-  }
-}
diff --git a/src/background/controllers/operation.js b/src/background/controllers/operation.js
deleted file mode 100644
index 646f50e..0000000
--- a/src/background/controllers/operation.js
+++ /dev/null
@@ -1,69 +0,0 @@
-import operations from '../../shared/operations';
-import OperationInteractor from '../usecases/operation';
-
-export default class OperationController {
-  constructor() {
-    this.operationInteractor = new OperationInteractor();
-  }
-
-  // eslint-disable-next-line complexity, max-lines-per-function
-  exec(operation) {
-    switch (operation.type) {
-    case operations.TAB_CLOSE:
-      return this.operationInteractor.close(false);
-    case operations.TAB_CLOSE_RIGHT:
-      return this.operationInteractor.closeRight();
-    case operations.TAB_CLOSE_FORCE:
-      return this.operationInteractor.close(true);
-    case operations.TAB_REOPEN:
-      return this.operationInteractor.reopen();
-    case operations.TAB_PREV:
-      return this.operationInteractor.selectPrev(1);
-    case operations.TAB_NEXT:
-      return this.operationInteractor.selectNext(1);
-    case operations.TAB_FIRST:
-      return this.operationInteractor.selectFirst();
-    case operations.TAB_LAST:
-      return this.operationInteractor.selectLast();
-    case operations.TAB_PREV_SEL:
-      return this.operationInteractor.selectPrevSelected();
-    case operations.TAB_RELOAD:
-      return this.operationInteractor.reload(operation.cache);
-    case operations.TAB_PIN:
-      return this.operationInteractor.setPinned(true);
-    case operations.TAB_UNPIN:
-      return this.operationInteractor.setPinned(false);
-    case operations.TAB_TOGGLE_PINNED:
-      return this.operationInteractor.togglePinned();
-    case operations.TAB_DUPLICATE:
-      return this.operationInteractor.duplicate();
-    case operations.PAGE_SOURCE:
-      return this.operationInteractor.openPageSource();
-    case operations.PAGE_HOME:
-      return this.operationInteractor.openHome(operation.newTab);
-    case operations.ZOOM_IN:
-      return this.operationInteractor.zoomIn();
-    case operations.ZOOM_OUT:
-      return this.operationInteractor.zoomOut();
-    case operations.ZOOM_NEUTRAL:
-      return this.operationInteractor.zoomNutoral();
-    case operations.COMMAND_SHOW:
-      return this.operationInteractor.showCommand();
-    case operations.COMMAND_SHOW_OPEN:
-      return this.operationInteractor.showOpenCommand(operation.alter);
-    case operations.COMMAND_SHOW_TABOPEN:
-      return this.operationInteractor.showTabopenCommand(operation.alter);
-    case operations.COMMAND_SHOW_WINOPEN:
-      return this.operationInteractor.showWinopenCommand(operation.alter);
-    case operations.COMMAND_SHOW_BUFFER:
-      return this.operationInteractor.showBufferCommand();
-    case operations.COMMAND_SHOW_ADDBOOKMARK:
-      return this.operationInteractor.showAddbookmarkCommand(operation.alter);
-    case operations.FIND_START:
-      return this.operationInteractor.findStart();
-    case operations.CANCEL:
-      return this.operationInteractor.hideConsole();
-    }
-  }
-}
-
diff --git a/src/background/controllers/setting.js b/src/background/controllers/setting.js
deleted file mode 100644
index 9e6019e..0000000
--- a/src/background/controllers/setting.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import SettingInteractor from '../usecases/setting';
-import ContentMessageClient from '../infrastructures/content-message-client';
-
-export default class SettingController {
-  constructor() {
-    this.settingInteractor = new SettingInteractor();
-    this.contentMessageClient = new ContentMessageClient();
-  }
-
-  getSetting() {
-    return this.settingInteractor.get();
-  }
-
-  async reload() {
-    await this.settingInteractor.reload();
-    this.contentMessageClient.broadcastSettingsChanged();
-  }
-}
diff --git a/src/background/controllers/version.js b/src/background/controllers/version.js
deleted file mode 100644
index 04d99fe..0000000
--- a/src/background/controllers/version.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import VersionInteractor from '../usecases/version';
-
-export default class VersionController {
-  constructor() {
-    this.versionInteractor = new VersionInteractor();
-  }
-
-  notifyIfUpdated() {
-    this.versionInteractor.notifyIfUpdated();
-  }
-}
diff --git a/src/background/domains/command-docs.js b/src/background/domains/CommandDocs.js
index 734c68e..734c68e 100644
--- a/src/background/domains/command-docs.js
+++ b/src/background/domains/CommandDocs.js
diff --git a/src/background/domains/completion-group.js b/src/background/domains/CompletionGroup.js
index 1749d72..1749d72 100644
--- a/src/background/domains/completion-group.js
+++ b/src/background/domains/CompletionGroup.js
diff --git a/src/background/domains/completion-item.js b/src/background/domains/CompletionItem.js
index c7ad8a1..c7ad8a1 100644
--- a/src/background/domains/completion-item.js
+++ b/src/background/domains/CompletionItem.js
diff --git a/src/background/domains/completions.js b/src/background/domains/Completions.js
index 4e4219f..4e4219f 100644
--- a/src/background/domains/completions.js
+++ b/src/background/domains/Completions.js
diff --git a/src/background/domains/global-mark.js b/src/background/domains/GlobalMark.js
index f0586f1..f0586f1 100644
--- a/src/background/domains/global-mark.js
+++ b/src/background/domains/GlobalMark.js
diff --git a/src/background/domains/setting.js b/src/background/domains/Setting.js
index 106ec0f..106ec0f 100644
--- a/src/background/domains/setting.js
+++ b/src/background/domains/Setting.js
diff --git a/src/background/index.js b/src/background/index.js
index 30007a9..b829f99 100644
--- a/src/background/index.js
+++ b/src/background/index.js
@@ -1,6 +1,6 @@
-import ContentMessageListener from './infrastructures/content-message-listener';
-import SettingController from './controllers/setting';
-import VersionController from './controllers/version';
+import ContentMessageListener from './infrastructures/ContentMessageListener';
+import SettingController from './controllers/SettingController';
+import VersionController from './controllers/VersionController';
 
 new SettingController().reload();
 new VersionController().notifyIfUpdated();
diff --git a/src/background/presenters/console.js b/src/background/infrastructures/ConsoleClient.js
index 8259238..f691515 100644
--- a/src/background/presenters/console.js
+++ b/src/background/infrastructures/ConsoleClient.js
@@ -1,6 +1,6 @@
 import messages from '../../shared/messages';
 
-export default class ConsolePresenter {
+export default class ConsoleClient {
   showCommand(tabId, command) {
     return browser.tabs.sendMessage(tabId, {
       type: messages.CONSOLE_SHOW_COMMAND,
@@ -34,3 +34,4 @@ export default class ConsolePresenter {
     });
   }
 }
+
diff --git a/src/background/infrastructures/content-message-client.js b/src/background/infrastructures/ContentMessageClient.js
index 7e7e602..7e7e602 100644
--- a/src/background/infrastructures/content-message-client.js
+++ b/src/background/infrastructures/ContentMessageClient.js
diff --git a/src/background/infrastructures/content-message-listener.js b/src/background/infrastructures/ContentMessageListener.js
index aae07c0..1179a8c 100644
--- a/src/background/infrastructures/content-message-listener.js
+++ b/src/background/infrastructures/ContentMessageListener.js
@@ -1,11 +1,11 @@
 import messages from '../../shared/messages';
-import CommandController from '../controllers/command';
-import SettingController from '../controllers/setting';
-import FindController from '../controllers/find';
-import AddonEnabledController from '../controllers/addon-enabled';
-import LinkController from '../controllers/link';
-import OperationController from '../controllers/operation';
-import MarkController from '../controllers/mark';
+import CommandController from '../controllers/CommandController';
+import SettingController from '../controllers/SettingController';
+import FindController from '../controllers/FindController';
+import AddonEnabledController from '../controllers/AddonEnabledController';
+import LinkController from '../controllers/LinkController';
+import OperationController from '../controllers/OperationController';
+import MarkController from '../controllers/MarkController';
 
 export default class ContentMessageListener {
   constructor() {
diff --git a/src/background/infrastructures/memory-storage.js b/src/background/infrastructures/MemoryStorage.js
index 3a7e4f2..3a7e4f2 100644
--- a/src/background/infrastructures/memory-storage.js
+++ b/src/background/infrastructures/MemoryStorage.js
diff --git a/src/background/infrastructures/notifier.js b/src/background/infrastructures/Notifier.js
index 1eccc47..1eccc47 100644
--- a/src/background/infrastructures/notifier.js
+++ b/src/background/infrastructures/Notifier.js
diff --git a/src/background/presenters/indicator.js b/src/background/presenters/IndicatorPresenter.js
index 5737519..5737519 100644
--- a/src/background/presenters/indicator.js
+++ b/src/background/presenters/IndicatorPresenter.js
diff --git a/src/background/presenters/tab.js b/src/background/presenters/TabPresenter.js
index 69cae1c..744be39 100644
--- a/src/background/presenters/tab.js
+++ b/src/background/presenters/TabPresenter.js
@@ -1,4 +1,4 @@
-import MemoryStorage from '../infrastructures/memory-storage';
+import MemoryStorage from '../infrastructures/MemoryStorage';
 
 const CURRENT_SELECTED_KEY = 'tabs.current.selected';
 const LAST_SELECTED_KEY = 'tabs.last.selected';
diff --git a/src/background/presenters/window.js b/src/background/presenters/WindowPresenter.js
index a82c4a2..a82c4a2 100644
--- a/src/background/presenters/window.js
+++ b/src/background/presenters/WindowPresenter.js
diff --git a/src/background/repositories/bookmark.js b/src/background/repositories/BookmarkRepository.js
index 99f7ec4..99f7ec4 100644
--- a/src/background/repositories/bookmark.js
+++ b/src/background/repositories/BookmarkRepository.js
diff --git a/src/background/repositories/completions.js b/src/background/repositories/CompletionsRepository.js
index 1318d36..1318d36 100644
--- a/src/background/repositories/completions.js
+++ b/src/background/repositories/CompletionsRepository.js
diff --git a/src/background/repositories/find.js b/src/background/repositories/FindRepository.js
index 6656c58..74ec914 100644
--- a/src/background/repositories/find.js
+++ b/src/background/repositories/FindRepository.js
@@ -1,4 +1,4 @@
-import MemoryStorage from '../infrastructures/memory-storage';
+import MemoryStorage from '../infrastructures/MemoryStorage';
 
 const FIND_KEYWORD_KEY = 'find-keyword';
 
diff --git a/src/background/repositories/mark.js b/src/background/repositories/MarkRepository.js
index 339a660..282c712 100644
--- a/src/background/repositories/mark.js
+++ b/src/background/repositories/MarkRepository.js
@@ -1,5 +1,5 @@
-import MemoryStorage from '../infrastructures/memory-storage';
-import GlobalMark from 'background/domains/global-mark';
+import MemoryStorage from '../infrastructures/MemoryStorage';
+import GlobalMark from '../domains/GlobalMark';
 
 const MARK_KEY = 'mark';
 
diff --git a/src/background/repositories/persistent-setting.js b/src/background/repositories/PersistentSettingRepository.js
index 247ea6f..639bcd1 100644
--- a/src/background/repositories/persistent-setting.js
+++ b/src/background/repositories/PersistentSettingRepository.js
@@ -1,4 +1,4 @@
-import Setting from '../domains/setting';
+import Setting from '../domains/Setting';
 
 export default class SettingRepository {
   save(settings) {
diff --git a/src/background/repositories/setting.js b/src/background/repositories/SettingRepository.js
index 6d48525..c4667a9 100644
--- a/src/background/repositories/setting.js
+++ b/src/background/repositories/SettingRepository.js
@@ -1,4 +1,4 @@
-import MemoryStorage from '../infrastructures/memory-storage';
+import MemoryStorage from '../infrastructures/MemoryStorage';
 
 const CACHED_SETTING_KEY = 'setting';
 
diff --git a/src/background/repositories/version.js b/src/background/repositories/VersionRepository.js
index 4c71d05..4c71d05 100644
--- a/src/background/repositories/version.js
+++ b/src/background/repositories/VersionRepository.js
diff --git a/src/background/usecases/addon-enabled.js b/src/background/usecases/AddonEnabledUseCase.js
index d83192f..bb2c347 100644
--- a/src/background/usecases/addon-enabled.js
+++ b/src/background/usecases/AddonEnabledUseCase.js
@@ -1,8 +1,8 @@
-import IndicatorPresenter from '../presenters/indicator';
-import TabPresenter from '../presenters/tab';
-import ContentMessageClient from '../infrastructures/content-message-client';
+import IndicatorPresenter from '../presenters/IndicatorPresenter';
+import TabPresenter from '../presenters/TabPresenter';
+import ContentMessageClient from '../infrastructures/ContentMessageClient';
 
-export default class AddonEnabledInteractor {
+export default class AddonEnabledUseCase {
   constructor() {
     this.indicatorPresentor = new IndicatorPresenter();
 
diff --git a/src/background/usecases/command.js b/src/background/usecases/CommandUseCase.js
index 0d21041..9ec46fe 100644
--- a/src/background/usecases/command.js
+++ b/src/background/usecases/CommandUseCase.js
@@ -1,11 +1,11 @@
 import * as parsers from './parsers';
 import * as urls from '../../shared/urls';
-import TabPresenter from '../presenters/tab';
-import WindowPresenter from '../presenters/window';
-import SettingRepository from '../repositories/setting';
-import BookmarkRepository from '../repositories/bookmark';
-import ConsolePresenter from '../presenters/console';
-import ContentMessageClient from '../infrastructures/content-message-client';
+import TabPresenter from '../presenters/TabPresenter';
+import WindowPresenter from '../presenters/WindowPresenter';
+import SettingRepository from '../repositories/SettingRepository';
+import BookmarkRepository from '../repositories/BookmarkRepository';
+import ConsoleClient from '../infrastructures/ConsoleClient';
+import ContentMessageClient from '../infrastructures/ContentMessageClient';
 import * as properties from 'shared/settings/properties';
 
 export default class CommandIndicator {
@@ -14,7 +14,7 @@ export default class CommandIndicator {
     this.windowPresenter = new WindowPresenter();
     this.settingRepository = new SettingRepository();
     this.bookmarkRepository = new BookmarkRepository();
-    this.consolePresenter = new ConsolePresenter();
+    this.consoleClient = new ConsoleClient();
 
     this.contentMessageClient = new ContentMessageClient();
   }
@@ -105,7 +105,7 @@ export default class CommandIndicator {
     let tab = await this.tabPresenter.getCurrent();
     let item = await this.bookmarkRepository.create(title, tab.url);
     let message = 'Saved current page: ' + item.url;
-    return this.consolePresenter.showInfo(tab.id, message);
+    return this.consoleClient.showInfo(tab.id, message);
   }
 
   async set(keywords) {
diff --git a/src/background/usecases/completions.js b/src/background/usecases/CompletionsUseCase.js
index 21dc668..7dc30ac 100644
--- a/src/background/usecases/completions.js
+++ b/src/background/usecases/CompletionsUseCase.js
@@ -1,19 +1,19 @@
-import CompletionItem from '../domains/completion-item';
-import CompletionGroup from '../domains/completion-group';
-import Completions from '../domains/completions';
-import CommandDocs from '../domains/command-docs';
-import CompletionRepository from '../repositories/completions';
+import CompletionItem from '../domains/CompletionItem';
+import CompletionGroup from '../domains/CompletionGroup';
+import Completions from '../domains/Completions';
+import CommandDocs from '../domains/CommandDocs';
+import CompletionsRepository from '../repositories/CompletionsRepository';
 import * as filters from './filters';
-import SettingRepository from '../repositories/setting';
-import TabPresenter from '../presenters/tab';
+import SettingRepository from '../repositories/SettingRepository';
+import TabPresenter from '../presenters/TabPresenter';
 import * as properties from '../../shared/settings/properties';
 
 const COMPLETION_ITEM_LIMIT = 10;
 
-export default class CompletionsInteractor {
+export default class CompletionsUseCase {
   constructor() {
     this.tabPresenter = new TabPresenter();
-    this.completionRepository = new CompletionRepository();
+    this.completionsRepository = new CompletionsRepository();
     this.settingRepository = new SettingRepository();
   }
 
@@ -86,7 +86,7 @@ export default class CompletionsInteractor {
         tabs = [tab];
       }
     } else {
-      tabs = await this.completionRepository.queryTabs(keywords, false);
+      tabs = await this.completionsRepository.queryTabs(keywords, false);
     }
     const flag = (tab) => {
       if (tab.active) {
@@ -153,7 +153,7 @@ export default class CompletionsInteractor {
   }
 
   async queryTabs(name, excludePinned, args) {
-    let tabs = await this.completionRepository.queryTabs(args, excludePinned);
+    let tabs = await this.completionsRepository.queryTabs(args, excludePinned);
     let items = tabs.map(tab => new CompletionItem({
       caption: tab.title,
       content: name + ' ' + tab.title,
@@ -177,7 +177,7 @@ export default class CompletionsInteractor {
   }
 
   async queryHistoryItems(name, keywords) {
-    let histories = await this.completionRepository.queryHistories(keywords);
+    let histories = await this.completionsRepository.queryHistories(keywords);
     histories = [histories]
       .map(filters.filterBlankTitle)
       .map(filters.filterHttp)
@@ -194,7 +194,7 @@ export default class CompletionsInteractor {
   }
 
   async queryBookmarkItems(name, keywords) {
-    let bookmarks = await this.completionRepository.queryBookmarks(keywords);
+    let bookmarks = await this.completionsRepository.queryBookmarks(keywords);
     return bookmarks.slice(0, COMPLETION_ITEM_LIMIT)
       .map(page => new CompletionItem({
         caption: page.title,
diff --git a/src/background/usecases/find.js b/src/background/usecases/FindUseCase.js
index eae480d..d6b0323 100644
--- a/src/background/usecases/find.js
+++ b/src/background/usecases/FindUseCase.js
@@ -1,6 +1,6 @@
-import FindRepository from '../repositories/find';
+import FindRepository from '../repositories/FindRepository';
 
-export default class FindInteractor {
+export default class FindUseCase {
   constructor() {
     this.findRepository = new FindRepository();
   }
diff --git a/src/background/usecases/link.js b/src/background/usecases/LinkUseCase.js
index b8ed719..89412c5 100644
--- a/src/background/usecases/link.js
+++ b/src/background/usecases/LinkUseCase.js
@@ -1,7 +1,7 @@
-import SettingRepository from '../repositories/setting';
-import TabPresenter from '../presenters/tab';
+import SettingRepository from '../repositories/SettingRepository';
+import TabPresenter from '../presenters/TabPresenter';
 
-export default class LinkInteractor {
+export default class LinkUseCase {
   constructor() {
     this.settingRepository = new SettingRepository();
     this.tabPresenter = new TabPresenter();
diff --git a/src/background/usecases/mark.js b/src/background/usecases/MarkUseCase.js
index 34b8a74..39c796b 100644
--- a/src/background/usecases/mark.js
+++ b/src/background/usecases/MarkUseCase.js
@@ -1,14 +1,14 @@
-import GlobalMark from '../domains/global-mark';
-import TabPresenter from '../presenters/tab';
-import MarkRepository from '../repositories/mark';
-import ConsolePresenter from '../presenters/console';
-import ContentMessageClient from '../infrastructures/content-message-client';
+import GlobalMark from '../domains/GlobalMark';
+import TabPresenter from '../presenters/TabPresenter';
+import MarkRepository from '../repositories/MarkRepository';
+import ConsoleClient from '../infrastructures/ConsoleClient';
+import ContentMessageClient from '../infrastructures/ContentMessageClient';
 
-export default class MarkInteractor {
+export default class MarkUseCase {
   constructor() {
     this.tabPresenter = new TabPresenter();
     this.markRepository = new MarkRepository();
-    this.consolePresenter = new ConsolePresenter();
+    this.consoleClient = new ConsoleClient();
     this.contentMessageClient = new ContentMessageClient();
   }
 
@@ -23,7 +23,7 @@ export default class MarkInteractor {
 
     let mark = await this.markRepository.getMark(key);
     if (!mark) {
-      return this.consolePresenter.showError(current.id, 'Mark is not set');
+      return this.consoleClient.showError(current.id, 'Mark is not set');
     }
 
     return this.contentMessageClient.scrollTo(
diff --git a/src/background/usecases/operation.js b/src/background/usecases/OperationUseCase.js
index ed64032..1d75d1a 100644
--- a/src/background/usecases/operation.js
+++ b/src/background/usecases/OperationUseCase.js
@@ -1,5 +1,5 @@
-import TabPresenter from '../presenters/tab';
-import ConsolePresenter from '../presenters/console';
+import TabPresenter from '../presenters/TabPresenter';
+import ConsoleClient from '../infrastructures/ConsoleClient';
 import * as urls from '../../shared/urls';
 
 const ZOOM_SETTINGS = [
@@ -7,10 +7,10 @@ const ZOOM_SETTINGS = [
   1.10, 1.25, 1.50, 1.75, 2.00, 2.50, 3.00
 ];
 
-export default class OperationInteractor {
+export default class OperationUseCase {
   constructor() {
     this.tabPresenter = new TabPresenter();
-    this.consolePresenter = new ConsolePresenter();
+    this.consoleClient = new ConsoleClient();
   }
 
   async close(force) {
@@ -134,7 +134,7 @@ export default class OperationInteractor {
 
   async showCommand() {
     let tab = await this.tabPresenter.getCurrent();
-    return this.consolePresenter.showCommand(tab.id, '');
+    return this.consoleClient.showCommand(tab.id, '');
   }
 
   async showOpenCommand(alter) {
@@ -143,7 +143,7 @@ export default class OperationInteractor {
     if (alter) {
       command += tab.url;
     }
-    return this.consolePresenter.showCommand(tab.id, command);
+    return this.consoleClient.showCommand(tab.id, command);
   }
 
   async showTabopenCommand(alter) {
@@ -152,7 +152,7 @@ export default class OperationInteractor {
     if (alter) {
       command += tab.url;
     }
-    return this.consolePresenter.showCommand(tab.id, command);
+    return this.consoleClient.showCommand(tab.id, command);
   }
 
   async showWinopenCommand(alter) {
@@ -161,13 +161,13 @@ export default class OperationInteractor {
     if (alter) {
       command += tab.url;
     }
-    return this.consolePresenter.showCommand(tab.id, command);
+    return this.consoleClient.showCommand(tab.id, command);
   }
 
   async showBufferCommand() {
     let tab = await this.tabPresenter.getCurrent();
     let command = 'buffer ';
-    return this.consolePresenter.showCommand(tab.id, command);
+    return this.consoleClient.showCommand(tab.id, command);
   }
 
   async showAddbookmarkCommand(alter) {
@@ -176,17 +176,17 @@ export default class OperationInteractor {
     if (alter) {
       command += tab.title;
     }
-    return this.consolePresenter.showCommand(tab.id, command);
+    return this.consoleClient.showCommand(tab.id, command);
   }
 
   async findStart() {
     let tab = await this.tabPresenter.getCurrent();
-    return this.consolePresenter.showFind(tab.id);
+    return this.consoleClient.showFind(tab.id);
   }
 
   async hideConsole() {
     let tab = await this.tabPresenter.getCurrent();
-    return this.consolePresenter.hide(tab.id);
+    return this.consoleClient.hide(tab.id);
   }
 
   async openHome(newTab) {
diff --git a/src/background/usecases/setting.js b/src/background/usecases/SettingUseCase.js
index 656fc3f..fe3ca5d 100644
--- a/src/background/usecases/setting.js
+++ b/src/background/usecases/SettingUseCase.js
@@ -1,8 +1,9 @@
-import Setting from '../domains/setting';
-import PersistentSettingRepository from '../repositories/persistent-setting';
-import SettingRepository from '../repositories/setting';
+import Setting from '../domains/Setting';
+// eslint-disable-next-line max-len
+import PersistentSettingRepository from '../repositories/PersistentSettingRepository';
+import SettingRepository from '../repositories/SettingRepository';
 
-export default class SettingInteractor {
+export default class SettingUseCase {
   constructor() {
     this.persistentSettingRepository = new PersistentSettingRepository();
     this.settingRepository = new SettingRepository();
diff --git a/src/background/usecases/version.js b/src/background/usecases/VersionUseCase.js
index a71f90d..704c808 100644
--- a/src/background/usecases/version.js
+++ b/src/background/usecases/VersionUseCase.js
@@ -1,9 +1,9 @@
 import manifest from '../../../manifest.json';
-import VersionRepository from '../repositories/version';
-import TabPresenter from '../presenters/tab';
-import Notifier from '../infrastructures/notifier';
+import VersionRepository from '../repositories/VersionRepository';
+import TabPresenter from '../presenters/TabPresenter';
+import Notifier from '../infrastructures/Notifier';
 
-export default class VersionInteractor {
+export default class VersionUseCase {
   constructor() {
     this.versionRepository = new VersionRepository();
     this.tabPresenter = new TabPresenter();