diff --git a/doc/html/index.html b/doc/html/index.html
index f432df3..baa1ee3 100644
--- a/doc/html/index.html
+++ b/doc/html/index.html
@@ -347,7 +347,7 @@
   </h3>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"><p><small>Last revised: March 17, 2015 at 21:29:11 GMT</small></p></td>
+<td align="left"><p><small>Last revised: March 12, 2015 at 16:58:43 GMT</small></p></td>
 <td align="right"><div class="copyright-footer"></div></td>
 </tr></table>
 <hr>
diff --git a/include/boost/phoenix/function/lazy_prelude.hpp b/include/boost/phoenix/function/lazy_prelude.hpp
index 15f7cb4..d79369d 100644
--- a/include/boost/phoenix/function/lazy_prelude.hpp
+++ b/include/boost/phoenix/function/lazy_prelude.hpp
@@ -564,7 +564,7 @@ namespace boost {
     Last  last;
     Init  all_but_last;  // renamed from init which is not available.
     Length length;
-    At at;
+    At at_;  //Renamed from at.
     Filter filter;
     Iterate iterate;
 
diff --git a/test/function/lazy_list3_tests.cpp b/test/function/lazy_list3_tests.cpp
index 53d7868..9e4bc6d 100644
--- a/test/function/lazy_list3_tests.cpp
+++ b/test/function/lazy_list3_tests.cpp
@@ -45,10 +45,10 @@ int main()
     BOOST_TEST(last(ll2)()  == 5);
     BOOST_TEST(last(lll2)() == 10);
     BOOST_TEST(length(lll2)() == 9);
-    BOOST_TEST(at(even4,3)() == 8);
-    BOOST_TEST(at(odd4,2)()  == 7);
-    BOOST_TEST(at(itersome,3)()   == -3);
-    BOOST_TEST(at(repeatsome,3)() == 1);
+    BOOST_TEST(at_(even4,3)() == 8);
+    BOOST_TEST(at_(odd4,2)()  == 7);
+    BOOST_TEST(at_(itersome,3)()   == -3);
+    BOOST_TEST(at_(repeatsome,3)() == 1);
 
     return boost::report_errors();
 }