diff --git a/dir.rb b/dir.rb
index 115f068771..243dd837ed 100644
--- a/dir.rb
+++ b/dir.rb
@@ -11,17 +11,17 @@
 #
 # First, what's elsewhere. \Class \Dir:
 #
-# - Inherits from {class Object}[Object.html#class-Object-label-What-27s+Here].
-# - Includes {module Enumerable}[Enumerable.html#module-Enumerable-label-What-27s+Here],
+# - Inherits from {class Object}[rdoc-ref:Object@What-27s+Here].
+# - Includes {module Enumerable}[rdoc-ref:Enumerable@What-27s+Here],
 #   which provides dozens of additional methods.
 #
 # Here, class \Dir provides methods that are useful for:
 #
-# - {Reading}[#class-Dir-label-Reading]
-# - {Setting}[#class-Dir-label-Setting]
-# - {Querying}[#class-Dir-label-Querying]
-# - {Iterating}[#class-Dir-label-Iterating]
-# - {Other}[#class-Dir-label-Other]
+# - {Reading}[rdoc-ref:Dir@Reading]
+# - {Setting}[rdoc-ref:Dir@Setting]
+# - {Querying}[rdoc-ref:Dir@Querying]
+# - {Iterating}[rdoc-ref:Dir@Iterating]
+# - {Other}[rdoc-ref:Dir@Other]
 #
 # === Reading
 #
diff --git a/timev.rb b/timev.rb
index a570f047c5..a7e70b290f 100644
--- a/timev.rb
+++ b/timev.rb
@@ -95,17 +95,17 @@
 #
 # First, what's elsewhere. \Class \Time:
 #
-# - Inherits from {class Object}[Object.html#class-Object-label-What-27s+Here].
-# - Includes {module Comparable}[Comparable.html#module-Comparable-label-What-27s+Here].
+# - Inherits from {class Object}[rdoc-ref:Object@What-27s+Here].
+# - Includes {module Comparable}[rdoc-ref:Comparable@What-27s+Here].
 #
 # Here, class \Time provides methods that are useful for:
 #
-# - {Creating \Time objects}[#class-Time-label-Methods+for+Creating].
-# - {Fetching \Time values}[#class-Time-label-Methods+for+Fetching].
-# - {Querying a \Time object}[#class-Time-label-Methods+for+Querying].
-# - {Comparing \Time objects}[#class-Time-label-Methods+for+Comparing].
-# - {Converting a \Time object}[#class-Time-label-Methods+for+Converting].
-# - {Rounding a \Time}[#class-Time-label-Methods+for+Rounding].
+# - {Creating \Time objects}[rdoc-ref:Time@Methods+for+Creating].
+# - {Fetching \Time values}[rdoc-ref:Time@Methods+for+Fetching].
+# - {Querying a \Time object}[rdoc-ref:Time@Methods+for+Querying].
+# - {Comparing \Time objects}[rdoc-ref:Time@Methods+for+Comparing].
+# - {Converting a \Time object}[rdoc-ref:Time@Methods+for+Converting].
+# - {Rounding a \Time}[rdoc-ref:Time@Methods+for+Rounding].
 #
 # === Methods for Creating
 #