Index: wflow/wflow_lib.py
===================================================================
diff -u -rce0286da9904de3134c149d4a7b7e84b9000bac0 -r5ac8d65a27480e9d720c0216af37204602cb3bce
--- wflow/wflow_lib.py	(.../wflow_lib.py)	(revision ce0286da9904de3134c149d4a7b7e84b9000bac0)
+++ wflow/wflow_lib.py	(.../wflow_lib.py)	(revision 5ac8d65a27480e9d720c0216af37204602cb3bce)
@@ -202,7 +202,7 @@
     :return: storage (m^3), outflow (m^3/s), PercentageFull (0-1), Release (m^3/sec)
     """
 
-    inflow = ifthen(boolean(ReserVoirLocs), inflow)
+    inflow = pcr.ifthen(pcr.boolean(ReserVoirLocs), inflow)
 
     oldstorage = storage
     storage = (
@@ -212,17 +212,17 @@
 
     percfull = ((storage + oldstorage) * 0.5) / maxstorage
     # first determine minimum (environmental) flow using a simple sigmoid curve to scale for target level
-    fac = sCurve(percfull, a=minimum_full_perc, c=30.0)
-    demandRelease = min(fac * demand * timestepsecs, storage)
+    fac = pcr.sCurve(percfull, a=minimum_full_perc, c=30.0)
+    demandRelease = pcr.min(fac * demand * timestepsecs, storage)
     storage = storage - demandRelease
 
     # Re-determine percfull
     percfull = ((storage + oldstorage) * 0.5) / maxstorage
 
-    wantrel = max(0.0, storage - (maxstorage * target_perc_full))
+    wantrel = pcr.max(0.0, storage - (maxstorage * target_perc_full))
     # Assume extra maximum Q if spilling
     overflowQ = (percfull - 1.0) * (storage - maxstorage)
-    torelease = min(wantrel, overflowQ + maximum_Q * timestepsecs)
+    torelease = pcr.min(wantrel, overflowQ + maximum_Q * timestepsecs)
     storage = storage - torelease
     outflow = (torelease + demandRelease) / timestepsecs
     percfull = storage / maxstorage