diff --git a/.docs/categories.json b/.docs/categories.json
index 85dd355a80..fe41763a75 100644
--- a/.docs/categories.json
+++ b/.docs/categories.json
@@ -120,11 +120,10 @@
 					"ve.ui.*Registry",
 					"ve.ui.*Sequence",
 					"ve.ui.*Tool",
-					"ve.ui.*Inspector",
 					"ve.ui.*Widget",
 					"ve.ui.*WindowManager",
-					"ve.ui.*InspectorManager",
-					"ve.ui.*Dialog"
+					"ve.ui.*Dialog",
+					"ve.ui.*Inspector"
 				]
 			},
 			{
diff --git a/.docs/eg-iframe.html b/.docs/eg-iframe.html
index ef0ecc4404..917261aced 100644
--- a/.docs/eg-iframe.html
+++ b/.docs/eg-iframe.html
@@ -347,7 +347,7 @@
 		<!-- visualEditor.desktop.build -->
 		<script src="lib/ve/src/ui/ve.ui.DesktopSurface.js"></script>
 		<script src="lib/ve/src/ui/ve.ui.DesktopContext.js"></script>
-		<script src="lib/ve/src/ui/ve.ui.DesktopInspectorManager.js"></script>
+		<script src="lib/ve/src/ui/windowmanagers/ve.ui.DesktopInspectorWindowManager.js"></script>
 
 		<!-- example scripts -->
 		<script>
diff --git a/VisualEditor.php b/VisualEditor.php
index 8b2bef18c1..2c72a4b1aa 100644
--- a/VisualEditor.php
+++ b/VisualEditor.php
@@ -742,7 +742,7 @@ $wgResourceModules += array(
 		'scripts' => array(
 			'lib/ve/src/ui/ve.ui.DesktopSurface.js',
 			'lib/ve/src/ui/ve.ui.DesktopContext.js',
-			'lib/ve/src/ui/ve.ui.DesktopInspectorManager.js',
+			'lib/ve/src/ui/windowmanagers/ve.ui.DesktopInspectorWindowManager.js',
 		),
 		'styles' => array(
 			'lib/ve/src/ui/styles/ve.ui.DesktopContext.css',
diff --git a/lib/ve b/lib/ve
index ddbedd1ba6..b5a02696da 160000
--- a/lib/ve
+++ b/lib/ve
@@ -1 +1 @@
-Subproject commit ddbedd1ba6a46529c01b653264d80cc52fc0d9da
+Subproject commit b5a02696daacb7d6eff908ecde1308506d776a7f