diff --git a/include/boost/core/empty_value.hpp b/include/boost/core/empty_value.hpp
index 9f04d61..6728bc2 100644
--- a/include/boost/core/empty_value.hpp
+++ b/include/boost/core/empty_value.hpp
@@ -138,10 +138,10 @@ template<class T, unsigned N>
 class empty_value<T, N, true>
 #if defined(BOOST_MSVC)
     : detail::empty_value_base<T> {
-    typedef detail::empty_value_base<T> core_ev_base;
+    typedef detail::empty_value_base<T> base_type;
 #else
     : T {
-    typedef T core_ev_base;
+    typedef T base_type;
 #endif
 
 public:
@@ -154,26 +154,26 @@ public:
 #endif
 
     BOOST_CONSTEXPR empty_value(boost::empty_init_t)
-        : core_ev_base() { }
+        : base_type() { }
 
 #if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
 #if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
     template<class U, class... Args>
     BOOST_CONSTEXPR empty_value(boost::empty_init_t, U&& value, Args&&... args)
-        : core_ev_base(std::forward<U>(value), std::forward<Args>(args)...) { }
+        : base_type(std::forward<U>(value), std::forward<Args>(args)...) { }
 #else
     template<class U>
     BOOST_CONSTEXPR empty_value(boost::empty_init_t, U&& value)
-        : core_ev_base(std::forward<U>(value)) { }
+        : base_type(std::forward<U>(value)) { }
 #endif
 #else
     template<class U>
     BOOST_CONSTEXPR empty_value(boost::empty_init_t, const U& value)
-        : core_ev_base(value) { }
+        : base_type(value) { }
 
     template<class U>
     BOOST_CONSTEXPR empty_value(boost::empty_init_t, U& value)
-        : core_ev_base(value) { }
+        : base_type(value) { }
 #endif
 
     BOOST_CONSTEXPR const T& get() const BOOST_NOEXCEPT {