diff --git a/.docs/categories.json b/.docs/categories.json
index 9760708236..f45d451d8e 100644
--- a/.docs/categories.json
+++ b/.docs/categories.json
@@ -96,7 +96,7 @@
 					"ve.ce.NodeFactory",
 					"ve.ce.Surface",
 					"ve.ce.SurfaceObserver",
-					"ve.ce.DomRange",
+					"ve.ce.RangeState",
 					"ve.ce.*Annotation",
 					"ve.ce.Document",
 					"ve.ce.*Node"
diff --git a/.docs/eg-iframe.html b/.docs/eg-iframe.html
index 998e6fcf65..507eb53663 100644
--- a/.docs/eg-iframe.html
+++ b/.docs/eg-iframe.html
@@ -209,7 +209,7 @@
 		<script src="lib/ve/src/dm/metaitems/ve.dm.CommentMetaItem.js"></script>
 		<script src="lib/ve/src/dm/nodes/ve.dm.CommentNode.js"></script>
 		<script src="lib/ve/src/ce/ve.ce.js"></script>
-		<script src="lib/ve/src/ce/ve.ce.DomRange.js"></script>
+		<script src="lib/ve/src/ce/ve.ce.RangeState.js"></script>
 		<script src="lib/ve/src/ce/ve.ce.AnnotationFactory.js"></script>
 		<script src="lib/ve/src/ce/ve.ce.NodeFactory.js"></script>
 		<script src="lib/ve/src/ce/ve.ce.Document.js"></script>
diff --git a/VisualEditor.php b/VisualEditor.php
index dad670edf9..c1c4fb53a0 100644
--- a/VisualEditor.php
+++ b/VisualEditor.php
@@ -453,7 +453,7 @@ $wgResourceModules += array(
 
 			// ce
 			'lib/ve/src/ce/ve.ce.js',
-			'lib/ve/src/ce/ve.ce.DomRange.js',
+			'lib/ve/src/ce/ve.ce.RangeState.js',
 			'lib/ve/src/ce/ve.ce.AnnotationFactory.js',
 			'lib/ve/src/ce/ve.ce.NodeFactory.js',
 			'lib/ve/src/ce/ve.ce.Document.js',
diff --git a/lib/ve b/lib/ve
index c8201dddc9..2d8aeef773 160000
--- a/lib/ve
+++ b/lib/ve
@@ -1 +1 @@
-Subproject commit c8201dddc99334481ef939606753c283dc69c3ed
+Subproject commit 2d8aeef7737c395dfa388f24bfa25583eda5d8d0