diff --git a/include/boost/lambda/core.hpp b/include/boost/lambda/core.hpp
index a6424e8..95cdbc7 100644
--- a/include/boost/lambda/core.hpp
+++ b/include/boost/lambda/core.hpp
@@ -54,13 +54,13 @@ namespace lambda {
 
 namespace {
 
-	boost::lambda::free1_type free1;
-	boost::lambda::free2_type free2;
-	boost::lambda::free3_type free3;
+	boost::lambda::placeholder1_type free1;
+	boost::lambda::placeholder2_type free2;
+	boost::lambda::placeholder3_type free3;
 
-	boost::lambda::free1_type& _1 = free1;
-	boost::lambda::free2_type& _2 = free2;
-	boost::lambda::free3_type& _3 = free3;
+	boost::lambda::placeholder1_type& _1 = free1;
+	boost::lambda::placeholder2_type& _2 = free2;
+	boost::lambda::placeholder3_type& _3 = free3;
   // _1, _2, ... naming scheme by Peter Dimov
 } // unnamed
    
diff --git a/include/boost/lambda/exceptions.hpp b/include/boost/lambda/exceptions.hpp
index c99b92c..ff97e8a 100644
--- a/include/boost/lambda/exceptions.hpp
+++ b/include/boost/lambda/exceptions.hpp
@@ -22,11 +22,11 @@
 namespace boost { 
 namespace lambda {
 
-typedef lambda_functor<placeholder<EXCEPTION> > freeE_type;
+typedef lambda_functor<placeholder<EXCEPTION> > placeholderE_type;
 
 namespace {
-  boost::lambda::freeE_type freeE;
-  boost::lambda::freeE_type& _E = freeE;        
+  boost::lambda::placeholderE_type freeE;
+  boost::lambda::placeholderE_type& _E = freeE;        
 }
 
 // -- try_catch arity_deduction --------------------------------