diff --git a/include/boost/mp11/algorithm.hpp b/include/boost/mp11/algorithm.hpp
index a25f48f..4cad722 100644
--- a/include/boost/mp11/algorithm.hpp
+++ b/include/boost/mp11/algorithm.hpp
@@ -490,15 +490,15 @@ template<template<class...> class L, class T1, class... T, template<class...> cl
 
 template<class L, template<class...> class P> using mp_sort = typename detail::mp_sort_impl<L, P>::type;
 
-// mp_find_index<L, V>
+// mp_find<L, V>
 namespace detail
 {
 
-template<class L, class V> struct mp_find_index_impl;
+template<class L, class V> struct mp_find_impl;
 
 #if !defined( BOOST_MP11_NO_CONSTEXPR )
 
-template<template<class...> class L, class V> struct mp_find_index_impl<L<>, V>
+template<template<class...> class L, class V> struct mp_find_impl<L<>, V>
 {
     using type = mp_size_t<0>;
 };
@@ -508,7 +508,7 @@ constexpr std::size_t cx_find_index( bool const * first, bool const * last )
     return first == last || *first? 0: 1 + cx_find_index( first + 1, last );
 }
 
-template<template<class...> class L, class... T, class V> struct mp_find_index_impl<L<T...>, V>
+template<template<class...> class L, class... T, class V> struct mp_find_impl<L<T...>, V>
 {
     static constexpr bool _v[] = { std::is_same<T, V>::value... };
     using type = mp_size_t< cx_find_index( _v, _v + sizeof...(T) ) >;
@@ -518,7 +518,7 @@ template<template<class...> class L, class... T, class V> struct mp_find_index_i
 
 #if defined( BOOST_MSVC ) && BOOST_WORKAROUND( BOOST_MSVC, <= 1800 )
 
-template<template<class...> class L, class... T, class V> struct mp_find_index_impl<L<T...>, V>
+template<template<class...> class L, class... T, class V> struct mp_find_impl<L<T...>, V>
 {
     static_assert( sizeof...(T) == 0, "T... must be empty" );
     using type = mp_size_t<0>;
@@ -526,21 +526,21 @@ template<template<class...> class L, class... T, class V> struct mp_find_index_i
 
 #else
 
-template<template<class...> class L, class V> struct mp_find_index_impl<L<>, V>
+template<template<class...> class L, class V> struct mp_find_impl<L<>, V>
 {
     using type = mp_size_t<0>;
 };
 
 #endif
 
-template<template<class...> class L, class... T, class V> struct mp_find_index_impl<L<V, T...>, V>
+template<template<class...> class L, class... T, class V> struct mp_find_impl<L<V, T...>, V>
 {
     using type = mp_size_t<0>;
 };
 
-template<template<class...> class L, class T1, class... T, class V> struct mp_find_index_impl<L<T1, T...>, V>
+template<template<class...> class L, class T1, class... T, class V> struct mp_find_impl<L<T1, T...>, V>
 {
-    using _r = typename mp_find_index_impl<mp_list<T...>, V>::type;
+    using _r = typename mp_find_impl<mp_list<T...>, V>::type;
     using type = mp_size_t<1 + _r::value>;
 };
 
@@ -548,22 +548,22 @@ template<template<class...> class L, class T1, class... T, class V> struct mp_fi
 
 } // namespace detail
 
-template<class L, class V> using mp_find_index = typename detail::mp_find_index_impl<L, V>::type;
+template<class L, class V> using mp_find = typename detail::mp_find_impl<L, V>::type;
 
-// mp_find_index_if<L, P>
+// mp_find_if<L, P>
 namespace detail
 {
 
-template<class L, template<class...> class P> struct mp_find_index_if_impl;
+template<class L, template<class...> class P> struct mp_find_if_impl;
 
 #if !defined( BOOST_MP11_NO_CONSTEXPR )
 
-template<template<class...> class L, template<class...> class P> struct mp_find_index_if_impl<L<>, P>
+template<template<class...> class L, template<class...> class P> struct mp_find_if_impl<L<>, P>
 {
     using type = mp_size_t<0>;
 };
 
-template<template<class...> class L, class... T, template<class...> class P> struct mp_find_index_if_impl<L<T...>, P>
+template<template<class...> class L, class... T, template<class...> class P> struct mp_find_if_impl<L<T...>, P>
 {
     static constexpr bool _v[] = { P<T>::value... };
     using type = mp_size_t< cx_find_index( _v, _v + sizeof...(T) ) >;
@@ -573,7 +573,7 @@ template<template<class...> class L, class... T, template<class...> class P> str
 
 #if defined( BOOST_MSVC ) && BOOST_WORKAROUND( BOOST_MSVC, <= 1800 )
 
-template<template<class...> class L, class... T, template<class...> class P> struct mp_find_index_if_impl<L<T...>, P>
+template<template<class...> class L, class... T, template<class...> class P> struct mp_find_if_impl<L<T...>, P>
 {
     static_assert( sizeof...(T) == 0, "T... must be empty" );
     using type = mp_size_t<0>;
@@ -581,35 +581,29 @@ template<template<class...> class L, class... T, template<class...> class P> str
 
 #else
 
-template<template<class...> class L, template<class...> class P> struct mp_find_index_if_impl<L<>, P>
+template<template<class...> class L, template<class...> class P> struct mp_find_if_impl<L<>, P>
 {
     using type = mp_size_t<0>;
 };
 
 #endif
 
-template<class L, template<class...> class P> struct mp_find_index_if_impl_2
+template<class L, template<class...> class P> struct mp_find_if_impl_2
 {
-    using _r = typename mp_find_index_if_impl<L, P>::type;
+    using _r = typename mp_find_if_impl<L, P>::type;
     using type = mp_size_t<1 + _r::value>;
 };
 
-template<template<class...> class L, class T1, class... T, template<class...> class P> struct mp_find_index_if_impl<L<T1, T...>, P>
+template<template<class...> class L, class T1, class... T, template<class...> class P> struct mp_find_if_impl<L<T1, T...>, P>
 {
-    using type = typename mp_if<P<T1>, mp_identity<mp_size_t<0>>, mp_find_index_if_impl_2<mp_list<T...>, P>>::type;
+    using type = typename mp_if<P<T1>, mp_identity<mp_size_t<0>>, mp_find_if_impl_2<mp_list<T...>, P>>::type;
 };
 
 #endif
 
 } // namespace detail
 
-template<class L, template<class...> class P> using mp_find_index_if = typename detail::mp_find_index_if_impl<L, P>::type;
-
-// mp_find<L, V>
-template<class L, class V> using mp_find = mp_drop<L, mp_find_index<L, V>>;
-
-// mp_find_if<L, P>
-template<class L, template<class...> class P> using mp_find_if = mp_drop<L, mp_find_index_if<L, P>>;
+template<class L, template<class...> class P> using mp_find_if = typename detail::mp_find_if_impl<L, P>::type;
 
 // mp_reverse<L>
 namespace detail
diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index b00e64c..2cd6766 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -48,8 +48,6 @@ run mp_remove.cpp : : : $(REQ) ;
 run mp_remove_if.cpp : : : $(REQ) ;
 run mp_partition.cpp : : : $(REQ) ;
 run mp_sort.cpp : : : $(REQ) ;
-run mp_find_index.cpp : : : $(REQ) ;
-run mp_find_index_if.cpp : : : $(REQ) ;
 run mp_find.cpp : : : $(REQ) ;
 run mp_find_if.cpp : : : $(REQ) ;
 run mp_reverse.cpp : : : $(REQ) ;
diff --git a/test/mp_find.cpp b/test/mp_find.cpp
index b9b3b2e..c9ee794 100644
--- a/test/mp_find.cpp
+++ b/test/mp_find.cpp
@@ -23,31 +23,40 @@ int main()
 {
     using boost::mp_list;
     using boost::mp_find;
+    using boost::mp_size_t;
 
     {
         using L1 = mp_list<>;
 
-        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_find<L1, void>, L1>));
+        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_find<L1, void>, mp_size_t<0>>));
 
         using L2 = mp_list<X1, X2, X2, X3, X3, X3>;
 
-        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_find<L2, void>, mp_list<>>));
-        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_find<L2, X1>, L2>));
-        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_find<L2, X2>, mp_list<X2, X2, X3, X3, X3>>));
-        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_find<L2, X3>, mp_list<X3, X3, X3>>));
+        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_find<L2, void>, mp_size_t<6>>));
+        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_find<L2, X1>, mp_size_t<0>>));
+        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_find<L2, X2>, mp_size_t<1>>));
+        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_find<L2, X3>, mp_size_t<3>>));
     }
 
     {
         using L3 = std::tuple<>;
 
-        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_find<L3, void>, L3>));
+        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_find<L3, void>, mp_size_t<0>>));
 
         using L4 = std::tuple<X1, X2, X2, X3, X3, X3>;
 
-        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_find<L4, void>, std::tuple<>>));
-        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_find<L4, X1>, L4>));
-        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_find<L4, X2>, std::tuple<X2, X2, X3, X3, X3>>));
-        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_find<L4, X3>, std::tuple<X3, X3, X3>>));
+        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_find<L4, void>, mp_size_t<6>>));
+        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_find<L4, X1>, mp_size_t<0>>));
+        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_find<L4, X2>, mp_size_t<1>>));
+        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_find<L4, X3>, mp_size_t<3>>));
+    }
+
+    {
+        using L5 = std::pair<X1, X2>;
+
+        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_find<L5, void>, mp_size_t<2>>));
+        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_find<L5, X1>, mp_size_t<0>>));
+        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_find<L5, X2>, mp_size_t<1>>));
     }
 
     return boost::report_errors();
diff --git a/test/mp_find_if.cpp b/test/mp_find_if.cpp
index 72fc9e0..2500381 100644
--- a/test/mp_find_if.cpp
+++ b/test/mp_find_if.cpp
@@ -21,29 +21,38 @@ int main()
 {
     using boost::mp_list;
     using boost::mp_find_if;
+    using boost::mp_size_t;
 
     {
         using L1 = mp_list<>;
 
-        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_find_if<L1, std::is_const>, L1>));
+        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_find_if<L1, std::is_const>, mp_size_t<0>>));
 
         using L2 = mp_list<X1, X1 const, X1 const, X1*, X1*, X1*>;
 
-        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_find_if<L2, std::is_volatile>, mp_list<>>));
-        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_find_if<L2, std::is_const>, mp_list<X1 const, X1 const, X1*, X1*, X1*>>));
-        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_find_if<L2, std::is_pointer>, mp_list<X1*, X1*, X1*>>));
+        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_find_if<L2, std::is_volatile>, mp_size_t<6>>));
+        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_find_if<L2, std::is_const>, mp_size_t<1>>));
+        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_find_if<L2, std::is_pointer>, mp_size_t<3>>));
     }
 
     {
         using L1 = std::tuple<>;
 
-        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_find_if<L1, std::is_const>, L1>));
+        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_find_if<L1, std::is_const>, mp_size_t<0>>));
 
         using L2 = std::tuple<X1, X1 const, X1 const, X1*, X1*, X1*>;
 
-        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_find_if<L2, std::is_volatile>, std::tuple<>>));
-        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_find_if<L2, std::is_const>, std::tuple<X1 const, X1 const, X1*, X1*, X1*>>));
-        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_find_if<L2, std::is_pointer>, std::tuple<X1*, X1*, X1*>>));
+        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_find_if<L2, std::is_volatile>, mp_size_t<6>>));
+        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_find_if<L2, std::is_const>, mp_size_t<1>>));
+        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_find_if<L2, std::is_pointer>, mp_size_t<3>>));
+    }
+
+    {
+        using L2 = std::pair<X1 const, X1*>;
+
+        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_find_if<L2, std::is_volatile>, mp_size_t<2>>));
+        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_find_if<L2, std::is_const>, mp_size_t<0>>));
+        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_find_if<L2, std::is_pointer>, mp_size_t<1>>));
     }
 
     return boost::report_errors();
diff --git a/test/mp_find_index.cpp b/test/mp_find_index.cpp
deleted file mode 100644
index 570f641..0000000
--- a/test/mp_find_index.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
-
-//  Copyright 2015 Peter Dimov.
-//
-// Distributed under the Boost Software License, Version 1.0.
-//
-// See accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt
-
-
-#include <boost/mp11/algorithm.hpp>
-#include <boost/mp11/list.hpp>
-#include <boost/mp11/integral.hpp>
-#include <boost/core/lightweight_test_trait.hpp>
-#include <type_traits>
-#include <tuple>
-#include <utility>
-
-struct X1 {};
-struct X2 {};
-struct X3 {};
-
-int main()
-{
-    using boost::mp_list;
-    using boost::mp_find_index;
-    using boost::mp_size_t;
-
-    {
-        using L1 = mp_list<>;
-
-        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_find_index<L1, void>, mp_size_t<0>>));
-
-        using L2 = mp_list<X1, X2, X2, X3, X3, X3>;
-
-        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_find_index<L2, void>, mp_size_t<6>>));
-        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_find_index<L2, X1>, mp_size_t<0>>));
-        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_find_index<L2, X2>, mp_size_t<1>>));
-        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_find_index<L2, X3>, mp_size_t<3>>));
-    }
-
-    {
-        using L3 = std::tuple<>;
-
-        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_find_index<L3, void>, mp_size_t<0>>));
-
-        using L4 = std::tuple<X1, X2, X2, X3, X3, X3>;
-
-        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_find_index<L4, void>, mp_size_t<6>>));
-        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_find_index<L4, X1>, mp_size_t<0>>));
-        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_find_index<L4, X2>, mp_size_t<1>>));
-        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_find_index<L4, X3>, mp_size_t<3>>));
-    }
-
-    {
-        using L5 = std::pair<X1, X2>;
-
-        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_find_index<L5, void>, mp_size_t<2>>));
-        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_find_index<L5, X1>, mp_size_t<0>>));
-        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_find_index<L5, X2>, mp_size_t<1>>));
-    }
-
-    return boost::report_errors();
-}
diff --git a/test/mp_find_index_if.cpp b/test/mp_find_index_if.cpp
deleted file mode 100644
index 3544f0b..0000000
--- a/test/mp_find_index_if.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-
-//  Copyright 2015 Peter Dimov.
-//
-// Distributed under the Boost Software License, Version 1.0.
-//
-// See accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt
-
-
-#include <boost/mp11/algorithm.hpp>
-#include <boost/mp11/list.hpp>
-#include <boost/mp11/integral.hpp>
-#include <boost/core/lightweight_test_trait.hpp>
-#include <type_traits>
-#include <tuple>
-#include <utility>
-
-struct X1 {};
-
-int main()
-{
-    using boost::mp_list;
-    using boost::mp_find_index_if;
-    using boost::mp_size_t;
-
-    {
-        using L1 = mp_list<>;
-
-        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_find_index_if<L1, std::is_const>, mp_size_t<0>>));
-
-        using L2 = mp_list<X1, X1 const, X1 const, X1*, X1*, X1*>;
-
-        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_find_index_if<L2, std::is_volatile>, mp_size_t<6>>));
-        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_find_index_if<L2, std::is_const>, mp_size_t<1>>));
-        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_find_index_if<L2, std::is_pointer>, mp_size_t<3>>));
-    }
-
-    {
-        using L1 = std::tuple<>;
-
-        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_find_index_if<L1, std::is_const>, mp_size_t<0>>));
-
-        using L2 = std::tuple<X1, X1 const, X1 const, X1*, X1*, X1*>;
-
-        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_find_index_if<L2, std::is_volatile>, mp_size_t<6>>));
-        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_find_index_if<L2, std::is_const>, mp_size_t<1>>));
-        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_find_index_if<L2, std::is_pointer>, mp_size_t<3>>));
-    }
-
-    {
-        using L2 = std::pair<X1 const, X1*>;
-
-        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_find_index_if<L2, std::is_volatile>, mp_size_t<2>>));
-        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_find_index_if<L2, std::is_const>, mp_size_t<0>>));
-        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_find_index_if<L2, std::is_pointer>, mp_size_t<1>>));
-    }
-
-    return boost::report_errors();
-}