diff --git a/include/boost/python/return_value_policy.hpp b/include/boost/python/return_value_policy.hpp
index 0beec47b..6a2036d7 100644
--- a/include/boost/python/return_value_policy.hpp
+++ b/include/boost/python/return_value_policy.hpp
@@ -9,10 +9,10 @@
 
 namespace boost { namespace python { 
 
-template <class Handler, class Base = default_call_policies>
+template <class ResultConverterGenerator, class Base = default_call_policies>
 struct return_value_policy : Base
 {
-    typedef Handler result_converter;
+    typedef ResultConverterGenerator result_converter;
 };
 
 }} // namespace boost::python