diff --git a/common/lib/xmodule/xmodule/modulestore/parsers.py b/common/lib/xmodule/xmodule/modulestore/parsers.py
index 9308894b86..b646d10707 100644
--- a/common/lib/xmodule/xmodule/modulestore/parsers.py
+++ b/common/lib/xmodule/xmodule/modulestore/parsers.py
@@ -19,10 +19,10 @@ def parse_url(string):
 
     Examples:
         'edx://version/0123FFFF'
-        'edx://edu.mit.eecs.6002x'
-        'edx://edu.mit.eecs.6002x/branch/published'
-        'edx://edu.mit.eecs.6002x/branch/published/version/519665f6223ebd6980884f2b/block/HW3'
-        'edx://edu.mit.eecs.6002x/branch/published/block/HW3'
+        'edx://mit.eecs.6002x'
+        'edx://mit.eecs.6002x;published'
+        'edx://mit.eecs.6002x;published#HW3'
+        'edx://mit.eecs.6002x;published@000eee12345#HW3'
 
     This returns None if string cannot be parsed.
 
@@ -97,11 +97,11 @@ def parse_course_id(string):
 
     Examples of valid course_ids:
 
-      'edu.mit.eecs.6002x'
-      'edu.mit.eecs.6002x/branch/published'
-      'edu.mit.eecs.6002x/block/HW3'
-      'edu.mit.eecs.6002x/branch/published/block/HW3'
-      'edu.mit.eecs.6002x/branch/published/version/519665f6223ebd6980884f2b/block/HW3'
+      'mit.eecs.6002x'
+      'mit.eecs.6002x;published'
+      'mit.eecs.6002x#HW3'
+      'mit.eecs.6002x;published#HW3'
+      'mit.eecs.6002x/branch/published/version/519665f6223ebd6980884f2b/block/HW3'
 
 
     Syntax: