diff --git a/i2p2www/spec/blockfile.rst b/i2p2www/spec/blockfile.rst
index ac1dc6ae..e529c2dd 100644
--- a/i2p2www/spec/blockfile.rst
+++ b/i2p2www/spec/blockfile.rst
@@ -234,14 +234,14 @@ Hostname keys are stored in lower-case and always end in ".i2p".
 References
 ==========
 
-.. [NAMING]
-    {{ site_url('docs/naming', True) }}
+.. [Destination]
+    {{ ctags_url('Destination') }}
+
+.. [Mapping]
+    {{ ctags_url('Mapping') }}
 
 .. [METANOTION]
     http://www.metanotion.net/software/sandbox/block.html
 
-.. [Mapping]
-    {{ spec_url('common-structures') }}#type-mapping
-
-.. [Destination]
-    {{ spec_url('common-structures') }}#struct-destination
+.. [NAMING]
+    {{ site_url('docs/naming', True) }}
diff --git a/i2p2www/spec/common-structures.rst b/i2p2www/spec/common-structures.rst
index e5c09f63..dbd85d52 100644
--- a/i2p2www/spec/common-structures.rst
+++ b/i2p2www/spec/common-structures.rst
@@ -1089,7 +1089,7 @@ References
     {{ site_url('docs/how/elgamal-aes', True) }}
 
 .. [GARLIC-DELIVERY]
-    {{ site_url('docs/protocol/i2np', True) }}#struct-garlicclovedeliveryinstructions
+    {{ ctags_url('GarlicCloveDeliveryInstructions') }}
 
 .. [I2CP]
     {{ site_url('docs/protocol/i2cp', True) }}
@@ -1104,4 +1104,4 @@ References
     {{ site_url('docs/transport/ssu', True) }}
 
 .. [TUNNEL-DELIVERY]
-    {{ site_url('docs/spec/tunnel-message', True) }}#struct-tunnelmessagedeliveryinstructions
+    {{ ctags_url('TunnelMessageDeliveryInstructions') }}
diff --git a/i2p2www/spec/configuration.rst b/i2p2www/spec/configuration.rst
index 8688999e..04ee292b 100644
--- a/i2p2www/spec/configuration.rst
+++ b/i2p2www/spec/configuration.rst
@@ -425,7 +425,7 @@ References
     http://docs.i2p-projekt.de/javadoc/net/i2p/data/DataHelper.html
 
 .. [Mapping]
-    {{ spec_url('common-structures') }}#type-mapping
+    {{ ctags_url('Mapping') }}
 
 .. [PLUGIN]
     {{ spec_url('plugin') }}
diff --git a/i2p2www/spec/datagrams.rst b/i2p2www/spec/datagrams.rst
index f45129e4..be29bc8b 100644
--- a/i2p2www/spec/datagrams.rst
+++ b/i2p2www/spec/datagrams.rst
@@ -125,4 +125,4 @@ References
     {{ site_url('docs/transport', True) }}
 
 .. [TUNMSG]
-    {{ site_url('docs/spec/tunnel-message', True) }}#notes
+    {{ spec_url('tunnel-message') }}#notes
diff --git a/i2p2www/spec/i2cp.rst b/i2p2www/spec/i2cp.rst
index ad0f48be..be069a09 100644
--- a/i2p2www/spec/i2cp.rst
+++ b/i2p2www/spec/i2cp.rst
@@ -1325,13 +1325,13 @@ References
 ==========
 
 .. [Date]
-    {{ spec_url('common-structures') }}#type-date
+    {{ ctags_url('Date') }}
 
 .. [Destination]
-    {{ spec_url('common-structures') }}#struct-destination
+    {{ ctags_url('Destination') }}
 
 .. [Hash]
-    {{ spec_url('common-structures') }}#struct-hash
+    {{ ctags_url('Hash') }}
 
 .. [I2CP]
     {{ site_url('docs/protocol/i2cp', True) }}
@@ -1343,35 +1343,41 @@ References
     http://docs.i2p-projekt.de/javadoc/net/i2p/data/i2cp/package-summary.html
 
 .. [Integer]
-    {{ spec_url('common-structures') }}#type-integer
+    {{ ctags_url('Integer') }}
 
 .. [Leases]
 .. [Lease]
-    {{ spec_url('common-structures') }}#struct-lease
+    {{ ctags_url('Lease') }}
 
 .. [LeaseSet]
-    {{ spec_url('common-structures') }}#struct-leaseset
+    {{ ctags_url('LeaseSet') }}
 
 .. [Mapping]
-    {{ spec_url('common-structures') }}#type-mapping
+    {{ ctags_url('Mapping') }}
 
 .. [MSM-JAVADOCS]
     http://docs.i2p-projekt.de/javadoc/net/i2p/data/i2cp/MessageStatusMessage.html
 
 .. [PrivateKey]
-    {{ spec_url('common-structures') }}#type-privatekey
+    {{ ctags_url('PrivateKey') }}
+
+.. [PublicKey]
+    {{ ctags_url('PublicKey') }}
 
 .. [RouterIdentity]
-    {{ spec_url('common-structures') }}#struct-routeridentity
+    {{ ctags_url('RouterIdentity') }}
 
 .. [Signature]
-    {{ spec_url('common-structures') }}#type-signature
+    {{ ctags_url('Signature') }}
 
 .. [SigningPrivateKey]
-    {{ spec_url('common-structures') }}#type-signingprivatekey
+    {{ ctags_url('SigningPrivateKey') }}
+
+.. [SigningPublicKey]
+    {{ ctags_url('SigningPublicKey') }}
 
 .. [String]
-    {{ spec_url('common-structures') }}#struct-string
+    {{ ctags_url('String') }}
 
 .. [TunnelId]
-    {{ spec_url('common-structures') }}#tunnelid
+    {{ ctags_url('TunnelId') }}
diff --git a/i2p2www/spec/i2np.rst b/i2p2www/spec/i2np.rst
index 73038352..6f15520d 100644
--- a/i2p2www/spec/i2np.rst
+++ b/i2p2www/spec/i2np.rst
@@ -1243,7 +1243,7 @@ References
     {{ site_url('docs/how/cryptography', True) }}#elgamal
 
 .. [Date]
-    {{ spec_url('common-structures') }}#type-date
+    {{ ctags_url('Date') }}
 
 .. [ElG-AES]
     {{ site_url('docs/how/elgamal-aes', True) }}
@@ -1252,16 +1252,16 @@ References
     {{ site_url('docs/how/garlic-routing', True) }}
 
 .. [Hash]
-    {{ spec_url('common-structures') }}#struct-hash
+    {{ ctags_url('Hash') }}
 
 .. [I2NP]
     {{ site_url('docs/protocol/i2np', True) }}
 
 .. [Integer]
-    {{ spec_url('common-structures') }}#type-integer
+    {{ ctags_url('Integer') }}
 
 .. [RouterIdentity]
-    {{ spec_url('common-structures') }}#struct-routeridentity
+    {{ ctags_url('RouterIdentity') }}
 
 .. [SSU]
     {{ site_url('docs/transport/ssu', True) }}
@@ -1270,7 +1270,7 @@ References
     {{ site_url('docs/transport/ssu', True) }}#establishDirect
 
 .. [TMDI]
-    {{ spec_url('tunnel-message') }}#struct-tunnelmessagedeliveryinstructions
+    {{ ctags_url('TunnelMessageDeliveryInstructions') }}
 
 .. [TUNNEL-CREATION]
     {{ spec_url('tunnel-creation') }}
@@ -1282,4 +1282,4 @@ References
     {{ site_url('docs/tunnels/implementation', True) }}
 
 .. [TunnelId]
-    {{ spec_url('common-structures') }}#tunnelid
+    {{ ctags_url('TunnelId') }}
diff --git a/i2p2www/spec/ssu.rst b/i2p2www/spec/ssu.rst
index c5ad10a9..ca196d08 100644
--- a/i2p2www/spec/ssu.rst
+++ b/i2p2www/spec/ssu.rst
@@ -1111,7 +1111,7 @@ References
     {{ site_url('docs/how/cryptography', True) }}#udp
 
 .. [Date]
-    {{ spec_url('common-structures') }}#type-date
+    {{ ctags_url('Date') }}
 
 .. [I2P-SRC]
     https://github.com/i2p/i2p.i2p
@@ -1126,19 +1126,19 @@ References
     {{ spec_url('common-structures') }}#key-certificates
 
 .. [RouterIdentity]
-    {{ spec_url('common-structures') }}#struct-routeridentity
+    {{ ctags_url('RouterIdentity') }}
 
 .. [SESSIONKEY]
-    {{ spec_url('common-structures') }}#type-sessionkey
+    {{ ctags_url('SessionKey') }}
 
 .. [Signature]
-    {{ spec_url('common-structures') }}#type-signature
+    {{ ctags_url('Signature') }}
 
 .. [SigningPrivateKey]
-    {{ spec_url('common-structures') }}#type-signingprivatekey
+    {{ ctags_url('SigningPrivateKey') }}
 
 .. [SigningPublicKey]
-    {{ spec_url('common-structures') }}#type-signingpublickey
+    {{ ctags_url('SigningPublicKey') }}
 
 .. [SSU]
     {{ site_url('docs/transport/ssu', True) }}
diff --git a/i2p2www/spec/streaming.rst b/i2p2www/spec/streaming.rst
index f68dbed7..d131d8de 100644
--- a/i2p2www/spec/streaming.rst
+++ b/i2p2www/spec/streaming.rst
@@ -176,16 +176,16 @@ References
 ==========
 
 .. [Destination]
-    {{ spec_url('common-structures') }}#struct-destination
+    {{ ctags_url('Destination') }}
 
 .. [Integer]
-    {{ spec_url('common-structures') }}#type-integer
+    {{ ctags_url('Integer') }}
 
 .. [Signature]
-    {{ spec_url('common-structures') }}#type-signature
+    {{ ctags_url('Signature') }}
 
 .. [SigningPrivateKey]
-    {{ spec_url('common-structures') }}#type-signingprivatekey
+    {{ ctags_url('SigningPrivateKey') }}
 
 .. [STREAMING]
     {{ site_url('docs/api/streaming', True) }}
diff --git a/i2p2www/spec/tunnel-creation.rst b/i2p2www/spec/tunnel-creation.rst
index e2f8161a..a7407c16 100644
--- a/i2p2www/spec/tunnel-creation.rst
+++ b/i2p2www/spec/tunnel-creation.rst
@@ -313,7 +313,7 @@ References
 ==========
 
 .. [BRR]
-    {{ spec_url('i2np') }}#struct_BuildRequestRecord
+    {{ ctags_url('BuildRequestRecord') }}
 
 .. [CRYPTO-AES]
     {{ site_url('docs/how/cryptography', True) }}#AES
@@ -334,10 +334,10 @@ References
     http://forensics.umass.edu/pubs/wright.tissec.2008.pdf
 
 .. [TBM]
-    {{ spec_url('i2np') }}#msg_TunnelBuild
+    {{ ctags_url('TunnelBuild') }}
 
 .. [TBRM]
-    {{ spec_url('i2np') }}#msg_TunnelBuildReply
+    {{ ctags_url('TunnelBuildReply') }}
 
 .. [TUNBUILD-REASONING]
     http://osdir.com/ml/network.i2p/2005-10/msg00129.html
@@ -352,7 +352,7 @@ References
     {{ site_url('docs/tunnels/implementation', True) }}#tunnel.operation
 
 .. [VTBM]
-    {{ spec_url('i2np') }}#msg_VariableTunnelBuild
+    {{ ctags_url('VariableTunnelBuild') }}
 
 .. [VTBRM]
-    {{ spec_url('i2np') }}#msg_VariableTunnelBuildReply
+    {{ ctags_url('VariableTunnelBuildReply') }}
diff --git a/i2p2www/spec/tunnel-message.rst b/i2p2www/spec/tunnel-message.rst
index b41576d3..cc18217d 100644
--- a/i2p2www/spec/tunnel-message.rst
+++ b/i2p2www/spec/tunnel-message.rst
@@ -342,10 +342,10 @@ References
     {{ site_url('docs/protocol/i2np', True) }}
 
 .. [I2NP-GC]
-    {{ spec_url('i2np') }}#struct-garlicclove
+    {{ ctags_url('GarlicClove') }}
 
 .. [I2NP-GCDI]
-    {{ spec_url('i2np') }}#struct-garlicclovedeliveryinstructions
+    {{ ctags_url('GarlicCloveDeliveryInstructions') }}
 
 .. [TUNNEL-IMPL]
     {{ site_url('docs/tunnels/implementation', True) }}
diff --git a/i2p2www/spec/updates.rst b/i2p2www/spec/updates.rst
index 0af85186..dd6ce4e9 100644
--- a/i2p2www/spec/updates.rst
+++ b/i2p2www/spec/updates.rst
@@ -555,7 +555,7 @@ References
     http://tools.ietf.org/html/rfc4287
 
 .. [Signature]
-    {{ spec_url('common-structures') }}#type-signature
+    {{ ctags_url('Signature') }}
 
 .. [SigningPublicKey]
-    {{ spec_url('common-structures') }}#type-signingpublickey
+    {{ ctags_url('SigningPublicKey') }}