diff --git a/zip-0207.rst b/zip-0207.rst
index 70b1927d..f005bd1a 100644
--- a/zip-0207.rst
+++ b/zip-0207.rst
@@ -57,8 +57,10 @@ ZIPs.
 
 The value of a funding stream at a given block height is defined as::
 
-    FundingStream.Value(height) =
-        floor((BlockReward(height) * FundingStream.ValueNumerator) / FundingStream.ValueDenominator)
+    FundingStream[FUND].Value(height) =
+        floor((
+            BlockReward(height) * FundingStream[FUND].ValueNumerator
+        ) / FundingStream[FUND].ValueDenominator)
 
 An active funding stream at a given block height is defined as a funding stream for which the block height is
 less than its end height, but not less than its start height.
@@ -68,11 +70,13 @@ halving interval, creating a roughly-monthly sequence of funding periods. The ad
 block height is defined as follows (using ``HalvingInterval`` as-defined in [#protocol-constants]_)::
 
     AddressChangeInterval = HalvingInterval / 48
-    FundingStream.AddressIndex(height) =
-        floor((height - FundingStream.StartHeight) / AddressChangeInterval)
-    Address(height) = FundingStream.Addresses[FundingStream.AddressIndex(height)]
+    FundingStream[FUND].AddressIndex(height) =
+        floor((
+            height - FundingStream[FUND].StartHeight
+        ) / AddressChangeInterval)
+    Address(height) = FundingStream[FUND].Addresses[FundingStream[FUND].AddressIndex(height)]
 
-- TODO: Fix ``FundingStream.AddressIndex`` to line funding periods up across funding streams.
+- TODO: Fix ``FundingStream[FUND].AddressIndex`` to line funding periods up across funding streams.
 
 Consensus rules
 ---------------