diff --git a/browser/blue/body.pt b/browser/blue/body.pt
index 1389844..f7c5b67 100644
--- a/browser/blue/body.pt
+++ b/browser/blue/body.pt
@@ -9,7 +9,7 @@
       <div class="top span-6"
            metal:define-slot="top">
         <a href="#" name="top" metal:define-slot="logo"
-           tal:attributes="href string:${request/URL/1}"><img class="logo"
+           tal:attributes="href string:${view/requestUrl/1}"><img class="logo"
                src="logo.gif" border="0" alt="Home"
                tal:attributes="src string:${resourceBase}logo.gif" /></a>
         <div metal:define-slot="top-actions">
diff --git a/browser/liquid/body.pt b/browser/liquid/body.pt
index fcfd3c1..a0761bb 100644
--- a/browser/liquid/body.pt
+++ b/browser/liquid/body.pt
@@ -7,7 +7,7 @@
     <div id="global" metal:define-macro="global">
       <div class="top" metal:define-slot="top">
         <a href="#" name="top" metal:define-slot="logo"
-           tal:attributes="href string:${request/URL/1}"><img class="logo"
+           tal:attributes="href string:${view/requestUrl/1}"><img class="logo"
                src="logo.gif" border="0" alt="Home"
                tal:attributes="src string:${resourceBase}logo.gif" /></a>
         <div metal:define-slot="top-actions">
diff --git a/browser/liquid/view_macros.pt b/browser/liquid/view_macros.pt
index 9d662a5..861dae3 100644
--- a/browser/liquid/view_macros.pt
+++ b/browser/liquid/view_macros.pt
@@ -35,7 +35,7 @@
     <div id="global">
       <div class="top" metal:define-slot="top">
         <a href="#" name="top" metal:define-slot="logo"
-           tal:attributes="href string:${request/URL/1}"><img class="logo"
+           tal:attributes="href string:${view/requestUrl/1}"><img class="logo"
                src="logo.gif" border="0" alt="Home"
                tal:attributes="src string:${resourceBase}logo.gif" /></a>
       </div>
diff --git a/browser/loops/loginform.pt b/browser/loops/loginform.pt
index 93489b8..994a231 100644
--- a/browser/loops/loginform.pt
+++ b/browser/loops/loginform.pt
@@ -24,7 +24,7 @@
       You are not authorized to perform this action. However, you may login as a
       different user who is authorized.</p>
     <form action="." method="post"
-          tal:attributes="action request/URL">
+          tal:attributes="action view/requestUrl">
         <div tal:omit-tag=""
              tal:condition="python:principal != 'zope.anybody' and 'SUBMIT' in request">
             <span tal:define="dummy python:
diff --git a/browser/mojo/body.pt b/browser/mojo/body.pt
index a76a3d0..b4eec06 100644
--- a/browser/mojo/body.pt
+++ b/browser/mojo/body.pt
@@ -12,7 +12,7 @@
            region="top" splitter="false">
         <div class="top" metal:define-slot="top">
           <a href="#" name="top" metal:define-slot="logo"
-             tal:attributes="href string:${request/URL/1}"><img class="logo"
+             tal:attributes="href string:${view/requestUrl/1}"><img class="logo"
                  src="logo.gif" border="0" alt="Home"
                  tal:attributes="src string:${resourceBase}logo.gif" /></a>
         </div>
diff --git a/composer/layout/browser/standard.pt b/composer/layout/browser/standard.pt
index 4bb846f..f57115c 100644
--- a/composer/layout/browser/standard.pt
+++ b/composer/layout/browser/standard.pt
@@ -20,7 +20,7 @@
       </tal:js>
       <link rel="shortcut icon" type="image/x-icon" href="favicon.ico"
             tal:attributes="href string:${view/page/resourceBase}${layout/favicon}" />
-      <base href="." tal:attributes="href request/URL">
+      <base href="." tal:attributes="href view/requestUrl">
     </head>
     <body tal:replace="structure body" />
   </html>
diff --git a/view/browser/liquid/body.pt b/view/browser/liquid/body.pt
index f983f3d..2c1c5be 100644
--- a/view/browser/liquid/body.pt
+++ b/view/browser/liquid/body.pt
@@ -7,7 +7,7 @@
     <div id="global" metal:define-macro="global">
       <div class="top" metal:define-slot="top">
         <a href="#" name="top" metal:define-slot="logo"
-           tal:attributes="href string:${request/URL/1}"><img class="logo"
+           tal:attributes="href string:${view/requestUrl/1}"><img class="logo"
                border="0" alt="Home"
                tal:attributes="src string:${resourceBase}logo.png" /></a>
         <div metal:define-slot="top-actions">
