--- a/src/hotspot/share/gc/epsilon/epsilonBarrierSet.hpp	Thu May 03 22:30:08 2018 +0200
+++ b/src/hotspot/share/gc/epsilon/epsilonBarrierSet.hpp	Fri May 04 19:16:56 2018 +0200
@@ -47,12 +47,12 @@
 
 template<>
 struct BarrierSet::GetName<EpsilonBarrierSet> {
-  static const BarrierSet::Name value = BarrierSet::Epsilon;
+  static const BarrierSet::Name value = BarrierSet::EpsilonBarrierSet;
 };
 
 template<>
-struct BarrierSet::GetType<BarrierSet::Epsilon> {
-  typedef EpsilonBarrierSet type;
+struct BarrierSet::GetType<BarrierSet::EpsilonBarrierSet> {
+  typedef ::EpsilonBarrierSet type;
 };
 
 #endif // SHARE_VM_GC_EPSILON_BARRIERSET_HPP