diff --git a/include/boost/function/function_base.hpp b/include/boost/function/function_base.hpp
index f7470d3..0ea7604 100644
--- a/include/boost/function/function_base.hpp
+++ b/include/boost/function/function_base.hpp
@@ -330,7 +330,7 @@ namespace boost {
         bool
         compare_equal(const Function& f, const Functor& g, mpl::bool_<false>)
         {
-          if (const Functor* fp = f.template contains<Functor>())
+          if (const Functor* fp = f.template target<Functor>())
             return *fp == g;
           else return false;
         }
@@ -340,7 +340,7 @@ namespace boost {
         compare_not_equal(const Function& f, const Functor& g,
                           mpl::bool_<false>)
         {
-          if (const Functor* fp = f.template contains<Functor>())
+          if (const Functor* fp = f.template target<Functor>())
             return *fp != g;
           else return true;
         }
@@ -366,7 +366,7 @@ public:
   bool empty() const { return !manager; }
 
   template<typename Functor>
-    Functor* contains()
+    Functor* target()
     {
       if (!manager) return 0;
 
@@ -381,7 +381,7 @@ public:
     }
 
   template<typename Functor>
-    const Functor* contains() const
+    const Functor* target() const
     {
       if (!manager) return 0;
 
diff --git a/include/boost/function/function_template.hpp b/include/boost/function/function_template.hpp
index 89d09fa..b8b4fc4 100644
--- a/include/boost/function/function_template.hpp
+++ b/include/boost/function/function_template.hpp
@@ -648,7 +648,7 @@ template<typename R BOOST_FUNCTION_COMMA BOOST_FUNCTION_TEMPLATE_PARMS ,
                      Allocator>& f,
              Functor g)
   {
-    if (const Functor* fp = f.template contains<Functor>()) return *fp == g;
+    if (const Functor* fp = f.template target<Functor>()) return *fp == g;
     else return false;
   }
 
@@ -661,7 +661,7 @@ template<typename R BOOST_FUNCTION_COMMA BOOST_FUNCTION_TEMPLATE_PARMS ,
                      BOOST_FUNCTION_TEMPLATE_ARGS ,
                      Allocator>& f)
   {
-    if (const Functor* fp = f.template contains<Functor>()) return g == *fp;
+    if (const Functor* fp = f.template target<Functor>()) return g == *fp;
     else return false;
   }
 
@@ -674,7 +674,7 @@ template<typename R BOOST_FUNCTION_COMMA BOOST_FUNCTION_TEMPLATE_PARMS ,
                      Allocator>& f,
              Functor g)
   {
-    if (const Functor* fp = f.template contains<Functor>()) return *fp != g;
+    if (const Functor* fp = f.template target<Functor>()) return *fp != g;
     else return true;
   }
 
@@ -687,7 +687,7 @@ template<typename R BOOST_FUNCTION_COMMA BOOST_FUNCTION_TEMPLATE_PARMS ,
                      BOOST_FUNCTION_TEMPLATE_ARGS ,
                      Allocator>& f)
   {
-    if (const Functor* fp = f.template contains<Functor>()) return g != *fp;
+    if (const Functor* fp = f.template target<Functor>()) return g != *fp;
     else return true;
   }
 #undef BOOST_FUNCTION_ENABLE_IF_NOT_INTEGRAL
diff --git a/test/contains_test.cpp b/test/contains_test.cpp
index b9ee1a3..601828c 100644
--- a/test/contains_test.cpp
+++ b/test/contains_test.cpp
@@ -31,23 +31,23 @@ bool operator==(const ReturnInt& x, const ReturnInt& y)
 bool operator!=(const ReturnInt& x, const ReturnInt& y)
 { return x.value != y.value; }
 
-static void contains_test()
+static void target_test()
 {
   boost::function0<int> f;
 
   f = &forty_two;
-  BOOST_TEST(*f.contains<int (*)()>() == &forty_two);
-  BOOST_TEST(!f.contains<Seventeen>());
+  BOOST_TEST(*f.target<int (*)()>() == &forty_two);
+  BOOST_TEST(!f.target<Seventeen>());
 
   f = Seventeen();
-  BOOST_TEST(!f.contains<int (*)()>());
-  BOOST_TEST(f.contains<Seventeen>());
+  BOOST_TEST(!f.target<int (*)()>());
+  BOOST_TEST(f.target<Seventeen>());
 
   Seventeen this_seventeen;
   f = boost::ref(this_seventeen);
-  BOOST_TEST(!f.contains<int (*)()>());
-  BOOST_TEST(f.contains<Seventeen>());
-  BOOST_TEST(f.contains<Seventeen>() == &this_seventeen);
+  BOOST_TEST(!f.target<int (*)()>());
+  BOOST_TEST(f.target<Seventeen>());
+  BOOST_TEST(f.target<Seventeen>() == &this_seventeen);
 }
 
 static void equal_test()
@@ -89,7 +89,7 @@ static void equal_test()
 
 int test_main(int, char*[])
 {
-  contains_test();
+  target_test();
   equal_test();
 
   return 0;