diff --git a/app/views/editor/level/component/new.coffee b/app/views/editor/level/component/new.coffee
index a1f2985ce..314cf2c86 100644
--- a/app/views/editor/level/component/new.coffee
+++ b/app/views/editor/level/component/new.coffee
@@ -1,10 +1,10 @@
-View = require 'views/kinds/ModalView'
+ModalView = require 'views/kinds/ModalView'
 template = require 'templates/editor/level/component/new'
 LevelComponent = require 'models/LevelComponent'
 forms = require 'lib/forms'
 {me} = require 'lib/auth'
 
-module.exports = class LevelComponentNewView extends View
+module.exports = class LevelComponentNewView extends ModalView
   id: 'editor-level-component-new-modal'
   template: template
   instant: false
diff --git a/app/views/editor/level/fork_view.coffee b/app/views/editor/level/fork_view.coffee
index 522a21b1c..2b3f7cfea 100644
--- a/app/views/editor/level/fork_view.coffee
+++ b/app/views/editor/level/fork_view.coffee
@@ -1,9 +1,9 @@
-View = require 'views/kinds/ModalView'
+ModalView = require 'views/kinds/ModalView'
 template = require 'templates/editor/level/fork'
 forms = require 'lib/forms'
 Level = require 'models/Level'
 
-module.exports = class LevelForkView extends View
+module.exports = class LevelForkView extends ModalView
   id: 'editor-level-fork-modal'
   template: template
   instant: false
diff --git a/app/views/editor/level/modal/world_select.coffee b/app/views/editor/level/modal/world_select.coffee
index adbbd11d3..4274a76ec 100644
--- a/app/views/editor/level/modal/world_select.coffee
+++ b/app/views/editor/level/modal/world_select.coffee
@@ -1,9 +1,9 @@
-View = require 'views/kinds/ModalView'
+ModalView = require 'views/kinds/ModalView'
 template = require 'templates/editor/level/modal/world_select'
 Surface = require 'lib/surface/Surface'
 ThangType = require 'models/ThangType'
 
-module.exports = class WorldSelectModal extends View
+module.exports = class WorldSelectModal extends ModalView
   id: 'select-point-modal'
   template: template
   modalWidthPercent: 80
diff --git a/app/views/editor/level/system/add.coffee b/app/views/editor/level/system/add.coffee
index 28a362809..f0c3b7490 100644
--- a/app/views/editor/level/system/add.coffee
+++ b/app/views/editor/level/system/add.coffee
@@ -1,4 +1,4 @@
-View = require 'views/kinds/ModalView'
+ModalView = require 'views/kinds/ModalView'
 template = require 'templates/editor/level/system/add'
 availableSystemTemplate = require 'templates/editor/level/system/available_system'
 LevelSystem = require 'models/LevelSystem'
@@ -8,7 +8,7 @@ class LevelSystemSearchCollection extends CocoCollection
   url: '/db/level_system'
   model: LevelSystem
 
-module.exports = class LevelSystemAddView extends View
+module.exports = class LevelSystemAddView extends ModalView
   id: 'editor-level-system-add-modal'
   template: template
   instant: true
diff --git a/app/views/editor/level/system/new.coffee b/app/views/editor/level/system/new.coffee
index 1ddd8d158..86b959f01 100644
--- a/app/views/editor/level/system/new.coffee
+++ b/app/views/editor/level/system/new.coffee
@@ -1,10 +1,10 @@
-View = require 'views/kinds/ModalView'
+ModalView = require 'views/kinds/ModalView'
 template = require 'templates/editor/level/system/new'
 LevelSystem = require 'models/LevelSystem'
 forms = require 'lib/forms'
 {me} = require 'lib/auth'
 
-module.exports = class LevelSystemNewView extends View
+module.exports = class LevelSystemNewView extends ModalView
   id: 'editor-level-system-new-modal'
   template: template
   instant: false
diff --git a/app/views/modal/auth_modal.coffee b/app/views/modal/auth_modal.coffee
index 9d32de0ae..ead7af8b9 100644
--- a/app/views/modal/auth_modal.coffee
+++ b/app/views/modal/auth_modal.coffee
@@ -1,11 +1,11 @@
-View = require 'views/kinds/ModalView'
+ModalView = require 'views/kinds/ModalView'
 template = require 'templates/modal/auth'
 {loginUser, createUser, me} = require 'lib/auth'
 forms = require 'lib/forms'
 User = require 'models/User'
 application  = require 'application'
 
-module.exports = class AuthModalView extends View
+module.exports = class AuthModalView extends ModalView
   id: 'auth-modal'
   template: template
   mode: 'login' # or 'signup'
diff --git a/app/views/modal/contact_modal.coffee b/app/views/modal/contact_modal.coffee
index 0851c9ee9..c8a6db460 100644
--- a/app/views/modal/contact_modal.coffee
+++ b/app/views/modal/contact_modal.coffee
@@ -1,4 +1,4 @@
-View = require 'views/kinds/ModalView'
+ModalView = require 'views/kinds/ModalView'
 template = require 'templates/modal/contact'
 
 forms = require 'lib/forms'
@@ -18,7 +18,7 @@ contactSchema =
       type: 'string'
       minLength: 1
 
-module.exports = class ContactView extends View
+module.exports = class ContactView extends ModalView
   id: 'contact-modal'
   template: template
   closeButton: true
diff --git a/app/views/modal/diplomat_suggestion_modal.coffee b/app/views/modal/diplomat_suggestion_modal.coffee
index 48312ad36..c0abed5e7 100644
--- a/app/views/modal/diplomat_suggestion_modal.coffee
+++ b/app/views/modal/diplomat_suggestion_modal.coffee
@@ -1,9 +1,9 @@
-View = require 'views/kinds/ModalView'
+ModalView = require 'views/kinds/ModalView'
 template = require 'templates/modal/diplomat_suggestion'
 {me} = require 'lib/auth'
 forms = require 'lib/forms'
 
-module.exports = class DiplomatSuggestionView extends View
+module.exports = class DiplomatSuggestionView extends ModalView
   id: 'diplomat-suggestion-modal'
   template: template
 
diff --git a/app/views/modal/employer_signup_modal.coffee b/app/views/modal/employer_signup_modal.coffee
index 5355e26c9..db766d979 100644
--- a/app/views/modal/employer_signup_modal.coffee
+++ b/app/views/modal/employer_signup_modal.coffee
@@ -1,11 +1,11 @@
-View = require 'views/kinds/ModalView'
+ModalView = require 'views/kinds/ModalView'
 template = require 'templates/modal/employer_signup_modal'
 forms = require 'lib/forms'
 User = require 'models/User'
 auth = require 'lib/auth'
 me = auth.me
 
-module.exports = class EmployerSignupView extends View
+module.exports = class EmployerSignupView extends ModalView
   id: 'employer-signup'
   template: template
   closeButton: true
diff --git a/app/views/modal/model_modal.coffee b/app/views/modal/model_modal.coffee
index 50b0cdd8a..a5fbc5ce5 100644
--- a/app/views/modal/model_modal.coffee
+++ b/app/views/modal/model_modal.coffee
@@ -1,7 +1,7 @@
-View = require 'views/kinds/ModalView'
+ModalView = require 'views/kinds/ModalView'
 template = require 'templates/modal/model'
 
-module.exports = class ModelModal extends View
+module.exports = class ModelModal extends ModalView
   id: 'model-modal'
   template: template
   plain: true
diff --git a/app/views/modal/recover_modal.coffee b/app/views/modal/recover_modal.coffee
index c65fc1f8a..5f8e9a17d 100644
--- a/app/views/modal/recover_modal.coffee
+++ b/app/views/modal/recover_modal.coffee
@@ -1,4 +1,4 @@
-View = require 'views/kinds/ModalView'
+ModalView = require 'views/kinds/ModalView'
 template = require 'templates/modal/recover'
 forms = require 'lib/forms'
 {genericFailure} = require 'lib/errors'
@@ -9,7 +9,7 @@ filterKeyboardEvents = (allowedEvents, func) ->
     return unless e.keyCode in allowedEvents or not e.keyCode
     return func(splat...)
 
-module.exports = class RecoverModalView extends View
+module.exports = class RecoverModalView extends ModalView
   id: 'recover-modal'
   template: template
 
diff --git a/app/views/modal/wizard_settings_modal.coffee b/app/views/modal/wizard_settings_modal.coffee
index 12732b28e..d8527ee74 100644
--- a/app/views/modal/wizard_settings_modal.coffee
+++ b/app/views/modal/wizard_settings_modal.coffee
@@ -1,4 +1,4 @@
-View = require 'views/kinds/ModalView'
+ModalView = require 'views/kinds/ModalView'
 template = require 'templates/modal/wizard_settings'
 WizardSprite = require 'lib/surface/WizardSprite'
 ThangType = require 'models/ThangType'
@@ -6,7 +6,7 @@ ThangType = require 'models/ThangType'
 forms = require 'lib/forms'
 User = require 'models/User'
 
-module.exports = class WizardSettingsModal extends View
+module.exports = class WizardSettingsModal extends ModalView
   id: 'wizard-settings-modal'
   template: template
   closesOnClickOutside: false
diff --git a/app/views/play/ladder/play_modal.coffee b/app/views/play/ladder/play_modal.coffee
index 41bf1e22b..0d7494950 100644
--- a/app/views/play/ladder/play_modal.coffee
+++ b/app/views/play/ladder/play_modal.coffee
@@ -1,11 +1,11 @@
-View = require 'views/kinds/ModalView'
+ModalView = require 'views/kinds/ModalView'
 template = require 'templates/play/ladder/play_modal'
 ThangType = require 'models/ThangType'
 {me} = require 'lib/auth'
 LeaderboardCollection = require 'collections/LeaderboardCollection'
 {teamDataFromLevel} = require './utils'
 
-module.exports = class LadderPlayModal extends View
+module.exports = class LadderPlayModal extends ModalView
   id: 'ladder-play-modal'
   template: template
   closeButton: true
diff --git a/app/views/play/level/modal/docs_modal.coffee b/app/views/play/level/modal/docs_modal.coffee
index 9970b8916..a046df051 100644
--- a/app/views/play/level/modal/docs_modal.coffee
+++ b/app/views/play/level/modal/docs_modal.coffee
@@ -1,11 +1,11 @@
-View = require 'views/kinds/ModalView'
+ModalView = require 'views/kinds/ModalView'
 template = require 'templates/play/level/modal/docs'
 Article = require 'models/Article'
 utils = require 'lib/utils'
 
 # let's implement this once we have the docs database schema set up
 
-module.exports = class DocsModal extends View
+module.exports = class DocsModal extends ModalView
   template: template
   id: 'docs-modal'
 
diff --git a/app/views/play/level/modal/editor_config_modal.coffee b/app/views/play/level/modal/editor_config_modal.coffee
index 5f8fd878f..c7dc162d1 100644
--- a/app/views/play/level/modal/editor_config_modal.coffee
+++ b/app/views/play/level/modal/editor_config_modal.coffee
@@ -1,8 +1,8 @@
-View = require 'views/kinds/ModalView'
+ModalView = require 'views/kinds/ModalView'
 template = require 'templates/play/level/modal/editor_config'
 {me} = require 'lib/auth'
 
-module.exports = class EditorConfigModal extends View
+module.exports = class EditorConfigModal extends ModalView
   id: 'level-editor-config-modal'
   template: template
   aceConfig: {}
diff --git a/app/views/play/level/modal/infinite_loop_modal.coffee b/app/views/play/level/modal/infinite_loop_modal.coffee
index ff89e229f..6436c7667 100644
--- a/app/views/play/level/modal/infinite_loop_modal.coffee
+++ b/app/views/play/level/modal/infinite_loop_modal.coffee
@@ -1,7 +1,7 @@
-View = require 'views/kinds/ModalView'
+ModalView = require 'views/kinds/ModalView'
 template = require 'templates/play/level/modal/infinite_loop'
 
-module.exports = class InfiniteLoopModal extends View
+module.exports = class InfiniteLoopModal extends ModalView
   id: '#infinite-loop-modal'
   template: template
 
diff --git a/app/views/play/level/modal/keyboard_shortcuts_modal.coffee b/app/views/play/level/modal/keyboard_shortcuts_modal.coffee
index 816bd3f10..41c15df9d 100644
--- a/app/views/play/level/modal/keyboard_shortcuts_modal.coffee
+++ b/app/views/play/level/modal/keyboard_shortcuts_modal.coffee
@@ -1,7 +1,7 @@
-View = require 'views/kinds/ModalView'
+ModalView = require 'views/kinds/ModalView'
 template = require 'templates/play/level/modal/keyboard_shortcuts'
 
-module.exports = class KeyboardShortcutsModal extends View
+module.exports = class KeyboardShortcutsModal extends ModalView
   id: 'keyboard-shortcuts-modal'
   template: template
 
diff --git a/app/views/play/level/modal/multiplayer_modal.coffee b/app/views/play/level/modal/multiplayer_modal.coffee
index c7e02b157..6645ca2f3 100644
--- a/app/views/play/level/modal/multiplayer_modal.coffee
+++ b/app/views/play/level/modal/multiplayer_modal.coffee
@@ -1,9 +1,9 @@
-View = require 'views/kinds/ModalView'
+ModalView = require 'views/kinds/ModalView'
 template = require 'templates/play/level/modal/multiplayer'
 {me} = require 'lib/auth'
 LadderSubmissionView = require 'views/play/common/ladder_submission_view'
 
-module.exports = class MultiplayerModal extends View
+module.exports = class MultiplayerModal extends ModalView
   id: 'level-multiplayer-modal'
   template: template
 
diff --git a/app/views/play/level/modal/reload_modal.coffee b/app/views/play/level/modal/reload_modal.coffee
index f8b454f1c..f7089e05c 100644
--- a/app/views/play/level/modal/reload_modal.coffee
+++ b/app/views/play/level/modal/reload_modal.coffee
@@ -1,9 +1,9 @@
-View = require 'views/kinds/ModalView'
+ModalView = require 'views/kinds/ModalView'
 template = require 'templates/play/level/modal/reload'
 
 # let's implement this once we have the docs database schema set up
 
-module.exports = class ReloadModal extends View
+module.exports = class ReloadModal extends ModalView
   id: '#reload-code-modal'
   template: template
 
diff --git a/app/views/play/level/modal/victory_modal.coffee b/app/views/play/level/modal/victory_modal.coffee
index 6ee9cabef..03c8d72d8 100644
--- a/app/views/play/level/modal/victory_modal.coffee
+++ b/app/views/play/level/modal/victory_modal.coffee
@@ -1,11 +1,11 @@
-View = require 'views/kinds/ModalView'
+ModalView = require 'views/kinds/ModalView'
 template = require 'templates/play/level/modal/victory'
 {me} = require 'lib/auth'
 LadderSubmissionView = require 'views/play/common/ladder_submission_view'
 LevelFeedback = require 'models/LevelFeedback'
 utils = require 'lib/utils'
 
-module.exports = class VictoryModal extends View
+module.exports = class VictoryModal extends ModalView
   id: 'level-victory-modal'
   template: template